Fix #60, some other small list verbose tweaks

Author: theRookieCoder

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog for Ferium
 
+## `v3.28.4`
+### 11.05.2022
+
+- Added project id to list verbose and some other small tweaks
+- Upgrading now deletes old files if moving the file failed (e.g. if it's already in `.old`)
+  - This fixes [#60](https://github.com/theRookieCoder/ferium/issues/60)
+
 ## `v3.28.3`
+### 11.05.2022
 
 - Update to Libium 1.14
   - This fixes [#53](https://github.com/theRookieCoder/ferium/issues/53)
@@ -10,6 +18,7 @@
 - Significantly improved verbose listing to be more colourful, consistent, and informative
 
 ## `v3.28.2`
+### 09.05.2022
 
 - Update to Libium 1.12
 - Improved upgrade code to be faster and more clean

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ferium"
-version = "3.28.3"
+version = "3.28.4"
 edition = "2021"
 authors = ["Ilesh Thiada (theRookieCoder) <[email protected]>", "薛詠謙 (KyleUltimate)", "Daniel Hauck (SolidTux)"]
 description = "Ferium is a CLI program for managing Minecraft mods from Modrinth, CurseForge, and Github Releases"

Cargo.toml

@@ -31,6 +31,10 @@ Ferium is coming to more package managers soon!
 
 Ferium releases a no-gui version [here](https://aur.archlinux.org/packages/ferium-bin) and a version with a GUI file dialog [here](https://aur.archlinux.org/packages/ferium-gui-bin). The GUI version dependes on GTK
 
+### Scoop
+
+Ferium releases [here](https://scoop.sh/#/apps?q=ferium) in Scoop's official games bucket. Run `scoop bucket add games` then `scoop install ferium` to install Ferium.
+
 ### Cargo Install
 
 If you have the Rust toolchain, you can also compile and install Ferium by running `cargo install ferium`.

README.md

@@ -12,15 +12,18 @@ pub async fn curseforge(curseforge: Arc<Furse>, project_id: i32) -> Result<()> {
         "{}
        \r  {}\n
        \r  Link:         {}
-       \r  Source:       CurseForge Mod
+       \r  Source:       {}
+       \r  Project ID:   {}
        \r  Open Source:  {}
        \r  Downloads:    {}
        \r  Authors:      {}
        \r  Categories:   {}
        ",
-        project.name.bold().italic(),
-        project.summary.trim(),
+        project.name.bold(),
+        project.summary.trim().italic(),
         project.links.website_url.blue(),
+        "CurseForge Mod".dimmed(),
+        project.id.to_string().dimmed(),
         project.links.source_url.map_or("No".red(), |url| format!(
             "Yes ({})",
             url.blue().underline()
@@ -54,18 +57,21 @@ pub async fn modrinth(modrinth: Arc<Ferinth>, project_id: String) -> Result<()>
         "{}
        \r  {}\n
        \r  Link:         {}
-       \r  Source:       Modrinth Mod
+       \r  Source:       {}
+       \r  Project ID:   {}
        \r  Open Source:  {}
        \r  Downloads:    {}
        \r  Authors:      {}
        \r  Categories:   {}
        \r  License:      {}{}
        ",
-        project.title.bold().italic(),
-        project.description,
+        project.title.bold(),
+        project.description.italic(),
         format!("https://modrinth.com/mod/{}", project.slug)
             .blue()
             .underline(),
+        "Modrinth Mod".dimmed(),
+        project.id.dimmed(),
         project.source_url.map_or("No".red(), |url| {
             format!("Yes ({})", url.blue().underline()).green()
         }),
@@ -104,17 +110,21 @@ pub async fn github(github: Arc<Octocrab>, full_name: (String, String)) -> Resul
     println!(
         "{}{}\n
        \r  Link:         {}
-       \r  Source:       GitHub Repository
+       \r  Source:       {}
+       \r  Identifier:   {}
        \r  Open Source:  {}
        \r  Downloads:    {}
        \r  Authors:      {}
        \r  Topics:       {}
        \r  License:      {}
        ",
-        repo.name.bold().italic(),
+        repo.name.bold(),
         repo.description
-            .map_or("".into(), |description| { format!("\n  {}", description) }),
+            .map_or("".into(), |description| { format!("\n  {}", description) })
+            .italic(),
         repo.html_url.unwrap().to_string().blue().underline(),
+        "GitHub Repository".dimmed(),
+        repo.full_name.unwrap().dimmed(),
         "Yes".green(),
         downloads.to_string().yellow(),
         repo.owner.unwrap().login.cyan(),

src/subcommands/list.rs

@@ -15,7 +15,10 @@ use std::{
         Arc, Mutex,
     },
 };
-use tokio::{fs::copy, spawn};
+use tokio::{
+    fs::{copy, remove_file},
+    spawn,
+};
 
 pub async fn upgrade(
     modrinth: Arc<Ferinth>,
@@ -118,12 +121,14 @@ pub async fn upgrade(
                 to_install.iter().find_position(|thing| filename == thing.0)
             {
                 to_install.swap_remove(index);
-            } else {
-                let _ = move_file(
-                    file.path(),
-                    profile.output_dir.join(".old").join(filename),
-                    &CopyOptions::new(),
-                );
+            } else if move_file(
+                file.path(),
+                profile.output_dir.join(".old").join(filename),
+                &CopyOptions::new(),
+            )
+            .is_err()
+            {
+                remove_file(file.path()).await?;
             }
         }
     }