From 5377f3b7374e45725131efa91418fa2a63520725 Mon Sep 17 00:00:00 2001 From: cucadmuh <49571317+cucadmuh@users.noreply.github.com> Date: Sat, 30 May 2026 00:26:29 +0300 Subject: [PATCH] fix(deps): bump zip to 4.6.1 with backup API fix (#920) Complete the Dependabot #910 bump: update Cargo.toml and migrate backup archive writes to SimpleFileOptions (zip 4.x API). Fixes lockfile drift where cargo downgraded zip back to 0.6.6 on every dev build. --- src-tauri/Cargo.toml | 2 +- src-tauri/src/lib_commands/app_api/backup.rs | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 446fbbdf..73c9a8c6 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -73,7 +73,7 @@ symphonia-adapter-libopus = "0.2.9" rusqlite = { version = "0.40", features = ["bundled"] } ebur128 = "0.1" dasp_sample = "0.11.0" -zip = "0.6.6" +zip = "4.6.1" image = { version = "0.25", default-features = false, features = ["jpeg", "png", "webp"] } webp = "0.3" diff --git a/src-tauri/src/lib_commands/app_api/backup.rs b/src-tauri/src/lib_commands/app_api/backup.rs index cdb20bb6..8dfe32de 100644 --- a/src-tauri/src/lib_commands/app_api/backup.rs +++ b/src-tauri/src/lib_commands/app_api/backup.rs @@ -5,7 +5,7 @@ use std::path::{Path, PathBuf}; use rusqlite::{Connection, OpenFlags}; use serde_json::Value; use tauri::{AppHandle, Manager}; -use zip::write::FileOptions; +use zip::write::SimpleFileOptions; use zip::{CompressionMethod, ZipArchive, ZipWriter}; const LIBRARY_ARCHIVE_ENTRY: &str = "library.sqlite"; @@ -212,7 +212,8 @@ fn write_databases_archive( ) -> Result<(), String> { let file = fs::File::create(destination_archive).map_err(|e| e.to_string())?; let mut zip = ZipWriter::new(file); - let options = FileOptions::default().compression_method(CompressionMethod::Deflated); + let options = + SimpleFileOptions::default().compression_method(CompressionMethod::Deflated); zip.start_file(LIBRARY_ARCHIVE_ENTRY, options) .map_err(|e| e.to_string())?; let mut src = fs::File::open(library_snapshot).map_err(|e| e.to_string())?; @@ -233,7 +234,8 @@ fn write_full_archive( ) -> Result<(), String> { let file = fs::File::create(destination_archive).map_err(|e| e.to_string())?; let mut zip = ZipWriter::new(file); - let options = FileOptions::default().compression_method(CompressionMethod::Deflated); + let options = + SimpleFileOptions::default().compression_method(CompressionMethod::Deflated); zip.start_file(FULL_ARCHIVE_SETTINGS_ENTRY, options) .map_err(|e| e.to_string())?;