add support for tar extraction

franciscoBSalgueiro · Oct 31, 2023 · 20b5a77 · 20b5a77
1 parent f54b436
commit 20b5a77
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -51,6 +51,7 @@ thiserror = "1.0.48"
 log = "0.4.20"
 oauth2 = "4.4.2"
 axum = "0.6.20"
+tar = "0.4.40"
 
 [features]
 # by default Tauri runs in production mode

diff --git a/src-tauri/src/fide.rs b/src-tauri/src/fide.rs
@@ -96,7 +96,6 @@ pub async fn download_fide_db(
         0,
         "http://ratings.fide.com/download/players_list_xml.zip".to_string(),
         app_config_dir(&app.config()).unwrap(),
-        true,
         app.clone(),
         None,
         Some(false),

diff --git a/src-tauri/src/fs.rs b/src-tauri/src/fs.rs
@@ -26,7 +26,6 @@ pub async fn download_file(
     id: u64,
     url: String,
     path: PathBuf,
-    zip: bool,
     app: tauri::AppHandle,
     token: Option<String>,
     finalize: Option<bool>,
@@ -71,11 +70,15 @@ pub async fn download_file(
 
     info!("Downloaded file to {}", path.display());
 
-    if zip {
+    if url.ends_with(".zip") {
         unzip_file(path, file).await?;
+    } else if url.ends_with(".tar") {
+        let mut archive = tar::Archive::new(Cursor::new(file));
+        archive.unpack(path)?;
     } else {
-        std::fs::write(path, file)?;
+        std::fs::write(path, file)?
     }
+
     if finalize {
         app.emit_all(
             "download_progress",

diff --git a/src/components/databases/AddDatabase.tsx b/src/components/databases/AddDatabase.tsx
@@ -201,7 +201,6 @@ function DatabaseCard({
     await invoke("download_file", {
       id,
       url,
-      zip: false,
       path,
     });
     setDatabases(await getDatabases());

diff --git a/src/components/engines/AddEngine.tsx b/src/components/engines/AddEngine.tsx
@@ -154,7 +154,6 @@ function EngineCard({
       await invoke("download_file", {
         id,
         url,
-        zip: true,
         path,
       });
       let appDataDirPath = await appDataDir();

diff --git a/src/components/puzzles/AddPuzzle.tsx b/src/components/puzzles/AddPuzzle.tsx
@@ -112,7 +112,6 @@ function PuzzleDbCard({
     await invoke("download_file", {
       id,
       url,
-      zip: false,
       path,
     });
     setPuzzleDbs(await getPuzzleDatabases());

diff --git a/src/utils/lichess.tsx b/src/utils/lichess.tsx
@@ -227,7 +227,6 @@ export async function downloadLichess(
   await invoke("download_file", {
     id: 1,
     url,
-    zip: false,
     path,
     token,
   });
-Original file line number
+Diff line change
@@ Expand Up / @@ -201,7 +201,6 @@ function DatabaseCard({ @@
         await invoke("download_file", {
           id,
           url,
-          zip: false,
           path,
         });
         setDatabases(await getDatabases());
@@ Expand Down @@