Fix #53 and #52, and much better list -v

Author: theRookieCoder

.github/workflows/release.yml

@@ -117,8 +117,8 @@ jobs:
             - GNU Linux (x64 linux gnu)
             - macOS Apple Silicon (aarch64 darwin)
             - macOS Intel (x64 darwin)
-            - GNU Windows, e.g. cygwin (x64 windows gnu)
-            - MSVC Windows (x64 windows msvc)
+            - GNU Windows, i.e. Cygwin/MinGW (x64 windows gnu)
+            - Windows (x64 windows msvc)
 
             You can install these by downloading and unzipping the appropriate asset, and moving the executable to ~/bin or any other binary folder in your path.
       - name: Update no-gui AUR package

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog for Ferium
 
+## `v3.28.3`
+
+- Update to Libium 1.14
+  - This fixes [#53](https://github.com/theRookieCoder/ferium/issues/53)
+- Update Releases description
+- Update the way the GitHub PAT is applied to the API
+  - This fixes [#52](https://github.com/theRookieCoder/ferium/issues/52)
+- Significantly improved verbose listing to be more colourful, consistent, and informative
+
 ## `v3.28.2`
 
 - Update to Libium 1.12

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ferium"
-version = "3.28.2"
+version = "3.28.3"
 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,7 +22,7 @@ default = ["gui"]
 gui = ["libium/gui"]
 
 [dependencies]
-tokio = { version = "1.18", default-features = false, features = ["rt-multi-thread", "macros", "time"] }
+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"] }
@@ -33,7 +33,7 @@ itertools = "0.10"
 fs_extra = "1.2"
 colored = "2.0"
 ferinth = "2.2"
-libium = "1.12"
+libium = "1.14"
 anyhow = "1.0"
 online = "3.0"
 semver = "1.0"

Cargo.toml

@@ -10,6 +10,7 @@ use ferinth::Ferinth;
 use furse::Furse;
 use lazy_static::lazy_static;
 use libium::config;
+use octocrab::OctocrabBuilder;
 use std::sync::Arc;
 use subcommands::{add, upgrade};
 use tokio::{fs::create_dir_all, io::AsyncReadExt, runtime, spawn};
@@ -39,13 +40,14 @@ fn main() {
 }
 
 async fn actual_main(cli_app: Ferium) -> Result<()> {
-    let github = {
-        let mut builder = octocrab::OctocrabBuilder::new();
-        if let Some(token) = cli_app.github_token {
-            builder = builder.personal_token(token);
-        }
-        octocrab::initialise(builder)
-    }?;
+    let github = Arc::new(
+        cli_app
+            .github_token
+            .map_or_else(OctocrabBuilder::new, |token| {
+                OctocrabBuilder::new().personal_token(token)
+            })
+            .build()?,
+    );
     let modrinth = Arc::new(Ferinth::new());
     let curseforge = Arc::new(Furse::new(env!(
         "CURSEFORGE_API_KEY",

src/main.rs

@@ -1,5 +1,5 @@
 use crate::{THEME, TICK};
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use dialoguer::Confirm;
 use ferinth::structures::version_structs::DependencyType;
 use ferinth::Ferinth;
@@ -23,13 +23,13 @@ pub async fn github(
     )
     .await?;
     upgrade::get_latest_compatible_asset(
-        repo_handler,
+        &repo_handler.releases().list().send().await?.items,
         &profile.game_version,
         &profile.mod_loader,
         should_check_game_version,
         should_check_mod_loader,
     )
-    .await?;
+    .ok_or_else(|| anyhow!("Repository does not release mods compatible with your profile"))?;
     println!("{} ({})", *TICK, repo.name);
     Ok(())
 }
@@ -51,14 +51,13 @@ pub async fn modrinth(
     )
     .await?;
     let latest_version = upgrade::get_latest_compatible_version(
-        modrinth.clone(),
-        &project.id,
+        &modrinth.list_versions(&project.id).await?,
         &profile.game_version,
         &profile.mod_loader,
         should_check_game_version,
         should_check_mod_loader,
     )
-    .await?
+    .ok_or_else(|| anyhow!("Mod is not compatible with your profile"))?
     .1;
     println!("{} ({})", *TICK, project.title);
     for dependency in &latest_version.dependencies {
@@ -115,14 +114,13 @@ pub async fn curseforge(
     )
     .await?;
     let latest_file = upgrade::get_latest_compatible_file(
-        curseforge.clone(),
-        project.id,
+        curseforge.get_mod_files(project.id).await?,
         &profile.game_version,
         &profile.mod_loader,
         should_check_game_version,
         should_check_mod_loader,
     )
-    .await?
+    .ok_or_else(|| anyhow!("Mod is not compatible with your profile"))?
     .0;
     println!("{} ({})", *TICK, project.name);
     for dependency in &latest_file.dependencies {