mirror of
https://github.com/YGGverse/Yoda.git
synced 2025-02-03 15:04:13 +00:00
track Status
change timestamp
This commit is contained in:
parent
d3d85e3672
commit
3f67c93c3d
@ -1,10 +1,12 @@
|
||||
mod redirect;
|
||||
mod status;
|
||||
|
||||
// Children dependencies
|
||||
use redirect::Redirect;
|
||||
use status::Status;
|
||||
|
||||
use gtk::{gio::Cancellable, prelude::CancellableExt};
|
||||
// Global dependencies
|
||||
use gtk::{gio::Cancellable, glib::DateTime, prelude::CancellableExt};
|
||||
use std::{
|
||||
cell::{Cell, RefCell},
|
||||
rc::Rc,
|
||||
@ -43,7 +45,7 @@ impl Client {
|
||||
Self {
|
||||
cancellable: Cell::new(Cancellable::new()),
|
||||
redirect: Rc::new(Redirect::new()),
|
||||
status: Rc::new(RefCell::new(Status::Cancellable)), // e.g. "ready to use"
|
||||
status: Rc::new(RefCell::new(Status::Cancellable(now()))), // e.g. "ready to use"
|
||||
gemini: gemini::Client::new(),
|
||||
}
|
||||
}
|
||||
@ -57,9 +59,9 @@ impl Client {
|
||||
let previous = self.cancellable.replace(cancellable.clone());
|
||||
if !previous.is_cancelled() {
|
||||
previous.cancel();
|
||||
self.status.replace(Status::Cancelled);
|
||||
self.status.replace(Status::Cancelled(now()));
|
||||
} else {
|
||||
self.status.replace(Status::Cancellable);
|
||||
self.status.replace(Status::Cancellable(now()));
|
||||
}
|
||||
|
||||
// Done
|
||||
@ -71,13 +73,20 @@ impl Client {
|
||||
/// Begin new request
|
||||
/// * the `query` as string, to support system routing requests (e.g. `source:`)
|
||||
pub fn request(&self, query: &str) {
|
||||
self.status.replace(Status::Request(query.to_string()));
|
||||
self.status
|
||||
.replace(Status::Request((now(), query.to_string())));
|
||||
|
||||
// Forcefully prevent infinitive redirection
|
||||
// * this condition just to make sure that client will never stuck by driver implementation issue
|
||||
if self.redirect.count() > redirect::LIMIT {
|
||||
self.status.replace(Status::RedirectLimit(redirect::LIMIT));
|
||||
self.status
|
||||
.replace(Status::RedirectLimit((now(), redirect::LIMIT)));
|
||||
// @TODO return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Get current [DateTime](https://docs.gtk.org/glib/struct.DateTime.html)
|
||||
fn now() -> DateTime {
|
||||
DateTime::now_local().unwrap() // @TODO handle?
|
||||
}
|
||||
|
@ -1,36 +1,48 @@
|
||||
use gtk::glib::{DateTime, GString};
|
||||
use std::fmt::{Display, Formatter, Result};
|
||||
|
||||
/// Local `Client` status
|
||||
/// * not same as the Gemini status!
|
||||
pub enum Status {
|
||||
/// Ready to use (or cancel from outside)
|
||||
Cancellable,
|
||||
Cancellable(DateTime),
|
||||
/// Operation cancelled, new `Cancellable` required to continue
|
||||
Cancelled,
|
||||
Cancelled(DateTime),
|
||||
/// Redirection count limit reached by protocol driver or global settings
|
||||
RedirectLimit(usize),
|
||||
RedirectLimit((DateTime, usize)),
|
||||
/// New `request` begin
|
||||
Request(String),
|
||||
Request((DateTime, String)),
|
||||
}
|
||||
|
||||
impl Display for Status {
|
||||
fn fmt(&self, f: &mut Formatter) -> Result {
|
||||
match self {
|
||||
Self::Cancellable => {
|
||||
write!(f, "Ready to use (or cancel from outside)")
|
||||
}
|
||||
Self::Cancelled => {
|
||||
Self::Cancellable(t) => {
|
||||
write!(
|
||||
f,
|
||||
"Operation cancelled, new `Cancellable` required to continue"
|
||||
"[{}] Ready to use (or cancel from outside)",
|
||||
format_time(t)
|
||||
)
|
||||
}
|
||||
Self::RedirectLimit(count) => {
|
||||
write!(f, "Redirection count limit ({count}) reached by protocol driver or global settings")
|
||||
Self::Cancelled(t) => {
|
||||
write!(
|
||||
f,
|
||||
"[{}] Operation cancelled, new `Cancellable` required to continue",
|
||||
format_time(t)
|
||||
)
|
||||
}
|
||||
Self::Request(value) => {
|
||||
write!(f, "Request `{value}`...")
|
||||
Self::RedirectLimit((t, count)) => {
|
||||
write!(f, "[{}] Redirection count limit ({count}) reached by protocol driver or global settings",
|
||||
format_time(t))
|
||||
}
|
||||
Self::Request((t, value)) => {
|
||||
write!(f, "[{}] Request `{value}`...", format_time(t))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Format given [DateTime](https://docs.gtk.org/glib/struct.DateTime.html)
|
||||
fn format_time(t: &DateTime) -> GString {
|
||||
t.format_iso8601().unwrap() // @TODO handle?
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user