Skip to content

Commit 12ff06b

Browse files
committed
Removed links from the List and Toggle components. Added GIF to README
1 parent 8ecbfa3 commit 12ff06b

File tree

7 files changed

+108
-11
lines changed

7 files changed

+108
-11
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
/.git
66
**/*.jukit
77
**/test2
8+
**/*.gif

core/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ pub fn calc_sha512(filename: &str) -> String {
7575
hex::encode(hash)
7676
}
7777

78+
#[allow(clippy::too_many_arguments)]
7879
pub async fn update_dir(
7980
github: &mut GHReleasesAPI,
8081
curseforge: CurseForgeAPI,
@@ -116,7 +117,6 @@ pub async fn update_dir(
116117
(*github).clone(),
117118
path.to_str().unwrap(),
118119
&new_version,
119-
del_prev,
120120
&prefix,
121121
)
122122
.await
@@ -155,7 +155,6 @@ pub async fn update_dir(
155155
(*github).clone(),
156156
path.to_str().unwrap(),
157157
&new_version,
158-
del_prev,
159158
&prefix,
160159
)
161160
.await
@@ -308,7 +307,6 @@ pub async fn update_file_github(
308307
github: GHReleasesAPI,
309308
filename: &str,
310309
new_version: &str,
311-
del_prev: bool,
312310
prefix: &str,
313311
) -> Result<()> {
314312
let metadata = Metadata::get_all_metadata(PathBuf::from(filename));

core/src/modrinth_wrapper/modrinth.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
use crate::gh_releases::{self};
33
use crate::metadata::Error as MetadataError;
44
use crate::{Link, ModLoader, calc_sha512};
5-
use color_eyre::eyre::{ContextCompat};
5+
use color_eyre::eyre::ContextCompat;
66
use colored::Colorize;
77
use futures::lock::Mutex;
8-
use itertools::Itertools;
98
use serde::{Deserialize, Serialize};
109
use std::sync::Arc;
1110
use std::{fmt::Display, fs};
@@ -214,6 +213,7 @@ impl Modrinth {
214213
version: &str,
215214
loader: ModLoader,
216215
) -> Option<VersionData> {
216+
#[allow(clippy::unnecessary_to_owned)]
217217
let versions = Modrinth::get_version_data(mod_name, version, &loader.to_string()).await;
218218
if versions.is_err() {
219219
error!(

tui/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ A Terminal User Interface for Modder-rs, a command-line Minecraft mod manager.
1010
* Search for mods
1111
* View mod details
1212

13+
![How it Looks](https://vhs.charm.sh/vhs-aqUn5U8TEFwtZNIA48IDR.gif)
14+
1315
## Installation
1416

1517
1. Clone the repository:

tui/demo_tui.tape

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
Output demo_tui.gif
2+
Set FontSize 20
3+
Set Width 1920
4+
Set Height 1080
5+
6+
Set Shell zsh
7+
Sleep 1.5s
8+
Type "cargo run --bin tui "
9+
Sleep 500ms
10+
Type "-- --dir test"
11+
Enter
12+
Sleep 23.5s
13+
Type "jj"
14+
Sleep 1s
15+
Type "j"
16+
Sleep 500ms
17+
Enter
18+
Sleep 2.5s
19+
Type "jjjjjjjjjjjjjjjjjjjjkkkkk"
20+
Escape
21+
Type "k"
22+
Sleep 500ms
23+
Enter
24+
Sleep 3.5s
25+
Type " jjkkjjjkk jjjjjjjjjjjjj jjjjjjjjjjkkjjj"
26+
Sleep 500ms
27+
Type "j "
28+
Sleep 500ms
29+
Enter
30+
Sleep 3s
31+
Escape
32+
Sleep 500ms
33+
Type "k"
34+
Enter
35+
Sleep 500ms
36+
Type "jjkk"
37+
Escape
38+
Type "q"
39+
Sleep 2s
40+
Escape
41+
Type "[A"
42+
Enter
43+
Sleep 10s
44+
Type "jjjk"
45+
Enter
46+
Sleep 2.5s
47+
Type "jjjjkkk"
48+
Escape
49+
Type "k"
50+
Enter
51+
Sleep 500ms
52+
Type "jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjg"
53+
Sleep 1.5s
54+
Type "Sjjkk"
55+
Escape
56+
Sleep 1s
57+
Type "L"
58+
Sleep 1s
59+
Type "jjjk"
60+
Sleep 1s
61+
Escape
62+
Sleep 500ms
63+
Type "V"
64+
Sleep 2s
65+
Type "1.21."
66+
Sleep 1s
67+
Type "4"
68+
Enter
69+
Sleep 8s
70+
Type "Mal"
71+
Backspace 3
72+
Sleep 1.5s
73+
Type "Sodium"
74+
Enter
75+
Sleep 1.5s
76+
Type "j j jkjjjjjk"
77+
Sleep 500ms
78+
Type "kkkkkj"
79+
Sleep 5.5s
80+
Escape
81+
Type "hjjjjjjjjjjjjjjjjjjjjjjkkkk"
82+
Sleep 500ms
83+
Type "jkkk"
84+
Sleep 500ms
85+
Type "j"
86+
Sleep 500ms
87+
Type "/"
88+
Backspace 6
89+
Type "Reese"
90+
Enter
91+
Sleep 1.5s
92+
Type "k"
93+
Sleep 500ms
94+
Type " "
95+
Sleep 1s
96+
Enter
97+
Sleep 10.5s

tui/src/components/list.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crossterm::event::KeyCode;
55
use modder::{
66
Link, calc_sha512,
77
cli::Source,
8-
curseforge_wrapper::{API_KEY, CurseForgeAPI, CurseForgeMod},
8+
curseforge_wrapper::{API_KEY, CurseForgeAPI},
99
metadata::Metadata,
1010
modrinth_wrapper::modrinth::{GetProject, VersionData},
1111
};
@@ -244,12 +244,12 @@ impl Component for ListComponent {
244244
Style::default().add_modifier(Modifier::DIM),
245245
);
246246
let top_line = Line::from(vec![name_span, version_span]);
247-
let url = if item.source == Source::Modrinth {
247+
248+
let new_link = if item.source == Source::Modrinth {
248249
format!("https://modrinth.com/mod/{}", item.project_id)
249250
} else {
250251
format!("https://github.com/{}", item.project_id)
251252
};
252-
let new_link = Link::new(url.clone(), url);
253253

254254
let lines = vec![
255255
top_line,

tui/src/components/toggle.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,14 +281,13 @@ impl Component for ToggleComponent {
281281
Style::default().add_modifier(Modifier::DIM),
282282
);
283283
let top_line = Line::from(vec![name_span, version_span]);
284-
let url = if item.source == Source::Modrinth {
284+
285+
let new_link = if item.source == Source::Modrinth {
285286
format!("https://modrinth.com/mod/{}", item.project_id)
286287
} else {
287288
format!("https://github.com/{}", item.project_id)
288289
};
289290

290-
let new_link = Link::new(url.clone(), url);
291-
292291
let lines = vec![
293292
top_line,
294293
Line::from(vec![

0 commit comments

Comments
 (0)