Fix #63, and a bunch more little changes

Author: theRookieCoder

.github/workflows/release.yml

@@ -13,7 +13,6 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
     env:
-      CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v3
@@ -76,7 +75,6 @@ jobs:
     needs: build
     env:
       CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
-      CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }}
     steps:
       - uses: actions/checkout@v3
       - name: Install Rust

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog for Ferium
 
+## `v3.28.7`
+### 12.05.2022
+
+- Added the minor version to all dependencies because `cargo install` doesn't use the lockfile
+- Update to Libium 1.14.1
+- The CurseForge API key is now written in source, no more environment variable! This is allowed as explained in the source code
+- Added `--dont-add-dependencies` flag to add commands ([#63](https://github.com/theRookieCoder/ferium/issues/63))
+- Tweak progress bar style colours
+- Changed the way the progress bar status is updated so that the spinner is smooth
+- Added coloured formatting to profile listing too
+
 ## `v3.28.6`
 ### 11.05.2022
 

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ferium"
-version = "3.28.6"
+version = "3.28.7"
 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"
@@ -22,26 +22,26 @@ default = ["gui"]
 gui = ["libium/gui"]
 
 [dependencies]
-tokio = { version = "1.18", default-features = false, features = ["rt-multi-thread", "macros"] }
-reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"] }
-octocrab = { version = "0.16", default-features = false, features = ["rustls"] }
-clap = { version = "3.1", features = ["derive"] }
-lazy_static = "1.4"
-dialoguer = "0.10"
-indicatif = "0.16"
-itertools = "0.10"
-serde_json = "1.0"
-fs_extra = "1.2"
-colored = "2.0"
-ferinth = "2.2"
-libium = "1.14"
-anyhow = "1.0"
-online = "3.0"
-semver = "1.0"
-bytes = "1.1"
-furse = "1.1"
-size = "0.1"
-url = "2.2"
+tokio = { version = "1.18.2", default-features = false, features = ["rt-multi-thread", "macros"] }
+reqwest = { version = "0.11.10", default-features = false, features = ["rustls-tls"] }
+octocrab = { version = "0.16.0", default-features = false, features = ["rustls"] }
+clap = { version = "3.1.18", features = ["derive"] }
+lazy_static = "1.4.0"
+serde_json = "1.0.81"
+dialoguer = "0.10.1"
+indicatif = "0.16.2"
+itertools = "0.10.3"
+fs_extra = "1.2.0"
+anyhow = "1.0.57"
+colored = "2.0.0"
+ferinth = "2.2.1"
+libium = "1.14.1"
+online = "3.0.1"
+semver = "1.0.9"
+bytes = "1.1.0"
+furse = "1.1.1"
+size = "0.1.2"
+url = "2.2.2"
 
 [dev-dependencies]
 rand = "0.8"

Cargo.toml

@@ -33,6 +33,9 @@ pub enum SubCommands {
         #[clap(long)]
         #[clap(help("Whether the mod loader should be checked for this mod"))]
         dont_check_mod_loader: bool,
+        #[clap(long)]
+        #[clap(help("Do not add any of the mod's dependencies"))]
+        dont_add_dependencies: bool,
     },
     #[clap(about("Add a GitHub repository to the profile"))]
     AddGithub {
@@ -55,6 +58,9 @@ pub enum SubCommands {
         #[clap(long)]
         #[clap(help("Whether the mod loader should be checked for this mod"))]
         dont_check_mod_loader: bool,
+        #[clap(long)]
+        #[clap(help("Do not add any of the mod's dependencies"))]
+        dont_add_dependencies: bool,
     },
     #[clap(about("List all the mods in the profile, and with some their metadata if verbose"))]
     List {

src/cli.rs

@@ -14,7 +14,7 @@ use libium::config::{self, structs::ModIdentifier};
 use octocrab::OctocrabBuilder;
 use std::sync::Arc;
 use subcommands::{add, upgrade};
-use tokio::{fs::create_dir_all, io::AsyncReadExt, runtime, spawn};
+use tokio::{fs::create_dir_all, runtime, spawn};
 
 const CROSS: &str = "×";
 lazy_static! {
@@ -23,7 +23,7 @@ lazy_static! {
     pub static ref THEME: dialoguer::theme::ColorfulTheme =
         dialoguer::theme::ColorfulTheme::default();
     pub static ref STYLE: ProgressStyle = ProgressStyle::default_bar()
-        .template("{spinner:.green} [{elapsed_precise}] [{wide_bar:.cyan/blue}] {pos}/{len}")
+        .template("{spinner} [{elapsed_precise}] [{wide_bar:.cyan/blue}] {pos:.cyan}/{len:.blue}")
         .progress_chars("#>-");
 }
 
@@ -53,17 +53,15 @@ async fn actual_main(cli_app: Ferium) -> Result<()> {
             .build()?,
     );
     let modrinth = Arc::new(Ferinth::new());
-    let curseforge = Arc::new(Furse::new(env!(
-        "CURSEFORGE_API_KEY",
-        "A CurseForge API key is required to build. If you don't have one, you can bypass this by setting the variable to a blank string, however anything using the CurseForge API will not work."
-    )));
+    // Yes this is a personal API key, but I am allowed to write it in source.
+    // The reason is the API key is used for tracking usage, it's not for authentication.
+    // So please don't use this outside of Ferium, although telling you not to is all I can do...
+    let curseforge = Arc::new(Furse::new(
+        "$2a$10$QbCxI6f4KxEs50QKwE2piu1t6oOA8ayOw27H9N/eaH3Sdp5NTWwvO",
+    ));
     let mut config_file =
         config::get_file(cli_app.config_file.unwrap_or_else(config::file_path)).await?;
-    let mut config_file_contents = String::new();
-    config_file
-        .read_to_string(&mut config_file_contents)
-        .await?;
-    let mut config: config::structs::Config = serde_json::from_str(&config_file_contents)?;
+    let mut config = config::deserialise(&config::read_file(&mut config_file).await?)?;
 
     // The create command must run before getting the profile so that configs without profiles can have profiles added to them
     if let SubCommands::Profile {
@@ -103,7 +101,7 @@ async fn actual_main(cli_app: Ferium) -> Result<()> {
         // Default to first profile if index is set incorrectly
         config.active_profile = 0;
         config::write_file(&mut config_file, &config).await?;
-        bail!("Active profile specified incorrectly. Switched to first profile",)
+        bail!("Active profile specified incorrectly. Switched to first profile")
     };
 
     // Run function(s) based on the sub(sub)command to be executed
@@ -112,6 +110,7 @@ async fn actual_main(cli_app: Ferium) -> Result<()> {
             project_id,
             dont_check_game_version,
             dont_check_mod_loader,
+            dont_add_dependencies,
         } => {
             check_internet().await?;
             add::modrinth(
@@ -120,6 +119,7 @@ async fn actual_main(cli_app: Ferium) -> Result<()> {
                 profile,
                 Some(!dont_check_game_version),
                 Some(!dont_check_mod_loader),
+                !dont_add_dependencies,
             )
             .await?;
         },
@@ -145,6 +145,7 @@ async fn actual_main(cli_app: Ferium) -> Result<()> {
             project_id,
             dont_check_game_version,
             dont_check_mod_loader,
+            dont_add_dependencies,
         } => {
             check_internet().await?;
             add::curseforge(
@@ -153,6 +154,7 @@ async fn actual_main(cli_app: Ferium) -> Result<()> {
                 profile,
                 Some(!dont_check_game_version),
                 Some(!dont_check_mod_loader),
+                !dont_add_dependencies,
             )
             .await?;
         },