YGGverse/Yoda
1
0
Fork 0
mirror of https://github.com/YGGverse/Yoda.git synced 2026-03-31 16:45:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

reorganize route by content type

Browse source
This commit is contained in:
yggverse 2025-02-13 17:49:53 +02:00
parent 8a4689fc0a
commit b5423c3923
1 changed files with 66 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

109
src/app/browser/window/tab/item/client/driver/file.rs
View file

@ -27,9 +27,10 @@ impl File {
}; };
let url = uri.to_string(); let url = uri.to_string();
let file = File::for_uri(&url);
match File::for_uri(&url).query_file_type(FileQueryInfoFlags::NONE, Some(&cancellable)) { match file.query_file_type(FileQueryInfoFlags::NONE, Some(&cancellable)) {
FileType::Directory => File::for_uri(&url).enumerate_children_async( FileType::Directory => file.enumerate_children_async(
"standard::content-type", "standard::content-type",
FileQueryInfoFlags::NONE, FileQueryInfoFlags::NONE,
Priority::DEFAULT, Priority::DEFAULT,
@ -55,21 +56,36 @@ impl File {
Err(_) => todo!(), Err(_) => todo!(),
}, },
), ),
_ => { _ => file.clone().query_info_async(
if url.ends_with(".gmi") || url.ends_with(".gemini") { "standard::content-type",
FileQueryInfoFlags::NONE,
Priority::DEFAULT,
Some(&cancellable.clone()),
{
let page = self.page.clone();
move |result| match result {
Ok(file_info) => match file_info.content_type() {
Some(content_type) => match content_type.as_str() {
"text/plain" => {
if matches!(*feature, Feature::Source) { if matches!(*feature, Feature::Source) {
text_source(&self.page, uri, cancellable) text_source(page, file, uri, cancellable)
} else {
text_gemini(&self.page, uri, cancellable)
}
} else if url.ends_with(".txt") { } else if url.ends_with(".txt") {
text_plain(&self.page, uri, cancellable) text_plain(page, file, uri, cancellable)
} else if !url.ends_with("/") {
text_gemini(&self.page, uri, cancellable)
} else { } else {
status_failure(&self.page, "Unsupported content type") text_gemini(page, file, uri, cancellable)
} }
} }
"image/png" | "image/gif" | "image/jpeg" | "image/webp" => {
todo!()
}
_ => status_failure(page, "Unsupported content type"),
},
None => status_failure(page, "Undetectable content type"),
},
Err(e) => status_failure(page, &e.to_string()),
}
},
),
} }
} }
} }
@ -77,57 +93,37 @@ impl File {
// Tools // Tools
/// Handle as `text/source` /// Handle as `text/source`
fn text_source(page: &Rc<Page>, uri: Uri, cancellable: Cancellable) { fn text_source(page: Rc<Page>, file: gtk::gio::File, uri: Uri, cancellable: Cancellable) {
load_contents_async(&uri.to_string(), cancellable, { load_contents_async(file, cancellable, move |result| match result {
let page = page.clone(); Ok(data) => text(page, uri, Text::Source(data)),
let uri = uri.clone(); Err(message) => status_failure(page, &message),
move |data| text(page, uri, Text::Source(data)) })
});
} }
/// Handle as `text/gemini` /// Handle as `text/gemini`
fn text_gemini(page: &Rc<Page>, uri: Uri, cancellable: Cancellable) { fn text_gemini(page: Rc<Page>, file: gtk::gio::File, uri: Uri, cancellable: Cancellable) {
load_contents_async(&uri.to_string(), cancellable, { load_contents_async(file, cancellable, move |result| match result {
let page = page.clone(); Ok(data) => text(page, uri, Text::Gemini(data)),
let uri = uri.clone(); Err(message) => status_failure(page, &message),
move |data| text(page, uri, Text::Gemini(data)) })
});
} }
/// Handle as `text/plain` /// Handle as `text/plain`
fn text_plain(page: &Rc<Page>, uri: Uri, cancellable: Cancellable) { fn text_plain(page: Rc<Page>, file: gtk::gio::File, uri: Uri, cancellable: Cancellable) {
load_contents_async(&uri.to_string(), cancellable, { load_contents_async(file, cancellable, move |result| match result {
let page = page.clone(); Ok(data) => text(page, uri, Text::Plain(data)),
let uri = uri.clone(); Err(message) => status_failure(page, &message),
move |data| text(page, uri, Text::Plain(data))
}); });
} }
/// Handle as failure status page /// Handle as failure status page
fn status_failure(page: &Rc<Page>, message: &str) { fn status_failure(page: Rc<Page>, message: &str) {
let status = page.content.to_status_failure(); let status = page.content.to_status_failure();
status.set_description(Some(message)); status.set_description(Some(message));
page.set_title(&status.title()); page.set_title(&status.title());
page.set_progress(0.0); page.set_progress(0.0);
} }
fn load_contents_async(
url: &str,
cancellable: Cancellable,
on_success: impl FnOnce(String) + 'static,
) {
use gtk::prelude::FileExtManual;
gtk::gio::File::for_uri(url).load_contents_async(Some(&cancellable), {
move |result| match result {
Ok((ref buffer, _)) => match String::from_utf8(buffer.to_vec()) {
Ok(data) => on_success(data),
Err(_) => todo!(),
},
Err(_) => todo!(),
}
})
}
enum Text { enum Text {
Gemini(String), Gemini(String),
Plain(String), Plain(String),
@ -150,6 +146,25 @@ fn text(page: Rc<Page>, uri: Uri, text: Text) {
page.window_action.find.simple_action.set_enabled(true); page.window_action.find.simple_action.set_enabled(true);
} }
fn load_contents_async(
file: gtk::gio::File,
cancellable: Cancellable,
callback: impl FnOnce(Result<String, String>) + 'static,
) {
use gtk::prelude::FileExtManual;
file.load_contents_async(Some(&cancellable), {
move |result| {
callback(match result {
Ok((ref buffer, _)) => match String::from_utf8(buffer.to_vec()) {
Ok(data) => Ok(data),
Err(e) => Err(e.to_string()),
},
Err(e) => Err(e.to_string()),
})
}
})
}
/// Helper function, extract readable title from [Uri](https://docs.gtk.org/glib/struct.Uri.html) /// Helper function, extract readable title from [Uri](https://docs.gtk.org/glib/struct.Uri.html)
/// * useful as common placeholder when page title could not be detected /// * useful as common placeholder when page title could not be detected
/// * this feature may be improved and moved outside @TODO /// * this feature may be improved and moved outside @TODO