clippy + pkgbuild

This commit is contained in:
nvrl committed 2026-06-30 17:41:52 +02:00
1 parent 03dd8d8496
commit 2812e0c893
4 files changed
+86 -16

No files matched your search

Generated
+75 -1
View File
@@ -53,6 +53,18 @@ dependencies = [
"aes", "aes",
] ]
[[package]]
name = "ahash"
version = "0.8.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
dependencies = [
"cfg-if",
"once_cell",
"version_check",
"zerocopy",
]
[[package]] [[package]]
name = "aho-corasick" name = "aho-corasick"
version = "1.1.4" version = "1.1.4"
@@ -1278,6 +1290,18 @@ dependencies = [
"pin-project-lite", "pin-project-lite",
] ]
[[package]]
name = "fallible-iterator"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
[[package]]
name = "fallible-streaming-iterator"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
[[package]] [[package]]
name = "fastrand" name = "fastrand"
version = "2.4.1" version = "2.4.1"
@@ -1793,12 +1817,30 @@ dependencies = [
"system-deps", "system-deps",
] ]
[[package]]
name = "hashbrown"
version = "0.14.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
dependencies = [
"ahash",
]
[[package]] [[package]]
name = "hashbrown" name = "hashbrown"
version = "0.17.1" version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
[[package]]
name = "hashlink"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af"
dependencies = [
"hashbrown 0.14.5",
]
[[package]] [[package]]
name = "heck" name = "heck"
version = "0.5.0" version = "0.5.0"
@@ -2117,7 +2159,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
dependencies = [ dependencies = [
"equivalent", "equivalent",
"hashbrown", "hashbrown 0.17.1",
] ]
[[package]] [[package]]
@@ -2345,6 +2387,17 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "libsqlite3-sys"
version = "0.30.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149"
dependencies = [
"cc",
"pkg-config",
"vcpkg",
]
[[package]] [[package]]
name = "linux-raw-sys" name = "linux-raw-sys"
version = "0.12.1" version = "0.12.1"
@@ -2793,6 +2846,7 @@ dependencies = [
"keyring", "keyring",
"proton-drive-rs", "proton-drive-rs",
"proton-sdk", "proton-sdk",
"rusqlite",
"serde", "serde",
"serde_json", "serde_json",
"sha2 0.10.9", "sha2 0.10.9",
@@ -3406,6 +3460,20 @@ dependencies = [
"windows-sys 0.59.0", "windows-sys 0.59.0",
] ]
[[package]]
name = "rusqlite"
version = "0.32.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7753b721174eb8ff87a9a0e799e2d7bc3749323e773db92e0984debb00019d6e"
dependencies = [
"bitflags 2.13.0",
"fallible-iterator",
"fallible-streaming-iterator",
"hashlink",
"libsqlite3-sys",
"smallvec",
]
[[package]] [[package]]
name = "rustc-hash" name = "rustc-hash"
version = "2.1.2" version = "2.1.2"
@@ -4347,6 +4415,12 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
[[package]]
name = "vcpkg"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
[[package]] [[package]]
name = "vec_map" name = "vec_map"
version = "0.8.2" version = "0.8.2"
+1
View File
@@ -27,6 +27,7 @@ tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] } tracing-subscriber = { version = "0.3", features = ["env-filter"] }
directories = "5" directories = "5"
sha2 = "0.10" sha2 = "0.10"
rusqlite = { version = "0.32", features = ["bundled"] }
keyring = { version = "3", features = ["sync-secret-service", "crypto-rust"] } keyring = { version = "3", features = ["sync-secret-service", "crypto-rust"] }
clap = { version = "4", features = ["derive"] } clap = { version = "4", features = ["derive"] }
rpassword = "7" rpassword = "7"
+9 -14
View File
@@ -1633,8 +1633,8 @@ fn wire_gallery(ui: &Rc<Ui>, grid: &gtk4::GridView) {
let ui = ui_upload.clone(); let ui = ui_upload.clone();
let parent_win = ui.stack.root().and_downcast::<gtk4::Window>(); let parent_win = ui.stack.root().and_downcast::<gtk4::Window>();
dialog.open(parent_win.as_ref(), gio::Cancellable::NONE, move |res| { dialog.open(parent_win.as_ref(), gio::Cancellable::NONE, move |res| {
if let Ok(file) = res { if let Ok(file) = res
if let Some(path) = file.path() { && let Some(path) = file.path() {
let name = path let name = path
.file_name() .file_name()
.and_then(|n| n.to_str()) .and_then(|n| n.to_str())
@@ -1698,7 +1698,6 @@ fn wire_gallery(ui: &Rc<Ui>, grid: &gtk4::GridView) {
} }
}); });
} }
}
}); });
}); });
} }
@@ -1715,14 +1714,12 @@ fn show_error_dialog(ui: &Rc<Ui>, message: &str) {
fn find_photo_index(model: &gio::ListStore, uid: &str) -> Option<u32> { fn find_photo_index(model: &gio::ListStore, uid: &str) -> Option<u32> {
for i in 0..model.n_items() { for i in 0..model.n_items() {
if let Some(obj) = model.item(i) { if let Some(obj) = model.item(i)
if let Some(boxed) = obj.downcast_ref::<BoxedAnyObject>() { && let Some(boxed) = obj.downcast_ref::<BoxedAnyObject>()
if boxed.borrow::<PhotoItem>().uid == uid { && boxed.borrow::<PhotoItem>().uid == uid {
return Some(i); return Some(i);
} }
} }
}
}
None None
} }
@@ -1792,15 +1789,14 @@ fn save_photo_to_disk(window: &gtk4::Window, source_path: &str, original_name: &
.build(); .build();
let source_path_str = source_path.to_string(); let source_path_str = source_path.to_string();
dialog.save(Some(window), gio::Cancellable::NONE, move |res| { dialog.save(Some(window), gio::Cancellable::NONE, move |res| {
if let Ok(file) = res { if let Ok(file) = res
if let Some(dest_path) = file.path() { && let Some(dest_path) = file.path() {
if let Err(e) = std::fs::copy(&source_path_str, &dest_path) { if let Err(e) = std::fs::copy(&source_path_str, &dest_path) {
tracing::error!("Failed to copy file to {:?}: {}", dest_path, e); tracing::error!("Failed to copy file to {:?}: {}", dest_path, e);
} else { } else {
tracing::info!("Saved photo to {:?}", dest_path); tracing::info!("Saved photo to {:?}", dest_path);
} }
} }
}
}); });
} }
@@ -1961,11 +1957,10 @@ fn open_photo_viewer(ui: &Rc<Ui>, initial_uid: String) {
next_btn.set_sensitive(initial_idx < n - 1); next_btn.set_sensitive(initial_idx < n - 1);
let mut initial_capture_time = 0; let mut initial_capture_time = 0;
if let Some(obj) = ui.gallery_model.item(initial_idx) { if let Some(obj) = ui.gallery_model.item(initial_idx)
if let Some(boxed) = obj.downcast_ref::<BoxedAnyObject>() { && let Some(boxed) = obj.downcast_ref::<BoxedAnyObject>() {
initial_capture_time = boxed.borrow::<PhotoItem>().capture_time; initial_capture_time = boxed.borrow::<PhotoItem>().capture_time;
} }
}
let date_str = format_capture_time(initial_capture_time); let date_str = format_capture_time(initial_capture_time);
title_label.set_label(&format!( title_label.set_label(&format!(
"Photo {} of {} • {}", "Photo {} of {} • {}",
+1 -1
View File
@@ -8,7 +8,7 @@
# Build + install: cd packaging && makepkg -fi # Build + install: cd packaging && makepkg -fi
pkgname=proton-drive-linux pkgname=proton-drive-linux
pkgver=0.1.2 pkgver=0.2.0
pkgrel=1 pkgrel=1
pkgdesc="Proton Drive client for Linux: FUSE files-on-demand mount, CLI, GTK4 app + tray" pkgdesc="Proton Drive client for Linux: FUSE files-on-demand mount, CLI, GTK4 app + tray"
arch=('x86_64') arch=('x86_64')