From f3f746be6c1c19c93d440bbc210dec631e2b42bb Mon Sep 17 00:00:00 2001
From: FxQnLr <felixquinn03@gmail.com>
Date: Sat, 3 Dec 2022 20:08:42 +0100
Subject: remove mod start

---
 src/commands/update.rs | 18 +++++++-----------
 src/files.rs           | 10 +++++++++-
 2 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/commands/update.rs b/src/commands/update.rs
index be15cfa..482e588 100644
--- a/src/commands/update.rs
+++ b/src/commands/update.rs
@@ -1,6 +1,6 @@
 use std::{io::{Error, ErrorKind}, fs::{rename, remove_file}};
 
-use crate::{config::Cfg, modrinth::{projects, Project, versions, extract_current_version, Version}, get_current_list, db::{userlist_get_all_ids, mods_get_versions, userlist_get_applicable_versions, userlist_change_versions, lists_get_all_ids, lists_get, userlist_get_current_version, userlist_add_disabled_versions, mods_change_versions}, List, input::Input, files::get_file_path, download_versions};
+use crate::{config::Cfg, modrinth::{projects, Project, versions, extract_current_version, Version}, get_current_list, db::{userlist_get_all_ids, mods_get_versions, userlist_get_applicable_versions, userlist_change_versions, lists_get_all_ids, lists_get, userlist_get_current_version, userlist_add_disabled_versions, mods_change_versions}, List, input::Input, files::{get_file_path, delete_version}, download_versions};
 
 pub async fn update(config: Cfg, input: Input) -> Result<(), Box<dyn std::error::Error>> {
 
@@ -73,7 +73,12 @@ pub async fn update(config: Cfg, input: Input) -> Result<(), Box<dyn std::error:
 
         //Disable old versions
         for ver in current_versions {
-            if input.delete_old { delete_old(current_list.clone(), ver.0, ver.1)? } else { disable_old(config.clone(), current_list.clone(), ver.0, ver.1)? };
+            if input.delete_old {
+                println!("Deleting version {} for mod {}", ver.0, ver.1);
+                delete_version(current_list.clone(), ver.0)?;
+            } else { 
+                disable_old(config.clone(), current_list.clone(), ver.0, ver.1)?
+            };
         }
     }
 
@@ -126,15 +131,6 @@ fn disable_old(config: Cfg, current_list: List, versionid: String, mod_id: Strin
     Ok(())
 }
 
-fn delete_old(current_list: List, versionid: String, mod_id: String) -> Result<(), Box<dyn std::error::Error>> {
-    println!("Deleting version {} for mod {}", versionid, mod_id);
-    let file = get_file_path(current_list, String::from(&versionid))?;
-    
-    remove_file(file)?;
-
-    Ok(())
-}
-
 #[tokio::test]
 async fn download_updates_test() {
 
diff --git a/src/files.rs b/src/files.rs
index 1c0b13c..2c5994d 100644
--- a/src/files.rs
+++ b/src/files.rs
@@ -1,4 +1,4 @@
-use std::{fs::{File, read_dir}, io::Write, collections::HashMap};
+use std::{fs::{File, read_dir, remove_file}, io::Write, collections::HashMap};
 use futures_util::StreamExt;
 use reqwest::Client;
 
@@ -24,6 +24,14 @@ pub async fn download_file(url: String, path: String, name: String) -> Result<()
     Ok(())
 }
 
+pub fn delete_version(list: List, version: String) -> Result<(), Box<dyn std::error::Error>> {
+    let file = get_file_path(list, version)?;
+    
+    remove_file(file)?;
+
+    Ok(())
+}
+
 pub fn get_file_path(list: List, versionid: String) -> Result<String, Box<dyn std::error::Error>> {
     let mut names: HashMap<String, String> = HashMap::new();
     for file in read_dir(list.download_folder)? {
-- 
cgit v1.2.3