diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3a7ca0d08..da534e1d5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,15 +21,16 @@ jobs:
runs-on: windows-latest
strategy:
matrix:
- configuration: [Release] # No need to distribute Debug builds
+ configuration: [Debug] # No need to distribute Debug builds
platform: [x64]
- framework: [net8.0-windows10.0.22621.0]
+ framework: [net9.0-windows10.0.22621.0]
env:
Configuration: ${{ matrix.configuration }}
Platform: ${{ matrix.platform }}
DOTNET_INSTALL_DIR: '.\.dotnet'
- DOTNET_VERSION: '8.x'
+ DOTNET_VERSION: '9.x'
+ DOTNET_QUALITY: 'preview'
NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
steps:
@@ -42,6 +43,48 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNET_VERSION }}
+ dotnet-quality: ${{ env.DOTNET_QUALITY }}
+ cache: true
+ cache-dependency-path: CollapseLauncher/packages.lock.json
+
+ - name: Build
+ run: |
+ dotnet publish CollapseLauncher -p:PublishProfile=Publish-DebugCIRelease -p:PublishDir=".\debug-build\"
+
+ - name: Upload Artifact
+ uses: actions/upload-artifact@v4.3.1
+ with:
+ name: collapse_${{ matrix.platform }}-${{ matrix.configuration }}_${{ matrix.framework }}_${{ github.sha }}
+ path: ./CollapseLauncher/debug-build/
+ compression-level: 9
+
+ build-nativeaot:
+ runs-on: windows-latest
+ strategy:
+ matrix:
+ configuration: [Debug]
+ platform: [x64]
+ framework: [net9.0-windows10.0.22621.0]
+
+ env:
+ Configuration: ${{ matrix.configuration }}
+ Platform: ${{ matrix.platform }}
+ DOTNET_INSTALL_DIR: '.\.dotnet'
+ DOTNET_VERSION: '9.x'
+ DOTNET_QUALITY: 'preview'
+ NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4.1.5
+ with:
+ submodules: recursive
+
+ - name: Install .NET
+ uses: actions/setup-dotnet@v4
+ with:
+ dotnet-version: ${{ env.DOTNET_VERSION }}
+ dotnet-quality: ${{ env.DOTNET_QUALITY }}
cache: true
cache-dependency-path: CollapseLauncher/packages.lock.json
@@ -51,16 +94,20 @@ jobs:
- name: Build
run: |
- dotnet publish CollapseLauncher -p:PublishProfile=Publish-PreviewRelease -p:PublishDir=".\preview-build\"
+ dotnet publish CollapseLauncher -p:PublishProfile=Publish-DebugCIReleaseAOT -p:PublishDir=".\debug-aot-build\"
- - name: Upload Artifact (Release)
+ - name: Upload Artifact
uses: actions/upload-artifact@v4.3.1
- if: ${{ matrix.configuration == 'Release' }}
with:
- name: collapse_${{ matrix.platform }}-${{ matrix.configuration }}_${{ matrix.framework }}_${{ github.sha }}
- path: ./CollapseLauncher/preview-build/
+ name: aot-experimental_collapse_${{ matrix.platform }}-${{ matrix.configuration }}_${{ matrix.framework }}_${{ github.sha }}
+ path: ./CollapseLauncher/debug-aot-build/
compression-level: 9
+ notify-discord:
+ runs-on: ubuntu-latest
+ if: always()
+ needs: [build, build-nativeaot]
+ steps:
- name: Notify Discord
uses: sarisia/actions-status-discord@v1.13.0
if: always()
diff --git a/.gitignore b/.gitignore
index 7fe060537..b2fcd1f69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-*/bin/*
-*/obj/*
+**/bin/*
+**/obj/*
*build/*
.vs/*
*.user
@@ -7,7 +7,7 @@ packages/*
CollapseLauncher/Deps/*
CollapseLauncher/Invoker/*
-CollapseLauncher/Generated Files/**
+**/Generated Files/**
*.psd
InstallerProp/Output/*
InstallerProp/temp/**
diff --git a/.gitmodules b/.gitmodules
index 8c68a51a8..bd0331340 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,3 +22,6 @@
[submodule "SevenZipExtractor"]
path = SevenZipExtractor
url = https://github.com/CollapseLauncher/SevenZipExtractor
+[submodule "H.NotifyIcon"]
+ path = H.NotifyIcon
+ url = https://github.com/CollapseLauncher/H.NotifyIcon
diff --git a/Backup/CommunityToolkit.WinUI.Controls.ImageCropper.csproj b/Backup/CommunityToolkit.WinUI.Controls.ImageCropper.csproj
new file mode 100644
index 000000000..0e97ae7dd
--- /dev/null
+++ b/Backup/CommunityToolkit.WinUI.Controls.ImageCropper.csproj
@@ -0,0 +1,30 @@
+
+
+
+
+ ImageCropper
+ The ImageCropper control allows the user to freely crop an image.
+
+
+ CommunityToolkit.WinUI.Controls.ImageCropperRns
+ ReadMe.md
+
+
+
+
+
+
+
+
+
+
+
+ True
+ \
+
+
+
+
+ $(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)
+
+
diff --git a/Backup/ReadMe.md b/Backup/ReadMe.md
new file mode 100644
index 000000000..07942198d
--- /dev/null
+++ b/Backup/ReadMe.md
@@ -0,0 +1,38 @@
+
+# Windows Community Toolkit - ImageCropper
+
+This package is part of the [Windows Community Toolkit](https://aka.ms/toolkit/windows) from the [.NET Foundation](https://dotnetfoundation.org).
+
+## Package Contents
+
+This package contains the following controls in the `CommunityToolkit.WinUI.Controls` namespace:
+
+- ImageCropper
+
+## Which Package is for me?
+
+If you're developing with _UWP/WinUI 2 or Uno.UI_ you should be using the `CommunityToolkit.Uwp.Controls.ImageCropper` package.
+
+If you're developing with _WindowsAppSDK/WinUI 3 or Uno.WinUI_ you should be using the `CommunityToolkit.WinUI.Controls.ImageCropper` package.
+
+## WinUI Resources (UWP)
+
+For UWP projects, the WinUI 2 reference requires you include the WinUI XAML Resources in your App.xaml file:
+
+```xml
+
+
+
+```
+
+See [Getting Started in WinUI 2](https://learn.microsoft.com/windows/apps/winui/winui2/getting-started) for more information.
+
+## Documentation
+
+Further documentation about these components can be found at: https://aka.ms/windowstoolkitdocs
+
+## License
+
+MIT
+
+See License.md in package for more details.
diff --git a/ClearCache.bat b/ClearCache.bat
index 50a691b8b..c42722760 100644
--- a/ClearCache.bat
+++ b/ClearCache.bat
@@ -3,6 +3,10 @@ echo Clearing Collapse cache
rmdir /S /Q CollapseLauncher\bin && rmdir /S /Q CollapseLauncher\obj
echo Clearing ColorThief cache
rmdir /S /Q ColorThief\ColorThief\bin && rmdir /S /Q ColorThief\ColorThief\obj
+echo Clearing CommunityToolkit.ImageCropper cache
+rmdir /S /Q Hi3Helper.CommunityToolkit\ImageCropper\bin && rmdir /S /Q Hi3Helper.CommunityToolkit\ImageCropper\obj
+echo Clearing CommunityToolkit.SettingsControls cache
+rmdir /S /Q Hi3Helper.CommunityToolkit\SettingsControls\bin && rmdir /S /Q Hi3Helper.CommunityToolkit\SettingsControls\obj
echo Clearing Core cache
rmdir /S /Q Hi3Helper.Core\bin && rmdir /S /Q Hi3Helper.Core\obj
echo Clearing EncTool cache
@@ -13,12 +17,16 @@ echo Clearing Http cache
rmdir /S /Q Hi3Helper.Http\bin && rmdir /S /Q Hi3Helper.Http\obj
echo Clearing Http tester cache
rmdir /S /Q Hi3Helper.Http\Test\bin && rmdir /S /Q Hi3Helper.Http\Test\obj
+echo Clearing TaskScheduler cache
+rmdir /S /Q Hi3Helper.TaskScheduler\bin && rmdir /S /Q Hi3Helper.TaskScheduler\obj
echo Clearing HDiff cache
rmdir /S /Q Hi3Helper.SharpHDiffPatch\Hi3Helper.SharpHDiffPatch\bin && rmdir /S /Q Hi3Helper.SharpHDiffPatch\Hi3Helper.SharpHDiffPatch\obj
echo Clearing 2nd HDiff cache
rmdir /S /Q Hi3Helper.SharpHDiffPatch\SharpHDiffPatch\bin && rmdir /S /Q Hi3Helper.SharpHDiffPatch\SharpHDiffPatch\obj
echo Clearing InnoSetupHelper cache
rmdir /S /Q InnoSetupHelper\bin && rmdir /S /Q InnoSetupHelper\obj
+echo Clearing ImageEx cache
+rmdir /S /Q ImageEx\ImageEx\bin && rmdir /S /Q ImageEx\ImageEx\obj
echo Clearing 7z cache
rmdir /S /Q Hi3Helper.Core\Classes\Data\Tools\SevenZipTool\SevenZipExtractor\SevenZipExtractor\bin && rmdir /S /Q Hi3Helper.Core\Classes\Data\Tools\SevenZipTool\SevenZipExtractor\SevenZipExtractor\obj
echo Clearing SharpDiscordRPC cache
diff --git a/CollapseLauncher.sln b/CollapseLauncher.sln
index aa68aa993..c6045a5c1 100644
--- a/CollapseLauncher.sln
+++ b/CollapseLauncher.sln
@@ -24,6 +24,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hi3Helper.Sophon", "Hi3Help
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageEx", "ImageEx\ImageEx\ImageEx.csproj", "{A6AF9DE9-1A18-4C2D-B106-B68A0A7CD07D}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hi3Helper.TaskScheduler", "Hi3Helper.TaskScheduler\Hi3Helper.TaskScheduler.csproj", "{C9CBAF52-49C7-4B72-A03B-130F596E24CB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hi3Helper.CommunityToolkit.WinUI.Controls.ImageCropper", "Hi3Helper.CommunityToolkit\ImageCropper\Hi3Helper.CommunityToolkit.WinUI.Controls.ImageCropper.csproj", "{558A1D17-BEB4-49DF-A200-15ABE283BDED}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hi3Helper.CommunityToolkit.WinUI.Controls.SettingsControls", "Hi3Helper.CommunityToolkit\SettingsControls\Hi3Helper.CommunityToolkit.WinUI.Controls.SettingsControls.csproj", "{5A1243EC-EFD9-4B55-8F29-D1A91A9B027D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "H.NotifyIcon.WinUI", "H.NotifyIcon\src\libs\H.NotifyIcon.WinUI\H.NotifyIcon.WinUI.csproj", "{141083CC-A924-4E19-904C-AF91361405A5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "H.NotifyIcon", "H.NotifyIcon\src\libs\H.NotifyIcon\H.NotifyIcon.csproj", "{6C8A25FA-BA1C-4EE4-8A9D-2FB4918077FB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "H.GeneratedIcons.System.Drawing", "H.NotifyIcon\src\libs\H.GeneratedIcons.System.Drawing\H.GeneratedIcons.System.Drawing.csproj", "{911C98FD-C64D-4BAC-8EF5-0616F8EFF7B9}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@@ -92,10 +104,44 @@ Global
{3F87DCD0-39B7-4F8C-8F34-A0FC7C6E65A0}.Release|x64.Build.0 = Release|x64
{A6AF9DE9-1A18-4C2D-B106-B68A0A7CD07D}.Debug|x64.ActiveCfg = Debug|x64
{A6AF9DE9-1A18-4C2D-B106-B68A0A7CD07D}.Debug|x64.Build.0 = Debug|x64
- {A6AF9DE9-1A18-4C2D-B106-B68A0A7CD07D}.Publish|x64.ActiveCfg = Debug|x64
- {A6AF9DE9-1A18-4C2D-B106-B68A0A7CD07D}.Publish|x64.Build.0 = Debug|x64
+ {A6AF9DE9-1A18-4C2D-B106-B68A0A7CD07D}.Publish|x64.ActiveCfg = Release|x64
+ {A6AF9DE9-1A18-4C2D-B106-B68A0A7CD07D}.Publish|x64.Build.0 = Release|x64
{A6AF9DE9-1A18-4C2D-B106-B68A0A7CD07D}.Release|x64.ActiveCfg = Release|x64
{A6AF9DE9-1A18-4C2D-B106-B68A0A7CD07D}.Release|x64.Build.0 = Release|x64
+ {C9CBAF52-49C7-4B72-A03B-130F596E24CB}.Debug|x64.ActiveCfg = Debug|x64
+ {C9CBAF52-49C7-4B72-A03B-130F596E24CB}.Debug|x64.Build.0 = Debug|x64
+ {C9CBAF52-49C7-4B72-A03B-130F596E24CB}.Publish|x64.ActiveCfg = Release|x64
+ {C9CBAF52-49C7-4B72-A03B-130F596E24CB}.Release|x64.ActiveCfg = Release|x64
+ {558A1D17-BEB4-49DF-A200-15ABE283BDED}.Debug|x64.ActiveCfg = Debug|x64
+ {558A1D17-BEB4-49DF-A200-15ABE283BDED}.Debug|x64.Build.0 = Debug|x64
+ {558A1D17-BEB4-49DF-A200-15ABE283BDED}.Publish|x64.ActiveCfg = Release|x64
+ {558A1D17-BEB4-49DF-A200-15ABE283BDED}.Publish|x64.Build.0 = Release|x64
+ {558A1D17-BEB4-49DF-A200-15ABE283BDED}.Release|x64.ActiveCfg = Release|x64
+ {558A1D17-BEB4-49DF-A200-15ABE283BDED}.Release|x64.Build.0 = Release|x64
+ {5A1243EC-EFD9-4B55-8F29-D1A91A9B027D}.Debug|x64.ActiveCfg = Debug|x64
+ {5A1243EC-EFD9-4B55-8F29-D1A91A9B027D}.Debug|x64.Build.0 = Debug|x64
+ {5A1243EC-EFD9-4B55-8F29-D1A91A9B027D}.Publish|x64.ActiveCfg = Release|x64
+ {5A1243EC-EFD9-4B55-8F29-D1A91A9B027D}.Publish|x64.Build.0 = Release|x64
+ {5A1243EC-EFD9-4B55-8F29-D1A91A9B027D}.Release|x64.ActiveCfg = Release|x64
+ {5A1243EC-EFD9-4B55-8F29-D1A91A9B027D}.Release|x64.Build.0 = Release|x64
+ {141083CC-A924-4E19-904C-AF91361405A5}.Debug|x64.ActiveCfg = Debug|x64
+ {141083CC-A924-4E19-904C-AF91361405A5}.Debug|x64.Build.0 = Debug|x64
+ {141083CC-A924-4E19-904C-AF91361405A5}.Publish|x64.ActiveCfg = Release|x64
+ {141083CC-A924-4E19-904C-AF91361405A5}.Publish|x64.Build.0 = Release|x64
+ {141083CC-A924-4E19-904C-AF91361405A5}.Release|x64.ActiveCfg = Release|x64
+ {141083CC-A924-4E19-904C-AF91361405A5}.Release|x64.Build.0 = Release|x64
+ {6C8A25FA-BA1C-4EE4-8A9D-2FB4918077FB}.Debug|x64.ActiveCfg = Debug|x64
+ {6C8A25FA-BA1C-4EE4-8A9D-2FB4918077FB}.Debug|x64.Build.0 = Debug|x64
+ {6C8A25FA-BA1C-4EE4-8A9D-2FB4918077FB}.Publish|x64.ActiveCfg = Release|x64
+ {6C8A25FA-BA1C-4EE4-8A9D-2FB4918077FB}.Publish|x64.Build.0 = Release|x64
+ {6C8A25FA-BA1C-4EE4-8A9D-2FB4918077FB}.Release|x64.ActiveCfg = Release|x64
+ {6C8A25FA-BA1C-4EE4-8A9D-2FB4918077FB}.Release|x64.Build.0 = Release|x64
+ {911C98FD-C64D-4BAC-8EF5-0616F8EFF7B9}.Debug|x64.ActiveCfg = Debug|x64
+ {911C98FD-C64D-4BAC-8EF5-0616F8EFF7B9}.Debug|x64.Build.0 = Debug|x64
+ {911C98FD-C64D-4BAC-8EF5-0616F8EFF7B9}.Publish|x64.ActiveCfg = Release|x64
+ {911C98FD-C64D-4BAC-8EF5-0616F8EFF7B9}.Publish|x64.Build.0 = Release|x64
+ {911C98FD-C64D-4BAC-8EF5-0616F8EFF7B9}.Release|x64.ActiveCfg = Release|x64
+ {911C98FD-C64D-4BAC-8EF5-0616F8EFF7B9}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/CollapseLauncher/App.xaml b/CollapseLauncher/App.xaml
index 03ea596c7..29062f0d2 100644
--- a/CollapseLauncher/App.xaml
+++ b/CollapseLauncher/App.xaml
@@ -1,4 +1,4 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -28,345 +41,359 @@
#ffd52a
#ffd52a
#ffd52a
-
-
-
-
-
+
+
+
+
+
+ FallbackColor="{ThemeResource SystemAccentColor}"
+ Opacity="0.8"
+ TintColor="{ThemeResource SystemAccentColor}"
+ TintLuminosityOpacity="0.8"
+ TintOpacity="0.2" />
+ Color="{ThemeResource SystemAccentColorLight2}" />
+ Color="#FFFFFF" />
+ Color="#000000" />
-
-
-
-
+ Color="#242424" />
+
+
+
+
#ffd52a
+ Color="{ThemeResource DialogTitleColor}" />
-
-
-
+ TintOpacity="0.0" />
+
+
+
+ TintOpacity="0.0" />
+ TintOpacity="0" />
+ TintOpacity="0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="1" />
+ TintOpacity="0.6" />
+ TintOpacity="0.0" />
+ TintOpacity="0.75" />
+ TintOpacity="0.0" />
+ TintLuminosityOpacity="0.2"
+ TintOpacity="0.2" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="1" />
-
+
+ TintOpacity="0.0" />
+ TintLuminosityOpacity="0.5"
+ TintOpacity="0.0" />
-
-
-
+ TintOpacity="0.0" />
+
+
+
+
+ Color="#00000000" />
+ Color="#22000000" />
+ Color="#11000000" />
+ Color="#0A000000" />
+
+ Color="#22000000" />
+ Color="#11000000" />
+ Color="#0A000000" />
+ Color="#44000000" />
+ Color="#55000000" />
+ Color="#33000000" />
+ Color="#22000000" />
-
-
-
+
+
+
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
-
+ TintOpacity="0.0" />
+
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
-
+ TintOpacity="0.0" />
+
+ TintOpacity="0" />
+ Opacity="0.9"
+ TintColor="{ThemeResource SystemAccentColor}" />
+ Opacity="0.75"
+ TintColor="{ThemeResource SystemAccentColor}" />
+ FallbackColor="{ThemeResource SystemAccentColor}"
+ TintColor="{ThemeResource SystemAccentColor}" />
+ Opacity="0.75"
+ Color="#DDFFFFFF" />
+ Color="#EE000000" />
+ Color="#CC000000" />
+ Color="#FF111111" />
+ TintOpacity="0" />
+ TintOpacity="0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
-
+ TintOpacity="0.0" />
+
+
+ Color="#00000000" />
+ Color="#00000000" />
+
+
+ Color="#A0C00000" />
+
+
@@ -378,338 +405,350 @@
#693758
#693758
#693758
-
-
-
-
-
+
+
+
+
+
+ FallbackColor="{ThemeResource SystemAccentColor}"
+ Opacity="0.8"
+ TintColor="{ThemeResource SystemAccentColor}"
+ TintLuminosityOpacity="0.8"
+ TintOpacity="0.2" />
+ Color="{ThemeResource SystemAccentColor}" />
+ Color="#000000" />
+ Color="#FFFFFF" />
-
-
-
-
+ Color="#ECECEC" />
+
+
+
+
#693758
+ Color="{ThemeResource DialogTitleColor}" />
-
-
-
+ TintOpacity="0.0" />
+
+
+
+ TintOpacity="0.0" />
+ TintOpacity="1" />
+ TintOpacity="0" />
+ TintOpacity="0" />
+ TintLuminosityOpacity="0.9"
+ TintOpacity="0.4" />
+ TintOpacity="0.25" />
+ TintOpacity="0.25" />
+ TintOpacity="0" />
+ TintOpacity="0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.75" />
+ TintOpacity="0.7" />
+ TintOpacity="0" />
+ TintOpacity="0" />
+ TintOpacity="0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
-
+ TintOpacity="1" />
+
+ TintOpacity="0.0" />
+ TintLuminosityOpacity="0.9"
+ TintOpacity="0.0" />
+
-
-
-
+ TintOpacity="0.0" />
+
+
+
+ Color="#00FFFFFF" />
+ Color="#66FFFFFF" />
+ Color="#44FFFFFF" />
+ Color="#22FFFFFF" />
+ Color="#66FFFFFF" />
+ Color="#44FFFFFF" />
+ Color="#22FFFFFF" />
+ Color="#88FFFFFF" />
+ Color="#55FFFFFF" />
+ Color="#44FFFFFF" />
-
-
-
-
+ Color="#22FFFFFF" />
+
+
+
+
-
+
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
-
+ TintOpacity="0.0" />
+
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
-
+ TintOpacity="0.0" />
+
+ FallbackColor="#88FFFFFF"
+ TintColor="#88FFFFFF" />
+ Opacity="0.9"
+ TintColor="{ThemeResource SystemAccentColor}" />
+ Opacity="0.8"
+ TintColor="{ThemeResource SystemAccentColor}" />
+ FallbackColor="{ThemeResource SystemAccentColor}"
+ TintColor="{ThemeResource SystemAccentColor}" />
+ Color="#88000000" />
+ Color="#DDFFFFFF" />
+ Color="#CCFFFFFF" />
+ Color="#FFFFFF" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
+ TintOpacity="0.0" />
-
+ TintOpacity="0.0" />
+
+
+ Color="#00FFFFFF" />
+ Color="#00FFFFFF" />
+
+
+ Color="#90FF6666" />
+
+
@@ -718,38 +757,28 @@
+
-
+
+ TargetType="ComboBox" />
2
-
-
-
-
-
-
-
-
-
-
-
-
ms-appx:///Assets/Fonts/FontAwesomeBrand6.otf#Font Awesome 6 Brands
diff --git a/CollapseLauncher/App.xaml.cs b/CollapseLauncher/App.xaml.cs
index 7159fa386..d6cf12ce2 100644
--- a/CollapseLauncher/App.xaml.cs
+++ b/CollapseLauncher/App.xaml.cs
@@ -8,7 +8,6 @@
using PhotoSauce.MagicScaler;
using PhotoSauce.NativeCodecs.Libwebp;
using System;
-using System.Collections.Generic;
using System.Linq;
using Windows.UI;
using static CollapseLauncher.InnerLauncherConfig;
@@ -134,7 +133,8 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
{
LogWriteLine($"FATAL ERROR ON APP INITIALIZER LEVEL!!!\r\n{ex}", LogType.Error, true);
LogWriteLine("\r\nIf this is not intended, please report it to: https://github.com/CollapseLauncher/Collapse/issues\r\nPress any key to exit...");
- Console.ReadLine();
+ //Console.ReadLine();
+ throw;
}
}
@@ -147,14 +147,12 @@ public static void ToggleBlurBackdrop(bool useBackdrop = true)
// then select the value, get the type of ResourceDictionary, then enumerate it
foreach (ResourceDictionary list in resource!
.ThemeDictionaries!
- .OfType>()
.Select(x => x.Value)
.OfType())
{
// Parse the dictionary as type of KeyValuePair,
// and get the value which has type of AcrylicBrush only, then enumerate it
foreach (AcrylicBrush theme in list
- .OfType>()
.Select(x => x.Value)
.OfType())
{
diff --git a/CollapseLauncher/Classes/CachesManagement/Honkai/Fetch.cs b/CollapseLauncher/Classes/CachesManagement/Honkai/Fetch.cs
index c70224f92..2fae2d352 100644
--- a/CollapseLauncher/Classes/CachesManagement/Honkai/Fetch.cs
+++ b/CollapseLauncher/Classes/CachesManagement/Honkai/Fetch.cs
@@ -204,7 +204,7 @@ private IEnumerable EnumerateCacheTextAsset(CacheAssetType type, IEn
try
{
// Deserialize the line and set the type
- content = line.Deserialize(InternalAppJSONContext.Default);
+ content = line.Deserialize(InternalAppJSONContext.Default.CacheAsset);
}
catch (Exception ex)
{
diff --git a/CollapseLauncher/Classes/Extension/TaskExtensions.cs b/CollapseLauncher/Classes/Extension/TaskExtensions.cs
index fb6367896..01ed2a487 100644
--- a/CollapseLauncher/Classes/Extension/TaskExtensions.cs
+++ b/CollapseLauncher/Classes/Extension/TaskExtensions.cs
@@ -6,18 +6,24 @@
#nullable enable
namespace CollapseLauncher.Extension
{
- internal delegate ValueTask ActionTimeoutValueTaskCallback(CancellationToken token);
+ internal delegate Task ActionTimeoutValueTaskCallback(CancellationToken token);
internal delegate void ActionOnTimeOutRetry(int retryAttemptCount, int retryAttemptTotal, int timeOutSecond, int timeOutStep);
internal static class TaskExtensions
{
internal const int DefaultTimeoutSec = 10;
internal const int DefaultRetryAttempt = 5;
- internal static async ValueTask WaitForRetryAsync(this ActionTimeoutValueTaskCallback funcCallback, int? timeout = null,
+ internal static async Task AsTaskAndDoAction(this Task taskResult, Action doAction)
+ {
+ TResult? result = await taskResult;
+ doAction(result);
+ }
+
+ internal static async Task WaitForRetryAsync(this ActionTimeoutValueTaskCallback funcCallback, int? timeout = null,
int? timeoutStep = null, int? retryAttempt = null, ActionOnTimeOutRetry? actionOnRetry = null, CancellationToken fromToken = default)
=> await WaitForRetryAsync(() => funcCallback, timeout, timeoutStep, retryAttempt, actionOnRetry, fromToken);
- internal static async ValueTask WaitForRetryAsync(Func> funcCallback, int? timeout = null,
+ internal static async Task WaitForRetryAsync(Func> funcCallback, int? timeout = null,
int? timeoutStep = null, int? retryAttempt = null, ActionOnTimeOutRetry? actionOnRetry = null, CancellationToken fromToken = default)
{
timeout ??= DefaultTimeoutSec;
@@ -78,7 +84,7 @@ internal static class TaskExtensions
}
internal static async
- ValueTask
+ Task
TimeoutAfter(this Task task, CancellationToken token = default, int timeout = DefaultTimeoutSec)
{
Task completedTask = await Task.WhenAny(task, ThrowExceptionAfterTimeout(timeout, task, token));
diff --git a/CollapseLauncher/Classes/Extension/UIElementExtensions.cs b/CollapseLauncher/Classes/Extension/UIElementExtensions.cs
index cb79a82f3..c53519858 100644
--- a/CollapseLauncher/Classes/Extension/UIElementExtensions.cs
+++ b/CollapseLauncher/Classes/Extension/UIElementExtensions.cs
@@ -1,12 +1,13 @@
using CommunityToolkit.WinUI;
-using CommunityToolkit.WinUI.Controls;
using Hi3Helper;
+using Hi3Helper.CommunityToolkit.WinUI.Controls;
using Microsoft.UI;
using Microsoft.UI.Input;
using Microsoft.UI.Text;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
using Microsoft.UI.Xaml.Documents;
using Microsoft.UI.Xaml.Media;
using System;
@@ -20,6 +21,12 @@
namespace CollapseLauncher.Extension
{
internal enum CornerRadiusKind { Normal, Rounded }
+ internal class NavigationViewItemLocaleTextProperty
+ {
+ public string LocaleSetName { get; set; }
+ public string LocalePropertyName { get; set; }
+ }
+
internal static class UIElementExtensions
{
///
@@ -30,6 +37,184 @@ internal static class UIElementExtensions
[UnsafeAccessor(UnsafeAccessorKind.Method, Name = "set_ProtectedCursor")]
internal static extern void SetCursor(this UIElement element, InputCursor inputCursor);
+ ///
+ /// Set the cursor for the element.
+ ///
+ /// The member of an element
+ /// The cursor you want to set. Use to choose the cursor you want to set.
+ internal static ref T WithCursor(this T element, InputCursor inputCursor) where T : UIElement
+ {
+ element.SetCursor(inputCursor);
+ return ref Unsafe.AsRef(ref element);
+ }
+
+#nullable enable
+ ///
+ /// Set the initial navigation view item's locale binding before getting set with
+ ///
+ /// The instance to set the initial text binding to.
+ /// The instance to set the initial text binding to.
+ /// The instance name of a members.
+ /// Name of the locale property
+ /// A reference of the
+ internal static ref T BindNavigationViewItemText(this T element, string localeSetName, string localePropertyName)
+ where T : NavigationViewItemBase
+ {
+ NavigationViewItemLocaleTextProperty property = new NavigationViewItemLocaleTextProperty
+ {
+ LocaleSetName = localeSetName,
+ LocalePropertyName = localePropertyName
+ };
+
+ if (element is NavigationViewItemHeader elementAsHeader)
+ {
+ elementAsHeader.Tag = property;
+ }
+ else
+ {
+ TextBlock textBlock = new TextBlock().WithTag(property);
+ element.Content = textBlock;
+ }
+ return ref Unsafe.AsRef(ref element);
+ }
+
+ internal static void SetAllControlsCursorRecursive(this UIElement element, InputSystemCursor toCursor)
+ {
+ if (element == null)
+ {
+ return;
+ }
+
+ if (element is Panel panelKind)
+ {
+ foreach (UIElement panelElements in panelKind.Children)
+ {
+ SetAllControlsCursorRecursive(panelElements, toCursor);
+ }
+ }
+
+ if (element is RadioButtons radioButtonsKind)
+ {
+ foreach (UIElement radioButtonContent in radioButtonsKind.Items.OfType())
+ {
+ radioButtonContent.SetCursor(toCursor);
+ }
+ }
+
+ if (element is Border borderKind)
+ {
+ SetAllControlsCursorRecursive(borderKind.Child, toCursor);
+ }
+
+ if (element is ComboBox comboBoxKind)
+ {
+ comboBoxKind.SetCursor(toCursor);
+ }
+
+ if (element is UserControl userControlKind)
+ {
+ SetAllControlsCursorRecursive(userControlKind.Content, toCursor);
+ }
+
+ if (element is ContentControl contentControlKind
+ && contentControlKind.Content is UIElement contentControlKindInner)
+ {
+ SetAllControlsCursorRecursive(contentControlKindInner, toCursor);
+ }
+
+ if (element is NavigationView navigationViewKind)
+ {
+ foreach (UIElement navigationViewElements in navigationViewKind.FindDescendants())
+ {
+ if (navigationViewElements is NavigationViewItem)
+ {
+ navigationViewElements.SetCursor(toCursor);
+ continue;
+ }
+ SetAllControlsCursorRecursive(navigationViewElements, toCursor);
+ }
+ }
+
+ if (element is ButtonBase buttonBaseKind)
+ {
+ buttonBaseKind.SetCursor(toCursor);
+ if (buttonBaseKind is Button buttonKind && buttonKind.Flyout != null && buttonKind.Flyout is Flyout buttonKindFlyout)
+ {
+ SetAllControlsCursorRecursive(buttonKindFlyout.Content, toCursor);
+ }
+ }
+
+ if (element is ToggleSwitch)
+ {
+ element.SetCursor(toCursor);
+ }
+
+ if (element.ContextFlyout != null && element.ContextFlyout is Flyout elementFlyoutKind)
+ {
+ SetAllControlsCursorRecursive(elementFlyoutKind.Content, toCursor);
+ }
+ }
+
+ internal static void ApplyNavigationViewItemLocaleTextBindings(this NavigationView navViewControl)
+ {
+ foreach (NavigationViewItemBase navItem in navViewControl
+ .FindDescendants()
+ .OfType())
+ {
+ string? localeValue = null;
+ if (navItem.Content is TextBlock navItemTextBlock
+ && navItemTextBlock.Tag is NavigationViewItemLocaleTextProperty localeProperty)
+ {
+ navItemTextBlock.BindProperty(
+ TextBlock.TextProperty,
+ Locale.Lang,
+ $"{localeProperty.LocaleSetName}.{localeProperty.LocalePropertyName}");
+ localeValue = navItemTextBlock.GetValue(TextBlock.TextProperty) as string;
+ }
+ else if (navItem is NavigationViewItemHeader navItemAsHeader
+ && navItemAsHeader.Tag is NavigationViewItemLocaleTextProperty localePropertyOnHeader)
+ {
+ navItemAsHeader.BindProperty(
+ ContentControl.ContentProperty,
+ Locale.Lang,
+ $"{localePropertyOnHeader.LocaleSetName}.{localePropertyOnHeader.LocalePropertyName}");
+ localeValue = navItemAsHeader.GetValue(ContentControl.ContentProperty) as string;
+ }
+
+ if (!string.IsNullOrEmpty(localeValue))
+ {
+ ToolTipService.SetToolTip(navItem, localeValue);
+ }
+ }
+
+ navViewControl.UpdateLayout();
+ }
+
+ internal static ref T BindProperty(this T element, DependencyProperty dependencyProperty, object objectToBind, string propertyName, IValueConverter? converter = null, BindingMode bindingMode = BindingMode.OneWay)
+ where T : FrameworkElement
+ {
+ // Create a new binding instance
+ Binding binding = new Binding
+ {
+ Source = objectToBind,
+ Mode = bindingMode,
+ Path = new PropertyPath(propertyName),
+ UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged
+ };
+
+ // If the converter is assigned, then add the converter
+ if (converter != null)
+ {
+ binding.Converter = converter;
+ }
+
+ // Set binding to the element
+ element.SetBinding(dependencyProperty, binding);
+
+ return ref Unsafe.AsRef(ref element);
+ }
+#nullable restore
+
internal static TButtonBase CreateButtonWithIcon(string text = null, string iconGlyph = null, string iconFontFamily = "FontAwesome",
string buttonStyle = "DefaultButtonStyle", double iconSize = 16d, double? textSize = null, CornerRadius? cornerRadius = null, FontWeight? textWeight = null)
where TButtonBase : ButtonBase, new()
@@ -704,6 +889,9 @@ void AssignShadowAttachment(FrameworkElement thisElement, bool innerMasked)
case Image imageElement:
AttachShadow(imageElement, true, offset);
break;
+ case ImageEx.ImageEx imageExElement:
+ AttachShadow(imageExElement, true, offset);
+ break;
default:
AttachShadow(element, innerMasked, offset);
break;
diff --git a/CollapseLauncher/Classes/FileMigrationProcess/Statics.cs b/CollapseLauncher/Classes/FileMigrationProcess/Statics.cs
index 717758e4d..707429ed5 100644
--- a/CollapseLauncher/Classes/FileMigrationProcess/Statics.cs
+++ b/CollapseLauncher/Classes/FileMigrationProcess/Statics.cs
@@ -21,6 +21,8 @@ internal static async Task CreateJob(UIElement parentUI, s
// Check whether the input is a file or not.
bool isFileTransfer = File.Exists(inputPath) && !inputPath.StartsWith('\\');
outputPath = await InitializeAndCheckOutputPath(parentUI, dialogTitle, inputPath, outputPath, isFileTransfer);
+ if (outputPath == null) return null;
+
if (Helper.FileUtility.IsRootPath(outputPath))
{
await SimpleDialogs.SpawnDialog(Lang._HomePage.InstallFolderRootTitle,
@@ -30,7 +32,6 @@ await SimpleDialogs.SpawnDialog(Lang._HomePage.InstallFolderRootTitle,
null, null, ContentDialogButton.Close, ContentDialogTheme.Error);
return null;
}
- if (outputPath == null) return null;
if (showWarningMessage)
if (await ShowNotCancellableProcedureMessage(parentUI) == ContentDialogResult.None)
diff --git a/CollapseLauncher/Classes/GameManagement/GamePlaytime/Context.cs b/CollapseLauncher/Classes/GameManagement/GamePlaytime/Context.cs
new file mode 100644
index 000000000..843d46ae3
--- /dev/null
+++ b/CollapseLauncher/Classes/GameManagement/GamePlaytime/Context.cs
@@ -0,0 +1,8 @@
+using System.Text.Json.Serialization;
+
+namespace CollapseLauncher.GamePlaytime
+{
+ [JsonSourceGenerationOptions(IncludeFields = false, GenerationMode = JsonSourceGenerationMode.Metadata, IgnoreReadOnlyFields = true)]
+ [JsonSerializable(typeof(CollapsePlaytime))]
+ internal sealed partial class UniversalPlaytimeJSONContext : JsonSerializerContext { }
+}
diff --git a/CollapseLauncher/Classes/GameManagement/GamePlaytime/Playtime.cs b/CollapseLauncher/Classes/GameManagement/GamePlaytime/Playtime.cs
new file mode 100644
index 000000000..591b9ddd6
--- /dev/null
+++ b/CollapseLauncher/Classes/GameManagement/GamePlaytime/Playtime.cs
@@ -0,0 +1,136 @@
+using CollapseLauncher.Extension;
+using CollapseLauncher.Interfaces;
+using Hi3Helper;
+using Microsoft.Win32;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Timers;
+using static Hi3Helper.Logger;
+using static CollapseLauncher.Dialogs.SimpleDialogs;
+using static CollapseLauncher.InnerLauncherConfig;
+
+namespace CollapseLauncher.GamePlaytime
+{
+ internal class Playtime : IGamePlaytime
+ {
+ #region Properties
+ public event EventHandler PlaytimeUpdated;
+#nullable enable
+ public CollapsePlaytime CollapsePlaytime => _playtime;
+
+ private static HashSet _activeSessions = [];
+ private RegistryKey? _registryRoot;
+ private CollapsePlaytime _playtime;
+ private IGameVersionCheck _gameVersionManager;
+
+ private CancellationTokenSourceWrapper _token = new();
+ #endregion
+
+ public Playtime(IGameVersionCheck GameVersionManager)
+ {
+ string registryPath = Path.Combine($"Software\\{GameVersionManager.VendorTypeProp.VendorType}", GameVersionManager.GamePreset.InternalGameNameInConfig!);
+ _registryRoot = Registry.CurrentUser.OpenSubKey(registryPath, true);
+
+ _registryRoot ??= Registry.CurrentUser.CreateSubKey(registryPath, true, RegistryOptions.None);
+
+ _gameVersionManager = GameVersionManager;
+
+ _playtime = CollapsePlaytime.Load(_registryRoot, _gameVersionManager.GamePreset.HashID);
+ }
+#nullable disable
+
+ public void Update(TimeSpan timeSpan)
+ {
+ TimeSpan oldTimeSpan = _playtime.TotalPlaytime;
+
+ _playtime.Update(timeSpan);
+ PlaytimeUpdated?.Invoke(this, _playtime);
+
+ LogWriteLine($"Playtime counter changed to {TimeSpanToString(timeSpan)}. (Previous value: {TimeSpanToString(oldTimeSpan)})", writeToLog: true);
+ }
+
+ public void Reset()
+ {
+ TimeSpan oldTimeSpan = _playtime.TotalPlaytime;
+
+ _playtime.Reset();
+ PlaytimeUpdated?.Invoke(this, _playtime);
+
+ LogWriteLine($"Playtime counter was reset! (Previous value: {TimeSpanToString(oldTimeSpan)})", writeToLog: true);
+ }
+
+ public async void StartSession(Process proc, DateTime? begin = null)
+ {
+ int hashId = _gameVersionManager.GamePreset.HashID;
+
+ // If a playtime HashSet has already tracked, then return (do not track the playtime more than once)
+ if (_activeSessions.Contains(hashId)) return;
+
+ // Otherwise, add it to track list
+ _activeSessions.Add(hashId);
+
+ begin ??= DateTime.Now;
+
+ TimeSpan initialTimeSpan = _playtime.TotalPlaytime;
+
+ _playtime.LastPlayed = begin;
+ _playtime.LastSession = TimeSpan.Zero;
+ _playtime.Save();
+ PlaytimeUpdated?.Invoke(this, _playtime);
+
+#if DEBUG
+ LogWriteLine($"{_gameVersionManager.GamePreset.ProfileName} - Started session at {begin.Value.ToLongTimeString()}.");
+#endif
+ int elapsedSeconds = 0;
+
+ using (var inGameTimer = new Timer())
+ {
+ inGameTimer.Interval = 60000;
+ inGameTimer.Elapsed += (_, _) =>
+ {
+ elapsedSeconds += 60;
+ DateTime now = DateTime.Now;
+
+ _playtime.AddMinute();
+ PlaytimeUpdated?.Invoke(this, _playtime);
+#if DEBUG
+ LogWriteLine($"{_gameVersionManager.GamePreset.ProfileName} - {elapsedSeconds}s elapsed. ({now.ToLongTimeString()})");
+#endif
+ };
+
+ inGameTimer.Start();
+ await proc.WaitForExitAsync(_token.Token);
+ inGameTimer.Stop();
+ }
+
+ DateTime end = DateTime.Now;
+ double totalElapsedSeconds = (end - begin.Value).TotalSeconds;
+ if (totalElapsedSeconds < 0)
+ {
+ LogWriteLine($"[HomePage::StartPlaytimeCounter] Date difference cannot be lower than 0. ({totalElapsedSeconds}s)", LogType.Error);
+ Dialog_InvalidPlaytime(m_mainPage?.Content, elapsedSeconds);
+ totalElapsedSeconds = elapsedSeconds;
+ }
+
+ TimeSpan totalTimeSpan = TimeSpan.FromSeconds(totalElapsedSeconds);
+ LogWriteLine($"Added {totalElapsedSeconds}s [{totalTimeSpan.Hours}h {totalTimeSpan.Minutes}m {totalTimeSpan.Seconds}s] " +
+ $"to {_gameVersionManager.GamePreset.ProfileName} playtime.", LogType.Default, true);
+
+ _playtime.Update(initialTimeSpan.Add(totalTimeSpan), false);
+ PlaytimeUpdated?.Invoke(this, _playtime);
+
+ _activeSessions.Remove(hashId);
+ }
+
+ private static string TimeSpanToString(TimeSpan timeSpan) => $"{timeSpan.Days * 24 + timeSpan.Hours}h {timeSpan.Minutes}m";
+
+ public void Dispose()
+ {
+ _token.Cancel();
+ _playtime.Save();
+ _registryRoot = null;
+ }
+ }
+}
diff --git a/CollapseLauncher/Classes/GameManagement/GamePlaytime/RegistryClass/CollapsePlaytime.cs b/CollapseLauncher/Classes/GameManagement/GamePlaytime/RegistryClass/CollapsePlaytime.cs
new file mode 100644
index 000000000..b8780e8a5
--- /dev/null
+++ b/CollapseLauncher/Classes/GameManagement/GamePlaytime/RegistryClass/CollapsePlaytime.cs
@@ -0,0 +1,229 @@
+using Hi3Helper;
+using Microsoft.Win32;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text;
+using System.Text.Json.Serialization;
+using static Hi3Helper.Logger;
+
+namespace CollapseLauncher.GamePlaytime
+{
+ internal class CollapsePlaytime
+ {
+ #region Fields
+ private static DateTime BaseDate => new(2012, 2, 13, 0, 0, 0, DateTimeKind.Utc);
+
+ private const string TotalTimeValueName = "CollapseLauncher_Playtime";
+ private const string LastPlayedValueName = "CollapseLauncher_LastPlayed";
+ private const string StatsValueName = "CollapseLauncher_PlaytimeStats";
+
+ private static HashSet _isDeserializing = [];
+ private RegistryKey _registryRoot;
+ private int _hashID;
+
+ #endregion
+
+ #region Properties
+ ///
+ /// Represents the total time a game was played.
+ /// Default: TimeSpan.Zero
+ ///
+ [JsonIgnore]
+ public TimeSpan TotalPlaytime { get; set; } = TimeSpan.Zero;
+
+ ///
+ /// Represents the daily playtime.
+ /// The ControlDate field is used to check if this value should be reset.
+ /// Default: TimeSpan.Zero
+ ///
+ public TimeSpan DailyPlaytime { get; set; } = TimeSpan.Zero;
+
+ ///
+ /// Represents the weekly playtime.
+ /// The ControlDate field is used to check if this value should be reset.
+ /// Default: TimeSpan.Zero
+ ///
+ public TimeSpan WeeklyPlaytime { get; set; } = TimeSpan.Zero;
+
+ ///
+ /// Represents the monthly playtime.
+ /// The ControlDate field is used to check if this value should be reset.
+ /// Default: TimeSpan.Zero
+ ///
+ public TimeSpan MonthlyPlaytime { get; set; } = TimeSpan.Zero;
+
+ ///
+ /// Represents the total time the last/current session lasted.
+ /// Default: TimeSpan.Zero
+ ///
+ public TimeSpan LastSession { get; set; } = TimeSpan.Zero;
+
+ ///
+ /// Represents the last time the game was launched.
+ /// Default: null
+ ///
+ [JsonIgnore]
+ public DateTime? LastPlayed { get; set; }
+
+ ///
+ /// Represents a control date.
+ /// This date is used to check if a specific playtime statistic should be reset.
+ /// Default: DateTime.Today
+ ///
+ public DateTime ControlDate { get; set; } = DateTime.Today;
+ #endregion
+
+ #region Methods
+#nullable enable
+ ///
+ /// Reads from the Registry and deserializes the contents.
+ ///
+ public static CollapsePlaytime Load(RegistryKey root, int hashID)
+ {
+ try
+ {
+ _isDeserializing.Add(hashID);
+ if (root == null) throw new NullReferenceException($"Cannot load playtime. RegistryKey is unexpectedly not initialized!");
+
+ int? totalTime = (int?)root.GetValue(TotalTimeValueName,null);
+ int? lastPlayed = (int?)root.GetValue(LastPlayedValueName,null);
+ object? stats = root.GetValue(StatsValueName, null);
+
+ CollapsePlaytime playtime;
+
+ if (stats != null)
+ {
+ ReadOnlySpan byteStr = (byte[])stats;
+#if DEBUG
+ LogWriteLine($"Loaded Playtime:\r\nTotal: {totalTime}s\r\nLastPlayed: {lastPlayed}\r\nStats: {Encoding.UTF8.GetString(byteStr.TrimEnd((byte)0))}", LogType.Debug, true);
+#endif
+ playtime = byteStr.Deserialize(UniversalPlaytimeJSONContext.Default.CollapsePlaytime, new CollapsePlaytime())!;
+ }
+ else
+ {
+ playtime = new CollapsePlaytime();
+ }
+
+ playtime._registryRoot = root;
+ playtime._hashID = hashID;
+ playtime.TotalPlaytime = TimeSpan.FromSeconds(totalTime ?? 0);
+ playtime.LastPlayed = lastPlayed != null ? BaseDate.AddSeconds((int)lastPlayed) : null;
+
+ return playtime;
+ }
+ catch (Exception ex)
+ {
+ LogWriteLine($"Failed while reading playtime.\r\n{ex}", LogType.Error, true);
+ }
+ finally
+ {
+ _isDeserializing.Remove(hashID);
+ }
+
+ return new CollapsePlaytime() { _hashID = hashID, _registryRoot = root };
+ }
+
+ ///
+ /// Serializes all fields and saves them to the Registry.
+ ///
+ public void Save()
+ {
+ try
+ {
+ if (_registryRoot == null) throw new NullReferenceException($"Cannot save playtime since RegistryKey is unexpectedly not initialized!");
+
+ string data = this.Serialize(UniversalPlaytimeJSONContext.Default.CollapsePlaytime, true);
+ byte[] dataByte = Encoding.UTF8.GetBytes(data);
+#if DEBUG
+ LogWriteLine($"Saved Playtime:\r\n{data}", LogType.Debug, true);
+#endif
+ _registryRoot.SetValue(StatsValueName, dataByte, RegistryValueKind.Binary);
+ _registryRoot.SetValue(TotalTimeValueName, TotalPlaytime.TotalSeconds, RegistryValueKind.DWord);
+
+ double? lastPlayed = (LastPlayed?.ToUniversalTime() - BaseDate)?.TotalSeconds;
+ if (lastPlayed != null)
+ _registryRoot.SetValue(LastPlayedValueName, lastPlayed, RegistryValueKind.DWord);
+ }
+ catch (Exception ex)
+ {
+ LogWriteLine($"Failed to save playtime!\r\n{ex}", LogType.Error, true);
+ }
+ }
+
+ ///
+ /// Resets all fields and saves to the Registry.
+ ///
+ public void Reset()
+ {
+ TotalPlaytime = TimeSpan.Zero;
+ LastSession = TimeSpan.Zero;
+ DailyPlaytime = TimeSpan.Zero;
+ WeeklyPlaytime = TimeSpan.Zero;
+ MonthlyPlaytime = TimeSpan.Zero;
+ ControlDate = DateTime.Today;
+ LastPlayed = null;
+
+ if (!_isDeserializing.Contains(_hashID)) Save();
+ }
+
+ ///
+ /// Updates the current Playtime TimeSpan to the provided value and saves to the Registry.
+ ///
+ /// New playtime value
+ /// Reset all other fields
+ public void Update(TimeSpan timeSpan, bool reset = true)
+ {
+ if (reset)
+ {
+ LastSession = TimeSpan.Zero;
+ DailyPlaytime = TimeSpan.Zero;
+ WeeklyPlaytime = TimeSpan.Zero;
+ MonthlyPlaytime = TimeSpan.Zero;
+ ControlDate = DateTime.Today;
+ }
+
+ TotalPlaytime = timeSpan;
+
+ if (!_isDeserializing.Contains(_hashID)) Save();
+ }
+
+ ///
+ /// Adds a minute to all fields, and checks if any should be reset.
+ /// After it saves to the Registry.
+ ///
+ public void AddMinute()
+ {
+ TimeSpan minute = TimeSpan.FromMinutes(1);
+ DateTime today = DateTime.Today;
+
+ TotalPlaytime = TotalPlaytime.Add(minute);
+ LastSession = LastSession.Add(minute);
+
+ if (ControlDate == today)
+ {
+ DailyPlaytime = DailyPlaytime.Add(minute);
+ WeeklyPlaytime = WeeklyPlaytime.Add(minute);
+ MonthlyPlaytime = MonthlyPlaytime.Add(minute);
+ }
+ else
+ {
+ DailyPlaytime = minute;
+ WeeklyPlaytime = IsDifferentWeek(ControlDate, today) ? minute : WeeklyPlaytime.Add(minute);
+ MonthlyPlaytime = IsDifferentMonth(ControlDate, today) ? minute : MonthlyPlaytime.Add(minute);
+
+ ControlDate = today;
+ }
+
+ if (!_isDeserializing.Contains(_hashID)) Save();
+ }
+
+ #endregion
+
+ #region Utility
+ private static bool IsDifferentMonth(DateTime date1, DateTime date2) => date1.Year != date2.Year || date1.Month != date2.Month;
+
+ private static bool IsDifferentWeek(DateTime date1, DateTime date2) => date1.Year != date2.Year || ISOWeek.GetWeekOfYear(date1) != ISOWeek.GetWeekOfYear(date2);
+ #endregion
+ }
+}
diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/BaseClass/ImportExportBase.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/BaseClass/ImportExportBase.cs
index 68cb4f2bd..f03ed7616 100644
--- a/CollapseLauncher/Classes/GameManagement/GameSettings/BaseClass/ImportExportBase.cs
+++ b/CollapseLauncher/Classes/GameManagement/GameSettings/BaseClass/ImportExportBase.cs
@@ -33,7 +33,7 @@ internal class ImportExportBase
using (FileStream fs = new FileStream(path, FileMode.Open, FileAccess.Read))
{
byte[] head = new byte[6];
- fs.Read(head, 0, head.Length);
+ _ = fs.Read(head, 0, head.Length);
Logger.LogWriteLine($"Importing registry {RegistryPath}...");
@@ -425,7 +425,7 @@ private string ReadValueName(Stream stream)
byte[] buffer = ArrayPool.Shared.Rent(length);
try
{
- stream.Read(buffer, 0, length);
+ _ = stream.Read(buffer, 0, length);
return Encoding.UTF8.GetString(buffer, 0, length);
}
finally
@@ -439,21 +439,21 @@ private string ReadValueName(Stream stream)
private long ReadInt64(Stream stream)
{
Span buffer = stackalloc byte[4];
- stream.Read(buffer);
+ _ = stream.Read(buffer);
return MemoryMarshal.Read(buffer);
}
private int ReadInt32(Stream stream)
{
Span buffer = stackalloc byte[4];
- stream.Read(buffer);
+ _ = stream.Read(buffer);
return MemoryMarshal.Read(buffer);
}
private short ReadInt16(Stream stream)
{
Span buffer = stackalloc byte[2];
- stream.Read(buffer);
+ _ = stream.Read(buffer);
return MemoryMarshal.Read(buffer);
}
@@ -481,7 +481,7 @@ private void ReadBinary(EndianBinaryReader reader, string valueName)
{
int leng = reader.ReadInt32();
byte[] val = new byte[leng];
- reader.Read(val, 0, leng);
+ _ = reader.Read(val, 0, leng);
RegistryRoot?.SetValue(valueName, val, RegistryValueKind.Binary);
}
}
diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/BaseClass/MagicNodeBaseValues.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/BaseClass/MagicNodeBaseValues.cs
index 9e1848897..752c72acd 100644
--- a/CollapseLauncher/Classes/GameManagement/GameSettings/BaseClass/MagicNodeBaseValues.cs
+++ b/CollapseLauncher/Classes/GameManagement/GameSettings/BaseClass/MagicNodeBaseValues.cs
@@ -289,14 +289,14 @@ internal class MagicNodeBaseValues : IGameSettingsValueMagic
public JsonNode? SettingsJsonNode { get; protected set; }
[JsonIgnore]
- public JsonSerializerContext Context { get; protected set; }
+ public JsonTypeInfo TypeInfo { get; protected set; }
#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
[Obsolete("Loading settings with Load() is not supported for IGameSettingsValueMagic member. Use LoadWithMagic() instead!", true)]
public static T Load() => throw new NotSupportedException("Loading settings with Load() is not supported for IGameSettingsValueMagic member. Use LoadWithMagic() instead!");
- public static T LoadWithMagic(byte[] magic, SettingsGameVersionManager versionManager, JsonSerializerContext context)
+ public static T LoadWithMagic(byte[] magic, SettingsGameVersionManager versionManager, JsonTypeInfo typeInfo)
{
if (magic == null || magic.Length == 0)
throw new NullReferenceException($"Magic cannot be an empty array!");
@@ -314,28 +314,28 @@ public static T LoadWithMagic(byte[] magic, SettingsGameVersionManager versionMa
#endif
JsonNode? node = raw.DeserializeAsJsonNode();
T data = new T();
- data.InjectNodeAndMagic(node, magic, versionManager, context);
+ data.InjectNodeAndMagic(node, magic, versionManager, typeInfo);
return data;
}
catch (Exception ex)
{
Logger.LogWriteLine($"Failed to parse MagicNodeBaseValues settings\r\n{ex}", LogType.Error, true);
- return DefaultValue(magic, versionManager, context);
+ return DefaultValue(magic, versionManager, typeInfo);
}
}
- private static T DefaultValue(byte[] magic, SettingsGameVersionManager versionManager, JsonSerializerContext context)
+ private static T DefaultValue(byte[] magic, SettingsGameVersionManager versionManager, JsonTypeInfo typeInfo)
{
// Generate dummy data
T data = new T();
// Generate raw JSON string
- string rawJson = data.Serialize(context, false, false);
+ string rawJson = data.Serialize(typeInfo, false, false);
// Deserialize it back to JSON Node and inject
// the node and magic
JsonNode? defaultJsonNode = rawJson.DeserializeAsJsonNode();
- data.InjectNodeAndMagic(defaultJsonNode, magic, versionManager, context);
+ data.InjectNodeAndMagic(defaultJsonNode, magic, versionManager, typeInfo);
// Return
return data;
@@ -352,18 +352,18 @@ public void Save()
Directory.CreateDirectory(fileDirPath!);
// Write into the file
- string jsonString = SettingsJsonNode.SerializeJsonNode(Context, false, false);
+ string jsonString = SettingsJsonNode.SerializeJsonNode(TypeInfo, false, false);
Sleepy.WriteString(filePath, jsonString, Magic);
}
public bool Equals(T? other) => JsonNode.DeepEquals(this.SettingsJsonNode, other?.SettingsJsonNode);
- protected virtual void InjectNodeAndMagic(JsonNode? jsonNode, byte[] magic, SettingsGameVersionManager versionManager, JsonSerializerContext context)
+ protected virtual void InjectNodeAndMagic(JsonNode? jsonNode, byte[] magic, SettingsGameVersionManager versionManager, JsonTypeInfo typeInfo)
{
SettingsJsonNode = jsonNode;
GameVersionManager = versionManager;
Magic = magic;
- Context = context;
+ TypeInfo = typeInfo;
}
}
}
diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/Genshin/RegistryClass/GeneralData.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/Genshin/RegistryClass/GeneralData.cs
index cefbc2b66..2c4a42d46 100644
--- a/CollapseLauncher/Classes/GameManagement/GameSettings/Genshin/RegistryClass/GeneralData.cs
+++ b/CollapseLauncher/Classes/GameManagement/GameSettings/Genshin/RegistryClass/GeneralData.cs
@@ -351,15 +351,15 @@ public static GeneralData Load()
// Dump GeneralData as indented JSON output using GeneralData properties
LogWriteLine($"Deserialized Genshin Settings: {_ValueName}\r\n{byteStr
- .Deserialize(GenshinSettingsJSONContext.Default)
- .Serialize(GenshinSettingsJSONContext.Default, false, true)}", LogType.Debug, true);
+ .Deserialize(GenshinSettingsJSONContext.Default.GeneralData)
+ .Serialize(GenshinSettingsJSONContext.Default.GeneralData, false, true)}", LogType.Debug, true);
#endif
#if DEBUG
LogWriteLine($"Loaded Genshin Settings: {_ValueName}", LogType.Debug, true);
#else
LogWriteLine($"Loaded Genshin Settings", LogType.Default, true);
#endif
- GeneralData data = byteStr.Deserialize(GenshinSettingsJSONContext.Default) ?? new GeneralData();
+ GeneralData data = byteStr.Deserialize(GenshinSettingsJSONContext.Default.GeneralData) ?? new GeneralData();
if (data._graphicsData != null) data.graphicsData = GraphicsData.Load(data._graphicsData);
if (data._globalPerfData != null) data.globalPerfData = GlobalPerfData.Load(data._globalPerfData, data.graphicsData)!;
@@ -376,7 +376,7 @@ public static GeneralData Load()
$"Unless you have never opened the game (fresh installation), please open the game and change any settings, then safely close the game. If the problem persist, report the issue on our GitHub\r\n\r\n" +
$"{ex}", ex));
- GeneralData data = _generalDataDefault!.Deserialize(GenshinSettingsJSONContext.Default) ?? new GeneralData();
+ GeneralData data = _generalDataDefault!.Deserialize(GenshinSettingsJSONContext.Default.GeneralData) ?? new GeneralData();
data.graphicsData = GraphicsData.Load(data._graphicsData!);
data.globalPerfData = GlobalPerfData.Load(data._globalPerfData!, data.graphicsData)!;
return data;
@@ -392,13 +392,13 @@ public void Save()
_graphicsData = graphicsData!.Create(globalPerfData!);
_globalPerfData = globalPerfData!.Save()!;
- string data = this.Serialize(GenshinSettingsJSONContext.Default);
+ string data = this.Serialize(GenshinSettingsJSONContext.Default.GeneralData);
byte[] dataByte = Encoding.UTF8.GetBytes(data);
RegistryRoot.SetValue(_ValueName, dataByte, RegistryValueKind.Binary);
#if DUMPGIJSON
//Dump saved GeneralData JSON from Collapse as indented output
- LogWriteLine($"Saved Genshin Settings: {_ValueName}\r\n{this.Serialize(GenshinSettingsJSONContext.Default, false, true)}", LogType.Debug, true);
+ LogWriteLine($"Saved Genshin Settings: {_ValueName}\r\n{this.Serialize(GenshinSettingsJSONContext.Default.GeneralData, false, true)}", LogType.Debug, true);
#endif
#if DEBUG
LogWriteLine($"Saved Genshin Settings: {_ValueName}" +
diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/Genshin/RegistryClass/GlobalPerfData.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/Genshin/RegistryClass/GlobalPerfData.cs
index a137cf607..7e11a3ace 100644
--- a/CollapseLauncher/Classes/GameManagement/GameSettings/Genshin/RegistryClass/GlobalPerfData.cs
+++ b/CollapseLauncher/Classes/GameManagement/GameSettings/Genshin/RegistryClass/GlobalPerfData.cs
@@ -307,7 +307,7 @@ public static GlobalPerfData Load(string globalPerfJson, GraphicsData graphics)
}
else
{
- tempData = globalPerfJson.Deserialize(GenshinSettingsJSONContext.Default) ?? new GlobalPerfData();
+ tempData = globalPerfJson.Deserialize(GenshinSettingsJSONContext.Default.GlobalPerfData) ?? new GlobalPerfData();
}
// Initialize globalPerf with a preset
@@ -492,7 +492,7 @@ public string Save()
new PerfDataItem(19, (int)GlobalIllumination, portedVersion),
new PerfDataItem(21, (int)DynamicCharacterResolution, portedVersion),
};
- string data = this.Serialize(GenshinSettingsJSONContext.Default, false);
+ string data = this.Serialize(GenshinSettingsJSONContext.Default.GlobalPerfData, false);
#if DEBUG
LogWriteLine($"Saved Genshin GlobalPerfData\r\n{data}", LogType.Debug, true);
#endif
diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/Genshin/RegistryClass/GraphicsData.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/Genshin/RegistryClass/GraphicsData.cs
index 773e3256a..7f4bfd12b 100644
--- a/CollapseLauncher/Classes/GameManagement/GameSettings/Genshin/RegistryClass/GraphicsData.cs
+++ b/CollapseLauncher/Classes/GameManagement/GameSettings/Genshin/RegistryClass/GraphicsData.cs
@@ -17,7 +17,7 @@ internal class GraphicsData
#nullable enable
public static GraphicsData Load(string graphicsJson)
{
- return graphicsJson.Deserialize(GenshinSettingsJSONContext.Default) ?? new GraphicsData();
+ return graphicsJson.Deserialize(GenshinSettingsJSONContext.Default.GraphicsData) ?? new GraphicsData();
}
public string Create(GlobalPerfData globalPerf)
@@ -45,7 +45,7 @@ public string Create(GlobalPerfData globalPerf)
new GenshinKeyValuePair(21, (int)globalPerf.DynamicCharacterResolution + 1),
};
- string data = this.Serialize(GenshinSettingsJSONContext.Default, false);
+ string data = this.Serialize(GenshinSettingsJSONContext.Default.GraphicsData, false);
#if DEBUG
LogWriteLine($"Saved Genshin GraphicsData\r\n{data}", LogType.Debug, true);
#endif
diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/RegistryClass/Enums/Enums.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/RegistryClass/Enums/Enums.cs
index 724fb2bf7..4e58360d1 100644
--- a/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/RegistryClass/Enums/Enums.cs
+++ b/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/RegistryClass/Enums/Enums.cs
@@ -5,10 +5,32 @@
namespace CollapseLauncher.GameSettings.Honkai.Enums
{
///
- /// This selection has 4 name types: Low (0), Middle (1), High (2), VHigh (3)
+ /// This selection has 10 name types:
+ /// - 0.6 (Quality06)
+ /// - 0.8 (Quality08)
+ /// - 0.9 (Quality09)
+ /// - 1.0 (Low)
+ /// - 1.1 (Quality11)
+ /// - 1.2 (Middle)
+ /// - 1.3 (Quality13)
+ /// - 1.4 (Quality14)
+ /// - 1.5 (High)
+ /// - 1.6 (VHigh)
///
[JsonConverter(typeof(JsonStringEnumConverter))]
- internal enum SelectResolutionQuality { Low, Middle, High, VHigh }
+ internal enum SelectResolutionQuality
+ {
+ Quality06,
+ Quality08,
+ Quality09,
+ Low,
+ Quality11,
+ Middle,
+ Quality13,
+ Quality14,
+ High,
+ VHigh
+ }
///
/// This selection has 5 name types: DISABLED (0), LOW (1), MIDDLE (2), HIGH (3), ULTRA (4)
diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/RegistryClass/PersonalAudioSetting.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/RegistryClass/PersonalAudioSetting.cs
index e70021a9e..34a7253a6 100644
--- a/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/RegistryClass/PersonalAudioSetting.cs
+++ b/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/RegistryClass/PersonalAudioSetting.cs
@@ -187,7 +187,7 @@ public static PersonalAudioSetting Load()
#if DEBUG
LogWriteLine($"Loaded HI3 Settings: {_ValueName}\r\n{Encoding.UTF8.GetString(byteStr.TrimEnd((byte)0))}", LogType.Debug, true);
#endif
- return byteStr.Deserialize(HonkaiSettingsJSONContext.Default) ?? new PersonalAudioSetting();
+ return byteStr.Deserialize(HonkaiSettingsJSONContext.Default.PersonalAudioSetting) ?? new PersonalAudioSetting();
}
}
catch (Exception ex)
@@ -211,7 +211,7 @@ public void Save()
{
if (RegistryRoot == null) throw new NullReferenceException($"Cannot save {_ValueName} since RegistryKey is unexpectedly not initialized!");
- string data = this.Serialize(HonkaiSettingsJSONContext.Default);
+ string data = this.Serialize(HonkaiSettingsJSONContext.Default.PersonalAudioSetting);
byte[] dataByte = Encoding.UTF8.GetBytes(data);
RegistryRoot.SetValue(_ValueName, dataByte, RegistryValueKind.Binary);
diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/RegistryClass/PersonalAudioSettingVolume.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/RegistryClass/PersonalAudioSettingVolume.cs
index 72c515c3d..4ad2f1520 100644
--- a/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/RegistryClass/PersonalAudioSettingVolume.cs
+++ b/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/RegistryClass/PersonalAudioSettingVolume.cs
@@ -81,7 +81,7 @@ public static PersonalAudioSettingVolume Load()
#if DEBUG
LogWriteLine($"Loaded HI3 Settings: {_ValueName}\r\n{Encoding.UTF8.GetString((byte[])value, 0, ((byte[])value).Length - 1)}", LogType.Debug, true);
#endif
- return byteStr.Deserialize(HonkaiSettingsJSONContext.Default) ?? new PersonalAudioSettingVolume();
+ return byteStr.Deserialize(HonkaiSettingsJSONContext.Default.PersonalAudioSettingVolume) ?? new PersonalAudioSettingVolume();
}
}
catch (Exception ex)
@@ -104,7 +104,7 @@ public void Save()
{
if (RegistryRoot == null) throw new NullReferenceException($"Cannot save {_ValueName} since RegistryKey is unexpectedly not initialized!");
- string data = this.Serialize(HonkaiSettingsJSONContext.Default);
+ string data = this.Serialize(HonkaiSettingsJSONContext.Default.PersonalAudioSettingVolume);
byte[] dataByte = Encoding.UTF8.GetBytes(data);
RegistryRoot.SetValue(_ValueName, dataByte, RegistryValueKind.Binary);
diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/RegistryClass/PersonalGraphicsSettingV2.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/RegistryClass/PersonalGraphicsSettingV2.cs
index 1b99d4920..c9c9a4f6e 100644
--- a/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/RegistryClass/PersonalGraphicsSettingV2.cs
+++ b/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/RegistryClass/PersonalGraphicsSettingV2.cs
@@ -23,7 +23,7 @@ internal class PersonalGraphicsSettingV2 : IGameSettingsValue
/// This defines "Rendering Accuracy" combobox In-game settings -> Video.
- ///
+ ///
/// Default: Middle
///
public SelectResolutionQuality ResolutionQuality { get; set; } = SelectResolutionQuality.Middle;
@@ -190,7 +190,7 @@ public static PersonalGraphicsSettingV2 Load()
#if DEBUG
LogWriteLine($"Loaded HI3 Settings: {_ValueName}\r\n{Encoding.UTF8.GetString(byteStr.TrimEnd((byte)0))}", LogType.Debug, true);
#endif
- return byteStr.Deserialize(HonkaiSettingsJSONContext.Default) ?? new PersonalGraphicsSettingV2();
+ return byteStr.Deserialize(HonkaiSettingsJSONContext.Default.PersonalGraphicsSettingV2) ?? new PersonalGraphicsSettingV2();
}
}
catch (Exception ex)
@@ -214,7 +214,7 @@ public void Save()
{
if (RegistryRoot == null) throw new NullReferenceException($"Cannot save {_ValueName} since RegistryKey is unexpectedly not initialized!");
- string data = this.Serialize(HonkaiSettingsJSONContext.Default);
+ string data = this.Serialize(HonkaiSettingsJSONContext.Default.PersonalGraphicsSettingV2);
byte[] dataByte = Encoding.UTF8.GetBytes(data);
RegistryRoot.SetValue(_ValueName, dataByte, RegistryValueKind.Binary);
diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/RegistryClass/Preset.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/RegistryClass/Preset.cs
index 3b9a97321..6fb7082dc 100644
--- a/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/RegistryClass/Preset.cs
+++ b/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/RegistryClass/Preset.cs
@@ -5,7 +5,7 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
using static CollapseLauncher.GameSettings.Base.SettingsBase;
using static Hi3Helper.Shared.Region.LauncherConfig;
@@ -16,7 +16,7 @@ internal class PresetConst
public const string DefaultPresetName = "Custom";
}
- internal class Preset where T1 : IGameSettingsValue where TObjectType : JsonSerializerContext
+ internal class Preset where T1 : IGameSettingsValue
{
#nullable enable
#region Fields
@@ -51,11 +51,11 @@ public Dictionary? Presets
#endregion
#region Methods
- public Preset(string presetJSONPath, TObjectType jsonContext)
+ public Preset(string presetJSONPath, JsonTypeInfo?> jsonType)
{
using (FileStream fs = new FileStream(presetJSONPath, FileMode.Open, FileAccess.Read))
{
- Presets = fs.Deserialize>(jsonContext);
+ Presets = fs.Deserialize(jsonType);
PresetKeys = GetPresetKeys();
}
}
@@ -66,10 +66,10 @@ public Preset(string presetJSONPath, TObjectType jsonContext)
/// The type of the game
/// JSON source generation context
/// The instance of preset
- public static Preset LoadPreset(GameNameType gameType, TObjectType jsonContext)
+ public static Preset LoadPreset(GameNameType gameType, JsonTypeInfo?> jsonType)
{
string presetPath = Path.Combine(AppFolder, $"Assets\\Presets\\{gameType}\\", $"{typeof(T1).Name}.json");
- return new Preset(presetPath, jsonContext);
+ return new Preset(presetPath, jsonType);
}
/// The key of the preset
diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/RegistryClass/ScreenSettingData.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/RegistryClass/ScreenSettingData.cs
index 566e73fdd..1b22264a0 100644
--- a/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/RegistryClass/ScreenSettingData.cs
+++ b/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/RegistryClass/ScreenSettingData.cs
@@ -105,7 +105,7 @@ public static ScreenSettingData Load()
#if DEBUG
LogWriteLine($"Loaded HI3 Settings: {_ValueName}\r\n{Encoding.UTF8.GetString(byteStr.TrimEnd((byte)0))}", LogType.Debug, true);
#endif
- return byteStr.Deserialize(HonkaiSettingsJSONContext.Default) ?? new ScreenSettingData();
+ return byteStr.Deserialize(HonkaiSettingsJSONContext.Default.ScreenSettingData) ?? new ScreenSettingData();
}
}
catch (Exception ex)
@@ -129,7 +129,7 @@ public override void Save()
{
if (RegistryRoot == null) throw new NullReferenceException($"Cannot save {_ValueName} since RegistryKey is unexpectedly not initialized!");
- string data = this.Serialize(HonkaiSettingsJSONContext.Default);
+ string data = this.Serialize(HonkaiSettingsJSONContext.Default.ScreenSettingData);
byte[] dataByte = Encoding.UTF8.GetBytes(data);
RegistryRoot.SetValue(_ValueName, dataByte, RegistryValueKind.Binary);
diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/Settings.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/Settings.cs
index 1e9e1adaf..c47446cb6 100644
--- a/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/Settings.cs
+++ b/CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/Settings.cs
@@ -38,7 +38,7 @@ public sealed override void InitializeSettings()
base.InitializeSettings();
// Load Preset
- Preset_SettingsGraphics = Preset.LoadPreset(GameNameType.Honkai, HonkaiSettingsJSONContext.Default);
+ Preset_SettingsGraphics = Preset.LoadPreset(GameNameType.Honkai, HonkaiSettingsJSONContext.Default.DictionaryStringPersonalGraphicsSettingV2);
}
public override void ReloadSettings() => InitializeSettings();
diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/StarRail/RegistryClass/Model.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/StarRail/RegistryClass/Model.cs
index a6d0521f5..0007a6f1e 100644
--- a/CollapseLauncher/Classes/GameManagement/GameSettings/StarRail/RegistryClass/Model.cs
+++ b/CollapseLauncher/Classes/GameManagement/GameSettings/StarRail/RegistryClass/Model.cs
@@ -307,7 +307,7 @@ private static Model LoadCustom()
LogWriteLine($"Loaded StarRail Settings: {_ValueName}\r\n{Encoding.UTF8.GetString((byte[])value, 0, ((byte[])value).Length - 1)}", LogType.Debug, true);
#endif
- return byteStr.Deserialize(StarRailSettingsJSONContext.Default) ?? new Model();
+ return byteStr.Deserialize(StarRailSettingsJSONContext.Default.Model) ?? new Model();
}
}
catch (Exception ex)
@@ -340,7 +340,7 @@ public void Save()
RegistryRoot.SetValue(_GraphicsQuality, Quality.Custom, RegistryValueKind.DWord);
- string data = this.Serialize(StarRailSettingsJSONContext.Default);
+ string data = this.Serialize(StarRailSettingsJSONContext.Default.Model);
byte[] dataByte = Encoding.UTF8.GetBytes(data);
RegistryRoot.SetValue(_ValueName, dataByte, RegistryValueKind.Binary);
#if DEBUG
diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/StarRail/RegistryClass/PCResolution.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/StarRail/RegistryClass/PCResolution.cs
index 67f9881a3..c763043e9 100644
--- a/CollapseLauncher/Classes/GameManagement/GameSettings/StarRail/RegistryClass/PCResolution.cs
+++ b/CollapseLauncher/Classes/GameManagement/GameSettings/StarRail/RegistryClass/PCResolution.cs
@@ -115,7 +115,7 @@ public static PCResolution Load()
#if DEBUG
LogWriteLine($"Loaded StarRail Settings: {_ValueName}\r\n{Encoding.UTF8.GetString(byteStr.TrimEnd((byte)0))}", LogType.Debug, true);
#endif
- return byteStr.Deserialize(StarRailSettingsJSONContext.Default) ?? new PCResolution();
+ return byteStr.Deserialize(StarRailSettingsJSONContext.Default.PCResolution) ?? new PCResolution();
}
}
catch (Exception ex)
@@ -139,7 +139,7 @@ public override void Save()
{
if (RegistryRoot == null) throw new NullReferenceException($"Cannot save {_ValueName} since RegistryKey is unexpectedly not initialized!");
- string data = this.Serialize(StarRailSettingsJSONContext.Default);
+ string data = this.Serialize(StarRailSettingsJSONContext.Default.PCResolution);
byte[] dataByte = Encoding.UTF8.GetBytes(data);
RegistryRoot.SetValue(_ValueName, dataByte, RegistryValueKind.Binary);
diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/Universal/RegistryClass/CollapseMiscSetting.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/Universal/RegistryClass/CollapseMiscSetting.cs
index 9498d77ca..3413e749d 100644
--- a/CollapseLauncher/Classes/GameManagement/GameSettings/Universal/RegistryClass/CollapseMiscSetting.cs
+++ b/CollapseLauncher/Classes/GameManagement/GameSettings/Universal/RegistryClass/CollapseMiscSetting.cs
@@ -129,7 +129,7 @@ public static CollapseMiscSetting Load()
#if DEBUG
LogWriteLine($"Loaded Collapse Misc Settings:\r\n{Encoding.UTF8.GetString(byteStr.TrimEnd((byte)0))}", LogType.Debug, true);
#endif
- return byteStr.Deserialize(UniversalSettingsJSONContext.Default) ?? new CollapseMiscSetting();
+ return byteStr.Deserialize(UniversalSettingsJSONContext.Default.CollapseMiscSetting) ?? new CollapseMiscSetting();
}
}
catch ( Exception ex )
@@ -150,7 +150,7 @@ public void Save()
{
if (RegistryRoot == null) throw new NullReferenceException($"Cannot save {_ValueName} since RegistryKey is unexpectedly not initialized!");
- string data = this.Serialize(UniversalSettingsJSONContext.Default, true);
+ string data = this.Serialize(UniversalSettingsJSONContext.Default.CollapseMiscSetting, true);
byte[] dataByte = Encoding.UTF8.GetBytes(data);
#if DEBUG
LogWriteLine($"Saved Collapse Misc Settings:\r\n{data}", LogType.Debug, true);
diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/Universal/RegistryClass/CollapseScreenSetting.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/Universal/RegistryClass/CollapseScreenSetting.cs
index 13692b7c4..440d7b646 100644
--- a/CollapseLauncher/Classes/GameManagement/GameSettings/Universal/RegistryClass/CollapseScreenSetting.cs
+++ b/CollapseLauncher/Classes/GameManagement/GameSettings/Universal/RegistryClass/CollapseScreenSetting.cs
@@ -70,7 +70,7 @@ public static CollapseScreenSetting Load()
#if DEBUG
LogWriteLine($"Loaded Collapse Screen Settings:\r\n{Encoding.UTF8.GetString(byteStr.TrimEnd((byte)0))}", LogType.Debug, true);
#endif
- return byteStr.Deserialize(UniversalSettingsJSONContext.Default) ?? new CollapseScreenSetting();
+ return byteStr.Deserialize(UniversalSettingsJSONContext.Default.CollapseScreenSetting) ?? new CollapseScreenSetting();
}
}
catch (Exception ex)
@@ -87,7 +87,7 @@ public void Save()
{
if (RegistryRoot == null) throw new NullReferenceException($"Cannot save {_ValueName} since RegistryKey is unexpectedly not initialized!");
- string data = this.Serialize(UniversalSettingsJSONContext.Default, true);
+ string data = this.Serialize(UniversalSettingsJSONContext.Default.CollapseScreenSetting, true);
byte[] dataByte = Encoding.UTF8.GetBytes(data);
#if DEBUG
LogWriteLine($"Saved Collapse Screen Settings:\r\n{data}", LogType.Debug, true);
diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/Zenless/FileClass/GeneralData.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/Zenless/FileClass/GeneralData.cs
index 0530291aa..ad2b16858 100644
--- a/CollapseLauncher/Classes/GameManagement/GameSettings/Zenless/FileClass/GeneralData.cs
+++ b/CollapseLauncher/Classes/GameManagement/GameSettings/Zenless/FileClass/GeneralData.cs
@@ -5,6 +5,7 @@
using System;
using System.Text.Json.Nodes;
using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
// ReSharper disable ReturnTypeCanBeNotNullable
#nullable enable
@@ -569,10 +570,10 @@ public bool Audio_MuteOnMinimize
[Obsolete("Loading settings with Load() is not supported for IGameSettingsValueMagic member. Use LoadWithMagic() instead!", true)]
public new static GeneralData Load() => throw new NotSupportedException("Loading settings with Load() is not supported for IGameSettingsValueMagic member. Use LoadWithMagic() instead!");
- public new static GeneralData LoadWithMagic(byte[] magic, SettingsGameVersionManager versionManager,
- JsonSerializerContext context)
+ public new static GeneralData LoadWithMagic(byte[] magic, SettingsGameVersionManager versionManager,
+ JsonTypeInfo typeInfo)
{
- var returnVal = MagicNodeBaseValues.LoadWithMagic(magic, versionManager, context);
+ var returnVal = MagicNodeBaseValues.LoadWithMagic(magic, versionManager, typeInfo);
#if DEBUG
const bool isPrintDebug = true;
diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/Zenless/Settings.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/Zenless/Settings.cs
index 5fdd3427e..d6cbd0771 100644
--- a/CollapseLauncher/Classes/GameManagement/GameSettings/Zenless/Settings.cs
+++ b/CollapseLauncher/Classes/GameManagement/GameSettings/Zenless/Settings.cs
@@ -53,7 +53,7 @@ public sealed override void InitializeSettings()
GeneralData = GeneralData.LoadWithMagic(
MagicReDo,
SettingsGameVersionManager.Create(_gameVersionManager, ZZZSettingsConfigFile, "GENERAL_DATA.bin"),
- ZenlessSettingsJSONContext.Default);
+ ZenlessSettingsJSONContext.Default.GeneralData);
}
public override void ReloadSettings()
diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/Zenless/Sleepy.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/Zenless/Sleepy.cs
index a4d0ea4cd..417adbd84 100644
--- a/CollapseLauncher/Classes/GameManagement/GameSettings/Zenless/Sleepy.cs
+++ b/CollapseLauncher/Classes/GameManagement/GameSettings/Zenless/Sleepy.cs
@@ -166,6 +166,13 @@ private static unsafe int InternalDecode(ReadOnlySpan magic, bool* evil, B
internal static void WriteString(string filePath, ReadOnlySpan content, ReadOnlySpan magic)
{
+ // Ensure the folder always exist
+ string? fileDir = Path.GetDirectoryName(filePath);
+ if (!string.IsNullOrEmpty(fileDir) && !Directory.Exists(fileDir))
+ {
+ Directory.CreateDirectory(fileDir);
+ }
+
// Get the FileInfo
FileInfo fileInfo = new FileInfo(filePath);
diff --git a/CollapseLauncher/Classes/GameManagement/GameVersion/BaseClass/GameVersionBase.cs b/CollapseLauncher/Classes/GameManagement/GameVersion/BaseClass/GameVersionBase.cs
index 7288beb8d..a4af4465f 100644
--- a/CollapseLauncher/Classes/GameManagement/GameVersion/BaseClass/GameVersionBase.cs
+++ b/CollapseLauncher/Classes/GameManagement/GameVersion/BaseClass/GameVersionBase.cs
@@ -83,7 +83,7 @@ private IniValue GenerateUAPCValue()
}
}
};
- string uapcValue = uapc.Serialize(InternalAppJSONContext.Default, false);
+ string uapcValue = uapc.Serialize(InternalAppJSONContext.Default.DictionaryStringDictionaryStringString, false);
return new IniValue(uapcValue);
}
@@ -580,7 +580,7 @@ public virtual async ValueTask CheckSdkUpdate(string validatePath)
if (string.IsNullOrEmpty(line))
continue;
- PkgVersionProperties pkgVersion = line.Deserialize(CoreLibraryJSONContext.Default);
+ PkgVersionProperties pkgVersion = line.Deserialize(CoreLibraryJSONContext.Default.PkgVersionProperties);
if (pkgVersion != null)
{
diff --git a/CollapseLauncher/Classes/GamePropertyVault.cs b/CollapseLauncher/Classes/GamePropertyVault.cs
index 461129a1d..cc02bf1c6 100644
--- a/CollapseLauncher/Classes/GamePropertyVault.cs
+++ b/CollapseLauncher/Classes/GamePropertyVault.cs
@@ -1,4 +1,5 @@
-using CollapseLauncher.GameSettings.Genshin;
+using CollapseLauncher.GamePlaytime;
+using CollapseLauncher.GameSettings.Genshin;
using CollapseLauncher.GameSettings.Honkai;
using CollapseLauncher.GameSettings.StarRail;
using CollapseLauncher.GameSettings.Zenless;
@@ -65,12 +66,15 @@ internal GamePresetProperty(UIElement UIElementParent, RegionResourceProp APIRes
default:
throw new NotSupportedException($"[GamePresetProperty.Ctor] Game type: {GamePreset.GameType} ({GamePreset.ProfileName} - {GamePreset.ZoneName}) is not supported!");
}
+
+ _GamePlaytime = new Playtime(_GameVersion);
}
}
internal RegionResourceProp _APIResouceProp { get; set; }
internal PresetConfig _GamePreset { get => _GameVersion.GamePreset; }
internal IGameSettings _GameSettings { get; set; }
+ internal IGamePlaytime _GamePlaytime { get; set; }
internal IRepair _GameRepair { get; set; }
internal ICache _GameCache { get; set; }
internal IGameVersionCheck _GameVersion { get; set; }
@@ -161,13 +165,15 @@ public void Dispose()
_GameRepair?.Dispose();
_GameCache?.Dispose();
_GameInstall?.Dispose();
+ _GamePlaytime?.Dispose();
_APIResouceProp = null;
- _GameSettings = null;
- _GameRepair = null;
- _GameCache = null;
- _GameVersion = null;
- _GameInstall = null;
+ _GameSettings = null;
+ _GameRepair = null;
+ _GameCache = null;
+ _GameVersion = null;
+ _GameInstall = null;
+ _GamePlaytime = null;
}
}
diff --git a/CollapseLauncher/Classes/Helper/Animation/AnimationHelper.cs b/CollapseLauncher/Classes/Helper/Animation/AnimationHelper.cs
index ee5329d0f..4f33ad75b 100644
--- a/CollapseLauncher/Classes/Helper/Animation/AnimationHelper.cs
+++ b/CollapseLauncher/Classes/Helper/Animation/AnimationHelper.cs
@@ -1,5 +1,5 @@
-using CommunityToolkit.WinUI.Controls;
-using Hi3Helper;
+using Hi3Helper;
+using Hi3Helper.CommunityToolkit.WinUI.Controls;
using Microsoft.UI.Composition;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
@@ -8,6 +8,7 @@
using System;
using System.Diagnostics.CodeAnalysis;
using System.Threading.Tasks;
+// ReSharper disable CheckNamespace
namespace CollapseLauncher.Helper.Animation
{
@@ -65,26 +66,26 @@ internal static async Task StartAnimation(this UIElement element, TimeSpan durat
{
foreach (KeyFrameAnimation anim in animBase!)
{
- if (element?.DispatcherQueue?.HasThreadAccess ?? false)
+ if (element.DispatcherQueue?.HasThreadAccess ?? false)
{
anim.Duration = duration;
anim.StopBehavior = AnimationStopBehavior.LeaveCurrentValue;
animGroup.Add(anim);
}
else
- element?.DispatcherQueue?.TryEnqueue(() =>
+ element.DispatcherQueue?.TryEnqueue(() =>
{
anim.Duration = duration;
anim.StopBehavior = AnimationStopBehavior.LeaveCurrentValue;
animGroup.Add(anim);
});
}
- if (element?.DispatcherQueue?.HasThreadAccess ?? false)
+ if (element.DispatcherQueue?.HasThreadAccess ?? false)
{
element.StartAnimation(animGroup);
}
else
- element?.DispatcherQueue?.TryEnqueue(() =>
+ element.DispatcherQueue?.TryEnqueue(() =>
{
element.StartAnimation(animGroup);
});
@@ -123,69 +124,85 @@ internal static void EnableSingleImplicitAnimation(this UIElement element,
rootFrameVisual.ImplicitAnimations = animationCollection;
}
- internal static void EnableImplicitAnimation(this UIElement element,
- bool recursiveAssignment = false,
- CompositionEasingFunction easingFunction = null)
+ internal static void EnableImplicitAnimation(this UIElement element, bool recursiveAssignment = false, CompositionEasingFunction easingFunction = null)
{
- try
+ while (true)
{
- Visual rootFrameVisual = ElementCompositionPreview.GetElementVisual(element);
- Compositor compositor = CompositionTarget.GetCompositorForCurrentThread();
-
- ImplicitAnimationCollection animationCollection =
- rootFrameVisual.ImplicitAnimations != null ?
- rootFrameVisual.ImplicitAnimations : compositor!.CreateImplicitAnimationCollection();
-
- foreach (VisualPropertyType type in Enum.GetValues())
+ try
{
- KeyFrameAnimation animation = CreateAnimationByType(compositor, type, 250, 0, easingFunction);
+ Visual rootFrameVisual = ElementCompositionPreview.GetElementVisual(element);
+ Compositor compositor = CompositionTarget.GetCompositorForCurrentThread();
- if (animation != null)
- {
- animationCollection[type.ToString()] = animation;
- }
- }
+ ImplicitAnimationCollection animationCollection = rootFrameVisual.ImplicitAnimations != null ? rootFrameVisual.ImplicitAnimations : compositor!.CreateImplicitAnimationCollection();
- rootFrameVisual.ImplicitAnimations = animationCollection;
- element.EnableElementVisibilityAnimation();
- }
- catch (Exception ex)
- {
- Logger.LogWriteLine($"[AnimationHelper::EnableImplicitAnimation()] Error has occurred while assigning Implicit Animation to the element!\r\n{ex}", LogType.Error, true);
- }
+ foreach (VisualPropertyType type in Enum.GetValues())
+ {
+ KeyFrameAnimation animation = CreateAnimationByType(compositor, type, 250, 0, easingFunction);
- if (!recursiveAssignment) return;
+ if (animation != null)
+ {
+ animationCollection[type.ToString()] = animation;
+ }
+ }
- if (element is Button button && button.Content is UIElement buttonContent)
- buttonContent.EnableImplicitAnimation(recursiveAssignment, easingFunction);
+ rootFrameVisual.ImplicitAnimations = animationCollection;
+ element.EnableElementVisibilityAnimation();
+ }
+ catch (Exception ex)
+ {
+ Logger.LogWriteLine($"[AnimationHelper::EnableImplicitAnimation()] Error has occurred while assigning Implicit Animation to the element!\r\n{ex}", LogType.Error, true);
+ }
- if (element is Page page && page.Content is UIElement pageContent)
- pageContent.EnableImplicitAnimation(recursiveAssignment, easingFunction);
+ if (!recursiveAssignment) return;
- if (element is NavigationView navigationView && navigationView.Content is UIElement navigationViewContent)
- navigationViewContent.EnableImplicitAnimation(recursiveAssignment, easingFunction);
+ switch (element)
+ {
+ case Button { Content: UIElement buttonContent }:
+ buttonContent.EnableImplicitAnimation(true, easingFunction);
+ break;
+ case Page { Content: not null } page:
+ page.Content.EnableImplicitAnimation(true, easingFunction);
+ break;
+ case NavigationView { Content: UIElement navigationViewContent }:
+ navigationViewContent.EnableImplicitAnimation(true, easingFunction);
+ break;
+ case Panel panel:
+ {
+ foreach (UIElement childrenElement in panel.Children!) childrenElement.EnableImplicitAnimation(true, easingFunction);
+ break;
+ }
+ case ScrollViewer { Content: UIElement elementInner }:
+ elementInner.EnableImplicitAnimation(true, easingFunction);
+ break;
+ }
- if (element is Panel panel)
- foreach (UIElement childrenElement in panel.Children!)
- childrenElement.EnableImplicitAnimation(recursiveAssignment, easingFunction);
+ switch (element)
+ {
+ case ContentControl { Content: UIElement contentControlInner } contentControl and (SettingsCard or Expander):
+ {
+ contentControlInner.EnableImplicitAnimation(true, easingFunction);
- if (element is ScrollViewer scrollViewer && scrollViewer.Content is UIElement elementInner)
- elementInner.EnableImplicitAnimation(recursiveAssignment, easingFunction);
+ if (contentControl is Expander { Header: UIElement expanderHeader })
+ {
+ element = expanderHeader;
+ recursiveAssignment = true;
+ continue;
+ }
- if (element is ContentControl contentControl && (element is SettingsCard || element is Expander) && contentControl.Content is UIElement contentControlInner)
- {
- contentControlInner.EnableImplicitAnimation(true, easingFunction);
+ break;
+ }
+ case InfoBar { Content: UIElement infoBarInner }:
+ element = infoBarInner;
+ recursiveAssignment = true;
+ continue;
+ }
- if (contentControl is Expander expander && expander.Header is UIElement expanderHeader)
- expanderHeader.EnableImplicitAnimation(true, easingFunction);
+ break;
}
-
- if (element is InfoBar infoBar && infoBar.Content is UIElement infoBarInner)
- infoBarInner.EnableImplicitAnimation(true, easingFunction);
}
private static KeyFrameAnimation CreateAnimationByType(Compositor compositor, VisualPropertyType type,
- double duration = 800, double delay = 0, CompositionEasingFunction easing = null)
+ double duration = 800, double delay = 0, CompositionEasingFunction easing = null)
{
KeyFrameAnimation animation;
@@ -202,6 +219,8 @@ private static KeyFrameAnimation CreateAnimationByType(Compositor compositor, Vi
case VisualPropertyType.RotationAngleInDegrees:
animation = compositor.CreateScalarKeyFrameAnimation();
break;
+ case VisualPropertyType.None:
+ case VisualPropertyType.All:
default:
return null;
}
@@ -221,25 +240,25 @@ public static void EnableElementVisibilityAnimation(this UIElement element, Comp
ElementCompositionPreview.SetIsTranslationEnabled(element, true);
- ScalarKeyFrameAnimation HideOpacityAnimation = compositor.CreateScalarKeyFrameAnimation();
- ScalarKeyFrameAnimation ShowOpacityAnimation = compositor.CreateScalarKeyFrameAnimation();
+ ScalarKeyFrameAnimation hideOpacityAnimation = compositor.CreateScalarKeyFrameAnimation();
+ ScalarKeyFrameAnimation showOpacityAnimation = compositor.CreateScalarKeyFrameAnimation();
- HideOpacityAnimation.InsertKeyFrame(1.0f, 0.0f);
- HideOpacityAnimation.Duration = animDur;
- HideOpacityAnimation.Target = "Opacity";
+ hideOpacityAnimation.InsertKeyFrame(1.0f, 0.0f);
+ hideOpacityAnimation.Duration = animDur;
+ hideOpacityAnimation.Target = "Opacity";
- ShowOpacityAnimation.InsertKeyFrame(1.0f, 1.0f);
- ShowOpacityAnimation.Duration = animDur;
- ShowOpacityAnimation.Target = "Opacity";
+ showOpacityAnimation.InsertKeyFrame(1.0f, 1.0f);
+ showOpacityAnimation.Duration = animDur;
+ showOpacityAnimation.Target = "Opacity";
- CompositionAnimationGroup HideAnimationGroup = compositor.CreateAnimationGroup();
- CompositionAnimationGroup ShowAnimationGroup = compositor.CreateAnimationGroup();
+ CompositionAnimationGroup hideAnimationGroup = compositor.CreateAnimationGroup();
+ CompositionAnimationGroup showAnimationGroup = compositor.CreateAnimationGroup();
- HideAnimationGroup.Add(HideOpacityAnimation);
- ShowAnimationGroup.Add(ShowOpacityAnimation);
+ hideAnimationGroup.Add(hideOpacityAnimation);
+ showAnimationGroup.Add(showOpacityAnimation);
- ElementCompositionPreview.SetImplicitHideAnimation(element, HideAnimationGroup);
- ElementCompositionPreview.SetImplicitShowAnimation(element, ShowAnimationGroup);
+ ElementCompositionPreview.SetImplicitHideAnimation(element, hideAnimationGroup);
+ ElementCompositionPreview.SetImplicitShowAnimation(element, showAnimationGroup);
}
internal static Compositor GetElementCompositor(this UIElement element)
diff --git a/CollapseLauncher/Classes/Helper/Background/BackgroundMediaUtility.cs b/CollapseLauncher/Classes/Helper/Background/BackgroundMediaUtility.cs
index 8455b89dc..f5fcc253d 100644
--- a/CollapseLauncher/Classes/Helper/Background/BackgroundMediaUtility.cs
+++ b/CollapseLauncher/Classes/Helper/Background/BackgroundMediaUtility.cs
@@ -86,6 +86,14 @@ internal static async Task CreateInstanceAsync(Framework
Grid bgOverlayTitleBar, Grid bgImageGridBackground,
Grid bgMediaPlayerGrid)
{
+ CurrentAppliedMediaPath = null;
+ CurrentAppliedMediaType = MediaType.Unknown;
+ if (_alternativeFileStream != null)
+ {
+ await _alternativeFileStream.DisposeAsync();
+ _alternativeFileStream = null;
+ }
+
// Set the parent UI
FrameworkElement? ui = parentUI;
@@ -484,4 +492,4 @@ public static MediaType GetMediaType(string mediaPath)
return SupportedMediaPlayerExt.Contains(extension, StringComparer.OrdinalIgnoreCase) ? MediaType.Media : MediaType.Unknown;
}
}
-}
\ No newline at end of file
+}
diff --git a/CollapseLauncher/Classes/Helper/HttpClientBuilder.cs b/CollapseLauncher/Classes/Helper/HttpClientBuilder.cs
index 14dfcf285..d48104dc3 100644
--- a/CollapseLauncher/Classes/Helper/HttpClientBuilder.cs
+++ b/CollapseLauncher/Classes/Helper/HttpClientBuilder.cs
@@ -230,6 +230,7 @@ public HttpClient Create()
socketsHttpHandler.UseCookies = IsAllowHttpCookies;
socketsHttpHandler.AutomaticDecompression = DecompressionMethod;
socketsHttpHandler.EnableMultipleHttp2Connections = true;
+ socketsHttpHandler.EnableMultipleHttp3Connections = true;
// Toggle for allowing untrusted cert
if (IsAllowUntrustedCert)
diff --git a/CollapseLauncher/Classes/Helper/ILoggerHelper.cs b/CollapseLauncher/Classes/Helper/ILoggerHelper.cs
new file mode 100644
index 000000000..67b113c53
--- /dev/null
+++ b/CollapseLauncher/Classes/Helper/ILoggerHelper.cs
@@ -0,0 +1,49 @@
+#if USEVELOPACK
+using Hi3Helper;
+using Microsoft.Extensions.Logging;
+using System;
+
+namespace CollapseLauncher.Helper
+{
+ internal static class ILoggerHelper
+ {
+ internal static ILogger CreateCollapseILogger() => new CollapseILoggerWrapper();
+ }
+
+ public class CollapseILoggerWrapper : ILogger
+ {
+ internal CollapseILoggerWrapper() { }
+
+ public IDisposable BeginScope(TState state)
+ where TState : notnull => default;
+
+ public bool IsEnabled(LogLevel logLevel) => true;
+
+ public void Log(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func formatter)
+ {
+ LogType logType = logLevel switch
+ {
+ LogLevel.Trace => LogType.Debug,
+ LogLevel.Debug => LogType.Debug,
+ LogLevel.Information => LogType.Default,
+ LogLevel.Warning => LogType.Warning,
+ LogLevel.Error => LogType.Error,
+ LogLevel.Critical => LogType.Error,
+ LogLevel.None => LogType.NoTag,
+ _ => LogType.Default
+ };
+
+ bool isWriteToLog = logType switch
+ {
+ LogType.Error => true,
+ LogType.Warning => true,
+ LogType.Debug => true,
+ _ => false
+ };
+
+ string message = formatter(state, exception);
+ Logger.LogWriteLine(message, logType, isWriteToLog);
+ }
+ }
+}
+#endif
\ No newline at end of file
diff --git a/CollapseLauncher/Classes/Helper/Image/ImageLoaderHelper.cs b/CollapseLauncher/Classes/Helper/Image/ImageLoaderHelper.cs
index 1f6e871c8..fdeae5577 100644
--- a/CollapseLauncher/Classes/Helper/Image/ImageLoaderHelper.cs
+++ b/CollapseLauncher/Classes/Helper/Image/ImageLoaderHelper.cs
@@ -3,7 +3,6 @@
using CollapseLauncher.Extension;
using CollapseLauncher.Helper.Background;
using CommunityToolkit.WinUI.Animations;
-using CommunityToolkit.WinUI.Controls;
using CommunityToolkit.WinUI.Media;
using Hi3Helper;
using Hi3Helper.Data;
@@ -28,6 +27,12 @@
using static Hi3Helper.Shared.Region.LauncherConfig;
using Orientation = Microsoft.UI.Xaml.Controls.Orientation;
+using ImageBlendBrush = Hi3Helper.CommunityToolkit.WinUI.Media.ImageBlendBrush;
+using ImageCropper = Hi3Helper.CommunityToolkit.WinUI.Controls.ImageCropper;
+using CropShape = Hi3Helper.CommunityToolkit.WinUI.Controls.CropShape;
+using ThumbPlacement = Hi3Helper.CommunityToolkit.WinUI.Controls.ThumbPlacement;
+using BitmapFileFormat = Hi3Helper.CommunityToolkit.WinUI.Controls.BitmapFileFormat;
+
namespace CollapseLauncher.Helper.Image
{
internal static class ImageLoaderHelper
@@ -152,7 +157,7 @@ internal static async Task LoadImage(string path, bool isUseImageCro
}
private static async Task SpawnImageCropperDialog(string filePath, string cachedFilePath,
- uint ToWidth, uint ToHeight)
+ uint toWidth, uint toHeight)
{
Grid parentGrid = new()
{
@@ -169,15 +174,19 @@ private static async Task SpawnImageCropperDialog(string filePath, s
imageCropper.HorizontalAlignment = HorizontalAlignment.Stretch;
imageCropper.VerticalAlignment = VerticalAlignment.Stretch;
imageCropper.Opacity = 0;
+
+ // Path of image
+ Uri overlayImageUri = new Uri(Path.Combine(AppFolder!, @"Assets\Images\ImageCropperOverlay",
+ GetAppConfigValue("WindowSizeProfile").ToString() == "Small" ? "small.png" : "normal.png"));
+
// Why not use ImageBrush?
// https://github.com/microsoft/microsoft-ui-xaml/issues/7809
imageCropper.Overlay = new ImageBlendBrush()
{
- Source = new BitmapImage(new Uri(Path.Combine(AppFolder!, @"Assets\Images\ImageCropperOverlay",
- GetAppConfigValue("WindowSizeProfile").ToString() == "Small" ? "small.png" : "normal.png"))),
Opacity = 0.5,
Stretch = Stretch.Fill,
Mode = ImageBlendMode.Multiply,
+ SourceUri = overlayImageUri
};
ContentDialogOverlay dialogOverlay = new ContentDialogOverlay(ContentDialogTheme.Informational)
@@ -215,7 +224,7 @@ private static async Task SpawnImageCropperDialog(string filePath, s
}
FileInfo cachedFileInfo = new FileInfo(cachedFilePath);
- return await GenerateCachedStream(cachedFileInfo, ToWidth, ToHeight, true);
+ return await GenerateCachedStream(cachedFileInfo, toWidth, toHeight, true);
}
private static async void LoadImageCropperDetached(string filePath, ImageCropper imageCropper,
@@ -392,21 +401,25 @@ public static bool IsFileCompletelyDownloaded(FileInfo fileInfo)
// Try to get the prop file which includes the filename + the suggested size provided
// by the network stream if it has been downloaded before
- string propFilePath = Directory.EnumerateFiles(outputParentPath, $"{outputFileName}#*", SearchOption.TopDirectoryOnly).FirstOrDefault();
- // Check if the file is found (not null), then try parse the information
- if (string.IsNullOrEmpty(propFilePath))
+ if (outputParentPath != null)
{
- return false;
- }
+ string propFilePath = Directory.EnumerateFiles(outputParentPath, $"{outputFileName}#*", SearchOption.TopDirectoryOnly).FirstOrDefault();
+ // Check if the file is found (not null), then try parse the information
+ if (string.IsNullOrEmpty(propFilePath))
+ {
+ return false;
+ }
- // Try split the filename into a segment by # char
- string[] propSegment = Path.GetFileName(propFilePath).Split('#');
- // Assign the check if the condition met and set the file existence status
- return propSegment.Length >= 2
- && long.TryParse(propSegment[1], null, out long suggestedSize)
- && fileInfo.Exists && fileInfo.Length == suggestedSize;
+ // Try split the filename into a segment by # char
+ string[] propSegment = Path.GetFileName(propFilePath).Split('#');
+ // Assign the check if the condition met and set the file existence status
+ return propSegment.Length >= 2
+ && long.TryParse(propSegment[1], null, out long suggestedSize)
+ && fileInfo.Exists && fileInfo.Length == suggestedSize;
+ }
// If the prop doesn't exist, then return false to assume that the file doesn't exist
+ return false;
}
public static async void TryDownloadToCompletenessAsync(string url, FileInfo fileInfo, CancellationToken token)
@@ -435,8 +448,11 @@ public static async ValueTask TryDownloadToCompleteness(string url, FileInfo fil
// Create the prop file for download completeness checking
string outputParentPath = Path.GetDirectoryName(fileInfo.FullName);
string outputFilename = Path.GetFileName(fileInfo.FullName);
- string propFilePath = Path.Combine(outputParentPath, $"{outputFilename}#{netStream.Length}");
- await File.Create(propFilePath).DisposeAsync();
+ if (outputParentPath != null)
+ {
+ string propFilePath = Path.Combine(outputParentPath, $"{outputFilename}#{netStream.Length}");
+ await File.Create(propFilePath).DisposeAsync();
+ }
// Copy (and download) the remote streams to local
int read;
@@ -446,6 +462,9 @@ public static async ValueTask TryDownloadToCompleteness(string url, FileInfo fil
Logger.LogWriteLine($"Resource download from: {url} has been completed and stored locally into:"
+ $"\"{fileInfo.FullName}\" with size: {ConverterTool.SummarizeSizeSimple(fileLength)} ({fileLength} bytes)", LogType.Default, true);
}
+ // Ignore cancellation exceptions
+ catch (TaskCanceledException) { }
+ catch (OperationCanceledException) { }
#if !DEBUG
catch (Exception ex)
{
diff --git a/CollapseLauncher/Classes/Helper/JsonConverter/RegionResourcePluginValidateConverter.cs b/CollapseLauncher/Classes/Helper/JsonConverter/RegionResourcePluginValidateConverter.cs
index a1f48a9c2..334ff9b04 100644
--- a/CollapseLauncher/Classes/Helper/JsonConverter/RegionResourcePluginValidateConverter.cs
+++ b/CollapseLauncher/Classes/Helper/JsonConverter/RegionResourcePluginValidateConverter.cs
@@ -19,7 +19,7 @@ public override List Read(
JsonSerializerOptions options)
{
string valueString = EmptiedBackslash(reader.ValueSpan);
- List returnList = valueString.Deserialize>(InternalAppJSONContext.Default);
+ List returnList = valueString.Deserialize(InternalAppJSONContext.Default.ListRegionResourcePluginValidate);
return returnList;
}
diff --git a/CollapseLauncher/Classes/Helper/LauncherApiLoader/HoYoPlay/HoYoPlayLauncherApiLoader.cs b/CollapseLauncher/Classes/Helper/LauncherApiLoader/HoYoPlay/HoYoPlayLauncherApiLoader.cs
index ae917ff1e..a2f22b1c9 100644
--- a/CollapseLauncher/Classes/Helper/LauncherApiLoader/HoYoPlay/HoYoPlayLauncherApiLoader.cs
+++ b/CollapseLauncher/Classes/Helper/LauncherApiLoader/HoYoPlay/HoYoPlayLauncherApiLoader.cs
@@ -28,31 +28,41 @@ protected override async Task LoadLauncherGameResource(ActionOnTimeOutRetry? onT
ActionTimeoutValueTaskCallback hypResourceResponseCallback =
async innerToken =>
- await FallbackCDNUtil.DownloadAsJSONType(PresetConfig?.LauncherResourceURL, InternalAppJSONContext.Default, innerToken);
+ await FallbackCDNUtil.DownloadAsJSONType(PresetConfig?.LauncherResourceURL, InternalAppJSONContext.Default.HoYoPlayLauncherResources, innerToken);
- HoYoPlayLauncherResources? hypResourceResponse = await hypResourceResponseCallback.WaitForRetryAsync(ExecutionTimeout, ExecutionTimeoutStep,
- ExecutionTimeoutAttempt, onTimeoutRoutine, token);
+ // Assign as 3 Task array
+ Task[] tasks = [
+ Task.CompletedTask,
+ Task.CompletedTask,
+ Task.CompletedTask
+ ];
+ // Init as null first before being assigned when the backing task is called
+ HoYoPlayLauncherResources? hypResourceResponse = null;
HoYoPlayLauncherResources? hypPluginResource = null;
HoYoPlayLauncherResources? hypSdkResource = null;
+
+ tasks[0] = hypResourceResponseCallback.WaitForRetryAsync(ExecutionTimeout, ExecutionTimeoutStep,
+ ExecutionTimeoutAttempt, onTimeoutRoutine, token).AsTaskAndDoAction((result) => hypResourceResponse = result);
+
if (!string.IsNullOrEmpty(PresetConfig?.LauncherPluginURL) && (PresetConfig.IsPluginUpdateEnabled ?? false))
{
ActionTimeoutValueTaskCallback hypPluginResourceCallback =
async innerToken =>
- await FallbackCDNUtil.DownloadAsJSONType(PresetConfig?.LauncherPluginURL, InternalAppJSONContext.Default, innerToken);
+ await FallbackCDNUtil.DownloadAsJSONType(PresetConfig?.LauncherPluginURL, InternalAppJSONContext.Default.HoYoPlayLauncherResources, innerToken);
- hypPluginResource = await hypPluginResourceCallback.WaitForRetryAsync(ExecutionTimeout, ExecutionTimeoutStep,
- ExecutionTimeoutAttempt, onTimeoutRoutine, token);
+ tasks[1] = hypPluginResourceCallback.WaitForRetryAsync(ExecutionTimeout, ExecutionTimeoutStep,
+ ExecutionTimeoutAttempt, onTimeoutRoutine, token).AsTaskAndDoAction((result) => hypPluginResource = result);
}
if (!string.IsNullOrEmpty(PresetConfig?.LauncherGameChannelSDKURL))
{
ActionTimeoutValueTaskCallback hypSdkResourceCallback =
async innerToken =>
- await FallbackCDNUtil.DownloadAsJSONType(PresetConfig?.LauncherGameChannelSDKURL, InternalAppJSONContext.Default, innerToken);
+ await FallbackCDNUtil.DownloadAsJSONType(PresetConfig?.LauncherGameChannelSDKURL, InternalAppJSONContext.Default.HoYoPlayLauncherResources, innerToken);
- hypSdkResource = await hypSdkResourceCallback.WaitForRetryAsync(ExecutionTimeout, ExecutionTimeoutStep,
- ExecutionTimeoutAttempt, onTimeoutRoutine, token);
+ tasks[2] = hypSdkResourceCallback.WaitForRetryAsync(ExecutionTimeout, ExecutionTimeoutStep,
+ ExecutionTimeoutAttempt, onTimeoutRoutine, token).AsTaskAndDoAction((result) => hypSdkResource = result);
}
RegionResourceLatest sophonResourceCurrentPackage = new RegionResourceLatest();
@@ -67,6 +77,9 @@ protected override async Task LoadLauncherGameResource(ActionOnTimeOutRetry? onT
data = sophonResourceData
};
+ // Await all callbacks
+ await Task.WhenAll(tasks).ConfigureAwait(false);
+
ConvertPluginResources(ref sophonResourceData, hypPluginResource);
ConvertSdkResources(ref sophonResourceData, hypSdkResource);
ConvertPackageResources(sophonResourceData, hypResourceResponse?.Data?.LauncherPackages);
@@ -309,7 +322,7 @@ private void ConvertMultiPackageResource(ref RegionResourceVersion sophonPackage
}
#endregion
- protected override async ValueTask LoadLauncherNews(ActionOnTimeOutRetry? onTimeoutRoutine, CancellationToken token)
+ protected override async Task LoadLauncherNews(ActionOnTimeOutRetry? onTimeoutRoutine, CancellationToken token)
{
bool isUseMultiLang = PresetConfig?.LauncherSpriteURLMultiLang ?? false;
@@ -317,18 +330,28 @@ protected override async ValueTask LoadLauncherNews(ActionOnTimeOutRetry? onTime
string launcherSpriteUrl = string.Format(PresetConfig?.LauncherSpriteURL!, localeCode);
string launcherNewsUrl = string.Format(PresetConfig?.LauncherNewsURL!, localeCode);
+
ActionTimeoutValueTaskCallback hypLauncherBackgroundCallback =
async innerToken =>
- await FallbackCDNUtil.DownloadAsJSONType(launcherSpriteUrl, InternalAppJSONContext.Default, innerToken);
+ await FallbackCDNUtil.DownloadAsJSONType(launcherSpriteUrl, InternalAppJSONContext.Default.HoYoPlayLauncherNews, innerToken);
ActionTimeoutValueTaskCallback hypLauncherNewsCallback =
async innerToken =>
- await FallbackCDNUtil.DownloadAsJSONType(launcherNewsUrl, InternalAppJSONContext.Default, innerToken);
+ await FallbackCDNUtil.DownloadAsJSONType(launcherNewsUrl, InternalAppJSONContext.Default.HoYoPlayLauncherNews, innerToken);
- HoYoPlayLauncherNews? hypLauncherBackground = await hypLauncherBackgroundCallback.WaitForRetryAsync(ExecutionTimeout, ExecutionTimeoutStep,
- ExecutionTimeoutAttempt, onTimeoutRoutine, token);
- HoYoPlayLauncherNews? hypLauncherNews = await hypLauncherNewsCallback.WaitForRetryAsync(ExecutionTimeout, ExecutionTimeoutStep,
- ExecutionTimeoutAttempt, onTimeoutRoutine, token);
+ HoYoPlayLauncherNews? hypLauncherBackground = null;
+ HoYoPlayLauncherNews? hypLauncherNews = null;
+
+ // Load both in parallel
+ Task[] tasks = [
+ hypLauncherBackgroundCallback.WaitForRetryAsync(ExecutionTimeout, ExecutionTimeoutStep,
+ ExecutionTimeoutAttempt, onTimeoutRoutine, token).AsTaskAndDoAction((result) => hypLauncherBackground = result),
+ hypLauncherNewsCallback.WaitForRetryAsync(ExecutionTimeout, ExecutionTimeoutStep,
+ ExecutionTimeoutAttempt, onTimeoutRoutine, token).AsTaskAndDoAction((result) => hypLauncherNews = result)
+ ];
+
+ // Await the result
+ await Task.WhenAll(tasks);
// Merge background image
if (hypLauncherBackground?.Data?.GameInfoList != null && hypLauncherNews?.Data != null)
@@ -447,7 +470,7 @@ private void ConvertLauncherSocialMedia(ref LauncherGameNews? sophonLauncherNews
}
#endregion
- protected override async ValueTask LoadLauncherGameInfo(ActionOnTimeOutRetry? onTimeoutRoutine, CancellationToken token)
+ protected override async Task LoadLauncherGameInfo(ActionOnTimeOutRetry? onTimeoutRoutine, CancellationToken token)
{
if (PresetConfig?.LauncherGameInfoDisplayURL == null)
{
@@ -462,7 +485,7 @@ protected override async ValueTask LoadLauncherGameInfo(ActionOnTimeOutRetry? on
ActionTimeoutValueTaskCallback hypLauncherGameInfoCallback =
async innerToken =>
- await FallbackCDNUtil.DownloadAsJSONType(launcherGameInfoUrl, InternalAppJSONContext.Default, innerToken);
+ await FallbackCDNUtil.DownloadAsJSONType(launcherGameInfoUrl, InternalAppJSONContext.Default.HoYoPlayLauncherGameInfo, innerToken);
HoYoPlayLauncherGameInfo? hypLauncherGameInfo = await hypLauncherGameInfoCallback.WaitForRetryAsync(ExecutionTimeout, ExecutionTimeoutStep,
ExecutionTimeoutAttempt, onTimeoutRoutine, token);
diff --git a/CollapseLauncher/Classes/Helper/LauncherApiLoader/LauncherApiBase.cs b/CollapseLauncher/Classes/Helper/LauncherApiLoader/LauncherApiBase.cs
index 8ef1d36f5..b2c8815fb 100644
--- a/CollapseLauncher/Classes/Helper/LauncherApiLoader/LauncherApiBase.cs
+++ b/CollapseLauncher/Classes/Helper/LauncherApiLoader/LauncherApiBase.cs
@@ -76,9 +76,11 @@ public async Task LoadAsync(OnLoadAction? beforeLoadRoutine, OnLoa
protected virtual async ValueTask LoadAsyncInner(ActionOnTimeOutRetry? onTimeoutRoutine,
CancellationToken token)
{
- await LoadLauncherGameResource(onTimeoutRoutine, token);
- await LoadLauncherNews(onTimeoutRoutine, token);
- await LoadLauncherGameInfo(onTimeoutRoutine, token);
+ await Task.WhenAll([
+ LoadLauncherGameResource(onTimeoutRoutine, token),
+ LoadLauncherNews(onTimeoutRoutine, token),
+ LoadLauncherGameInfo(onTimeoutRoutine, token)
+ ]).ConfigureAwait(false);
}
protected virtual async Task LoadLauncherGameResource(ActionOnTimeOutRetry? onTimeoutRoutine,
@@ -89,33 +91,41 @@ protected virtual async Task LoadLauncherGameResource(ActionOnTimeOutRetry? onTi
ActionTimeoutValueTaskCallback launcherGameResourceCallback =
async innerToken =>
- await FallbackCDNUtil.DownloadAsJSONType(PresetConfig?.LauncherResourceURL, InternalAppJSONContext.Default, innerToken);
+ await FallbackCDNUtil.DownloadAsJSONType(PresetConfig?.LauncherResourceURL, InternalAppJSONContext.Default.RegionResourceProp, innerToken);
- LauncherGameResource = await launcherGameResourceCallback.WaitForRetryAsync(ExecutionTimeout, ExecutionTimeoutStep,
- ExecutionTimeoutAttempt, onTimeoutRoutine, token);
-
- if (LauncherGameResource == null)
- {
- throw new NullReferenceException("Launcher game resource returns a null!");
- }
+ Task[] tasks = [
+ launcherGameResourceCallback.WaitForRetryAsync(ExecutionTimeout, ExecutionTimeoutStep,
+ ExecutionTimeoutAttempt, onTimeoutRoutine, token)
+ .AsTaskAndDoAction((result) => LauncherGameResource = result),
+ Task.CompletedTask
+ ];
+ RegionResourceProp? pluginProp = null;
if (string.IsNullOrEmpty(PresetConfig?.LauncherPluginURL))
{
ActionTimeoutValueTaskCallback launcherPluginPropCallback =
async innerToken =>
- await FallbackCDNUtil.DownloadAsJSONType(string.Format(PresetConfig?.LauncherPluginURL!, GetDeviceId(PresetConfig!)), InternalAppJSONContext.Default, innerToken);
+ await FallbackCDNUtil.DownloadAsJSONType(string.Format(PresetConfig?.LauncherPluginURL!, GetDeviceId(PresetConfig!)), InternalAppJSONContext.Default.RegionResourceProp, innerToken);
- RegionResourceProp? pluginProp = await launcherPluginPropCallback.WaitForRetryAsync(ExecutionTimeout, ExecutionTimeoutStep,
- ExecutionTimeoutAttempt, onTimeoutRoutine, token);
+ tasks[1] = launcherPluginPropCallback.WaitForRetryAsync(ExecutionTimeout, ExecutionTimeoutStep,
+ ExecutionTimeoutAttempt, onTimeoutRoutine, token)
+ .AsTaskAndDoAction((result) => pluginProp = result);
+ }
- if (pluginProp != null && LauncherGameResource.data != null)
- {
- LauncherGameResource.data.plugins = pluginProp.data?.plugins;
- #if DEBUG
- Logger.LogWriteLine("[LauncherApiBase::LoadLauncherGameResource] Loading plugin handle!",
- LogType.Debug, true);
- #endif
- }
+ await Task.WhenAll(tasks).ConfigureAwait(false);
+
+ if (LauncherGameResource == null)
+ {
+ throw new NullReferenceException("Launcher game resource returns a null!");
+ }
+
+ if (pluginProp != null && LauncherGameResource.data != null)
+ {
+ LauncherGameResource.data.plugins = pluginProp.data?.plugins;
+#if DEBUG
+ Logger.LogWriteLine("[LauncherApiBase::LoadLauncherGameResource] Loading plugin handle!",
+ LogType.Debug, true);
+#endif
}
PerformDebugRoutines();
@@ -207,8 +217,8 @@ protected void EnsureResourceUrlNotNull()
}
}
- protected virtual async ValueTask LoadLauncherNews(ActionOnTimeOutRetry? onTimeoutRoutine,
- CancellationToken token)
+ protected virtual async Task LoadLauncherNews(ActionOnTimeOutRetry? onTimeoutRoutine,
+ CancellationToken token)
{
EnsurePresetConfigNotNull();
@@ -252,9 +262,9 @@ protected virtual async ValueTask LoadLauncherNews(ActionOnTimeOutRetry? onTimeo
#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
- protected virtual async ValueTask LoadLauncherGameInfo(ActionOnTimeOutRetry? onTimeoutRoutine,
+ protected virtual async Task LoadLauncherGameInfo(ActionOnTimeOutRetry? onTimeoutRoutine,
#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
- CancellationToken token)
+ CancellationToken token)
{
LauncherGameInfoField = new HoYoPlayGameInfoField();
}
@@ -282,8 +292,7 @@ protected virtual async ValueTask LoadLauncherGameInfo(ActionOnTimeOutRetry? onT
private static async Task LoadSingleLangLauncherNews(
string launcherSpriteUrl, CancellationToken token)
{
- return await FallbackCDNUtil.DownloadAsJSONType(launcherSpriteUrl,
- InternalAppJSONContext.Default, token);
+ return await FallbackCDNUtil.DownloadAsJSONType(launcherSpriteUrl, InternalAppJSONContext.Default.LauncherGameNews, token);
}
private static async Task LoadMultiLangLauncherNews(string launcherSpriteUrl, string lang,
@@ -291,8 +300,7 @@ protected virtual async ValueTask LoadLauncherGameInfo(ActionOnTimeOutRetry? onT
{
return await
FallbackCDNUtil
- .DownloadAsJSONType(string.Format(launcherSpriteUrl, lang),
- InternalAppJSONContext.Default, token);
+ .DownloadAsJSONType(string.Format(launcherSpriteUrl, lang), InternalAppJSONContext.Default.LauncherGameNews, token);
}
protected virtual string GetDeviceId(PresetConfig preset)
diff --git a/CollapseLauncher/Classes/Helper/LauncherApiLoader/Sophon/LauncherGameNews.cs b/CollapseLauncher/Classes/Helper/LauncherApiLoader/Sophon/LauncherGameNews.cs
index 00496cc1c..59ac9600b 100644
--- a/CollapseLauncher/Classes/Helper/LauncherApiLoader/Sophon/LauncherGameNews.cs
+++ b/CollapseLauncher/Classes/Helper/LauncherApiLoader/Sophon/LauncherGameNews.cs
@@ -6,6 +6,8 @@
using System.Linq;
using System.Text.Json.Serialization;
using System.Threading;
+using WinRT;
+// ReSharper disable PartialTypeWithSinglePart
namespace CollapseLauncher.Helper.LauncherApiLoader.Sophon
{
@@ -83,7 +85,7 @@ public List? NewsPostTypeInfo
return _newsPostTypeInfo;
}
- _newsPostTypeInfo = NewsPost.Where(x => x.PostType == LauncherGameNewsPostType.POST_TYPE_INFO)?
+ _newsPostTypeInfo = NewsPost.Where(x => x.PostType == LauncherGameNewsPostType.POST_TYPE_INFO)
.OrderBy(x => x.PostOrder)
.ToList();
return _newsPostTypeInfo;
@@ -105,7 +107,7 @@ public List? NewsPostTypeActivity
return _newsPostTypeActivity;
}
- _newsPostTypeActivity = NewsPost.Where(x => x.PostType == LauncherGameNewsPostType.POST_TYPE_ACTIVITY)?
+ _newsPostTypeActivity = NewsPost.Where(x => x.PostType == LauncherGameNewsPostType.POST_TYPE_ACTIVITY)
.OrderBy(x => x.PostOrder)
.ToList();
return _newsPostTypeActivity;
@@ -128,7 +130,7 @@ public List? NewsPostTypeAnnouncement
}
_newsPostTypeAnnouncement = NewsPost
- .Where(x => x.PostType == LauncherGameNewsPostType.POST_TYPE_ANNOUNCE)?
+ .Where(x => x.PostType == LauncherGameNewsPostType.POST_TYPE_ANNOUNCE)
.OrderBy(x => x.PostOrder)
.ToList();
return _newsPostTypeAnnouncement;
@@ -220,7 +222,8 @@ public string? CarouselImg
public int? CarouselOrder { get; init; }
}
- public class LauncherGameNewsSocialMedia : ILauncherGameNewsDataTokenized
+ [GeneratedBindableCustomProperty]
+ public partial class LauncherGameNewsSocialMedia : ILauncherGameNewsDataTokenized
{
private readonly string? _qrImg;
private readonly List? _qrLinks;
@@ -303,7 +306,8 @@ public List? QrLinks
[JsonIgnore] public bool IsHasQrDescription => !string.IsNullOrEmpty(QrTitle);
}
- public class LauncherGameNewsSocialMediaQrLinks
+ [GeneratedBindableCustomProperty]
+ public partial class LauncherGameNewsSocialMediaQrLinks
{
[JsonPropertyName("title")]
[JsonConverter(typeof(EmptyStringAsNullConverter))]
diff --git a/CollapseLauncher/Classes/Helper/Metadata/LauncherMetadataHelper.cs b/CollapseLauncher/Classes/Helper/Metadata/LauncherMetadataHelper.cs
index 64b4c4b1b..1096aaa53 100644
--- a/CollapseLauncher/Classes/Helper/Metadata/LauncherMetadataHelper.cs
+++ b/CollapseLauncher/Classes/Helper/Metadata/LauncherMetadataHelper.cs
@@ -1,5 +1,4 @@
#nullable enable
-using CollapseLauncher.Helper.LauncherApiLoader;
using CollapseLauncher.Helper.LauncherApiLoader.HoYoPlay;
using CollapseLauncher.Helper.LauncherApiLoader.Sophon;
using CollapseLauncher.Helper.Loading;
@@ -33,8 +32,8 @@ internal static class LauncherMetadataHelper
#region Metadata Stamp List and Config Dictionary
- internal static List? LauncherMetadataStamp { get; private set; }
- internal static List? NewUpdateMetadataStamp { get; private set; }
+ internal static List? LauncherMetadataStamp { get; private set; }
+ internal static List? NewUpdateMetadataStamp { get; private set; }
internal static List? LauncherGameNameCollection => LauncherGameNameRegionCollection?.Keys.ToList();
private static Dictionary? LauncherMetadataStampDictionary { get; set; }
@@ -249,7 +248,7 @@ internal static async ValueTask InitializeStamp(string currentChannel, bool thro
// Deserialize the stream
LauncherMetadataStamp =
- await stampLocalStream.DeserializeAsync>(InternalAppJSONContext.Default);
+ await stampLocalStream.DeserializeAsListAsync(InternalAppJSONContext.Default.Stamp);
// SANITIZE: Check if the stamp is empty, then throw
if (LauncherMetadataStamp == null || LauncherMetadataStamp.Count == 0)
@@ -258,6 +257,9 @@ internal static async ValueTask InitializeStamp(string currentChannel, bool thro
// Load and add stamp into stamp dictionary
foreach (Stamp? stamp in LauncherMetadataStamp)
{
+ if (stamp == null)
+ continue;
+
string? gameName = string.IsNullOrEmpty(stamp.GameName) ? stamp.MetadataType.ToString() : stamp.GameName;
string? gameRegion = string.IsNullOrEmpty(stamp.GameRegion) ? stamp.MetadataPath : stamp.GameRegion;
LauncherMetadataStampDictionary?.Add($"{gameName} - {gameRegion}", stamp);
@@ -324,7 +326,7 @@ internal static async ValueTask InitializeConfig(string currentChannel, bool isC
// Find and iterate the master key first
Stamp? masterKeyStamp =
- LauncherMetadataStamp.FirstOrDefault(x => x.MetadataType == MetadataType.MasterKey);
+ LauncherMetadataStamp.FirstOrDefault(x => x?.MetadataType == MetadataType.MasterKey);
if (masterKeyStamp == null)
{
throw new KeyNotFoundException("Master key information is not found in the stamp!");
@@ -333,7 +335,7 @@ internal static async ValueTask InitializeConfig(string currentChannel, bool isC
// Iterate the CommunityTools configs
Stamp? stampCommunityToolkit = LauncherMetadataStamp
- .FirstOrDefault(x => x.MetadataType == MetadataType.CommunityTools);
+ .FirstOrDefault(x => x?.MetadataType == MetadataType.CommunityTools);
if (stampCommunityToolkit != null)
{
await LoadConfigInner(stampCommunityToolkit, currentChannel, false, false);
@@ -341,11 +343,14 @@ internal static async ValueTask InitializeConfig(string currentChannel, bool isC
// Iterate the stamp and try to load the configs
int index = 1;
- List stampList = LauncherMetadataStamp
- .Where(x => x.MetadataType == MetadataType.PresetConfigV2)
+ List stampList = LauncherMetadataStamp
+ .Where(x => x?.MetadataType == MetadataType.PresetConfigV2)
.ToList();
- foreach (Stamp stamp in stampList)
+ foreach (Stamp? stamp in stampList)
{
+ if (stamp == null)
+ continue;
+
if (isShowLoadingMessage)
{
LoadingMessageHelper.SetMessage(Locale.Lang._MainPage.Initializing,
@@ -404,7 +409,7 @@ internal static async ValueTask LoadConfigInner(Stamp stamp, string currentChann
{
// Deserialize the key config
MasterKeyConfig? keyConfig =
- await configLocalStream.DeserializeAsync(InternalAppJSONContext.Default);
+ await configLocalStream.DeserializeAsync(InternalAppJSONContext.Default.MasterKeyConfig);
// Assign the key to instance property
CurrentMasterKey = keyConfig ?? throw new InvalidDataException("Master key config seems to be empty!");
@@ -421,7 +426,7 @@ internal static async ValueTask LoadConfigInner(Stamp stamp, string currentChann
case MetadataType.PresetConfigV2:
{
PresetConfig? presetConfig =
- await configLocalStream.DeserializeAsync(InternalAppJSONContext.Default);
+ await configLocalStream.DeserializeAsync(InternalAppJSONContext.Default.PresetConfig);
if (presetConfig != null)
{
if (isCacheUpdateModeOnly && (!presetConfig.IsCacheUpdateEnabled ?? false)) return;
@@ -526,8 +531,8 @@ internal static async ValueTask IsMetadataHasUpdate()
// Check and throw if the stream returns null or empty
if (stampRemoteStream != null)
{
- List? remoteMetadataStampList =
- await stampRemoteStream.DeserializeAsync>(InternalAppJSONContext.Default);
+ List? remoteMetadataStampList =
+ await stampRemoteStream.DeserializeAsListAsync(InternalAppJSONContext.Default.Stamp);
// Check and throw if the metadata stamp returns null or empty
if (remoteMetadataStampList == null || remoteMetadataStampList.Count == 0)
@@ -545,18 +550,21 @@ internal static async ValueTask IsMetadataHasUpdate()
bool isOutdatedStampDetected = false;
foreach (Stamp? remoteMetadataStamp in remoteMetadataStampList)
{
+ if (remoteMetadataStamp == null)
+ continue;
+
// Check if the local stamp does not have one, then add it to new update stamp list
Stamp? localStamp =
LauncherMetadataStamp?.FirstOrDefault(x => remoteMetadataStamp.GameRegion ==
- x.GameRegion
+ x?.GameRegion
&& remoteMetadataStamp.GameName ==
- x.GameName
+ x?.GameName
&& remoteMetadataStamp.LastUpdated ==
- x.LastUpdated
+ x?.LastUpdated
&& remoteMetadataStamp.MetadataPath ==
- x.MetadataPath
+ x?.MetadataPath
&& remoteMetadataStamp.MetadataType ==
- x.MetadataType);
+ x?.MetadataType);
if (localStamp != null) continue;
@@ -608,8 +616,10 @@ internal static async ValueTask RunMetadataUpdate()
}
// Remove the old metadata config file first
- foreach (Stamp newUpdateStamp in NewUpdateMetadataStamp)
+ foreach (Stamp? newUpdateStamp in NewUpdateMetadataStamp)
{
+ if (newUpdateStamp == null) continue;
+
// Ensure if the MetadataPath is not empty
if (string.IsNullOrEmpty(newUpdateStamp.MetadataPath))
{
@@ -644,7 +654,7 @@ internal static async ValueTask RunMetadataUpdate()
}
}
- private static async ValueTask UpdateStampContent(string stampPath, List newStampList)
+ private static async ValueTask UpdateStampContent(string stampPath, List newStampList)
{
try
{
@@ -653,26 +663,28 @@ private static async ValueTask UpdateStampContent(string stampPath, List
throw new FileNotFoundException($"Unable to update the stamp file because it is not exist! It should have been located here: {stampPath}");
// Read the old stamp list stream
- List? oldStampList = null;
+ List? oldStampList = null;
using (FileStream stampStream = File.OpenRead(stampPath))
{
// Deserialize and do sanitize if the old stamp list is empty
- oldStampList = await stampStream.DeserializeAsync>(InternalAppJSONContext.Default);
+ oldStampList = await stampStream.DeserializeAsListAsync(InternalAppJSONContext.Default.Stamp);
if (oldStampList == null || oldStampList?.Count == 0)
throw new NullReferenceException($"The old stamp list contains an empty/null content!");
// Try iterate the new stamp list to replace the old ones or add a new entry
- foreach (Stamp newStamp in newStampList)
+ foreach (Stamp? newStamp in newStampList)
{
+ if (newStamp == null) continue;
+
// Find the old stamp reference from the old list
Stamp? oldStampRef = oldStampList?.FirstOrDefault(x => newStamp.GameRegion ==
- x.GameRegion
+ x?.GameRegion
&& newStamp.GameName ==
- x.GameName
+ x?.GameName
&& newStamp.MetadataPath ==
- x.MetadataPath
+ x?.MetadataPath
&& newStamp.MetadataType ==
- x.MetadataType);
+ x?.MetadataType);
// Check if the old stamp ref is null or index of old stamp reference returns < 0, then
// add it as a new entry.
int indexOfOldStamp = 0;
@@ -687,7 +699,7 @@ private static async ValueTask UpdateStampContent(string stampPath, List
// Now write the updated list to the stamp file
using (FileStream updatedStampStream = File.Create(stampPath))
{
- await oldStampList.SerializeAsync(updatedStampStream, InternalAppJSONContext.Default);
+ await oldStampList.SerializeAsync(updatedStampStream, InternalAppJSONContext.Default.ListStamp);
return;
}
}
diff --git a/CollapseLauncher/Classes/Helper/Metadata/PresetConfig.cs b/CollapseLauncher/Classes/Helper/Metadata/PresetConfig.cs
index b5def426f..e303d79a7 100644
--- a/CollapseLauncher/Classes/Helper/Metadata/PresetConfig.cs
+++ b/CollapseLauncher/Classes/Helper/Metadata/PresetConfig.cs
@@ -94,7 +94,7 @@ public async ValueTask EnsureReassociated(HttpClient client, string? branchUrl,
// Fetch branch info
ActionTimeoutValueTaskCallback hypLauncherBranchCallback =
async innerToken =>
- await FallbackCDNUtil.DownloadAsJSONType(branchUrl, InternalAppJSONContext.Default, innerToken);
+ await FallbackCDNUtil.DownloadAsJSONType(branchUrl, InternalAppJSONContext.Default.HoYoPlayLauncherGameInfo, innerToken);
HoYoPlayLauncherGameInfo? hypLauncherBranchInfo = await hypLauncherBranchCallback.WaitForRetryAsync(
LauncherApiBase.ExecutionTimeout,
diff --git a/CollapseLauncher/Classes/Helper/TaskSchedulerHelper.cs b/CollapseLauncher/Classes/Helper/TaskSchedulerHelper.cs
new file mode 100644
index 000000000..664b5a907
--- /dev/null
+++ b/CollapseLauncher/Classes/Helper/TaskSchedulerHelper.cs
@@ -0,0 +1,220 @@
+using Hi3Helper;
+using Hi3Helper.Shared.Region;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+
+namespace CollapseLauncher.Helper
+{
+ internal static class TaskSchedulerHelper
+ {
+ private const string CollapseStartupTaskName = "CollapseLauncherStartupTask";
+
+ internal static bool IsInitialized;
+ internal static bool CachedIsOnTrayEnabled;
+ internal static bool CachedIsEnabled;
+
+ internal static bool IsOnTrayEnabled()
+ {
+ if (!IsInitialized)
+ InvokeGetStatusCommand();
+
+ return CachedIsOnTrayEnabled;
+ }
+
+ internal static bool IsEnabled()
+ {
+ if (!IsInitialized)
+ InvokeGetStatusCommand();
+
+ return CachedIsEnabled;
+ }
+
+ internal static void InvokeGetStatusCommand()
+ {
+ // Build the argument and mode to set
+ StringBuilder argumentBuilder = new StringBuilder();
+ argumentBuilder.Append("IsEnabled");
+
+ // Append task name and stub path
+ AppendTaskNameAndPathArgument(argumentBuilder);
+
+ // Store argument builder as string
+ string argumentString = argumentBuilder.ToString();
+
+ // Invoke command and get return code
+ int returnCode = GetInvokeCommandReturnCode(argumentString);
+
+ (CachedIsEnabled, CachedIsOnTrayEnabled) = returnCode switch
+ {
+ // -1 means task is disabled with tray enabled
+ -1 => (false, true),
+ // 0 means task is disabled with tray disabled
+ 0 => (false, false),
+ // 1 means task is enabled with tray disabled
+ 1 => (true, false),
+ // 2 means task is enabled with tray enabled
+ 2 => (true, true),
+ // Otherwise, return both disabled (due to failure)
+ _ => (false, false)
+ };
+
+ // Print init determination
+ CheckInitDetermination(returnCode);
+ }
+
+ private static void CheckInitDetermination(int returnCode)
+ {
+ // If the return code is within range, then set as initialized
+ if (returnCode is > -2 and < 3)
+ {
+ // Set as initialized
+ IsInitialized = true;
+ }
+ // Otherwise, log the return code
+ else
+ {
+ string reason = returnCode switch
+ {
+ int.MaxValue => "ARGUMENT_INVALID",
+ int.MinValue => "UNHANDLED_ERROR",
+ short.MaxValue => "INTERNALINVOKE_ERROR",
+ short.MinValue => "APPLET_NOTFOUND",
+ _ => $"UNKNOWN_{returnCode}"
+ };
+ Logger.LogWriteLine($"Error while getting task status from applet with reason: {reason}", LogType.Error, true);
+ }
+ }
+
+ internal static void ToggleTrayEnabled(bool isEnabled)
+ {
+ CachedIsOnTrayEnabled = isEnabled;
+ InvokeToggleCommand();
+ }
+
+ internal static void ToggleEnabled(bool isEnabled)
+ {
+ CachedIsEnabled = isEnabled;
+ InvokeToggleCommand();
+ }
+
+ private static void InvokeToggleCommand()
+ {
+ // Build the argument and mode to set
+ StringBuilder argumentBuilder = new StringBuilder();
+ argumentBuilder.Append(CachedIsEnabled ? "Enable" : "Disable");
+
+ // Append argument whether to toggle the tray or not
+ if (CachedIsOnTrayEnabled)
+ argumentBuilder.Append("ToTray");
+
+ // Append task name and stub path
+ AppendTaskNameAndPathArgument(argumentBuilder);
+
+ // Store argument builder as string
+ string argumentString = argumentBuilder.ToString();
+
+ // Invoke applet
+ int returnCode = GetInvokeCommandReturnCode(argumentString);
+
+ // Print init determination
+ CheckInitDetermination(returnCode);
+ }
+
+ private static void AppendTaskNameAndPathArgument(StringBuilder argumentBuilder)
+ {
+ // Get current stub or main executable path
+ string currentExecPath = MainEntryPoint.FindCollapseStubPath();
+
+ // Build argument to the task name
+ argumentBuilder.Append(" \"");
+ argumentBuilder.Append(CollapseStartupTaskName);
+ argumentBuilder.Append('"');
+
+ // Build argument to the executable path
+ argumentBuilder.Append(" \"");
+ argumentBuilder.Append(currentExecPath);
+ argumentBuilder.Append('"');
+ }
+
+ internal static void RecreateIconShortcuts()
+ {
+ // Build the argument and get the current executable path
+ StringBuilder argumentBuilder = new StringBuilder();
+ argumentBuilder.Append("RecreateIcons");
+ string currentExecPath = LauncherConfig.AppExecutablePath;
+
+ // Build argument to the executable path
+ argumentBuilder.Append(" \"");
+ argumentBuilder.Append(currentExecPath);
+ argumentBuilder.Append('"');
+
+ // Store argument builder as string
+ string argumentString = argumentBuilder.ToString();
+
+ // Invoke applet
+ int returnCode = GetInvokeCommandReturnCode(argumentString);
+
+ // Print init determination
+ CheckInitDetermination(returnCode);
+ }
+
+ private static int GetInvokeCommandReturnCode(string argument)
+ {
+ const string returnvalmark = "RETURNVAL_";
+
+ // Get the applet path and check if the file exist
+ string appletPath = Path.Combine(LauncherConfig.AppFolder, "Lib", "win-x64", "Hi3Helper.TaskScheduler.exe");
+ if (!File.Exists(appletPath))
+ {
+ Logger.LogWriteLine($"Task Scheduler Applet does not exist in this path: {appletPath}", LogType.Error, true);
+ return short.MinValue;
+ }
+
+ // Try to make process instance for the applet
+ using Process process = new Process();
+ process.StartInfo = new ProcessStartInfo
+ {
+ FileName = appletPath,
+ Arguments = argument,
+ UseShellExecute = false,
+ RedirectStandardOutput = true,
+ CreateNoWindow = true
+ };
+ int lastErrCode = short.MaxValue;
+ try
+ {
+ // Start the applet and wait until it exit.
+ process.Start();
+ while (!process.StandardOutput.EndOfStream)
+ {
+ string consoleStdOut = process.StandardOutput.ReadLine();
+ Logger.LogWriteLine("[TaskScheduler] " + consoleStdOut, LogType.Debug, true);
+
+ // Parse if it has RETURNVAL_
+ if (consoleStdOut == null || !consoleStdOut.StartsWith(returnvalmark))
+ {
+ continue;
+ }
+
+ ReadOnlySpan span = consoleStdOut.AsSpan(returnvalmark.Length);
+ if (int.TryParse(span, null, out int resultReturnCode))
+ {
+ lastErrCode = resultReturnCode;
+ }
+ }
+ process.WaitForExit();
+ }
+ catch (Exception ex)
+ {
+ // If error happened, then return.
+ Logger.LogWriteLine($"An error has occurred while invoking Task Scheduler applet!\r\n{ex}", LogType.Error, true);
+ return short.MaxValue;
+ }
+
+ // Get return code
+ return lastErrCode;
+ }
+ }
+}
diff --git a/CollapseLauncher/Classes/Helper/Update/LauncherUpdateHelper.cs b/CollapseLauncher/Classes/Helper/Update/LauncherUpdateHelper.cs
index 44ab9b118..4bb3619c4 100644
--- a/CollapseLauncher/Classes/Helper/Update/LauncherUpdateHelper.cs
+++ b/CollapseLauncher/Classes/Helper/Update/LauncherUpdateHelper.cs
@@ -1,14 +1,21 @@
#nullable enable
- using Hi3Helper;
- using Hi3Helper.Data;
- using Hi3Helper.Shared.Region;
- using Squirrel;
- using Squirrel.Sources;
- using System;
- using System.Threading.Tasks;
+using Hi3Helper;
+using Hi3Helper.Data;
+using Hi3Helper.Shared.Region;
+using System;
+using System.Threading.Tasks;
+#if !USEVELOPACK
+using Squirrel;
+using Squirrel.Sources;
+#else
+using Microsoft.Extensions.Logging;
+using Velopack;
+using Velopack.Locators;
+using Velopack.Sources;
+#endif
// ReSharper disable CheckNamespace
- namespace CollapseLauncher.Helper.Update
+namespace CollapseLauncher.Helper.Update
{
internal static class LauncherUpdateHelper
{
@@ -42,7 +49,7 @@ internal static async Task RunUpdateCheckDetached()
}
catch (Exception ex)
{
- Logger.LogWriteLine($"The squirrel check throws an error, Skipping update check!\r\n{ex}", LogType.Warning, true);
+ Logger.LogWriteLine($"The update manager check throws an error, Skipping update check!\r\n{ex}", LogType.Warning, true);
}
}
@@ -51,12 +58,65 @@ internal static async Task IsUpdateAvailable(bool isForceCheckUpdate = fal
string updateChannel = LauncherConfig.IsPreview ? "preview" : "stable";
CDNURLProperty launcherUpdatePreferredCdn = FallbackCDNUtil.GetPreferredCDN();
- string? launcherUpdateSquirrelBaseUrl = ConverterTool.CombineURLFromString(launcherUpdatePreferredCdn.URLPrefix, "squirrel", updateChannel);
+ string? launcherUpdateManagerBaseUrl = ConverterTool.CombineURLFromString(launcherUpdatePreferredCdn.URLPrefix,
+#if USEVELOPACK
+ "velopack",
+ updateChannel
+#else
+ "squirrel",
+ updateChannel
+#endif
+ );
- IFileDownloader squirrelUpdateManagerHttpAdapter = new UpdateManagerHttpAdapter();
- using (UpdateManager squirrelUpdateManager = new UpdateManager(launcherUpdateSquirrelBaseUrl, null, null, squirrelUpdateManagerHttpAdapter))
+ // Register the update manager adapter
+ IFileDownloader updateManagerHttpAdapter = new UpdateManagerHttpAdapter();
+#if USEVELOPACK
+ // Initialize update manager logger, locator and options
+ ILogger velopackLogger = ILoggerHelper.CreateCollapseILogger();
+ VelopackLocator updateManagerLocator = VelopackLocator.GetDefault(velopackLogger);
+ UpdateOptions updateManagerOptions = new UpdateOptions
{
- UpdateInfo info = await squirrelUpdateManager.CheckForUpdate();
+ AllowVersionDowngrade = true,
+ ExplicitChannel = updateChannel
+ };
+
+ // Initialize update manager source
+ IUpdateSource updateSource = new SimpleWebSource(launcherUpdateManagerBaseUrl, updateManagerHttpAdapter);
+
+ // Initialize the update manager
+ UpdateManager updateManager = new UpdateManager(
+ updateSource,
+ updateManagerOptions,
+ velopackLogger,
+ updateManagerLocator);
+
+ // Get the update info. If it's null, then return false (no update)
+ UpdateInfo? updateInfo = await updateManager.CheckForUpdatesAsync();
+ if (updateInfo == null)
+ {
+ return false;
+ }
+
+ // If there's an update, then get the update metadata
+ GameVersion updateVersion = new GameVersion(updateInfo.TargetFullRelease.Version.ToString());
+ AppUpdateVersionProp = await GetUpdateMetadata(updateChannel);
+ if (AppUpdateVersionProp == null)
+ {
+ return false;
+ }
+
+ // Compare the version
+ IsLauncherUpdateAvailable = LauncherCurrentVersion.Compare(updateVersion);
+
+ // Get the status if the update is ignorable or forced update.
+ bool isUserIgnoreUpdate = (LauncherConfig.GetAppConfigValue("DontAskUpdate").ToBoolNullable() ?? false) && !isForceCheckUpdate;
+ bool isUpdateRoutineSkipped = isUserIgnoreUpdate && !AppUpdateVersionProp.IsForceUpdate;
+
+ return IsLauncherUpdateAvailable && !isUpdateRoutineSkipped;
+#else
+ using (UpdateManager updateManager = new UpdateManager(launcherUpdateManagerBaseUrl, null, null, updateManagerHttpAdapter))
+ {
+ UpdateInfo info = await updateManager.CheckForUpdate();
if (info == null) return false;
GameVersion remoteVersion = new GameVersion(info.FutureReleaseEntry.Version.Version);
@@ -71,13 +131,14 @@ internal static async Task IsUpdateAvailable(bool isForceCheckUpdate = fal
return IsLauncherUpdateAvailable && !isUpdateRoutineSkipped;
}
+#endif
}
private static async ValueTask GetUpdateMetadata(string updateChannel)
{
string relativePath = ConverterTool.CombineURLFromString(updateChannel, "fileindex.json");
await using BridgedNetworkStream ms = await FallbackCDNUtil.TryGetCDNFallbackStream(relativePath);
- return await ms.DeserializeAsync(InternalAppJSONContext.Default);
+ return await ms.DeserializeAsync(InternalAppJSONContext.Default.AppUpdateVersionProp);
}
}
}
diff --git a/CollapseLauncher/Classes/InstallManagement/BaseClass/InstallManagerBase.PkgVersion.cs b/CollapseLauncher/Classes/InstallManagement/BaseClass/InstallManagerBase.PkgVersion.cs
index 9392901a0..a89b54451 100644
--- a/CollapseLauncher/Classes/InstallManagement/BaseClass/InstallManagerBase.PkgVersion.cs
+++ b/CollapseLauncher/Classes/InstallManagement/BaseClass/InstallManagerBase.PkgVersion.cs
@@ -357,7 +357,7 @@ protected virtual async ValueTask InnerParsePkgVersion2FileInfo(string
{
// Read line and deserialize
string? line = await reader.ReadLineAsync(token);
- LocalFileInfo? localFileInfo = line?.Deserialize(InternalAppJSONContext.Default);
+ LocalFileInfo? localFileInfo = line?.Deserialize(InternalAppJSONContext.Default.LocalFileInfo);
// Assign the values
if (localFileInfo == null)
diff --git a/CollapseLauncher/Classes/InstallManagement/BaseClass/InstallManagerBase.cs b/CollapseLauncher/Classes/InstallManagement/BaseClass/InstallManagerBase.cs
index 5b2941b2e..09397b7b3 100644
--- a/CollapseLauncher/Classes/InstallManagement/BaseClass/InstallManagerBase.cs
+++ b/CollapseLauncher/Classes/InstallManagement/BaseClass/InstallManagerBase.cs
@@ -949,11 +949,7 @@ await _gameVersionManager.GamePreset
async ValueTask DelegateAssetDownload(SophonAsset asset, CancellationToken _)
{
// ReSharper disable once AccessToDisposedClosure
- if (httpClient != null)
- {
- // ReSharper disable once AccessToDisposedClosure
- await RunSophonAssetDownloadThread(httpClient, asset, parallelChunksOptions);
- }
+ await RunSophonAssetDownloadThread(httpClient, asset, parallelChunksOptions);
}
// Declare the rename temp file delegate
@@ -1517,9 +1513,13 @@ protected virtual async Task StartPackageInstallationInner(List entriesIndex, List entries,
CancellationToken cancellationToken)
{
- // 16 MB of buffer (hope it's not too big)
- byte[] buffer = new byte[16 << 20];
+ // 4 MB of buffer
+ byte[] buffer = GC.AllocateUninitializedArray(4 << 20);
foreach (int entryIndex in entriesIndex)
{
@@ -2309,10 +2309,6 @@ public virtual async ValueTask ApplyHdiffListPatch()
{
throw ex.Flatten().InnerExceptions.First();
}
- catch (Exception)
- {
- throw;
- }
finally
{
EventListener.LoggerEvent -= EventListener_PatchLogEvent;
@@ -2387,7 +2383,7 @@ public virtual List TryGetHDiffList()
while (!listReader.EndOfStream)
{
string currentLine = listReader.ReadLine();
- var prop = currentLine?.Deserialize(CoreLibraryJSONContext.Default);
+ var prop = currentLine?.Deserialize(CoreLibraryJSONContext.Default.PkgVersionProperties);
if (prop == null)
{
@@ -2591,12 +2587,7 @@ protected virtual bool TryGetVoiceOverResourceByLocaleCode(List localeCode)
{
- // If it's empty or null, return false
- if (localeCode == null)
- {
- return false;
- }
-
+ // If it's empty, return false
if (localeCode.IsEmpty)
{
return false;
@@ -3067,7 +3058,7 @@ private bool TryGetExistingBHI3LPath(ref string OutputPath)
{
// Try parsing the config
value = Encoding.UTF8.GetString(keyValue);
- config = value.Deserialize(InternalAppJSONContext.Default);
+ config = value.Deserialize(InternalAppJSONContext.Default.BHI3LInfo);
}
catch (Exception ex)
{
@@ -3153,9 +3144,9 @@ private async Task GetLatestPackageList(List packageList, Ga
if (gameState != GameInstallStateEnum.InstalledHavePlugin)
{
// Iterate the package resource version and add it into packageList
- foreach (RegionResourceVersion asset in usePreload
+ foreach (RegionResourceVersion asset in (usePreload
? _gameVersionManager.GetGamePreloadZip()
- : _gameVersionManager.GetGameLatestZip(gameState))
+ : _gameVersionManager.GetGameLatestZip(gameState))!)
{
if (asset == null)
{
@@ -3844,17 +3835,20 @@ await Dialog_InsufficientDriveSpace(Content, diskFreeSpace, remainedDownloadUnco
private async Task GetPackagesRemoteSize(List packageList, CancellationToken token)
{
- // Iterate and assign the remote size to each package inside the list
- for (int i = 0; i < packageList.Count; i++)
+ // Iterate and assign the remote size to each package inside the list in parallel
+ await Parallel.ForEachAsync(packageList, new ParallelOptions
{
- if (packageList[i].Segments != null)
+ CancellationToken = token
+ }, async (package, innerToken) =>
+ {
+ if (package.Segments != null)
{
- await TryGetSegmentedPackageRemoteSize(packageList[i], token);
- continue;
+ await TryGetSegmentedPackageRemoteSize(package, token);
+ return;
}
- await TryGetPackageRemoteSize(packageList[i], token);
- }
+ await TryGetPackageRemoteSize(package, token);
+ });
}
#endregion
@@ -3908,14 +3902,18 @@ protected async Task TryGetPackageRemoteSize(GameInstallPackage asset, Cancellat
protected async Task TryGetSegmentedPackageRemoteSize(GameInstallPackage asset, CancellationToken token)
{
long totalSize = 0;
- for (int i = 0; i < asset.Segments.Count; i++)
+ await Parallel.ForAsync(0, asset.Segments.Count, new ParallelOptions
+ {
+ CancellationToken = token
+ },
+ async (i, innerToken) =>
{
long segmentSize = await FallbackCDNUtil.GetContentLength(asset.Segments[i].URL, token);
- totalSize += segmentSize;
- asset.Segments[i].Size = segmentSize;
+ totalSize += segmentSize;
+ asset.Segments[i].Size = segmentSize;
LogWriteLine($"Package Segment: [T: {asset.PackageType}] {asset.Segments[i].Name} has {ConverterTool.SummarizeSizeSimple(segmentSize)} in size",
LogType.Default, true);
- }
+ });
asset.Size = totalSize;
LogWriteLine($"Package Segment (count: {asset.Segments.Count}) has {ConverterTool.SummarizeSizeSimple(asset.Size)} in total size with {ConverterTool.SummarizeSizeSimple(asset.SizeRequired)} of free space required",
diff --git a/CollapseLauncher/Classes/InstallManagement/GameConversionManagement.cs b/CollapseLauncher/Classes/InstallManagement/GameConversionManagement.cs
index 5e598b558..445b9b9bf 100644
--- a/CollapseLauncher/Classes/InstallManagement/GameConversionManagement.cs
+++ b/CollapseLauncher/Classes/InstallManagement/GameConversionManagement.cs
@@ -87,7 +87,7 @@ public async Task StartPreparation()
ConvertDetail = Lang._InstallConvert.Step2Subtitle;
await FallbackCDNUtil.DownloadCDNFallbackContent(downloadClient, buffer, URL, Token);
buffer.Position = 0;
- SourceFileRemote = await buffer.DeserializeAsync>(CoreLibraryJSONContext.Default, Token);
+ SourceFileRemote = await buffer.DeserializeAsListAsync(CoreLibraryJSONContext.Default.FilePropertiesRemote, Token);
}
using (MemoryStream buffer = new MemoryStream())
@@ -96,7 +96,7 @@ public async Task StartPreparation()
ConvertDetail = Lang._InstallConvert.Step2Subtitle;
await FallbackCDNUtil.DownloadCDNFallbackContent(downloadClient, buffer, URL, Token);
buffer.Position = 0;
- TargetFileRemote = await buffer.DeserializeAsync>(CoreLibraryJSONContext.Default, Token);
+ TargetFileRemote = await buffer.DeserializeAsListAsync(CoreLibraryJSONContext.Default.FilePropertiesRemote, Token);
}
}
finally
diff --git a/CollapseLauncher/Classes/Interfaces/Class/CommunityToolsProperty.cs b/CollapseLauncher/Classes/Interfaces/Class/CommunityToolsProperty.cs
index 80d0c6fb0..4fb8f21d3 100644
--- a/CollapseLauncher/Classes/Interfaces/Class/CommunityToolsProperty.cs
+++ b/CollapseLauncher/Classes/Interfaces/Class/CommunityToolsProperty.cs
@@ -36,7 +36,7 @@ public static async Task LoadCommunityTools(Stream fileS
{
try
{
- CommunityToolsProperty communityToolkitProperty = await fileStream.DeserializeAsync(InternalAppJSONContext.Default);
+ CommunityToolsProperty communityToolkitProperty = await fileStream.DeserializeAsync(InternalAppJSONContext.Default.CommunityToolsProperty);
ResolveCommunityToolkitFontAwesomeGlyph(communityToolkitProperty.OfficialToolsDictionary);
ResolveCommunityToolkitFontAwesomeGlyph(communityToolkitProperty.CommunityToolsDictionary);
return communityToolkitProperty;
diff --git a/CollapseLauncher/Classes/Interfaces/Class/JSONSerializerHelper.cs b/CollapseLauncher/Classes/Interfaces/Class/JSONSerializerHelper.cs
index 6214d4e68..609b0e62e 100644
--- a/CollapseLauncher/Classes/Interfaces/Class/JSONSerializerHelper.cs
+++ b/CollapseLauncher/Classes/Interfaces/Class/JSONSerializerHelper.cs
@@ -5,7 +5,6 @@
using System.Text.Encodings.Web;
using System.Text.Json;
using System.Text.Json.Nodes;
-using System.Text.Json.Serialization;
using System.Text.Json.Serialization.Metadata;
#nullable enable
@@ -46,52 +45,52 @@ internal static partial class JSONSerializerHelper
private static readonly Utf8JsonWriter jsonWriter = new Utf8JsonWriter(jsonBufferWriter, jsonWriterOptions);
private static readonly Utf8JsonWriter jsonWriterIndented = new Utf8JsonWriter(jsonBufferWriter, jsonWriterOptionsIndented);
- internal static T? Deserialize(this string data, JsonSerializerContext context, T? defaultType = null)
- where T : class => InnerDeserialize(data, context, defaultType);
+ internal static T? Deserialize(this string data, JsonTypeInfo typeInfo, T? defaultType = null)
+ where T : class => InnerDeserialize(data, typeInfo, defaultType);
- internal static T? Deserialize(this string data, JsonSerializerContext context, T? defaultType = null)
- where T : struct => InnerDeserialize(data, context, defaultType);
+ internal static T? Deserialize(this string data, JsonTypeInfo typeInfo, T? defaultType = null)
+ where T : struct => InnerDeserialize(data, typeInfo, defaultType);
internal static JsonNode? DeserializeAsJsonNode(this string data)
=> InnerDeserializeAsJsonNode(data);
- internal static T? Deserialize(this ReadOnlySpan data, JsonSerializerContext context, T? defaultType = null)
- where T : class => InnerDeserialize(data, context, defaultType);
+ internal static T? Deserialize(this ReadOnlySpan data, JsonTypeInfo typeInfo, T? defaultType = null)
+ where T : class => InnerDeserialize(data, typeInfo, defaultType);
- internal static T? Deserialize(this ReadOnlySpan data, JsonSerializerContext context, T? defaultType = null)
- where T : struct => InnerDeserialize(data, context, defaultType);
+ internal static T? Deserialize(this ReadOnlySpan data, JsonTypeInfo typeInfo, T? defaultType = null)
+ where T : struct => InnerDeserialize(data, typeInfo, defaultType);
internal static JsonNode? DeserializeAsJsonNode(this ReadOnlySpan data)
=> InnerDeserializeAsJsonNode(data);
- internal static T? Deserialize(this ReadOnlySpan data, JsonSerializerContext context, T? defaultType = null)
- where T : class => InnerDeserialize(data, context, defaultType);
+ internal static T? Deserialize(this ReadOnlySpan data, JsonTypeInfo typeInfo, T? defaultType = null)
+ where T : class => InnerDeserialize(data, typeInfo, defaultType);
- internal static T? Deserialize(this ReadOnlySpan data, JsonSerializerContext context, T? defaultType = null)
- where T : struct => InnerDeserialize(data, context, defaultType);
+ internal static T? Deserialize(this ReadOnlySpan data, JsonTypeInfo typeInfo, T? defaultType = null)
+ where T : struct => InnerDeserialize(data, typeInfo, defaultType);
internal static JsonNode? DeserializeAsJsonNode(this ReadOnlySpan data)
=> InnerDeserializeAsJsonNode(data);
- internal static T? Deserialize(this Stream data, JsonSerializerContext context, T? defaultType = null)
- where T : class => InnerDeserializeStream(data, context, defaultType);
+ internal static T? Deserialize(this Stream data, JsonTypeInfo typeInfo, T? defaultType = null)
+ where T : class => InnerDeserializeStream(data, typeInfo, defaultType);
- internal static T? Deserialize(this Stream data, JsonSerializerContext context, T? defaultType = null)
- where T : struct => InnerDeserializeStream(data, context, defaultType);
+ internal static T? Deserialize(this Stream data, JsonTypeInfo typeInfo, T? defaultType = null)
+ where T : struct => InnerDeserializeStream(data, typeInfo, defaultType);
internal static JsonNode? DeserializeAsJsonNode(this Stream data)
=> InnerDeserializeStreamAsJsonNode(data);
- private static T? InnerDeserializeStream(Stream data, JsonSerializerContext context, T? defaultType)
+ private static T? InnerDeserializeStream(Stream data, JsonTypeInfo typeInfo, T? defaultType)
{
// Check if the data length is 0, then return default value
if (data.Length == 0) return defaultType ?? default;
// Try deserialize. If it returns a null, then return the default value
- return (T?)JsonSerializer.Deserialize(data, typeof(T), context) ?? defaultType ?? default;
+ return JsonSerializer.Deserialize(data, typeInfo) ?? defaultType ?? default;
}
- private static T? InnerDeserialize(ReadOnlySpan data, JsonSerializerContext context, T? defaultType)
+ private static T? InnerDeserialize(ReadOnlySpan data, JsonTypeInfo typeInfo, T? defaultType)
{
// Check if the data length is less than 2 bytes (assuming the buffer is "{}"), then return default value
if (data.Length <= MIN_ALLOWED_CHAR_LENGTH) return defaultType ?? default;
@@ -109,7 +108,7 @@ internal static partial class JSONSerializerHelper
// Convert the char[] buffer into byte[]
int bufferWritten = Encoding.UTF8.GetBytes(dataTrimmed, tempBuffer);
// Start deserialize and return
- return InnerDeserialize(tempBuffer.AsSpan(0, bufferWritten), context, defaultType);
+ return InnerDeserialize(tempBuffer.AsSpan(0, bufferWritten), typeInfo, defaultType);
}
finally
{
@@ -118,7 +117,7 @@ internal static partial class JSONSerializerHelper
}
}
- private static T? InnerDeserialize(ReadOnlySpan data, JsonSerializerContext context, T? defaultType)
+ private static T? InnerDeserialize(ReadOnlySpan data, JsonTypeInfo typeInfo, T? defaultType)
{
// Check if the data length is less than 2 bytes (assuming the buffer is "{}"), then return default value
if (data.Length <= MIN_ALLOWED_CHAR_LENGTH) return defaultType ?? default;
@@ -128,7 +127,6 @@ internal static partial class JSONSerializerHelper
Utf8JsonReader jsonReader = new Utf8JsonReader(dataTrimmed, jsonReaderOptions);
// Try deserialize. If it returns a null, then return the default value
- JsonTypeInfo typeInfo = (JsonTypeInfo?)context.GetTypeInfo(typeof(T)) ?? throw new NullReferenceException($"The type info of {typeof(T)} is null!");
return JsonSerializer.Deserialize(ref jsonReader, typeInfo) ?? defaultType ?? default;
}
@@ -181,13 +179,13 @@ internal static partial class JSONSerializerHelper
return JsonNode.Parse(ref jsonReader, jsonNodeOptions);
}
- internal static string Serialize(this T? value, JsonSerializerContext context, bool isIncludeNullEndChar = true, bool isWriteIndented = false)
- => InnerSerialize(value, context, isIncludeNullEndChar, isWriteIndented);
+ internal static string Serialize(this T? value, JsonTypeInfo typeInfo, bool isIncludeNullEndChar = true, bool isWriteIndented = false)
+ => InnerSerialize(value, typeInfo, isIncludeNullEndChar, isWriteIndented);
- internal static string SerializeJsonNode(this JsonNode? node, JsonSerializerContext context, bool isIncludeNullEndChar = true, bool isWriteIndented = false)
- => InnerSerializeJsonNode(node, context, isIncludeNullEndChar, isWriteIndented);
+ internal static string SerializeJsonNode(this JsonNode? node, JsonTypeInfo typeInfo, bool isIncludeNullEndChar = true, bool isWriteIndented = false)
+ => InnerSerializeJsonNode(node, typeInfo, isIncludeNullEndChar, isWriteIndented);
- private static string InnerSerialize(this T? data, JsonSerializerContext context, bool isIncludeNullEndChar, bool isWriteIndented)
+ private static string InnerSerialize(this T? data, JsonTypeInfo typeInfo, bool isIncludeNullEndChar, bool isWriteIndented)
{
const string _defaultValue = "{}";
// Check if the data is null, then return default value
@@ -212,13 +210,10 @@ private static string InnerSerialize(this T? data, JsonSerializerContext cont
// Lock the writer
lock (writer)
{
- // Try get the JsonTypeInfo
- JsonTypeInfo typeInfo = (JsonTypeInfo?)context.GetTypeInfo(typeof(T)) ?? throw new NullReferenceException($"The type info of {typeof(T)} is null!");
-
// Try serialize the type into JSON string
JsonSerializer.Serialize(writer, data, typeInfo);
- // Flush the writter
+ // Flush the writer
writer.Flush();
// Write the buffer to string
@@ -232,7 +227,7 @@ private static string InnerSerialize(this T? data, JsonSerializerContext cont
}
}
- private static string InnerSerializeJsonNode(this JsonNode? node, JsonSerializerContext context, bool isIncludeNullEndChar, bool isWriteIndented)
+ private static string InnerSerializeJsonNode(this JsonNode? node, JsonTypeInfo typeInfo, bool isIncludeNullEndChar, bool isWriteIndented)
{
const string _defaultValue = "{}";
// Check if the node is null, then return default value
@@ -257,13 +252,10 @@ private static string InnerSerializeJsonNode(this JsonNode? node, JsonSerializer
// Lock the writer
lock (writer)
{
- // Try get the JsonSerializerOptions
- JsonSerializerOptions jsonOptions = context.Options;
-
// Try serialize the JSON Node into JSON string
- node.WriteTo(writer, jsonOptions);
+ node.WriteTo(writer, typeInfo.Options);
- // Flush the writter
+ // Flush the writer
writer.Flush();
// Write the buffer to string
diff --git a/CollapseLauncher/Classes/Interfaces/Class/JSONSerializerHelperAsync.cs b/CollapseLauncher/Classes/Interfaces/Class/JSONSerializerHelperAsync.cs
index f902b1f53..53b623205 100644
--- a/CollapseLauncher/Classes/Interfaces/Class/JSONSerializerHelperAsync.cs
+++ b/CollapseLauncher/Classes/Interfaces/Class/JSONSerializerHelperAsync.cs
@@ -1,8 +1,8 @@
using System;
+using System.Collections.Generic;
using System.IO;
using System.Text.Json;
using System.Text.Json.Nodes;
-using System.Text.Json.Serialization;
using System.Text.Json.Serialization.Metadata;
using System.Threading;
using System.Threading.Tasks;
@@ -12,20 +12,39 @@ namespace CollapseLauncher
{
internal static partial class JSONSerializerHelper
{
- internal static async ValueTask DeserializeAsync(this Stream data, JsonSerializerContext context, CancellationToken token = default, T? defaultType = null)
- where T : class => await InnerDeserializeStreamAsync(data, context, token, defaultType);
+ internal static async ValueTask DeserializeAsync(this Stream data, JsonTypeInfo typeInfo, CancellationToken token = default, T? defaultType = null)
+ where T : class => await InnerDeserializeStreamAsync(data, typeInfo, token, defaultType);
- internal static async ValueTask DeserializeAsync(this Stream data, JsonSerializerContext context, CancellationToken token = default, T? defaultType = null)
- where T : struct => await InnerDeserializeStreamAsync(data, context, token, defaultType);
+ internal static async ValueTask DeserializeAsync(this Stream data, JsonTypeInfo