Rename config file env var name

Update to ferinth 2.3
Update readme
Fix find dupe function bug
Switched to FO for modpack tests

Author: theRookieCoder

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog for Ferium
 
+## `v4.1.4`
+### 12.06.2022
+
+- Fixed bug where if the slice is shorter than 2, the find dupe functions will panic
+- Added an env var to set the config file
+- Updated ferinth to `2.3.0`
+
 ## `v4.1.3`
 ### 11.06.2022
 

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ferium"
-version = "4.1.3"
+version = "4.1.4"
 edition = "2021"
 authors = [
     "Ilesh Thiada (theRookieCoder) <[email protected]>",
@@ -41,7 +41,7 @@ itertools = "~0.10.3"
 fs_extra = "~1.2.0"
 anyhow = "~1.0.57"
 colored = "~2.0.0"
-ferinth = "~2.2.2"
+ferinth = "~2.3.0"
 libium = "~1.18.1"
 online = "~3.0.1"
 semver = "~1.0.9"

Cargo.toml

@@ -68,7 +68,7 @@ Remember to use an add-on like [cargo-update](https://crates.io/crates/cargo-upd
 > Note! A lot of Ferium's backend is in a seperate project [Libium](https://github.com/theRookieCoder/libium).
 > It deals with things such as the config, adding mod(pack)s, upgrading, file pickers, etc
 
-> The config file is located at `~/.config/ferium/config.json` if you're interested in manually editing it
+Ferium stores profile and modpack information in it's config file. By default it is located at `~/.config/ferium/config.json`, but you can change this in 2 ways. You can set the `FERIUM_CONFIG_FILE` environment variable or set the `--config-file` global command flag, the flag always takes precedence.
 
 ### First Startup
 

README.md

@@ -173,6 +173,9 @@ where
     F: Fn(&T) -> V,
 {
     let mut indices = Vec::new();
+    if slice.len() < 2 {
+        return indices;
+    }
     slice.sort_unstable_by_key(&key);
     for i in 0..(slice.len() - 1) {
         if key(&slice[i]) == key(&slice[i + 1]) {

src/download.rs

@@ -63,18 +63,20 @@ async fn actual_main(cli_app: Ferium) -> Result<()> {
             })
             .build()?,
     );
-    let modrinth = Arc::new(Ferinth::new());
+    let modrinth = Arc::new(Ferinth::default());
     // 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
-            .or_else(|| std::env::var_os("FERIUM_CONFIG_LOCATION")
-                .map(Into::into))
-            .unwrap_or_else(config::file_path)).await?;
+    let mut config_file = config::get_file(
+        cli_app
+            .config_file
+            .or_else(|| std::env::var_os("FERIUM_CONFIG_FILE").map(Into::into))
+            .unwrap_or_else(config::file_path),
+    )
+    .await?;
     let mut config = config::deserialise(&config::read_file(&mut config_file).await?)?;
 
     // Run function(s) based on the sub(sub)command to be executed

src/main.rs

@@ -12,11 +12,11 @@
             }
         },
         {
-            "name": "Better Minecraft",
+            "name": "Fabulously Optimised",
             "output_dir": "./tests/md_modpack",
             "install_overrides": true,
             "identifier": {
-                "ModrinthModpack": "shFhR8Vx"
+                "ModrinthModpack": "1KVo5zza"
             }
         }
     ]

tests/configs/two_modpacks_cfactive.json

@@ -1,23 +1,23 @@
 {
-  "active_profile": 0,
-  "active_modpack": 1,
-  "profiles": [],
-  "modpacks": [
-    {
-      "name": "RLCraft",
-      "output_dir": "./tests/cf_modpack",
-      "install_overrides": true,
-      "identifier": {
-        "CurseForgeModpack": 285109
-      }
-    },
-    {
-      "name": "Better Minecraft",
-      "output_dir": "./tests/md_modpack",
-      "install_overrides": true,
-      "identifier": {
-        "ModrinthModpack": "shFhR8Vx"
-      }
-    }
-  ]
+    "active_profile": 0,
+    "active_modpack": 1,
+    "profiles": [],
+    "modpacks": [
+        {
+            "name": "RLCraft",
+            "output_dir": "./tests/cf_modpack",
+            "install_overrides": true,
+            "identifier": {
+                "CurseForgeModpack": 285109
+            }
+        },
+        {
+            "name": "Fabulously Optimised",
+            "output_dir": "./tests/md_modpack",
+            "install_overrides": true,
+            "identifier": {
+                "ModrinthModpack": "1KVo5zza"
+            }
+        }
+    ]
 }