lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fileModel: Use GFile with URI as key

Browse source 
Part-of: <https://gitlab.gnome.org/Incubator/loupe/-/merge_requests/174>
This commit is contained in:
Sophie Herold 2023-04-12 01:11:59 +02:00 • committed by Marge Bot
parent 3b0c32ecee
commit 032707a210
10 changed files with 164 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/widgets/image.rs
View file

@ -43,7 +43,7 @@ use once_cell::sync::Lazy;
use once_cell::unsync::OnceCell;
use std::cell::{Cell, RefCell};
use std::path::{Path, PathBuf};
use std::path::PathBuf;
use std::sync::Arc;
/// Default background color around images and behind transparent images
@ -742,9 +742,8 @@ glib::wrapper! {
}
impl LpImage {
pub async fn load(&self, path: &Path) {
let path = path.to_path_buf();
let file = gio::File::for_path(&path);
pub async fn load(&self, file: &gio::File) {
let path = file.path().unwrap();
self.set_file(&file);
if !path.is_file() {
@ -963,7 +962,7 @@ impl LpImage {
let file = file_a.clone();
// TODO: error handling is missing
spawn(async move {
obj.load(&file.path().unwrap()).await;
obj.load(&file).await;
});
}
gio::FileMonitorEvent::Deleted