Finished CurseForge implementation for Add screen

Author: JayanAXHF

core/src/cli.rs

@@ -1,9 +1,10 @@
 use clap::{Parser, Subcommand};
-use std::{fmt::Display, path::PathBuf};
-use strum::EnumIter;
+use itertools::Itertools;
+use std::{fmt::Display, path::PathBuf, sync::LazyLock};
+use strum::{EnumIter, IntoEnumIterator};
 
 use crate::ModLoader;
-
+pub static SOURCES: LazyLock<Vec<Source>> = LazyLock::new(|| Source::iter().collect_vec());
 /// Modder is a tool for managing mods for Minecraft.
 /// It can add mods from Modrinth and Github.
 /// Other features include bulk-updating a directory of mods to a specified version

core/src/curseforge_wrapper/mod.rs

@@ -14,6 +14,7 @@ use reqwest::{
 use serde_json::json;
 use std::{fs, path::PathBuf, sync::LazyLock};
 pub use structs::*;
+use tracing::debug;
 use url::Url;
 
 type Result<T> = color_eyre::Result<T, CurseForgeError>;
@@ -68,19 +69,25 @@ impl CurseForgeAPI {
         game_version: &str,
         loader: ModLoader,
         search: &str,
+        page_size: u32,
     ) -> Result<Vec<Mod>> {
         let params = [
             ("gameId", GAME_ID.to_string()),
-            ("gameVersion", game_version.to_string()),
+            ("index", 0.to_string()),
             ("searchFilter", search.to_string()),
-            ("modLoaderType", loader.as_num().to_string()),
+            ("gameVersion", game_version.to_string()),
+            ("pageSize", page_size.to_string()),
+            ("sortField", 6.to_string()),
+            ("gameFlavors[0]", loader.as_num().to_string()),
+            ("sortOrder", "desc".to_string()),
         ];
         let params_str = params
             .iter()
             .map(|(k, v)| format!("{}={}", k, v))
             .collect::<Vec<String>>()
             .join("&");
         let url = format!("{}/mods/search?{params_str}", BASE_URL);
+        debug!(url = ?url);
         let headers = HEADERS.clone();
         let response = self
             .client
@@ -90,7 +97,9 @@ impl CurseForgeAPI {
             .await?;
         let response = response.error_for_status()?;
         let body = response.text().await?;
+        debug!(body = ?body);
         let root: Root = serde_json::from_str(&body)?;
+        debug!(root_data = ?root.data);
         Ok(root.data)
     }
     pub async fn get_mods<T>(&self, mod_ids: T) -> Result<Vec<Mod>>
@@ -120,6 +129,35 @@ impl CurseForgeAPI {
         let root: Root = serde_json::from_str(&body)?;
         Ok(root.data)
     }
+    pub async fn get_mod_files(
+        &self,
+        mod_id: u32,
+        game_version: &str,
+        mod_loader: ModLoader,
+    ) -> Result<Vec<File>> {
+        let params = [
+            ("index", 0.to_string()),
+            ("gameVersion", game_version.to_string()),
+            ("pageSize", 1.to_string()),
+            ("modLoaderType", mod_loader.as_num().to_string()),
+        ];
+        let params_str = params
+            .iter()
+            .map(|(k, v)| format!("{}={}", k, v))
+            .collect::<Vec<String>>()
+            .join("&");
+        let url = format!("{BASE_URL}/mods/{mod_id}/files?{params_str}");
+        let response = self
+            .client
+            .request(Method::GET, Url::parse(&url)?)
+            .headers(HEADERS.clone())
+            .send()
+            .await?;
+        let response = response.error_for_status()?;
+        let body = response.text().await?;
+        let root = serde_json::from_str::<FileSearchRoot>(&body)?;
+        Ok(root.data)
+    }
     pub async fn download_mod(&self, mod_id: u32, file_id: u32, dir: PathBuf) -> Result<()> {
         let url = format!(
             "{}/mods/{}/files/{}/download-url",
@@ -138,7 +176,6 @@ impl CurseForgeAPI {
         let file_data = reqwest::get(url).await?;
         let file_name = file_data.url().path_segments().unwrap().last().unwrap();
         let file_name = percent_decode(file_name.as_bytes()).decode_utf8_lossy();
-        println!("{}", file_name);
         let path = dir.join(file_name.to_string());
         fs::create_dir_all(path.parent().unwrap())?;
         fs::write(&path, file_data.bytes().await?)?;
@@ -218,7 +255,6 @@ mod tests {
         let api = CurseForgeAPI::new(API_KEY.to_string());
         let loader = ModLoader::Fabric;
         let mods = api.search_mods("1.21.4", loader, "Carpet").await.unwrap();
-        println!("{:#?}", mods);
         assert_eq!(!mods.is_empty(), true);
     }
     #[tokio::test]

core/src/curseforge_wrapper/structs.rs

@@ -32,6 +32,13 @@ pub struct Root {
     pub pagination: Option<Pagination>,
 }
 
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct FileSearchRoot {
+    pub data: Vec<File>,
+    pub pagination: Option<Pagination>,
+}
+
 #[derive(Debug, Deserialize, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct Mod {
@@ -251,7 +258,6 @@ pub trait CurseForgeMod {
 
 impl CurseForgeMod for Mod {
     fn get_version_and_loader(&self, game_version: &str) -> Option<FileIndex> {
-        println!("{:#?}", game_version);
         self.latest_files_indexes
             .iter()
             .find(|file_index| file_index.game_version == game_version)

tui/README.md

@@ -1,5 +1,165 @@
-# tui
+# Modder TUI
 
-[![CI](https://github.com//tui/workflows/CI/badge.svg)](https://github.com//tui/actions)
+A Terminal User Interface for Modder-rs, a command-line Minecraft mod manager.
 
-TUI Wrapper for Modder-rs
+## Features
+
+*   List installed mods
+*   Enable and disable mods
+*   Add new mods from Modrinth or GitHub
+*   Search for mods
+*   View mod details
+
+## Installation
+
+1.  Clone the repository:
+    ```bash
+    git clone https://github.com/JayanAXHF/modder-rs.git
+    ```
+2.  Navigate to the `tui` directory:
+    ```bash
+    cd modder-rs/tui
+    ```
+3.  Build the project:
+    ```bash
+    cargo build --release
+    ```
+4.  Run the application:
+    ```bash
+    ./target/release/tui --dir /path/to/your/mods
+    ```
+
+## Usage
+
+The application is divided into several modes, each with its own set of keybindings and functionality.
+
+### Home
+
+The default mode, which displays a menu of available actions.
+
+### List
+
+Displays a list of all installed mods in the specified directory. You can view details for each mod.
+
+### Toggle
+
+Allows you to enable or disable mods by renaming the mod files (e.g., `mod.jar` to `mod.jar.disabled`).
+
+### Add
+
+Search for and download new mods from Modrinth or GitHub.
+
+## Keybindings
+
+### Global
+
+*   `Ctrl-c`, `Ctrl-d`, `q`: Quit the application
+*   `Ctrl-z`: Suspend the application
+
+### Home
+
+*   `j` or `Down Arrow`: Select next item
+*   `k` or `Up Arrow`: Select previous item
+*   `g` or `Home`: Select first item
+*   `G` or `End`: Select last item
+*   `Enter`: Select the highlighted mode and switch to it
+
+### List
+
+*   `h` or `Left Arrow`: Deselect item
+*   `j` or `Down Arrow`: Select next item
+*   `k` or `Up Arrow`: Select previous item
+*   `g` or `Home`: Select first item
+*   `G` or `End`: Select last item
+*   `/`: Enter Search mode
+*   `Esc`: Go back to Home
+
+#### Search Mode
+
+*   `Tab` or `Esc`: Exit Search mode
+*   Any other key: Updates the search query
+
+### Toggle
+
+*   `h` or `Left Arrow`: Deselect item
+*   `j` or `Down Arrow`: Select next item
+*   `k` or `Up Arrow`: Select previous item
+*   `g` or `Home`: Select first item
+*   `G` or `End`: Select last item
+*   `Space`: Toggle whether a mod is enabled or disabled
+*   `Enter`: Apply the changes (rename files)
+*   `/`: Enter Search mode
+*   `Esc`: Go back to Home
+
+#### Search Mode
+
+*   `Tab` or `Esc`: Exit Search mode
+*   Any other key: Updates the search query
+
+### Add
+
+*   `h` or `Left Arrow`: Deselect item in the current mods list
+*   `j` or `Down Arrow`: Select next item in the current mods list
+*   `k` or `Up Arrow`: Select previous item in the current mods list
+*   `g` or `Home`: Select first item in the current mods list
+*   `G` or `End`: Select last item in the current mods list
+*   `S`: Change source (Modrinth/Github)
+*   `R`: View search results
+*   `V`: Enter version
+*   `/`: Enter search mode
+*   `l`: View search results
+*   `J` or `s`: View selected mods
+*   `L`: Change loader
+*   `Esc`: Go back to Home
+
+#### Search Mode
+
+*   `Tab` or `Esc`: Exit search mode
+*   `Enter`: Perform search
+*   Any other key: Updates the search query
+
+#### Toggle Source Mode
+
+*   `h` or `Left Arrow`: Deselect source
+*   `j` or `Down Arrow`: Select next source
+*   `k` or `Up Arrow`: Select previous source
+*   `g` or `Home`: Select first source
+*   `G` or `End`: Select last source
+*   `Enter`: Perform search if version, search query and loader are set
+*   `Esc`: Go back to Normal mode
+
+#### Change Loader Mode
+
+*   `Tab` or `Esc`: Go back to Normal mode
+*   `Enter`: Perform search if version and search query are set, otherwise go to search mode
+*   `h` or `Left Arrow`: Deselect loader
+*   `j` or `Down Arrow`: Select next loader
+*   `k` or `Up Arrow`: Select previous loader
+*   `g` or `Home`: Select first loader
+*   `G` or `End`: Select last loader
+
+#### Version Input Mode
+
+*   `Tab` or `Esc`: Go back to Normal mode
+*   `Enter`: Perform search if version, search query and loader are set, otherwise go to search mode
+*   Any other key: Updates the version input
+
+#### Search Result List Mode
+
+*   `h` or `Left Arrow`: Deselect item
+*   `j` or `Down Arrow`: Select next item
+*   `k` or `Up Arrow`: Select previous item
+*   `g` or `Home`: Select first item
+*   `G` or `End`: Select last item
+*   `Space`: Toggle selection of a mod
+*   `Enter`: Download selected mods
+*   `Esc`: Go back to Normal mode
+
+#### Selected List Mode
+
+*   `j` or `Down Arrow`: Select next item
+*   `k` or `Up Arrow`: Select previous item
+*   `g` or `Home`: Select first item
+*   `G` or `End`: Select last item
+*   `J`: Go to Version Input mode
+*   `Esc`: Go back to Normal mode