Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev: Packages #429

Draft
wants to merge 42 commits into
base: main
Choose a base branch
from
Draft
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
9c0e479
feat: Initial support for reading NS packages dir
GeckoEidechse Jul 16, 2023
008e31e
Merge branch 'main' into feat/read-packages-dir
GeckoEidechse Jul 17, 2023
babb502
chore: Code cleanup
GeckoEidechse Jul 17, 2023
58b8dce
Merge branch 'main' into feat/read-packages-dir
GeckoEidechse Jul 17, 2023
7e301bd
feat: Add ability to delete a Thunderstore package
GeckoEidechse Jul 17, 2023
0fc68de
fix: Formatting
GeckoEidechse Jul 17, 2023
0cd98b6
Merge branch 'main' into feat/read-packages-dir
GeckoEidechse Jul 18, 2023
6d0d813
feat: Initial support for installing packages
GeckoEidechse Jul 18, 2023
24090dd
feat: Give wrong version number on legacy TS mods
GeckoEidechse Jul 18, 2023
7df3de9
Merge remote-tracking branch 'origin/feat/delete-package' into dev/pa…
GeckoEidechse Jul 18, 2023
fb8cfbf
Merge remote-tracking branch 'origin/feat/install-packages' into dev/…
GeckoEidechse Jul 18, 2023
5fc6669
Merge remote-tracking branch 'origin/feat/upgrade-to-packges' into de…
GeckoEidechse Jul 18, 2023
9f9c555
feat: Support deleting older versions of package
GeckoEidechse Jul 18, 2023
8a1c8d3
fix: Typo in comment
GeckoEidechse Jul 18, 2023
ea74685
fix: Add missing semi colon
GeckoEidechse Jul 18, 2023
6958580
feat: Delete packages installed in legacy mode
GeckoEidechse Jul 18, 2023
349a3cb
fix: Remove unnecessary reference
GeckoEidechse Jul 18, 2023
a2b80ef
Merge branch 'main' into feat/read-packages-dir
GeckoEidechse Jul 19, 2023
f8d321a
Merge remote-tracking branch 'origin/feat/read-packages-dir' into dev…
GeckoEidechse Jul 19, 2023
794817d
Merge branch 'main' into dev/packages
GeckoEidechse Jul 19, 2023
48bfce1
feat: Add ability to delete a Thunderstore package
GeckoEidechse Jul 19, 2023
0d06d88
fix: Remove debug prints
GeckoEidechse Jul 19, 2023
28c2627
Merge branch 'feat/delete-package' into dev/packages
GeckoEidechse Jul 19, 2023
56ac4a1
Merge branch 'main' into dev/packages
GeckoEidechse Jul 19, 2023
e0aab46
fix: Typo in comment
GeckoEidechse Jul 19, 2023
5f3dcde
Merge branch 'main' into feat/install-packages
GeckoEidechse Jul 19, 2023
e3c68e1
fix: Typo in Cargo.toml
GeckoEidechse Jul 19, 2023
8ae71ef
feat: Delete old version of package on update
GeckoEidechse Jul 19, 2023
c16ff2e
chore: Sync with other branch
GeckoEidechse Jul 19, 2023
d335e74
feat: Add sanity check for package install
GeckoEidechse Jul 20, 2023
ef088ee
Merge branch 'feat/install-packages' into dev/packages
GeckoEidechse Jul 20, 2023
c5bffe6
fix: Remove accidentally duplicated code
GeckoEidechse Jul 20, 2023
06cdb5d
Bump libthermite to 0.7.0-alpha.1
GeckoEidechse Jul 20, 2023
68892a4
fix: Formatting
GeckoEidechse Jul 20, 2023
d7fdbf8
fix: Bump libthermite to 0.7.0-beta
GeckoEidechse Jul 21, 2023
448c6f3
docs: Add comment explaining "legacy package"
GeckoEidechse Jul 21, 2023
e4f995b
docs: Add comment explaining why we skip a folder
GeckoEidechse Jul 21, 2023
17d6282
Merge branch 'main' into dev/packages
GeckoEidechse Jul 21, 2023
5e988a6
style: Remove trailing whitespace
GeckoEidechse Jul 21, 2023
4fbb3e2
Merge branch 'feat/install-packages' into dev/packages
GeckoEidechse Jul 21, 2023
09f8834
Merge branch 'main' into dev/packages
GeckoEidechse Jul 21, 2023
6b49af5
Merge branch 'main' into dev/packages
GeckoEidechse Jul 21, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src-tauri/src/mod_management/legacy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ pub fn parse_installed_mods(
}
};
// Get Thunderstore mod string if it exists
let thunderstore_mod_string = match parsed_mod_json.thunderstore_mod_string {
let mut thunderstore_mod_string = match parsed_mod_json.thunderstore_mod_string {
// Attempt legacy method for getting Thunderstore string first
Some(ts_mod_string) => Some(ts_mod_string),
// Legacy method failed
Expand All @@ -100,6 +100,17 @@ pub fn parse_installed_mods(
// Get directory path
let mod_directory = directory.to_str().unwrap().to_string();

// This is a stupid way to show a legacy installed mod as outdated by simply giving back a wrong version number
if thunderstore_mod_string.is_some() {
// Parse the string
let mut parsed_string: ParsedThunderstoreModString =
thunderstore_mod_string.clone().unwrap().parse().unwrap();
// Set version number to `0.0.0`
parsed_string.version = "0.0.0".to_string();
// And store new string back in original variable
thunderstore_mod_string = Some(parsed_string.to_string())
}
Comment on lines +103 to +112
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

perhaps just move this into the match case above ;)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't I have to duplicate the code then? Cause the match matches for like two cases

  1. checking if it's in mods.json
  2. checking if it there's a manifest.json and a thunderstore_author.txt


let ns_mod = NorthstarMod {
name: parsed_mod_json.name,
version: parsed_mod_json.version,
Expand Down