diff --git a/Cargo.lock b/Cargo.lock index 4c4faf4..724b4e9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -454,9 +454,9 @@ checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" [[package]] name = "bytes" -version = "1.8.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "cc" @@ -1019,7 +1019,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http 1.1.0", + "http 1.3.1", "indexmap", "slab", "tokio", @@ -1075,9 +1075,9 @@ dependencies = [ [[package]] name = "http" -version = "1.1.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" dependencies = [ "bytes", "fnv", @@ -1102,7 +1102,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.1.0", + "http 1.3.1", ] [[package]] @@ -1113,7 +1113,7 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http 1.1.0", + "http 1.3.1", "http-body 1.0.1", "pin-project-lite", ] @@ -1197,7 +1197,7 @@ dependencies = [ "futures-channel", "futures-util", "h2", - "http 1.1.0", + "http 1.3.1", "http-body 1.0.1", "httparse", "itoa", @@ -1214,7 +1214,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", - "http 1.1.0", + "http 1.3.1", "hyper 1.6.0", "hyper-util", "rustls", @@ -1251,7 +1251,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "http 1.1.0", + "http 1.3.1", "http-body 1.0.1", "hyper 1.6.0", "ipnet", @@ -1347,9 +1347,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "2.6.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" dependencies = [ "equivalent", "hashbrown", @@ -1517,9 +1517,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" dependencies = [ "value-bag", ] @@ -1938,9 +1938,9 @@ dependencies = [ [[package]] name = "progenitor" -version = "0.8.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "293df5b79211fbf0c1ebad6513ba451d267e9c15f5f19ee5d3da775e2dd27331" +checksum = "d7b99ef43fdd69d70aa4df8869db24b10ac704a2dbbc387ffac51944a1f3c0a8" dependencies = [ "progenitor-client", "progenitor-impl", @@ -1949,9 +1949,9 @@ dependencies = [ [[package]] name = "progenitor-client" -version = "0.8.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a5db54eac3cae7007a0785854bc3e89fd418cca7dfc2207b99b43979154c1b" +checksum = "3832a961a5f1b0b5a5ccda5fbf67cae2ba708f6add667401007764ba504ffebf" dependencies = [ "bytes", "futures-core", @@ -1964,12 +1964,12 @@ dependencies = [ [[package]] name = "progenitor-impl" -version = "0.8.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d85934a440963a69f9f04f48507ff6e7aa2952a5b2d8f96cc37fa3dd5c270f66" +checksum = "7646201b823e61712dd72f37428ceecaa8fb2a6c841e5d7cf909edb9a17f5677" dependencies = [ "heck 0.5.0", - "http 1.1.0", + "http 1.3.1", "indexmap", "openapiv3", "proc-macro2", @@ -1979,16 +1979,16 @@ dependencies = [ "serde", "serde_json", "syn 2.0.104", - "thiserror 1.0.65", + "thiserror 2.0.12", "typify", "unicode-ident", ] [[package]] name = "progenitor-macro" -version = "0.8.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d99a5a259e2d65a4933054aa51717c70b6aba0522695731ac354a522124efc9b" +checksum = "e710a11140d9b4241b7d8a90748f6125b6796d7a1205238eddb08dc790ce3830" dependencies = [ "openapiv3", "proc-macro2", @@ -2004,9 +2004,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] @@ -2054,7 +2054,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" dependencies = [ - "getrandom", + "getrandom 0.2.15", "libredox", "thiserror 2.0.12", ] @@ -2110,7 +2110,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http 1.1.0", + "http 1.3.1", "http-body 1.0.1", "http-body-util", "hyper 1.6.0", @@ -2237,9 +2237,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.21" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" +checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615" dependencies = [ "chrono", "dyn-clone", @@ -2251,9 +2251,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.21" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" +checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d" dependencies = [ "proc-macro2", "quote", @@ -2292,9 +2292,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.23" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" dependencies = [ "serde", ] @@ -2842,7 +2842,7 @@ dependencies = [ "bitflags 2.6.0", "bytes", "futures-util", - "http 1.1.0", + "http 1.3.1", "http-body 1.0.1", "iri-string", "pin-project-lite", @@ -2912,9 +2912,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typify" -version = "0.2.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c644dda9862f0fef3a570d8ddb3c2cfb1d5ac824a1f2ddfa7bc8f071a5ad8a" +checksum = "6c6c647a34e851cf0260ccc14687f17cdcb8302ff1a8a687a24b97ca0f82406f" dependencies = [ "typify-impl", "typify-macro", @@ -2922,9 +2922,9 @@ dependencies = [ [[package]] name = "typify-impl" -version = "0.2.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59ab345b6c0d8ae9500b9ff334a4c7c0d316c1c628dc55726b95887eb8dbd11" +checksum = "741b7f1e2e1338c0bee5ad5a7d3a9bbd4e24c33765c08b7691810e68d879365d" dependencies = [ "heck 0.5.0", "log", @@ -2936,15 +2936,15 @@ dependencies = [ "serde", "serde_json", "syn 2.0.104", - "thiserror 1.0.65", + "thiserror 2.0.12", "unicode-ident", ] [[package]] name = "typify-macro" -version = "0.2.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "785e2cdcef0df8160fdd762ed548a637aaec1e83704fdbc14da0df66013ee8d0" +checksum = "7560adf816a1e8dad7c63d8845ef6e31e673e39eab310d225636779230cbedeb" dependencies = [ "proc-macro2", "quote", @@ -2974,9 +2974,9 @@ checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "unicode-normalization" diff --git a/Cargo.toml b/Cargo.toml index c83cbeb..f1b0a09 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ figment_file_provider_adapter = "0.1.1" log = "0.4.22" multimap = "0.10.0" pretty_env_logger = "0.5.0" -progenitor-client = "0.8.0" +progenitor-client = "0.11.0" readonly = "0.2.12" regress = "0.10.1" reqwest = { version = "0.12.8", features = ["json", "stream"] } @@ -37,7 +37,7 @@ vcard4 = "0.5.2" [build-dependencies] openapiv3 = "2.0.0" prettyplease = "0.2.24" -progenitor = "0.8.0" +progenitor = "0.11.0" serde_json = "1.0" syn = "2.0" diff --git a/src/commands/auto_create_albums.rs b/src/commands/auto_create_albums.rs index 6679567..7292b90 100644 --- a/src/commands/auto_create_albums.rs +++ b/src/commands/auto_create_albums.rs @@ -50,7 +50,7 @@ pub async fn auto_create_albums(ctx: Context, separator: String) -> Result<()> { .cloned() .collect(); - info!("Creating missing albums: {:?}", missing_albums); + info!("Creating missing albums: {missing_albums:?}"); for missing_album in &missing_albums { let assets = sorted_assets diff --git a/src/commands/sync_date_of_birth.rs b/src/commands/sync_date_of_birth.rs index 0aaf40d..1499b31 100644 --- a/src/commands/sync_date_of_birth.rs +++ b/src/commands/sync_date_of_birth.rs @@ -55,8 +55,7 @@ pub async fn sync_date_of_birth(ctx: Context, vcard_file: &PathBuf) -> Result<() let bday = vcard_date_to_naive_date(dt.value.first().unwrap().clone())?; if c.date_of_birth.as_ref().is_some_and(|bdate| bday == *bdate) { debug!( - "{} already has the proper date of birth, skipping", - formatted_name + "{formatted_name} already has the proper date of birth, skipping" ); } else if bday.year() > 0 { UpdatePersonDateOfBirth::new(UpdatePersonDateOfBirthArgs { @@ -68,8 +67,7 @@ pub async fn sync_date_of_birth(ctx: Context, vcard_file: &PathBuf) -> Result<() updated_dobs += 1; } else { debug!( - "{} has an incomplete date of birth, skipping", - formatted_name + "{formatted_name} has an incomplete date of birth, skipping" ); } } @@ -77,14 +75,14 @@ pub async fn sync_date_of_birth(ctx: Context, vcard_file: &PathBuf) -> Result<() todo!("{}: DateTimeOrTextProperty({})", formatted_name, prop) } }, - None => debug!("No Immich match for {}", formatted_name), + None => debug!("No Immich match for {formatted_name}"), } } None => todo!(), } } - info!("Updated {} persons", updated_dobs); + info!("Updated {updated_dobs} persons"); Ok(()) } diff --git a/src/main.rs b/src/main.rs index 28da743..7226bc5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -55,7 +55,7 @@ async fn main() -> Result<()> { if let Some(project_dirs) = ProjectDirs::from("fr", "enoent", "Immich Tools") { let config_file_path = project_dirs.config_dir().join("config.toml"); if config_file_path.exists() { - debug!("Reading configuration from {:?}", config_file_path); + debug!("Reading configuration from {config_file_path:?}"); conf_extractor = conf_extractor.merge(FileAdapter::wrap(Toml::file_exact(config_file_path))); } @@ -135,7 +135,7 @@ async fn validate_client_connection(client: &Client) -> Result<()> { .with_note(|| { format!( "The API version for this client is {}, make sure the server version is compatible", - client.api_version() + Client::api_version() ) })?; diff --git a/src/utils/assets.rs b/src/utils/assets.rs index b24a8f3..eea5a58 100644 --- a/src/utils/assets.rs +++ b/src/utils/assets.rs @@ -15,7 +15,7 @@ pub struct AssetQuery { } pub async fn fetch_all_assets(query: AssetQuery, client: &Client) -> Result> { - debug!("Fetching assets with query {:?}", query); + debug!("Fetching assets with query {query:?}"); // is_offline is ignored, let's fetch trashed assets instead and filter them later let trashed_after = if query.is_offline == Some(true) {