From 96ffee28da1b6838cff1d38ff2f7c260785a1dd3 Mon Sep 17 00:00:00 2001 From: mtkennerly Date: Fri, 22 Dec 2023 22:32:43 +0800 Subject: [PATCH] Refresh data for some recent renames --- data/manifest.yaml | 18 ++++++++++++------ data/missing.md | 1 - data/steam-game-cache.yaml | 2 +- data/wiki-game-cache.yaml | 4 +++- src/cli.rs | 4 ++-- src/manifest.rs | 7 ------- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/data/manifest.yaml b/data/manifest.yaml index b8a16028..20f057f2 100644 --- a/data/manifest.yaml +++ b/data/manifest.yaml @@ -296025,16 +296025,16 @@ Koihime Enbu RyoRaiRai: id: 795510 Koikatsu: files: - "/Koikatsu Party/UserData/save": - tags: - - save - when: - - os: windows "/UserData/config": tags: - config when: - os: windows + "/UserData/save": + tags: + - save + when: + - os: windows installDir: Koikatsu Party: {} launch: @@ -499252,6 +499252,12 @@ Squad: steam: id: 393380 Squad 51 vs. the Flying Saucers: + files: + "/Squad51/Saved/SaveGames": + tags: + - save + when: + - os: windows installDir: Squadron 51: {} steam: @@ -625173,7 +625179,7 @@ Where They Cremate the Roadkill: Where They Cremate The Roadkill: {} launch: "/Contents/MacOS/WineskinLauncher": - - arguments: "../Resources/drive_c/Program\\\\ Files/.WTCTR/Game.exe" + - arguments: "../Resources/drive_c/Program\\ Files/.WTCTR/Game.exe" when: - os: mac store: steam diff --git a/data/missing.md b/data/missing.md index c6589147..6631039d 100644 --- a/data/missing.md +++ b/data/missing.md @@ -28979,7 +28979,6 @@ * [SQR 2](https://www.pcgamingwiki.com/wiki/?curid=64050) * [SQR 3](https://www.pcgamingwiki.com/wiki/?curid=73827) * [SQR 4](https://www.pcgamingwiki.com/wiki/?curid=134678) -* [Squad 51 vs. the Flying Saucers](https://www.pcgamingwiki.com/wiki/?curid=166523) * [Squad Z](https://www.pcgamingwiki.com/wiki/?curid=104243) * [Squadron 42](https://www.pcgamingwiki.com/wiki/?curid=189862) * [Squadron: Sky Guardians](https://www.pcgamingwiki.com/wiki/?curid=65578) diff --git a/data/steam-game-cache.yaml b/data/steam-game-cache.yaml index 7c5ea531..12a11984 100644 --- a/data/steam-game-cache.yaml +++ b/data/steam-game-cache.yaml @@ -220896,7 +220896,7 @@ oslist: windows executable: Launcher.exe type: default - - arguments: "../Resources/drive_c/Program\\\\ Files/.WTCTR/Game.exe" + - arguments: "../Resources/drive_c/Program\\ Files/.WTCTR/Game.exe" config: oslist: macos executable: Contents/MacOS/WineskinLauncher diff --git a/data/wiki-game-cache.yaml b/data/wiki-game-cache.yaml index 32f1db34..70fd12ae 100644 --- a/data/wiki-game-cache.yaml +++ b/data/wiki-game-cache.yaml @@ -88447,7 +88447,7 @@ Koikatsu: steam: 1073440 templates: - "{{Game data/config|Windows|{{p|game}}\\UserData\\config}}" - - "{{Game data/saves|Windows|{{p|game}}\\Koikatsu Party\\UserData\\save}}" + - "{{Game data/saves|Windows|{{p|game}}\\UserData\\save}}" Koikoi: pageId: 100190 steam: 763380 @@ -149342,6 +149342,8 @@ Squad 51 vs. the Flying Saucers: renamedFrom: - Squadron 51 steam: 1378800 + templates: + - "{{Game data/saves|Windows|{{p|localappdata}}\\Squad51\\Saved\\SaveGames}}" Squad Z: pageId: 104243 steam: 784030 diff --git a/src/cli.rs b/src/cli.rs index e622ceb9..ad2f03a7 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -111,7 +111,7 @@ pub async fn run( steam_cache.transition_states_from(wiki_cache); steam_cache.refresh(outdated_only, None, limit, steam_from)?; - manifest.refresh(manifest_override, wiki_cache, steam_cache, None)?; + manifest.refresh(manifest_override, wiki_cache, steam_cache)?; schema::validate_manifest(manifest)?; } Subcommand::Solo { local, games } => { @@ -131,7 +131,7 @@ pub async fn run( steam_cache.refresh(outdated_only, Some(steam_ids), None, None)?; } - manifest.refresh(manifest_override, wiki_cache, steam_cache, Some(games))?; + manifest.refresh(manifest_override, wiki_cache, steam_cache)?; schema::validate_manifest(manifest)?; } Subcommand::Schema => { diff --git a/src/manifest.rs b/src/manifest.rs index cd21c3ec..42e44f05 100644 --- a/src/manifest.rs +++ b/src/manifest.rs @@ -118,17 +118,10 @@ impl Manifest { overrides: &ManifestOverride, wiki_cache: &WikiCache, steam_cache: &SteamCache, - games: Option>, ) -> Result<(), Error> { self.0.clear(); for (title, info) in &wiki_cache.0 { - if let Some(games) = &games { - if !games.contains(title) { - continue; - } - } - if overrides.0.get(title).map(|x| x.omit).unwrap_or(false) { continue; }