diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index baec3399f..500e0c0be 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -44,7 +44,7 @@ body:
attributes:
label: Describe alternatives you've considered
description: A clear and concise description of any alternative solutions or features you've considered.
- placeholder: What are the alternatives you've considered? Sometimes, the Collapse team can't always implement everything the way you envisonned it, so what are some compromises, changes you're willing to make to the current proposal?
+ placeholder: What are the alternatives you've considered? Sometimes, the Collapse team can't always implement everything the way you envisioned it, so what are some compromises, changes you're willing to make to the current proposal?
validations:
required: true
@@ -56,4 +56,4 @@ body:
placeholder: If there are any images, concept art, code snippets you're willing to share, please put them here.
validations:
required: false
----
\ No newline at end of file
+---
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3a7ca0d08..d347d6c92 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: 'ga'
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: 'ga'
+ 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 5f823895b..b2fcd1f69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-*/bin/*
-*/obj/*
+**/bin/*
+**/obj/*
*build/*
.vs/*
*.user
@@ -7,6 +7,7 @@ packages/*
CollapseLauncher/Deps/*
CollapseLauncher/Invoker/*
+**/Generated Files/**
*.psd
InstallerProp/Output/*
InstallerProp/temp/**
diff --git a/.gitmodules b/.gitmodules
index 4a90b493f..bd0331340 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "Hi3Helper.Core/Classes/Data/Tools/SevenZipTool/SevenZipExtractor"]
- path = Hi3Helper.Core/Classes/Data/Tools/SevenZipTool/SevenZipExtractor
- url = https://github.com/neon-nyan/SevenZipExtractor
[submodule "Hi3Helper.Http"]
path = Hi3Helper.Http
url = https://github.com/neon-nyan/Hi3Helper.Http
@@ -19,3 +16,12 @@
[submodule "Hi3Helper.Sophon"]
path = Hi3Helper.Sophon
url = https://github.com/CollapseLauncher/Hi3Helper.Sophon
+[submodule "ImageEx"]
+ path = ImageEx
+ url = https://github.com/CollapseLauncher/ImageEx
+[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/.idea/.idea.CollapseLauncher/.idea/inspectionProfiles/Project_Default.xml b/.idea/.idea.CollapseLauncher/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 000000000..5cb71ef0b
--- /dev/null
+++ b/.idea/.idea.CollapseLauncher/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/.idea.CollapseLauncher/.idea/projectSettingsUpdater.xml b/.idea/.idea.CollapseLauncher/.idea/projectSettingsUpdater.xml
index 4bb9f4d2a..64af657f5 100644
--- a/.idea/.idea.CollapseLauncher/.idea/projectSettingsUpdater.xml
+++ b/.idea/.idea.CollapseLauncher/.idea/projectSettingsUpdater.xml
@@ -1,6 +1,7 @@
-
+
+
\ No newline at end of file
diff --git a/.idea/.idea.CollapseLauncher/.idea/vcs.xml b/.idea/.idea.CollapseLauncher/.idea/vcs.xml
index 7c2ea1047..b5af8fbf9 100644
--- a/.idea/.idea.CollapseLauncher/.idea/vcs.xml
+++ b/.idea/.idea.CollapseLauncher/.idea/vcs.xml
@@ -2,11 +2,16 @@
+
+
+
+
+
\ No newline at end of file
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 e25193810..c6045a5c1 100644
--- a/CollapseLauncher.sln
+++ b/CollapseLauncher.sln
@@ -14,7 +14,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ColorThief", "ColorThief\Co
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hi3Helper.EncTool.Test", "Hi3Helper.EncTool.Test\Hi3Helper.EncTool.Test.csproj", "{1BAB5CE4-640E-41A7-B529-4842D378BD4C}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SevenZipExtractor", "Hi3Helper.Core\Classes\Data\Tools\SevenZipTool\SevenZipExtractor\SevenZipExtractor\SevenZipExtractor.csproj", "{D145686A-C0AA-4164-9854-A8942CB1DFDE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SevenZipExtractor", "SevenZipExtractor\SevenZipExtractor\SevenZipExtractor.csproj", "{D145686A-C0AA-4164-9854-A8942CB1DFDE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InnoSetupHelper", "InnoSetupHelper\InnoSetupHelper.csproj", "{21691306-8D30-4993-98A2-A5AE0712D81A}"
EndProject
@@ -22,6 +22,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscordRPC", "Hi3Helper.Sha
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hi3Helper.Sophon", "Hi3Helper.Sophon\Hi3Helper.Sophon.csproj", "{3F87DCD0-39B7-4F8C-8F34-A0FC7C6E65A0}"
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
@@ -88,6 +102,46 @@ Global
{3F87DCD0-39B7-4F8C-8F34-A0FC7C6E65A0}.Publish|x64.Build.0 = Release|x64
{3F87DCD0-39B7-4F8C-8F34-A0FC7C6E65A0}.Release|x64.ActiveCfg = Release|x64
{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 = 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.sln.DotSettings b/CollapseLauncher.sln.DotSettings
index 54eafe745..44e429afd 100644
--- a/CollapseLauncher.sln.DotSettings
+++ b/CollapseLauncher.sln.DotSettings
@@ -42,6 +42,7 @@
CDNURL
FX
FXAA
+ GLC
HD
HDR
ID
@@ -68,6 +69,12 @@
True
True
True
+ True
+ True
+ True
+ True
+ True
True
+ True
True
\ No newline at end of file
diff --git a/CollapseLauncher.slnx b/CollapseLauncher.slnx
new file mode 100644
index 000000000..fd78fee4e
--- /dev/null
+++ b/CollapseLauncher.slnx
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CollapseLauncher/App.xaml b/CollapseLauncher/App.xaml
index bcfa59e18..29062f0d2 100644
--- a/CollapseLauncher/App.xaml
+++ b/CollapseLauncher/App.xaml
@@ -1,7 +1,8 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -27,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" />
+
+
@@ -377,382 +405,380 @@
#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" />
+
+
-
- ms-appx:///Assets/Fonts/FontAwesomeBrand6.otf#Font Awesome 6 Brands
- ms-appx:///Assets/Fonts/FontAwesomeRegular6.otf#Font Awesome 6 Free
- ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid
0,47,0,0
+
-
+
-
+
+ TargetType="ComboBox" />
2
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ ms-appx:///Assets/Fonts/FontAwesomeBrand6.otf#Font Awesome 6 Brands
+ ms-appx:///Assets/Fonts/FontAwesomeRegular6.otf#Font Awesome 6 Free
+ ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free
diff --git a/CollapseLauncher/App.xaml.cs b/CollapseLauncher/App.xaml.cs
index c7f8f2561..28a54554d 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;
@@ -20,7 +19,7 @@ namespace CollapseLauncher
public partial class App
{
public static bool IsAppKilled = false;
-
+
public App()
{
if (DebugSettings != null)
@@ -34,9 +33,28 @@ public App()
DebugSettings.IsXamlResourceReferenceTracingEnabled = true;
DebugSettings.IsBindingTracingEnabled = true;
#endif
- DebugSettings.XamlResourceReferenceFailed += (sender, args) => { LogWriteLine($"[XAML_RES_REFERENCE] Sender: {sender}\r\n{args!.Message}", LogType.Error, true); };
- DebugSettings.BindingFailed += (sender, args) => { LogWriteLine($"[XAML_BINDING] Sender: {sender}\r\n{args!.Message}", LogType.Error, true); };
- UnhandledException += (sender, e) => { LogWriteLine($"[XAML_OTHER] Sender: {sender}\r\n{e!.Exception} {e.Exception!.InnerException}", LogType.Error, true); };
+ DebugSettings.XamlResourceReferenceFailed += static (sender, args) =>
+ {
+ LogWriteLine($"[XAML_RES_REFERENCE] Sender: {sender}\r\n{args!.Message}", LogType.Error, true);
+ #if !DEBUG
+ MainEntryPoint.SpawnFatalErrorConsole(new Exception(args!.Message));
+ #endif
+
+ };
+ DebugSettings.BindingFailed += static (sender, args) =>
+ {
+ LogWriteLine($"[XAML_BINDING] Sender: {sender}\r\n{args!.Message}", LogType.Error, true);
+ #if !DEBUG
+ MainEntryPoint.SpawnFatalErrorConsole(new Exception(args!.Message));
+ #endif
+ };
+ UnhandledException += static (sender, e) =>
+ {
+ LogWriteLine($"[XAML_OTHER] Sender: {sender}\r\n{e!.Exception} {e.Exception!.InnerException}", LogType.Error, true);
+ #if !DEBUG
+ MainEntryPoint.SpawnFatalErrorConsole(e!.Exception);
+ #endif
+ };
}
RequestedTheme = IsAppThemeLight ? ApplicationTheme.Light : ApplicationTheme.Dark;
@@ -49,18 +67,19 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
{
try
{
- ThemeChangerInvoker.ThemeEvent += (_, _) => {
- WindowUtility.ApplyWindowTitlebarLegacyColor();
- bool isThemeLight = IsAppThemeLight;
- Color color = isThemeLight ? Colors.Black : Colors.White;
- Current!.Resources!["WindowCaptionForeground"] = color;
+ ThemeChangerInvoker.ThemeEvent += (_, _) =>
+ {
+ WindowUtility.ApplyWindowTitlebarLegacyColor();
+ bool isThemeLight = IsAppThemeLight;
+ Color color = isThemeLight ? Colors.Black : Colors.White;
+ Current!.Resources!["WindowCaptionForeground"] = color;
- WindowUtility.CurrentAppWindow!.TitleBar!.ButtonForegroundColor = color;
- WindowUtility.CurrentAppWindow!.TitleBar!.ButtonInactiveBackgroundColor = color;
+ WindowUtility.CurrentAppWindow!.TitleBar!.ButtonForegroundColor = color;
+ WindowUtility.CurrentAppWindow!.TitleBar!.ButtonInactiveBackgroundColor = color;
- if (WindowUtility.CurrentWindow!.Content is not null and FrameworkElement frameworkElement)
- frameworkElement.RequestedTheme = isThemeLight ? ElementTheme.Light : ElementTheme.Dark;
- };
+ if (WindowUtility.CurrentWindow!.Content is not null and FrameworkElement frameworkElement)
+ frameworkElement.RequestedTheme = isThemeLight ? ElementTheme.Light : ElementTheme.Dark;
+ };
Window toInitializeWindow = null;
switch (m_appMode)
@@ -114,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;
}
}
@@ -127,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/Assets/Fonts/FontAwesomeBrand6.otf b/CollapseLauncher/Assets/Fonts/FontAwesomeBrand6.otf
index 80ff0b665..3984ea31f 100644
Binary files a/CollapseLauncher/Assets/Fonts/FontAwesomeBrand6.otf and b/CollapseLauncher/Assets/Fonts/FontAwesomeBrand6.otf differ
diff --git a/CollapseLauncher/Assets/Fonts/FontAwesomeRegular6.otf b/CollapseLauncher/Assets/Fonts/FontAwesomeRegular6.otf
index 2edf2b2f3..b32b57de6 100644
Binary files a/CollapseLauncher/Assets/Fonts/FontAwesomeRegular6.otf and b/CollapseLauncher/Assets/Fonts/FontAwesomeRegular6.otf differ
diff --git a/CollapseLauncher/Assets/Fonts/FontAwesomeSolid6.otf b/CollapseLauncher/Assets/Fonts/FontAwesomeSolid6.otf
index 6bd19b13b..24ca1b913 100644
Binary files a/CollapseLauncher/Assets/Fonts/FontAwesomeSolid6.otf and b/CollapseLauncher/Assets/Fonts/FontAwesomeSolid6.otf differ
diff --git a/CollapseLauncher/Assets/Images/GenshinHDRCalibrationScene.jxr b/CollapseLauncher/Assets/Images/GenshinHDRCalibration/Scene.jxr
similarity index 100%
rename from CollapseLauncher/Assets/Images/GenshinHDRCalibrationScene.jxr
rename to CollapseLauncher/Assets/Images/GenshinHDRCalibration/Scene.jxr
diff --git a/CollapseLauncher/Assets/Images/GenshinHDRCalibrationSign.png b/CollapseLauncher/Assets/Images/GenshinHDRCalibration/Sign.png
similarity index 100%
rename from CollapseLauncher/Assets/Images/GenshinHDRCalibrationSign.png
rename to CollapseLauncher/Assets/Images/GenshinHDRCalibration/Sign.png
diff --git a/CollapseLauncher/Assets/Images/GenshinHDRCalibration/UI.jxr b/CollapseLauncher/Assets/Images/GenshinHDRCalibration/UI.jxr
new file mode 100644
index 000000000..bb5e4fbc8
Binary files /dev/null and b/CollapseLauncher/Assets/Images/GenshinHDRCalibration/UI.jxr differ
diff --git a/CollapseLauncher/Assets/Images/GenshinHDRCalibrationUI.jxr b/CollapseLauncher/Assets/Images/GenshinHDRCalibrationUI.jxr
deleted file mode 100644
index c048cae43..000000000
Binary files a/CollapseLauncher/Assets/Images/GenshinHDRCalibrationUI.jxr and /dev/null differ
diff --git a/CollapseLauncher/Assets/Images/ImageCropperOverlay/normal.png b/CollapseLauncher/Assets/Images/ImageCropperOverlay/normal.png
index 4b5a6b015..def007b66 100644
Binary files a/CollapseLauncher/Assets/Images/ImageCropperOverlay/normal.png and b/CollapseLauncher/Assets/Images/ImageCropperOverlay/normal.png differ
diff --git a/CollapseLauncher/Assets/Images/ImageCropperOverlay/small.png b/CollapseLauncher/Assets/Images/ImageCropperOverlay/small.png
index 23fbe96be..123af6170 100644
Binary files a/CollapseLauncher/Assets/Images/ImageCropperOverlay/small.png and b/CollapseLauncher/Assets/Images/ImageCropperOverlay/small.png differ
diff --git a/CollapseLauncher/Assets/Presets/CommunityTools.json b/CollapseLauncher/Assets/Presets/CommunityTools.json
deleted file mode 100644
index 9359c086a..000000000
--- a/CollapseLauncher/Assets/Presets/CommunityTools.json
+++ /dev/null
@@ -1,361 +0,0 @@
-{
- "OfficialToolsDictionary": {
- "Honkai": [
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "Daily Check-in",
- "URL": "https://act.hoyolab.com/bbs/event/signin-bh3/index.html?act_id=e202110291205111",
- "Profiles": ["Hi3SEA", "Hi3Global", "Hi3TW", "Hi3KR", "Hi3JP"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "HoYoLab Website",
- "URL": "https://www.hoyolab.com",
- "Profiles": ["Hi3SEA", "Hi3Global", "Hi3TW", "Hi3KR", "Hi3JP"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "Honkai Impact 3rd Wiki",
- "URL": "https://honkaiimpact3.fandom.com",
- "Profiles": ["Hi3SEA", "Hi3Global", "Hi3TW", "Hi3KR", "Hi3JP"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "Battle Chronicle",
- "URL": "https://act.hoyolab.com/app/community-game-records-sea/index.html?gid=1",
- "Profiles": ["Hi3SEA", "Hi3Global", "Hi3TW", "Hi3KR", "Hi3JP"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "米游社",
- "URL": "https://www.miyoushe.com/bh3/",
- "Profiles": ["Hi3CN"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "官方 Wiki",
- "URL": "https://bbs.mihoyo.com/bh3/wiki/",
- "Profiles": ["Hi3CN"]
- }
- ],
- "Genshin": [
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "Daily Check-in",
- "URL": "https://act.hoyolab.com/ys/event/signin-sea-v3/index.html?act_id=e202102251931481&hyl_auth_required=true&hyl_presentation_style=fullscreen&utm_source=hoyolab&utm_medium=tools&lang=en-us&bbs_theme=light&bbs_theme_device=1",
- "Profiles": ["GIGlb"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "HoYoLab Website",
- "URL": "https://www.hoyolab.com",
- "Profiles": ["GIGlb"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "Genshin Impact Wiki",
- "URL": "https://wiki.hoyolab.com/pc/genshin/home",
- "Profiles": ["GIGlb"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "Redeem Codes",
- "URL": "https://genshin.hoyoverse.com/gift",
- "Profiles": ["GIGlb"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "Battle Chronicle",
- "URL": "https://act.hoyolab.com/app/community-game-records-sea/index.html?gid=2",
- "Profiles": ["GIGlb"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "米游社",
- "URL": "https://www.miyoushe.com/ys/",
- "Profiles": ["GICN", "GICNBilibili"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "观测枢·攻略",
- "URL": "https://bbs.mihoyo.com/ys/strategy/",
- "Profiles": ["GICN", "GICNBilibili"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "观测枢·Wiki",
- "URL": "https://bbs.mihoyo.com/ys/obc/",
- "Profiles": ["GICN", "GICNBilibili"]
- }
- ],
- "StarRail": [
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "Daily Check-in",
- "URL": "https://act.hoyolab.com/bbs/event/signin/hkrpg/index.html?act_id=e202303301540311",
- "Profiles": ["SRGlb"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "HoYoLab Website",
- "URL": "https://www.hoyolab.com",
- "Profiles": ["SRGlb"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "Honkai: Star Rail Wiki",
- "URL": "https://wiki.hoyolab.com/pc/hsr/home",
- "Profiles": ["SRGlb"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "Redeem Codes",
- "URL": "https://hsr.hoyoverse.com/gift",
- "Profiles": ["SRGlb"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "Battle Chronicle",
- "URL": "https://act.hoyolab.com/app/community-game-records-sea/index.html?gid=6",
- "Profiles": ["SRGlb"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "米游社",
- "URL": "https://www.miyoushe.com/sr/",
- "Profiles": ["GICN", "GICNBilibili"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "官方 Wiki",
- "URL": "https://bbs.mihoyo.com/sr/wiki/",
- "Profiles": ["SRCN", "HSRCNBilibili"]
- }
- ]
- },
- "CommunityToolsDictionary": {
- "Honkai": [
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "Reddit Community",
- "URL": "https://www.reddit.com/r/HonkaiImpact3rd",
- "Profiles": ["Hi3SEA", "Hi3Global", "Hi3TW", "Hi3KR", "Hi3JP"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "ER Build Guide",
- "URL": "https://risbi0.github.io/Elysian-Realm",
- "Profiles": ["Hi3SEA", "Hi3Global", "Hi3TW", "Hi3KR", "Hi3JP"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeBrand6.otf#Font Awesome 6 Brands",
- "IconGlyph": "",
- "Text": "BWIKI",
- "URL": "https://wiki.biligame.com/bh3/",
- "Profiles": ["Hi3CN"]
- }
- ],
- "Genshin": [
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "paimon.moe",
- "URL": "https://paimon.moe",
- "Profiles": ["GIGlb"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "Enka Network",
- "URL": "https://enka.network",
- "Profiles": ["GIGlb"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "seelie.me",
- "URL": "https://seelie.me",
- "Profiles": ["GIGlb"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "Genshin Optimizer",
- "URL": "https://frzyc.github.io/genshin-optimizer",
- "Profiles": ["GIGlb"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "Inventory Kamera",
- "URL": "https://github.com/Andrewthe13th/Inventory_Kamera$OpenExternalApp:ApplicationName=Inventory Kamera,ApplicationExecName=InventoryKamera.exe,RunAsAdmin=true$OpenUrlIfCancel",
- "Profiles": ["GIGlb"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "Kongying Map",
- "URL": "https://yuanshen.site/docs/en/$OpenExternalApp:ApplicationName=Kongying Map,ApplicationExecName=Map.exe,RunAsAdmin=true$OpenUrlIfCancel",
- "Profiles": ["GIGlb"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "akasha.cv",
- "URL": "https://akasha.cv",
- "Profiles": ["GIGlb"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "Genshin Configurator",
- "URL": "https://github.com/Myp3a/GenshinConfigurator/$OpenExternalApp:ApplicationName=Genshin Impact Configurator,ApplicationExecName=GenshinConfigurator*.exe,RunAsAdmin=true$OpenUrlIfCancel",
- "Profiles": ["GIGlb"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "Guides by KQM",
- "URL": "https://keqingmains.com",
- "Profiles": ["GIGlb"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "非小酋",
- "URL": "https://feixiaoqiu.com/",
- "Profiles": ["GICN", "GICNBilibili"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "椰羊",
- "URL": "https://cocogoat.work/",
- "Profiles": ["GICN", "GICNBilibili"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "莫娜占卜铺",
- "URL": "https://mona-uranai.com/",
- "Profiles": ["GICN", "GICNBilibili"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "胡桃工具箱",
- "URL": "https://hut.ao/zh/",
- "Profiles": ["GICN", "GICNBilibili"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeBrand6.otf#Font Awesome 6 Brands",
- "IconGlyph": "",
- "Text": "BWIKI",
- "URL": "https://wiki.biligame.com/ys/",
- "Profiles": ["GICN", "GICNBilibili"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "爱丽丝工坊",
- "URL": "https://genshin.kchlu.com/",
- "Profiles": ["GICN", "GICNBilibili"]
- }
- ],
- "StarRail": [
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "pom.moe",
- "URL": "https://pom.moe/",
- "Profiles": ["SRGlb"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "Project Yatta (HSR)",
- "URL": "https://hsr.yatta.top/",
- "Profiles": ["SRGlb"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "Star Rail Station",
- "URL": "https://starrailstation.com/",
- "Profiles": ["SRGlb"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "prydwen.gg",
- "URL": "https://www.prydwen.gg/star-rail/",
- "Profiles": ["SRGlb"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "Guides by KQM",
- "URL": "https://hsr.keqingmains.com",
- "Profiles": ["SRGlb"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "\uE0BB",
- "Text": "Pokke's Library",
- "URL": "https://pokkelibrary.com/",
- "Profiles": ["SRGlb"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "非小酋",
- "URL": "https://feixiaoqiu.com/",
- "Profiles": ["SRCN", "HSRCNBilibili"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeBrand6.otf#Font Awesome 6 Brands",
- "IconGlyph": "",
- "Text": "BWIKI",
- "URL": "https://wiki.biligame.com/sr/",
- "Profiles": ["SRCN", "HSRCNBilibili"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "爱丽丝工坊",
- "URL": "https://starrail.kchlu.com/",
- "Profiles": ["SRCN", "HSRCNBilibili"]
- },
- {
- "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
- "IconGlyph": "",
- "Text": "Enka Network",
- "URL": "https://enka.network/?hsr",
- "Profiles": ["SRGlb"]
- }
- ]
- }
-}
diff --git a/CollapseLauncher/Classes/AnimatedVisuals/Lottie/DownloadIcon.cs b/CollapseLauncher/Classes/AnimatedVisuals/Lottie/DownloadIcon.cs
index d9ac202ef..59d0c86ba 100644
--- a/CollapseLauncher/Classes/AnimatedVisuals/Lottie/DownloadIcon.cs
+++ b/CollapseLauncher/Classes/AnimatedVisuals/Lottie/DownloadIcon.cs
@@ -59,7 +59,7 @@ namespace CollapseLauncher.AnimatedVisuals.Lottie
// Frame rate: 60 fps
// Frame count: 300
// Duration: 5000.0 mS
- sealed class DownloadIcon
+ sealed partial class DownloadIcon
: Microsoft.UI.Xaml.Controls.IAnimatedVisualSource
, Microsoft.UI.Xaml.Controls.IAnimatedVisualSource2
{
@@ -132,7 +132,7 @@ public void SetScalarProperty(string propertyName, double value)
{
}
- sealed class DownloadIcon_AnimatedVisual
+ sealed partial class DownloadIcon_AnimatedVisual
: Microsoft.UI.Xaml.Controls.IAnimatedVisual
, Microsoft.UI.Xaml.Controls.IAnimatedVisual2
{
diff --git a/CollapseLauncher/Classes/AnimatedVisuals/Lottie/LoadingSprite.cs b/CollapseLauncher/Classes/AnimatedVisuals/Lottie/LoadingSprite.cs
index 2251c0002..3d1e74178 100644
--- a/CollapseLauncher/Classes/AnimatedVisuals/Lottie/LoadingSprite.cs
+++ b/CollapseLauncher/Classes/AnimatedVisuals/Lottie/LoadingSprite.cs
@@ -55,7 +55,7 @@ namespace CollapseLauncher.AnimatedVisuals.Lottie
// Frame rate: 60 fps
// Frame count: 180
// Duration: 3000.0 mS
- sealed class LoadingSprite
+ sealed partial class LoadingSprite
: Microsoft.UI.Xaml.Controls.IAnimatedVisualSource
, Microsoft.UI.Xaml.Controls.IAnimatedVisualSource2
{
@@ -128,7 +128,7 @@ public void SetScalarProperty(string propertyName, double value)
{
}
- sealed class LoadingSprite_AnimatedVisual
+ sealed partial class LoadingSprite_AnimatedVisual
: Microsoft.UI.Xaml.Controls.IAnimatedVisual
, Microsoft.UI.Xaml.Controls.IAnimatedVisual2
{
diff --git a/CollapseLauncher/Classes/AnimatedVisuals/Lottie/NewLogoTitleIntro.cs b/CollapseLauncher/Classes/AnimatedVisuals/Lottie/NewLogoTitleIntro.cs
index 1b330cab3..8375f311b 100644
--- a/CollapseLauncher/Classes/AnimatedVisuals/Lottie/NewLogoTitleIntro.cs
+++ b/CollapseLauncher/Classes/AnimatedVisuals/Lottie/NewLogoTitleIntro.cs
@@ -64,7 +64,7 @@ namespace CollapseLauncher.AnimatedVisuals.Lottie
// Frame rate: 60 fps
// Frame count: 600
// Duration: 10000.0 mS
- sealed class NewLogoTitleIntro
+ sealed partial class NewLogoTitleIntro
: Microsoft.UI.Xaml.Controls.IAnimatedVisualSource
, Microsoft.UI.Xaml.Controls.IAnimatedVisualSource2
, Microsoft.UI.Xaml.Controls.IDynamicAnimatedVisualSource
@@ -232,7 +232,7 @@ public void SetScalarProperty(string propertyName, double value)
{
}
- sealed class NewLogoTitleIntro_AnimatedVisual
+ sealed partial class NewLogoTitleIntro_AnimatedVisual
: Microsoft.UI.Xaml.Controls.IAnimatedVisual
, Microsoft.UI.Xaml.Controls.IAnimatedVisual2
{
diff --git a/CollapseLauncher/Classes/AnimatedVisuals/Lottie/StartGameIcon.cs b/CollapseLauncher/Classes/AnimatedVisuals/Lottie/StartGameIcon.cs
index f59dd3bbe..8478138ac 100644
--- a/CollapseLauncher/Classes/AnimatedVisuals/Lottie/StartGameIcon.cs
+++ b/CollapseLauncher/Classes/AnimatedVisuals/Lottie/StartGameIcon.cs
@@ -55,7 +55,7 @@ namespace CollapseLauncher.AnimatedVisuals.Lottie
// Frame rate: 60 fps
// Frame count: 40
// Duration: 666.7 mS
- sealed class StartGameIcon
+ sealed partial class StartGameIcon
: Microsoft.UI.Xaml.Controls.IAnimatedVisualSource
, Microsoft.UI.Xaml.Controls.IAnimatedVisualSource2
{
@@ -128,7 +128,7 @@ public void SetScalarProperty(string propertyName, double value)
{
}
- sealed class StartGameIcon_AnimatedVisual
+ sealed partial class StartGameIcon_AnimatedVisual
: Microsoft.UI.Xaml.Controls.IAnimatedVisual
, Microsoft.UI.Xaml.Controls.IAnimatedVisual2
{
diff --git a/CollapseLauncher/Classes/AnimatedVisuals/Lottie/UpdateIcon.cs b/CollapseLauncher/Classes/AnimatedVisuals/Lottie/UpdateIcon.cs
index 95fab675b..f41006052 100644
--- a/CollapseLauncher/Classes/AnimatedVisuals/Lottie/UpdateIcon.cs
+++ b/CollapseLauncher/Classes/AnimatedVisuals/Lottie/UpdateIcon.cs
@@ -56,7 +56,7 @@ namespace CollapseLauncher.AnimatedVisuals.Lottie
// Frame rate: 60 fps
// Frame count: 240
// Duration: 4000.0 mS
- sealed class UpdateIcon
+ sealed partial class UpdateIcon
: Microsoft.UI.Xaml.Controls.IAnimatedVisualSource
, Microsoft.UI.Xaml.Controls.IAnimatedVisualSource2
{
@@ -129,7 +129,7 @@ public void SetScalarProperty(string propertyName, double value)
{
}
- sealed class UpdateIcon_AnimatedVisual
+ sealed partial class UpdateIcon_AnimatedVisual
: Microsoft.UI.Xaml.Controls.IAnimatedVisual
, Microsoft.UI.Xaml.Controls.IAnimatedVisual2
{
diff --git a/CollapseLauncher/Classes/CachesManagement/Honkai/Check.cs b/CollapseLauncher/Classes/CachesManagement/Honkai/Check.cs
index f84772a4b..0339742aa 100644
--- a/CollapseLauncher/Classes/CachesManagement/Honkai/Check.cs
+++ b/CollapseLauncher/Classes/CachesManagement/Honkai/Check.cs
@@ -52,10 +52,6 @@ private async Task> Check(List assetIndex, Cancella
{
throw ex.Flatten().InnerExceptions.First();
}
- catch (Exception)
- {
- throw;
- }
// Return the asset index
return returnAsset;
@@ -135,16 +131,14 @@ private async ValueTask CheckAsset(CacheAsset asset, List returnAsse
}
// If above passes, then run the CRC check
- using (FileStream fs = new FileStream(asset.ConcatPath, FileMode.Open, FileAccess.Read, FileShare.None, _bufferBigLength))
- {
- // Calculate the asset CRC (SHA1)
- byte[] hashArray = await CheckHashAsync(fs, new HMACSHA1(_gameSalt!), token);
+ await using FileStream fs = await NaivelyOpenFileStreamAsync(fileInfo, FileMode.Open, FileAccess.Read, FileShare.Read);
+ // Calculate the asset CRC (SHA1)
+ byte[] hashArray = await CheckHashAsync(fs, new HMACSHA1(_gameSalt!), token);
- // If the asset CRC doesn't match, then add the file to asset index.
- if (!IsArrayMatch(asset.CRCArray, hashArray))
- {
- AddGenericCheckAsset(asset, CacheAssetStatus.Obsolete, returnAsset, hashArray, asset.CRCArray);
- }
+ // If the asset CRC doesn't match, then add the file to asset index.
+ if (!IsArrayMatch(asset.CRCArray, hashArray))
+ {
+ AddGenericCheckAsset(asset, CacheAssetStatus.Obsolete, returnAsset, hashArray, asset.CRCArray);
}
}
diff --git a/CollapseLauncher/Classes/CachesManagement/Honkai/Fetch.cs b/CollapseLauncher/Classes/CachesManagement/Honkai/Fetch.cs
index cdc6830a5..2fae2d352 100644
--- a/CollapseLauncher/Classes/CachesManagement/Honkai/Fetch.cs
+++ b/CollapseLauncher/Classes/CachesManagement/Honkai/Fetch.cs
@@ -25,66 +25,56 @@ internal partial class HonkaiCache
private async Task> Fetch(CancellationToken token)
{
// Initialize asset index for the return
- List returnAsset = new();
+ List returnAsset = [];
// Initialize new proxy-aware HttpClient
using HttpClient httpClientNew = new HttpClientBuilder()
- .UseLauncherConfig()
+ .UseLauncherConfig(_downloadThreadCount + _downloadThreadCountReserved)
.SetUserAgent(_userAgent)
.SetAllowedDecompression(DecompressionMethods.None)
.Create();
- // Use HttpClient instance on fetching
- using Http httpClient = new Http(true, 5, 1000, _userAgent, httpClientNew);
- try
- {
- // Subscribe the event listener
- httpClient.DownloadProgress += _httpClient_FetchAssetProgress;
+ // Use a new DownloadClient for fetching
+ DownloadClient downloadClient = DownloadClient.CreateInstance(httpClientNew);
- // Build _gameRepoURL from loading Dispatcher and Gateway
- await BuildGameRepoURL(token);
+ // Build _gameRepoURL from loading Dispatcher and Gateway
+ await BuildGameRepoURL(downloadClient, token);
- // Iterate type and do fetch
- foreach (CacheAssetType type in Enum.GetValues())
+ // Iterate type and do fetch
+ foreach (CacheAssetType type in Enum.GetValues())
+ {
+ // Skip for unused type
+ switch (type)
{
- // Skip for unused type
- switch (type)
- {
- case CacheAssetType.Unused:
- case CacheAssetType.Dispatcher:
- case CacheAssetType.Gateway:
- case CacheAssetType.General:
- case CacheAssetType.IFix:
- case CacheAssetType.DesignData:
- case CacheAssetType.Lua:
- continue;
- }
+ case CacheAssetType.Unused:
+ case CacheAssetType.Dispatcher:
+ case CacheAssetType.Gateway:
+ case CacheAssetType.General:
+ case CacheAssetType.IFix:
+ case CacheAssetType.DesignData:
+ case CacheAssetType.Lua:
+ continue;
+ }
- // uint = Count of the assets available
- // long = Total size of the assets available
- (int, long) count = await FetchByType(type, httpClient, returnAsset, token);
+ // uint = Count of the assets available
+ // long = Total size of the assets available
+ (int, long) count = await FetchByType(type, downloadClient, returnAsset, token);
- // Write a log about the metadata
- LogWriteLine($"Cache Metadata [T: {type}]:", LogType.Default, true);
- LogWriteLine($" Cache Count = {count.Item1}", LogType.NoTag, true);
- LogWriteLine($" Cache Size = {SummarizeSizeSimple(count.Item2)}", LogType.NoTag, true);
+ // Write a log about the metadata
+ LogWriteLine($"Cache Metadata [T: {type}]:", LogType.Default, true);
+ LogWriteLine($" Cache Count = {count.Item1}", LogType.NoTag, true);
+ LogWriteLine($" Cache Size = {SummarizeSizeSimple(count.Item2)}", LogType.NoTag, true);
- // Increment the Total Size and Count
- _progressAllCountTotal += count.Item1;
- _progressAllSizeTotal += count.Item2;
- }
- }
- finally
- {
- // Unsubscribe the event listener and dispose Http client
- httpClient.DownloadProgress -= _httpClient_FetchAssetProgress;
+ // Increment the Total Size and Count
+ _progressAllCountTotal += count.Item1;
+ _progressAllSizeTotal += count.Item2;
}
// Return asset index
return returnAsset;
}
- private async Task BuildGameRepoURL(CancellationToken token)
+ private async Task BuildGameRepoURL(DownloadClient downloadClient, CancellationToken token)
{
KianaDispatch dispatch = null;
Exception lastException = null;
@@ -93,7 +83,7 @@ private async Task BuildGameRepoURL(CancellationToken token)
{
try
{
- // Init the key and decrypt it if exist.
+ // Init the key and decrypt it if existed.
if (string.IsNullOrEmpty(_gameVersionManager.GamePreset.DispatcherKey))
{
throw new NullReferenceException("Dispatcher key is null or empty!");
@@ -102,7 +92,7 @@ private async Task BuildGameRepoURL(CancellationToken token)
string key = _gameVersionManager.GamePreset.DispatcherKey;
// Try assign dispatcher
- dispatch = await KianaDispatch.GetDispatch(baseURL,
+ dispatch = await KianaDispatch.GetDispatch(downloadClient, baseURL,
_gameVersionManager.GamePreset.GameDispatchURLTemplate,
_gameVersionManager.GamePreset.GameDispatchChannelName,
key, _gameVersion.VersionArray, token);
@@ -120,13 +110,13 @@ private async Task BuildGameRepoURL(CancellationToken token)
// Get gatewayURl and fetch the gateway
_gameGateway =
- await KianaDispatch.GetGameserver(dispatch!, _gameVersionManager.GamePreset.GameGatewayDefault!, token);
+ await KianaDispatch.GetGameserver(downloadClient, dispatch!, _gameVersionManager.GamePreset.GameGatewayDefault!, token);
_gameRepoURL = BuildAssetBundleURL(_gameGateway);
}
- private string BuildAssetBundleURL(KianaDispatch gateway) => CombineURLFromString(gateway!.AssetBundleUrls![0], "/{0}/editor_compressed/");
+ private static string BuildAssetBundleURL(KianaDispatch gateway) => CombineURLFromString(gateway!.AssetBundleUrls![0], "/{0}/editor_compressed/");
- private async Task<(int, long)> FetchByType(CacheAssetType type, Http httpClient, List assetIndex, CancellationToken token)
+ private async Task<(int, long)> FetchByType(CacheAssetType type, DownloadClient downloadClient, List assetIndex, CancellationToken token)
{
// Set total activity string as "Fetching Caches Type: "
_status!.ActivityStatus = string.Format(Lang!._CachesPage!.CachesStatusFetchingType!, type);
@@ -145,9 +135,9 @@ private async Task BuildGameRepoURL(CancellationToken token)
// Get a direct HTTP Stream
await using HttpResponseInputStream remoteStream = await HttpResponseInputStream.CreateStreamAsync(
- httpClient.GetHttpClient(), assetIndexURL, null, null, token);
+ downloadClient.GetHttpClient(), assetIndexURL, null, null, null, null, null, token);
- using XORStream stream = new XORStream(remoteStream);
+ await using XORStream stream = new XORStream(remoteStream);
// Build the asset index and return the count and size of each type
(int, long) returnValue = await BuildAssetIndex(type, baseURL, stream, assetIndex, token);
@@ -189,7 +179,7 @@ private IEnumerable EnumerateCacheTextAsset(CacheAssetType type, IEn
// If isFirst flag set to true, then get the _gameSalt.
if (isFirst)
{
- _gameSalt = GetAssetIndexSalt(line.ToString());
+ _gameSalt = GetAssetIndexSalt(line);
isFirst = false;
continue;
}
@@ -210,11 +200,11 @@ private IEnumerable EnumerateCacheTextAsset(CacheAssetType type, IEn
continue;
}
- CacheAsset content = null;
+ CacheAsset content;
try
{
// Deserialize the line and set the type
- content = line.Deserialize(InternalAppJSONContext.Default);
+ content = line.Deserialize(InternalAppJSONContext.Default.CacheAsset);
}
catch (Exception ex)
{
@@ -248,19 +238,25 @@ private IEnumerable EnumerateCacheTextAsset(CacheAssetType type, IEn
// Set isFirst flag as true if type is Data and
// also convert type as lowered string.
- bool isFirst = type == CacheAssetType.Data;
- bool isNeedReadLuckyNumber = type == CacheAssetType.Data;
+
+ // Unused as of Aug 4th 2024, bonk @bagusnl if not true
+ // bool isFirst = type == CacheAssetType.Data;
+ // bool isNeedReadLuckyNumber = type == CacheAssetType.Data;
// Parse asset index file from UABT
BundleFile bundleFile = new BundleFile(stream);
SerializedFile serializeFile = new SerializedFile(bundleFile.fileList!.FirstOrDefault()!.stream);
- // Try get the asset index file as byte[] and load it as TextAsset
+ // Try to get the asset index file as byte[] and load it as TextAsset
byte[] dataRaw = serializeFile.GetDataFirstOrDefaultByName("packageversion.txt");
TextAsset dataTextAsset = new TextAsset(dataRaw);
// Initialize local HTTP client
- using HttpClient client = new HttpClient(new HttpClientHandler { MaxConnectionsPerServer = _threadCount });
+ using HttpClient client = new HttpClientBuilder()
+ .UseLauncherConfig(_downloadThreadCount + _downloadThreadCountReserved)
+ .SetUserAgent(_userAgent)
+ .SetAllowedDecompression(DecompressionMethods.None)
+ .Create();
// Iterate lines of the TextAsset in parallel
await Parallel.ForEachAsync(EnumerateCacheTextAsset(type, dataTextAsset.GetStringList(), baseURL),
@@ -333,16 +329,16 @@ private bool IsValidRegionFile(string input, string lang)
public KianaDispatch GetCurrentGateway() => _gameGateway;
public async Task<(List, string, string, int)> GetCacheAssetList(
- Http httpClient, CacheAssetType type, CancellationToken token)
+ DownloadClient downloadClient, CacheAssetType type, CancellationToken token)
{
// Initialize asset index for the return
List returnAsset = new();
// Build _gameRepoURL from loading Dispatcher and Gateway
- await BuildGameRepoURL(token);
+ await BuildGameRepoURL(downloadClient, token);
// Fetch the progress
- _ = await FetchByType(type, httpClient, returnAsset, token);
+ _ = await FetchByType(type, downloadClient, returnAsset, token);
// Return the list and base asset bundle repo URL
return (returnAsset, _gameGateway!.ExternalAssetUrls!.FirstOrDefault(), BuildAssetBundleURL(_gameGateway),
diff --git a/CollapseLauncher/Classes/CachesManagement/Honkai/Update.cs b/CollapseLauncher/Classes/CachesManagement/Honkai/Update.cs
index 417fba5d9..b54a56456 100644
--- a/CollapseLauncher/Classes/CachesManagement/Honkai/Update.cs
+++ b/CollapseLauncher/Classes/CachesManagement/Honkai/Update.cs
@@ -1,10 +1,10 @@
-using CollapseLauncher.Helper;
+using CollapseLauncher.Helper;
using CollapseLauncher.Interfaces;
using Hi3Helper;
-using Hi3Helper.Data;
using Hi3Helper.Http;
using System;
using System.Collections.Generic;
+using System.Collections.ObjectModel;
using System.IO;
using System.Net;
using System.Net.Http;
@@ -20,32 +20,51 @@ internal partial class HonkaiCache
private async Task Update(List updateAssetIndex, List assetIndex, CancellationToken token)
{
// Initialize new proxy-aware HttpClient
- using HttpClient httpClientNew = new HttpClientBuilder()
- .UseLauncherConfig()
+ using HttpClient client = new HttpClientBuilder()
+ .UseLauncherConfig(_downloadThreadCount + _downloadThreadCountReserved)
.SetUserAgent(_userAgent)
.SetAllowedDecompression(DecompressionMethods.None)
.Create();
- // Assign Http client
- using Http httpClient = new Http(true, 5, 1000, _userAgent, httpClientNew);
+ // Use the new DownloadClient instance
+ DownloadClient downloadClient = DownloadClient.CreateInstance(client);
try
{
// Set IsProgressAllIndetermined as false and update the status
_status!.IsProgressAllIndetermined = true;
UpdateStatus();
- // Subscribe the event listener
- httpClient.DownloadProgress += _httpClient_UpdateAssetProgress;
// Iterate the asset index and do update operation
- foreach (CacheAsset asset in
-#if ENABLEHTTPREPAIR
- EnforceHTTPSchemeToAssetIndex(updateAssetIndex!)
+ ObservableCollection assetProperty = new ObservableCollection(AssetEntry);
+ if (_isBurstDownloadEnabled)
+ {
+ await Parallel.ForEachAsync(
+ PairEnumeratePropertyAndAssetIndexPackage(
+#if ENABLEHTTPREPAIR
+ EnforceHTTPSchemeToAssetIndex(updateAssetIndex)
#else
- updateAssetIndex!
+ updateAssetIndex
#endif
- )
+ , assetProperty),
+ new ParallelOptions { CancellationToken = token, MaxDegreeOfParallelism = _downloadThreadCount },
+ async (asset, innerToken) =>
+ {
+ await UpdateCacheAsset(asset, downloadClient, _httpClient_UpdateAssetProgress, innerToken);
+ });
+ }
+ else
{
- await UpdateCacheAsset(asset, httpClient, token);
+ foreach ((CacheAsset, IAssetProperty) asset in
+ PairEnumeratePropertyAndAssetIndexPackage(
+#if ENABLEHTTPREPAIR
+ EnforceHTTPSchemeToAssetIndex(updateAssetIndex)
+#else
+ updateAssetIndex
+#endif
+ , assetProperty))
+ {
+ await UpdateCacheAsset(asset, downloadClient, _httpClient_UpdateAssetProgress, token);
+ }
}
// Reindex the asset index in Verify.txt
@@ -60,11 +79,6 @@ private async Task Update(List updateAssetIndex, List assetIndex)
@@ -74,31 +88,31 @@ private void UpdateCacheVerifyList(List assetIndex)
// Initialize listFile File Stream
using (FileStream fs = new FileStream(listFile, FileMode.Create, FileAccess.Write))
- using (StreamWriter sw = new StreamWriter(fs))
- {
- // Iterate asset index and generate the path for the cache path
- foreach (CacheAsset asset in assetIndex!)
+ using (StreamWriter sw = new StreamWriter(fs))
{
- // Yes, the path is written in this way. Idk why miHoYo did this...
- // Update 6.8: They finally notices that they use "//" instead of "/"
- string basePath = GetAssetBasePathByType(asset!.DataType)!.Replace('\\', '/');
- string path = basePath + "/" + asset.ConcatN;
- sw.WriteLine(path);
+ // Iterate asset index and generate the path for the cache path
+ foreach (CacheAsset asset in assetIndex!)
+ {
+ // Yes, the path is written in this way. Idk why miHoYo did this...
+ // Update 6.8: They finally notices that they use "//" instead of "/"
+ string basePath = GetAssetBasePathByType(asset!.DataType)!.Replace('\\', '/');
+ string path = basePath + "/" + asset.ConcatN;
+ sw.WriteLine(path);
+ }
}
- }
}
- private async Task UpdateCacheAsset(CacheAsset asset, Http httpClient, CancellationToken token)
+ private async Task UpdateCacheAsset((CacheAsset AssetIndex, IAssetProperty AssetProperty) asset, DownloadClient downloadClient, DownloadProgressDelegate downloadProgress, CancellationToken token)
{
// Increment total count and update the status
_progressAllCountCurrent++;
- _status!.ActivityStatus = string.Format(Lang!._Misc!.Downloading + " {0}: {1}", asset!.DataType, asset.N);
+ _status!.ActivityStatus = string.Format(Lang!._Misc!.Downloading + " {0}: {1}", asset!.AssetIndex.DataType, asset.AssetIndex.N);
UpdateAll();
// This is a action for Unused asset.
- if (asset.DataType == CacheAssetType.Unused)
+ if (asset.AssetIndex.DataType == CacheAssetType.Unused)
{
- FileInfo fileInfo = new FileInfo(asset.ConcatPath!);
+ FileInfo fileInfo = new FileInfo(asset.AssetIndex.ConcatPath!);
if (fileInfo.Exists)
{
fileInfo.IsReadOnly = false;
@@ -110,63 +124,19 @@ private async Task UpdateCacheAsset(CacheAsset asset, Http httpClient, Cancellat
// Other than unused file, do this action
else
{
- // Assign and check the path of the asset directory
- string assetDir = Path.GetDirectoryName(asset.ConcatPath);
- if (!Directory.Exists(assetDir))
- {
- Directory.CreateDirectory(assetDir!);
- }
-
#if DEBUG
- LogWriteLine($"Downloading cache [T: {asset.DataType}]: {asset.N} at URL: {asset.ConcatURL}", LogType.Debug, true);
+ LogWriteLine($"Downloading cache [T: {asset.AssetIndex.DataType}]: {asset.AssetIndex.N} at URL: {asset.AssetIndex.ConcatURL}", LogType.Debug, true);
#endif
- // Do multi-session download for asset that has applicable size
- if (asset.CS >= _sizeForMultiDownload)
- {
- await httpClient!.Download(asset.ConcatURL, asset.ConcatPath, _downloadThreadCount, true, token);
- await httpClient.Merge(token);
- }
- // Do single-session download for others
- else
- {
- await httpClient!.Download(asset.ConcatURL, asset.ConcatPath, true, null, null, token);
- }
+ await RunDownloadTask(asset.AssetIndex.CS, asset.AssetIndex.ConcatPath, asset.AssetIndex.ConcatURL, downloadClient, downloadProgress, token);
#if !DEBUG
- LogWriteLine($"Downloaded cache [T: {asset.DataType}]: {asset.N}", LogType.Default, true);
+ LogWriteLine($"Downloaded cache [T: {asset.AssetIndex.DataType}]: {asset.AssetIndex.N}", LogType.Default, true);
#endif
}
// Remove Asset Entry display
- Dispatch(() => { if (AssetEntry!.Count > 0) AssetEntry.RemoveAt(0); });
- }
-
- private async void _httpClient_UpdateAssetProgress(object sender, DownloadEvent e)
- {
- // Update current progress percentages and speed
- _progress!.ProgressAllPercentage = _progressAllSizeCurrent != 0 ?
- ConverterTool.GetPercentageNumber(_progressAllSizeCurrent, _progressAllSizeTotal) :
- 0;
-
- if (e!.State != DownloadState.Merging)
- {
- _progressAllSizeCurrent += e.Read;
- }
- long speed = (long)(_progressAllSizeCurrent / _stopwatch!.Elapsed.TotalSeconds);
-
- if (await CheckIfNeedRefreshStopwatch())
- {
- // Update current activity status
- _status!.IsProgressAllIndetermined = false;
- string timeLeftString = string.Format(Lang!._Misc!.TimeRemainHMSFormat!, ((_progressAllSizeCurrent - _progressAllSizeTotal) / ConverterTool.Unzeroed(speed)).ToTimeSpanNormalized());
- _status.ActivityAll = string.Format(Lang!._Misc!.Downloading + ": {0}/{1} ", _progressAllCountCurrent, _progressAllCountTotal)
- + string.Format($"({Lang._Misc.SpeedPerSec})", ConverterTool.SummarizeSizeSimple(speed))
- + $" | {timeLeftString}";
-
- // Trigger update
- UpdateAll();
- }
+ PopRepairAssetEntry(asset.AssetProperty);
}
}
}
diff --git a/CollapseLauncher/Classes/CachesManagement/StarRail/Check.cs b/CollapseLauncher/Classes/CachesManagement/StarRail/Check.cs
index 61f8f47a1..d78c9ea7c 100644
--- a/CollapseLauncher/Classes/CachesManagement/StarRail/Check.cs
+++ b/CollapseLauncher/Classes/CachesManagement/StarRail/Check.cs
@@ -66,10 +66,6 @@ private async Task> Check(List assetIndex, CancellationTo
{
throw ex.Flatten().InnerExceptions.First();
}
- catch (Exception)
- {
- throw;
- }
// Return the asset index
return returnAsset;
@@ -108,16 +104,15 @@ private async ValueTask CheckAsset(SRAsset asset, List returnAsset, str
}
// If above passes, then run the CRC check
- using (FileStream fs = new FileStream(asset.LocalName, FileMode.Open, FileAccess.Read, FileShare.None, _bufferBigLength))
- {
- // Calculate the asset CRC (MD5)
- byte[] hashArray = await CheckHashAsync(fs, MD5.Create(), token);
+ await using FileStream fs = await NaivelyOpenFileStreamAsync(UsePersistent ? fileInfoPersistent : fileInfoStreaming,
+ FileMode.Open, FileAccess.Read, FileShare.Read);
+ // Calculate the asset CRC (MD5)
+ byte[] hashArray = await CheckHashAsync(fs, MD5.Create(), token);
- // If the asset CRC doesn't match, then add the file to asset index.
- if (!IsArrayMatch(asset.Hash, hashArray))
- {
- AddGenericCheckAsset(asset, CacheAssetStatus.Obsolete, returnAsset, hashArray, asset.Hash);
- }
+ // If the asset CRC doesn't match, then add the file to asset index.
+ if (!IsArrayMatch(asset.Hash, hashArray))
+ {
+ AddGenericCheckAsset(asset, CacheAssetStatus.Obsolete, returnAsset, hashArray, asset.Hash);
}
}
diff --git a/CollapseLauncher/Classes/CachesManagement/StarRail/Fetch.cs b/CollapseLauncher/Classes/CachesManagement/StarRail/Fetch.cs
index 68e83db65..8fe493f45 100644
--- a/CollapseLauncher/Classes/CachesManagement/StarRail/Fetch.cs
+++ b/CollapseLauncher/Classes/CachesManagement/StarRail/Fetch.cs
@@ -1,8 +1,12 @@
-using Hi3Helper;
+using CollapseLauncher.Helper;
+using Hi3Helper;
using Hi3Helper.EncTool.Parser.AssetMetadata.SRMetadataAsset;
+using Hi3Helper.Http;
using System;
using System.Collections.Generic;
using System.IO;
+using System.Net;
+using System.Net.Http;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
@@ -20,59 +24,58 @@ private async Task> Fetch(CancellationToken token)
// Initialize asset index for the return
List returnAsset = new List();
- try
- {
- // Subscribe the event listener
- _innerGameVersionManager!.StarRailMetadataTool!.HttpEvent += _httpClient_FetchAssetProgress;
+ // Initialize new proxy-aware HttpClient
+ using HttpClient client = new HttpClientBuilder()
+ .UseLauncherConfig(_downloadThreadCount + _downloadThreadCountReserved)
+ .SetUserAgent(_userAgent)
+ .SetAllowedDecompression(DecompressionMethods.None)
+ .Create();
+
+ // Initialize the new DownloadClient
+ DownloadClient downloadClient = DownloadClient.CreateInstance(client);
- // Initialize metadata
- // Set total activity string as "Fetching Caches Type: Dispatcher"
- _status!.ActivityStatus = string.Format(Lang!._CachesPage!.CachesStatusFetchingType!, CacheAssetType.Dispatcher);
- _status!.IsProgressAllIndetermined = true;
- _status!.IsIncludePerFileIndicator = false;
- UpdateStatus();
+ // Initialize metadata
+ // Set total activity string as "Fetching Caches Type: Dispatcher"
+ _status!.ActivityStatus = string.Format(Lang!._CachesPage!.CachesStatusFetchingType!, CacheAssetType.Dispatcher);
+ _status!.IsProgressAllIndetermined = true;
+ _status!.IsIncludePerFileIndicator = false;
+ UpdateStatus();
- if (!await _innerGameVersionManager!.StarRailMetadataTool.Initialize(token, GetExistingGameRegionID(), Path.Combine(_gamePath!, $"{Path.GetFileNameWithoutExtension(_gameVersionManager!.GamePreset!.GameExecutableName)}_Data\\Persistent")))
- throw new InvalidDataException("The dispatcher response is invalid! Please open an issue to our GitHub page to report this issue.");
+ if (!await _innerGameVersionManager!.StarRailMetadataTool.Initialize(token, downloadClient, _httpClient_FetchAssetProgress, GetExistingGameRegionID(), Path.Combine(_gamePath!, $"{Path.GetFileNameWithoutExtension(_gameVersionManager!.GamePreset!.GameExecutableName)}_Data\\Persistent")))
+ throw new InvalidDataException("The dispatcher response is invalid! Please open an issue to our GitHub page to report this issue.");
- // Iterate type and do fetch
- foreach (SRAssetType type in Enum.GetValues())
+ // Iterate type and do fetch
+ await Parallel.ForEachAsync(Enum.GetValues(), token, async (type, innerCancelToken) =>
+ {
+ // Skip for unused type
+ switch (type)
{
- // Skip for unused type
- switch (type)
- {
- case SRAssetType.Audio:
- case SRAssetType.Video:
- case SRAssetType.Block:
- case SRAssetType.Asb:
- continue;
- }
-
- // uint = Count of the assets available
- // long = Total size of the assets available
- (int, long) count = await FetchByType(type, returnAsset, token);
-
- // Write a log about the metadata
- LogWriteLine($"Cache Metadata [T: {type}]:", LogType.Default, true);
- LogWriteLine($" Cache Count = {count.Item1}", LogType.NoTag, true);
- LogWriteLine($" Cache Size = {SummarizeSizeSimple(count.Item2)}", LogType.NoTag, true);
-
- // Increment the Total Size and Count
- _progressAllCountTotal += count.Item1;
- _progressAllSizeTotal += count.Item2;
+ case SRAssetType.Audio:
+ case SRAssetType.Video:
+ case SRAssetType.Block:
+ case SRAssetType.Asb:
+ return;
}
- }
- finally
- {
- // Unsubscribe the event listener and dispose Http client
- _innerGameVersionManager!.StarRailMetadataTool!.HttpEvent -= _httpClient_FetchAssetProgress;
- }
+
+ // uint = Count of the assets available
+ // long = Total size of the assets available
+ (int, long) count = await FetchByType(downloadClient, _httpClient_FetchAssetProgress, type, returnAsset, innerCancelToken);
+
+ // Write a log about the metadata
+ LogWriteLine($"Cache Metadata [T: {type}]:", LogType.Default, true);
+ LogWriteLine($" Cache Count = {count.Item1}", LogType.NoTag, true);
+ LogWriteLine($" Cache Size = {SummarizeSizeSimple(count.Item2)}", LogType.NoTag, true);
+
+ // Increment the Total Size and Count
+ Interlocked.Add(ref _progressAllCountTotal, count.Item1);
+ Interlocked.Add(ref _progressAllSizeTotal, count.Item2);
+ }).ConfigureAwait(false);
// Return asset index
return returnAsset;
}
- private async Task<(int, long)> FetchByType(SRAssetType type, List assetIndex, CancellationToken token)
+ private async Task<(int, long)> FetchByType(DownloadClient downloadClient, DownloadProgressDelegate downloadProgress, SRAssetType type, List assetIndex, CancellationToken token)
{
// Set total activity string as "Fetching Caches Type: "
_status!.ActivityStatus = string.Format(Lang!._CachesPage!.CachesStatusFetchingType!, type);
@@ -80,32 +83,28 @@ private async Task> Fetch(CancellationToken token)
_status!.IsIncludePerFileIndicator = false;
UpdateStatus();
- try
+ // Start reading the metadata and build the asset index of each type
+ SRAssetProperty assetProperty;
+ switch (type)
{
- // Start reading the metadata and build the asset index of each type
- SRAssetProperty assetProperty;
- switch (type)
- {
- case SRAssetType.IFix:
- await _innerGameVersionManager!.StarRailMetadataTool!.ReadIFixMetadataInformation(token);
- assetProperty = _innerGameVersionManager!.StarRailMetadataTool!.MetadataIFix!.GetAssets();
- assetIndex!.AddRange(assetProperty!.AssetList!);
- return (assetProperty.AssetList.Count, assetProperty.AssetTotalSize);
- case SRAssetType.DesignData:
- await _innerGameVersionManager!.StarRailMetadataTool!.ReadDesignMetadataInformation(token);
- assetProperty = _innerGameVersionManager.StarRailMetadataTool.MetadataDesign!.GetAssets();
- assetIndex!.AddRange(assetProperty!.AssetList!);
- return (assetProperty.AssetList.Count, assetProperty.AssetTotalSize);
- case SRAssetType.Lua:
- await _innerGameVersionManager!.StarRailMetadataTool!.ReadLuaMetadataInformation(token);
- assetProperty = _innerGameVersionManager.StarRailMetadataTool.MetadataLua!.GetAssets();
- assetIndex!.AddRange(assetProperty!.AssetList!);
- return (assetProperty.AssetList.Count, assetProperty.AssetTotalSize);
- }
-
- return (0, 0);
+ case SRAssetType.IFix:
+ await _innerGameVersionManager!.StarRailMetadataTool!.ReadIFixMetadataInformation(downloadClient, downloadProgress, token);
+ assetProperty = _innerGameVersionManager!.StarRailMetadataTool!.MetadataIFix!.GetAssets();
+ assetIndex!.AddRange(assetProperty!.AssetList!);
+ return (assetProperty.AssetList.Count, assetProperty.AssetTotalSize);
+ case SRAssetType.DesignData:
+ await _innerGameVersionManager!.StarRailMetadataTool!.ReadDesignMetadataInformation(downloadClient, downloadProgress, token);
+ assetProperty = _innerGameVersionManager.StarRailMetadataTool.MetadataDesign!.GetAssets();
+ assetIndex!.AddRange(assetProperty!.AssetList!);
+ return (assetProperty.AssetList.Count, assetProperty.AssetTotalSize);
+ case SRAssetType.Lua:
+ await _innerGameVersionManager!.StarRailMetadataTool!.ReadLuaMetadataInformation(downloadClient, downloadProgress, token);
+ assetProperty = _innerGameVersionManager.StarRailMetadataTool.MetadataLua!.GetAssets();
+ assetIndex!.AddRange(assetProperty!.AssetList!);
+ return (assetProperty.AssetList.Count, assetProperty.AssetTotalSize);
}
- catch { throw; }
+
+ return (0, 0);
}
#region Utilities
diff --git a/CollapseLauncher/Classes/CachesManagement/StarRail/Update.cs b/CollapseLauncher/Classes/CachesManagement/StarRail/Update.cs
index 41498405c..3ef249cce 100644
--- a/CollapseLauncher/Classes/CachesManagement/StarRail/Update.cs
+++ b/CollapseLauncher/Classes/CachesManagement/StarRail/Update.cs
@@ -1,10 +1,10 @@
using CollapseLauncher.Helper;
using Hi3Helper;
-using Hi3Helper.Data;
using Hi3Helper.EncTool.Parser.AssetMetadata.SRMetadataAsset;
using Hi3Helper.Http;
using System;
using System.Collections.Generic;
+using System.Collections.ObjectModel;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Net;
@@ -23,33 +23,51 @@ internal partial class StarRailCache
private async Task Update(List updateAssetIndex, List assetIndex, CancellationToken token)
{
// Initialize new proxy-aware HttpClient
- using HttpClient httpClientNew = new HttpClientBuilder()
- .UseLauncherConfig()
+ using HttpClient client = new HttpClientBuilder()
+ .UseLauncherConfig(_downloadThreadCount + _downloadThreadCountReserved)
.SetUserAgent(_userAgent)
.SetAllowedDecompression(DecompressionMethods.None)
.Create();
- // Assign Http client
- Http httpClient = new Http(true, 5, 1000, _userAgent, httpClientNew);
+ // Assign DownloadClient
+ DownloadClient downloadClient = DownloadClient.CreateInstance(client);
try
{
// Set IsProgressAllIndetermined as false and update the status
_status.IsProgressAllIndetermined = true;
UpdateStatus();
- // Subscribe the event listener
- httpClient.DownloadProgress += _httpClient_UpdateAssetProgress;
-
// Iterate the asset index and do update operation
- foreach (SRAsset asset in
-#if ENABLEHTTPREPAIR
- EnforceHTTPSchemeToAssetIndex(updateAssetIndex!)
+ ObservableCollection assetProperty = new ObservableCollection(AssetEntry);
+ if (_isBurstDownloadEnabled)
+ {
+ await Parallel.ForEachAsync(
+ PairEnumeratePropertyAndAssetIndexPackage(
+#if ENABLEHTTPREPAIR
+ EnforceHTTPSchemeToAssetIndex(updateAssetIndex)
#else
- updateAssetIndex!
+ updateAssetIndex
#endif
- )
+ , assetProperty),
+ new ParallelOptions { CancellationToken = token, MaxDegreeOfParallelism = _downloadThreadCount },
+ async (asset, innerToken) =>
+ {
+ await UpdateCacheAsset(asset, downloadClient, _httpClient_UpdateAssetProgress, innerToken);
+ });
+ }
+ else
{
- await UpdateCacheAsset(asset, httpClient, token);
+ foreach ((SRAsset, IAssetProperty) asset in
+ PairEnumeratePropertyAndAssetIndexPackage(
+#if ENABLEHTTPREPAIR
+ EnforceHTTPSchemeToAssetIndex(updateAssetIndex)
+#else
+ updateAssetIndex
+#endif
+ , assetProperty))
+ {
+ await UpdateCacheAsset(asset, downloadClient, _httpClient_UpdateAssetProgress, token);
+ }
}
return true;
@@ -61,72 +79,21 @@ private async Task Update(List updateAssetIndex, List as
LogWriteLine($"An error occured while updating cache file!\r\n{ex}", LogType.Error, true);
throw;
}
- finally
- {
- // Unsubscribe the event listener and dispose Http client
- httpClient.DownloadProgress -= _httpClient_UpdateAssetProgress;
- httpClient.Dispose();
- }
}
- private async Task UpdateCacheAsset(SRAsset asset, Http httpClient, CancellationToken token)
+ private async Task UpdateCacheAsset((SRAsset AssetIndex, IAssetProperty AssetProperty) asset, DownloadClient downloadClient, DownloadProgressDelegate downloadProgress, CancellationToken token)
{
// Increment total count and update the status
_progressAllCountCurrent++;
- _status.ActivityStatus = string.Format(Lang._Misc.Downloading + " {0}: {1}", asset.AssetType, Path.GetFileName(asset.LocalName));
+ _status.ActivityStatus = string.Format(Lang._Misc.Downloading + " {0}: {1}", asset.AssetIndex.AssetType, Path.GetFileName(asset.AssetIndex.LocalName));
UpdateAll();
- // Assign and check the path of the asset directory
- string assetDir = Path.GetDirectoryName(asset.LocalName);
- if (!Directory.Exists(assetDir))
- {
- Directory.CreateDirectory(assetDir);
- }
-
- // Do multi-session download for asset that has applicable size
- if (asset.Size >= _sizeForMultiDownload)
- {
- await httpClient.Download(asset.RemoteURL, asset.LocalName, _downloadThreadCount, true, token);
- await httpClient.Merge(token);
- }
- // Do single-session download for others
- else
- {
- await httpClient.Download(asset.RemoteURL, asset.LocalName, true, null, null, token);
- }
-
- LogWriteLine($"Downloaded cache [T: {asset.AssetType}]: {Path.GetFileName(asset.LocalName)}", LogType.Default, true);
-
+ // Run download task
+ await RunDownloadTask(asset.AssetIndex.Size, asset.AssetIndex.LocalName!, asset.AssetIndex.RemoteURL, downloadClient, downloadProgress, token);
+ LogWriteLine($"Downloaded cache [T: {asset.AssetIndex.AssetType}]: {Path.GetFileName(asset.AssetIndex.LocalName)}", LogType.Default, true);
// Remove Asset Entry display
- Dispatch(() => { if (AssetEntry.Count != 0) AssetEntry.RemoveAt(0); });
- }
-
- private async void _httpClient_UpdateAssetProgress(object sender, DownloadEvent e)
- {
- // Update current progress percentages and speed
- _progress.ProgressAllPercentage = _progressAllSizeCurrent != 0 ?
- ConverterTool.GetPercentageNumber(_progressAllSizeCurrent, _progressAllSizeTotal) :
- 0;
-
- if (e.State != DownloadState.Merging)
- {
- _progressAllSizeCurrent += e.Read;
- }
- long speed = (long)(_progressAllSizeCurrent / _stopwatch.Elapsed.TotalSeconds);
-
- if (await CheckIfNeedRefreshStopwatch())
- {
- // Update current activity status
- _status.IsProgressAllIndetermined = false;
- string timeLeftString = string.Format(Lang._Misc.TimeRemainHMSFormat, ((_progressAllSizeCurrent - _progressAllSizeTotal) / ConverterTool.Unzeroed(speed)).ToTimeSpanNormalized());
- _status.ActivityAll = string.Format(Lang._Misc.Downloading + ": {0}/{1} ", _progressAllCountCurrent, _progressAllCountTotal)
- + string.Format($"({Lang._Misc.SpeedPerSec})", ConverterTool.SummarizeSizeSimple(speed))
- + $" | {timeLeftString}";
-
- // Trigger update
- UpdateAll();
- }
+ PopRepairAssetEntry(asset.AssetProperty);
}
}
}
diff --git a/CollapseLauncher/Classes/CachesManagement/Zenless/ZenlessCache.cs b/CollapseLauncher/Classes/CachesManagement/Zenless/ZenlessCache.cs
new file mode 100644
index 000000000..51163446c
--- /dev/null
+++ b/CollapseLauncher/Classes/CachesManagement/Zenless/ZenlessCache.cs
@@ -0,0 +1,16 @@
+using CollapseLauncher.GameSettings.Zenless;
+using CollapseLauncher.Interfaces;
+using Microsoft.UI.Xaml;
+using System.Threading.Tasks;
+
+namespace CollapseLauncher
+{
+ internal class ZenlessCache(UIElement parentUI, IGameVersionCheck gameVersionManager, ZenlessSettings gameSettings)
+ : ZenlessRepair(parentUI, gameVersionManager, gameSettings, false, null, true), ICache, ICacheBase
+ {
+ public ZenlessCache AsBaseType() => this;
+
+ public async Task StartUpdateRoutine(bool showInteractivePrompt = false)
+ => await StartRepairRoutine(showInteractivePrompt);
+ }
+}
diff --git a/CollapseLauncher/Classes/CoCreateInstance.cs b/CollapseLauncher/Classes/CoCreateInstance.cs
index 14a8a93dc..a182bccfa 100644
--- a/CollapseLauncher/Classes/CoCreateInstance.cs
+++ b/CollapseLauncher/Classes/CoCreateInstance.cs
@@ -2,7 +2,9 @@
using System;
using System.Diagnostics;
using System.Globalization;
+using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
#pragma warning disable IL2050
namespace CollapseLauncher
@@ -135,18 +137,40 @@ internal HRESULT ThrowOnFailure(IntPtr errorInfo = default)
internal static partial class PInvoke
{
- internal static unsafe HRESULT CoCreateInstance(Guid rclsid, object pUnkOuter, CLSCTX dwClsContext, out T ppv)
- where T : class
+#nullable enable
+ internal static unsafe HRESULT CoCreateInstance(Guid rclsid, nint pUnkOuter, CLSCTX dwClsContext, out T? ppv)
{
- Guid refTGuid = typeof(T).GUID;
- HRESULT hr = CoCreateInstanceInvoke(ref rclsid, pUnkOuter, dwClsContext, ref refTGuid, out object o);
- ppv = (T)o;
+ Guid refTGuid = typeof(T).GUID;
+ HRESULT hr = CoCreateInstance(in rclsid, pUnkOuter, dwClsContext, in refTGuid, out void* o);
+ ppv = ComInterfaceMarshaller.ConvertToManaged(o);
return hr;
}
[DllImport("OLE32.dll", EntryPoint = "CoCreateInstance", ExactSpelling = true)]
[DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
- private static unsafe extern HRESULT CoCreateInstanceInvoke(ref Guid rclsid, [MarshalAs(UnmanagedType.IUnknown)] object pUnkOuter, CLSCTX dwClsContext, ref Guid riid, [MarshalAs(UnmanagedType.Interface)] out object ppObj);
+ public static unsafe extern HRESULT CoCreateInstance(in Guid rclsid, IntPtr pUnkOuter, CLSCTX dwClsContext, in Guid riid, out void* ppObj);
+
+ [MethodImpl(MethodImplOptions.AggressiveInlining)]
+ internal static unsafe TInterfaceTo? CastComInterfaceAs(this TInterfaceFrom interfaceFrom, in Guid interfaceToGuid)
+ where TInterfaceFrom : class
+ where TInterfaceTo : class
+ {
+ void* interfaceFromPtr = ComInterfaceMarshaller.ConvertToUnmanaged(interfaceFrom);
+
+ Marshal.QueryInterface((nint)interfaceFromPtr, in interfaceToGuid, out nint ppv);
+ void* interfaceToPtr = (void*)ppv;
+
+ TInterfaceTo? interfaceTo = ComInterfaceMarshaller.ConvertToManaged(interfaceToPtr);
+ return interfaceTo;
+ }
+
+ internal static unsafe void Free(T? obj)
+ where T : class
+ {
+ void* objPtr = ComInterfaceMarshaller.ConvertToUnmanaged(obj);
+ ComInterfaceMarshaller.Free(objPtr);
+ }
+#nullable restore
}
}
#pragma warning restore IL2050
diff --git a/CollapseLauncher/Classes/DiscordPresence/DiscordPresenceManager.cs b/CollapseLauncher/Classes/DiscordPresence/DiscordPresenceManager.cs
index 4dbe21c20..e0a188eda 100644
--- a/CollapseLauncher/Classes/DiscordPresence/DiscordPresenceManager.cs
+++ b/CollapseLauncher/Classes/DiscordPresence/DiscordPresenceManager.cs
@@ -34,10 +34,10 @@ public class DiscordPresenceManager : IDisposable
private RichPresence _presence;
private ActivityType _activityType;
- private ActivityType _lastAttemptedActivityType;
+ //private ActivityType _lastAttemptedActivityType;
private DateTime? _lastPlayTime;
private bool _firstTimeConnect = true;
- private ActionBlock _presenceUpdateQueue = null;
+ private ActionBlock _presenceUpdateQueue;
private bool _cachedIsIdleEnabled = true;
@@ -95,13 +95,14 @@ private void EnablePresence(long applicationId)
// Initialize Discord RPC client
_client = new DiscordRpcClient(applicationId.ToString());
_presenceUpdateQueue = new ActionBlock(
- presence => _client?.SetPresence(_presence),
- new ExecutionDataflowBlockOptions
- {
- MaxMessagesPerTask = 1,
- MaxDegreeOfParallelism = 1,
- EnsureOrdered = true
- });
+ // ReSharper disable once UnusedParameter.Local
+ presence => _client?.SetPresence(_presence),
+ new ExecutionDataflowBlockOptions
+ {
+ MaxMessagesPerTask = 1,
+ MaxDegreeOfParallelism = 1,
+ EnsureOrdered = true
+ });
_client.OnReady += (_, msg) =>
{
@@ -185,11 +186,11 @@ public void SetupPresence()
EnablePresence(AppDiscordApplicationID);
}
- public void SetActivity(ActivityType activity)
+ public void SetActivity(ActivityType activity, DateTime? activityOffset = null)
{
if (GetAppConfigValue("EnableDiscordRPC").ToBool())
{
- _lastAttemptedActivityType = activity;
+ //_lastAttemptedActivityType = activity;
_activityType = activity;
switch (activity)
@@ -198,7 +199,7 @@ public void SetActivity(ActivityType activity)
{
bool isGameStatusEnabled = GetAppConfigValue("EnableDiscordGameStatus").ToBool();
BuildActivityGameStatus(isGameStatusEnabled ? Lang._Misc.DiscordRP_InGame : Lang._Misc.DiscordRP_Play,
- isGameStatusEnabled);
+ isGameStatusEnabled, activityOffset);
break;
}
case ActivityType.Update:
@@ -249,7 +250,7 @@ public void SetActivity(ActivityType activity)
}
}
- private void BuildActivityGameStatus(string activityName, bool isGameStatusEnabled)
+ private void BuildActivityGameStatus(string activityName, bool isGameStatusEnabled, DateTime? activityOffset = null)
{
var curGameName = LauncherMetadataHelper.CurrentMetadataConfigGameName;
var curGameRegion = LauncherMetadataHelper.CurrentMetadataConfigGameRegion;
@@ -278,14 +279,14 @@ private void BuildActivityGameStatus(string activityName, bool isGameStatusEnabl
},
Timestamps = new Timestamps
{
- Start = GetCachedStartPlayTime()
+ Start = GetCachedStartPlayTime(activityOffset)
}
};
}
- private DateTime GetCachedStartPlayTime()
+ private DateTime GetCachedStartPlayTime(DateTime? activityOffset)
{
- _lastPlayTime ??= DateTime.UtcNow;
+ _lastPlayTime ??= activityOffset ??= DateTime.UtcNow;
return _lastPlayTime.Value;
}
diff --git a/CollapseLauncher/Classes/EventsManagement/EventsHandler.cs b/CollapseLauncher/Classes/EventsManagement/EventsHandler.cs
index 989320cdd..2942a6a44 100644
--- a/CollapseLauncher/Classes/EventsManagement/EventsHandler.cs
+++ b/CollapseLauncher/Classes/EventsManagement/EventsHandler.cs
@@ -124,7 +124,7 @@ internal class ThemeProperty
}
#endregion
#region ErrorSenderRegion
- public enum ErrorType { Unhandled, GameError, Connection, Warning }
+ public enum ErrorType { Unhandled, GameError, Connection, Warning, DiskCrc }
internal static class ErrorSender
{
@@ -164,6 +164,10 @@ public static void SetPageTitle(ErrorType errorType)
ExceptionTitle = _locUnhandledException.UnhandledTitle4;
ExceptionSubtitle = _locUnhandledException.UnhandledSubtitle4;
break;
+ case ErrorType.DiskCrc:
+ ExceptionTitle = _locUnhandledException.UnhandledTitleDiskCrc;
+ ExceptionSubtitle = _locUnhandledException.UnhandledSubDiskCrc;
+ break;
}
}
}
diff --git a/CollapseLauncher/Classes/Extension/CancellationTokenExtensions.cs b/CollapseLauncher/Classes/Extension/CancellationTokenExtensions.cs
index 4588d19c4..9d07c5a53 100644
--- a/CollapseLauncher/Classes/Extension/CancellationTokenExtensions.cs
+++ b/CollapseLauncher/Classes/Extension/CancellationTokenExtensions.cs
@@ -6,11 +6,11 @@ namespace CollapseLauncher.Extension
public class CancellationTokenSourceWrapper : CancellationTokenSource
{
public bool IsDisposed;
- public bool IsCancelled = false;
+ public bool IsCancelled;
public new void Cancel()
{
- if (!base.IsCancellationRequested) base.Cancel();
+ if (!IsCancellationRequested) base.Cancel();
IsCancelled = true;
}
diff --git a/CollapseLauncher/Classes/Extension/NumberExtensions.cs b/CollapseLauncher/Classes/Extension/NumberExtensions.cs
new file mode 100644
index 000000000..66256384d
--- /dev/null
+++ b/CollapseLauncher/Classes/Extension/NumberExtensions.cs
@@ -0,0 +1,15 @@
+using Hi3Helper.Shared.Region;
+using System;
+using System.Runtime.CompilerServices;
+
+namespace CollapseLauncher.Extension
+{
+ internal static class NumberExtensions
+ {
+ [MethodImpl(MethodImplOptions.AggressiveInlining)]
+ internal static double ClampLimitedSpeedNumber(this double speed)
+ => LauncherConfig.DownloadSpeedLimitCached > 0 ?
+ Math.Min(LauncherConfig.DownloadSpeedLimitCached, speed) :
+ speed;
+ }
+}
diff --git a/CollapseLauncher/Classes/Extension/TaskExtensions.cs b/CollapseLauncher/Classes/Extension/TaskExtensions.cs
index 83cee18d0..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;
@@ -45,7 +51,7 @@ internal static class TaskExtensions
catch (Exception ex)
{
lastException = ex;
- actionOnRetry?.Invoke(retryAttemptCurrent, retryAttempt ?? 0, timeout ?? 0, timeoutStep ?? 0);
+ actionOnRetry?.Invoke(retryAttemptCurrent, (int)retryAttempt, timeout ?? 0, timeoutStep ?? 0);
if (ex is TimeoutException)
{
@@ -60,7 +66,6 @@ internal static class TaskExtensions
retryAttemptCurrent++;
timeout += timeoutStep;
- continue;
}
finally
{
@@ -79,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 0e10a5726..c53519858 100644
--- a/CollapseLauncher/Classes/Extension/UIElementExtensions.cs
+++ b/CollapseLauncher/Classes/Extension/UIElementExtensions.cs
@@ -1,11 +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;
@@ -19,8 +21,200 @@
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
{
+ ///
+ /// 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.
+ [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()
@@ -101,10 +295,11 @@ internal static void AddGridColumns(this Grid grid, params GridLength[] columnWi
if (columnWidths.Length == 0)
throw new IndexOutOfRangeException($"\"columnWidth\" cannot be empty!");
- for (int i = 0; i < columnWidths.Length; i++) grid.ColumnDefinitions.Add(new ColumnDefinition()
- {
- Width = columnWidths[i]
- });
+ for (int i = 0; i < columnWidths.Length; i++)
+ grid.ColumnDefinitions.Add(new ColumnDefinition()
+ {
+ Width = columnWidths[i]
+ });
}
internal static void AddGridColumns(this Grid grid, int count, GridLength? columnWidth = null)
@@ -221,11 +416,15 @@ internal static CornerRadius GetElementCornerRadius(FrameworkElement element, Co
internal static CornerRadius AttachRoundedKindCornerRadius(FrameworkElement element)
{
CornerRadius initialRadius = GetElementCornerRadius(element, CornerRadiusKind.Rounded);
- element.SizeChanged += (sender, _) => InnerSetCornerRadius(element, GetElementCornerRadius(element, CornerRadiusKind.Rounded));
+ element.SizeChanged += (_, _) => InnerSetCornerRadius(element, GetElementCornerRadius(element, CornerRadiusKind.Rounded));
return initialRadius;
}
- internal static void FindAndSetTextBlockWrapping(this UIElement element, TextWrapping wrap = TextWrapping.Wrap, HorizontalAlignment posAlign = HorizontalAlignment.Center, TextAlignment textAlign = TextAlignment.Center, bool recursiveAssignment = false, bool isParentAButton = false)
+ internal static void FindAndSetTextBlockWrapping(this UIElement element,
+ TextWrapping wrap = TextWrapping.Wrap,
+ HorizontalAlignment posAlign = HorizontalAlignment.Center,
+ TextAlignment textAlign = TextAlignment.Center,
+ bool recursiveAssignment = false, bool isParentAButton = false)
{
if (element is not null && element is TextBlock textBlock)
{
@@ -242,28 +441,28 @@ internal static void FindAndSetTextBlockWrapping(this UIElement element, TextWra
if (element is ButtonBase button)
{
if (button.Content is UIElement buttonContent)
- buttonContent.FindAndSetTextBlockWrapping(wrap, posAlign, textAlign, recursiveAssignment, true);
+ buttonContent.FindAndSetTextBlockWrapping(wrap, posAlign, textAlign, true, true);
else if (button.Content is string buttonString)
button.Content = new TextBlock { Text = buttonString, TextWrapping = wrap, HorizontalAlignment = HorizontalAlignment.Center };
}
if (element is Panel panel)
foreach (UIElement childrenElement in panel.Children!)
- childrenElement.FindAndSetTextBlockWrapping(wrap, posAlign, textAlign, recursiveAssignment, isParentAButton);
+ childrenElement.FindAndSetTextBlockWrapping(wrap, posAlign, textAlign, true, isParentAButton);
if (element is ScrollViewer scrollViewer && scrollViewer.Content is UIElement elementInner)
- elementInner.FindAndSetTextBlockWrapping(wrap, posAlign, textAlign, recursiveAssignment, isParentAButton);
+ elementInner.FindAndSetTextBlockWrapping(wrap, posAlign, textAlign, true, isParentAButton);
if (element is ContentControl contentControl && (element is SettingsCard || element is Expander) && contentControl.Content is UIElement contentControlInner)
{
- contentControlInner.FindAndSetTextBlockWrapping(wrap, posAlign, textAlign, recursiveAssignment, isParentAButton);
+ contentControlInner.FindAndSetTextBlockWrapping(wrap, posAlign, textAlign, true, isParentAButton);
if (contentControl is Expander expander && expander.Header is UIElement expanderHeader)
- expanderHeader.FindAndSetTextBlockWrapping(wrap, posAlign, textAlign, recursiveAssignment, isParentAButton);
+ expanderHeader.FindAndSetTextBlockWrapping(wrap, posAlign, textAlign, true, isParentAButton);
}
if (element is InfoBar infoBar && infoBar.Content is UIElement infoBarInner)
- infoBarInner.FindAndSetTextBlockWrapping(wrap, posAlign, textAlign, recursiveAssignment, isParentAButton);
+ infoBarInner.FindAndSetTextBlockWrapping(wrap, posAlign, textAlign, true, isParentAButton);
}
internal static ref TElement WithWidthAndHeight(this TElement element, double uniform)
@@ -657,9 +856,7 @@ private static void InnerSetCornerRadius(TElement element, CornerRadiu
internal static void ApplyDropShadow(this FrameworkElement element, Color? shadowColor = null,
double blurRadius = 10, double opacity = 0.25, bool isMasked = true, Vector3? offset = null)
{
- FrameworkElement shadowPanel = null;
-
- shadowPanel = element.FindDescendant("ShadowGrid");
+ var shadowPanel = element.FindDescendant("ShadowGrid");
if (shadowPanel == null)
{
shadowPanel = CreateGrid()
@@ -692,13 +889,16 @@ 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;
}
}
- void AttachShadow(FrameworkElement thisElement, bool innerMask, Vector3? offset)
+ void AttachShadow(FrameworkElement thisElement, bool innerMask, Vector3? _offset)
{
FrameworkElement xamlRoot = (thisElement.Parent as FrameworkElement) ?? thisElement.FindDescendant();
@@ -717,7 +917,7 @@ void AttachShadow(FrameworkElement thisElement, bool innerMask, Vector3? offset)
if (xamlRoot == null || xamlRoot is not Panel)
throw new NullReferenceException("The element must be inside of a Grid or StackPanel or any \"Panel\" elements");
- thisElement.ApplyDropShadow(shadowPanel, shadowColor, blurRadius, opacity, innerMask, offset);
+ thisElement.ApplyDropShadow(shadowPanel, shadowColor, blurRadius, opacity, innerMask, _offset);
}
catch (Exception ex)
{
@@ -731,7 +931,9 @@ internal static void ApplyDropShadow(this FrameworkElement from, FrameworkElemen
double blurRadius = 10, double opacity = 0.25, bool isMasked = false, Vector3? offset = null)
{
offset ??= Vector3.Zero;
- string passedValue = $"{offset?.X ?? 0},{offset?.Y ?? 0},{offset?.Z ?? 0}";
+ // ReSharper disable ConstantConditionalAccessQualifier
+ string passedValue = $"{offset?.X},{offset?.Y},{offset?.Z}";
+ // ReSharper restore ConstantConditionalAccessQualifier
AttachedDropShadow shadow = new AttachedDropShadow()
{
diff --git a/CollapseLauncher/Classes/FileDialogCOM/FileDialogHelper.cs b/CollapseLauncher/Classes/FileDialogCOM/FileDialogHelper.cs
new file mode 100644
index 000000000..3d4ec0a79
--- /dev/null
+++ b/CollapseLauncher/Classes/FileDialogCOM/FileDialogHelper.cs
@@ -0,0 +1,194 @@
+using CollapseLauncher.Dialogs;
+using CollapseLauncher.Extension;
+using CollapseLauncher.FileDialogCOM;
+using CollapseLauncher.Helper;
+using Hi3Helper;
+using Hi3Helper.Data;
+using Hi3Helper.Shared.Region;
+using Microsoft.UI.Text;
+using Microsoft.UI.Xaml.Controls;
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+
+#nullable enable
+namespace CollapseLauncher.Classes.FileDialogCOM
+{
+ internal static class FileDialogHelper
+ {
+ ///
+ /// Get only folder paths that's allowed by Collapse Launcher
+ ///
+ /// The title of the folder dialog
+ /// Override path check and returns the actual string
+ /// If is empty, then it's cancelled. Otherwise, returns a selected path
+ internal static async Task GetRestrictedFolderPathDialog(string? title = null, Func? checkOverride = null)
+ {
+ StartGet:
+ string dirPath = await FileDialogNative.GetFolderPicker(title);
+
+ if (string.IsNullOrEmpty(dirPath))
+ return dirPath;
+
+ string? existingCheckOverride;
+ if (checkOverride != null && !string.IsNullOrEmpty(existingCheckOverride = checkOverride(dirPath)))
+ {
+ return existingCheckOverride;
+ }
+
+ if (!ConverterTool.IsUserHasPermission(dirPath))
+ {
+ await SpawnInvalidDialog(
+ Locale.Lang._Dialogs.InvalidGameDirNew2Title,
+ Locale.Lang._Dialogs.InvalidGameDirNew2Subtitle,
+ dirPath);
+ goto StartGet;
+ }
+
+ if (IsRootPath(dirPath))
+ {
+ await SpawnInvalidDialog(
+ Locale.Lang._Dialogs.InvalidGameDirNew3Title,
+ Locale.Lang._Dialogs.InvalidGameDirNew3Subtitle,
+ dirPath);
+ goto StartGet;
+ }
+
+ if (IsSystemDirPath(dirPath))
+ {
+ await SpawnInvalidDialog(
+ Locale.Lang._Dialogs.InvalidGameDirNew4Title,
+ Locale.Lang._Dialogs.InvalidGameDirNew4Subtitle,
+ dirPath);
+ goto StartGet;
+ }
+
+ if (IsProgramDataPath(dirPath))
+ {
+ await SpawnInvalidDialog(
+ Locale.Lang._Dialogs.InvalidGameDirNew5Title,
+ Locale.Lang._Dialogs.InvalidGameDirNew5Subtitle,
+ dirPath);
+ goto StartGet;
+ }
+
+ if (IsCollapseProgramPath(dirPath) || !CheckIfFolderIsValidLegacy(dirPath))
+ {
+ await SpawnInvalidDialog(
+ Locale.Lang._Dialogs.CannotUseAppLocationForGameDirTitle,
+ Locale.Lang._Dialogs.CannotUseAppLocationForGameDirSubtitle,
+ dirPath,
+ true);
+ goto StartGet;
+ }
+
+ if (IsProgramFilesPath(dirPath))
+ {
+ await SpawnInvalidDialog(
+ Locale.Lang._Dialogs.InvalidGameDirNew6Title,
+ Locale.Lang._Dialogs.InvalidGameDirNew6Subtitle,
+ dirPath);
+ goto StartGet;
+ }
+
+ return dirPath;
+
+
+ async Task SpawnInvalidDialog(string title, string message, string selectedPath, bool isUseLegacyFormatting = false)
+ {
+ TextBlock textBlock = new TextBlock()
+ {
+ TextWrapping = Microsoft.UI.Xaml.TextWrapping.Wrap
+ };
+ textBlock.AddTextBlockLine(message)
+ .AddTextBlockNewLine(2)
+ .AddTextBlockLine(Locale.Lang._Dialogs.InvalidGameDirNewSubtitleSelectedPath, weight: FontWeights.Bold)
+ .AddTextBlockNewLine()
+ .AddTextBlockLine(selectedPath);
+ if (!isUseLegacyFormatting)
+ {
+ textBlock.AddTextBlockNewLine(2)
+ .AddTextBlockLine(Locale.Lang._Dialogs.InvalidGameDirNewSubtitleSelectOther);
+ }
+
+ await SimpleDialogs.SpawnDialog(
+ isUseLegacyFormatting ? title : string.Format(Locale.Lang._Dialogs.InvalidGameDirNewTitleFormat, title),
+ textBlock,
+ (WindowUtility.CurrentWindow as MainWindow)?.Content,
+ Locale.Lang._Misc.Okay,
+ defaultButton: ContentDialogButton.Close,
+ dialogTheme: CustomControls.ContentDialogTheme.Error);
+ }
+ }
+
+ private static bool IsSystemDirPath(ReadOnlySpan path)
+ {
+ string? systemRootPath = Environment.GetEnvironmentVariable("SystemRoot");
+ if (path.StartsWith(systemRootPath))
+ return true;
+
+ return false;
+ }
+
+ private static bool IsProgramDataPath(ReadOnlySpan path)
+ {
+ string? programDataPath = Environment.GetEnvironmentVariable("ProgramData");
+ if (path.StartsWith(programDataPath))
+ return true;
+
+ return false;
+ }
+
+ private static bool IsProgramFilesPath(ReadOnlySpan path)
+ {
+ string? programFilesPath = Environment.GetEnvironmentVariable("ProgramFiles");
+ if (path.StartsWith(programFilesPath))
+ return true;
+
+ return false;
+ }
+
+ private static bool IsCollapseProgramPath(ReadOnlySpan path)
+ {
+ string collapseProgramPath = LauncherConfig.AppFolder;
+ if (path.StartsWith(collapseProgramPath))
+ return true;
+
+ return false;
+ }
+
+ ///
+ /// Determines if the path given is a drive root
+ ///
+ /// Path to check
+ /// True if path is root of the drive
+ internal static bool IsRootPath(ReadOnlySpan path)
+ {
+ ReadOnlySpan rootPath = Path.GetPathRoot(path);
+ return rootPath.SequenceEqual(path);
+ }
+
+ private static bool CheckIfFolderIsValidLegacy(string basePath)
+ {
+ bool isInAppFolderExist = File.Exists(Path.Combine(basePath, LauncherConfig.AppExecutableName))
+ || File.Exists(Path.Combine($"{basePath}\\..\\", LauncherConfig.AppExecutableName))
+ || File.Exists(Path.Combine($"{basePath}\\..\\..\\", LauncherConfig.AppExecutableName))
+ || File.Exists(Path.Combine($"{basePath}\\..\\..\\..\\", LauncherConfig.AppExecutableName));
+
+ string? driveLetter = Path.GetPathRoot(basePath);
+ if (string.IsNullOrEmpty(driveLetter))
+ {
+ return false;
+ }
+
+ bool isInAppFolderExist2 = basePath.EndsWith("Collapse Launcher")
+ || basePath.StartsWith(Path.Combine(driveLetter, "Program Files"))
+ || basePath.StartsWith(Path.Combine(driveLetter, "Program Files (x86)"))
+ || basePath.StartsWith(Path.Combine(driveLetter, "Windows"));
+
+ return !(isInAppFolderExist || isInAppFolderExist2);
+ }
+
+ }
+}
diff --git a/CollapseLauncher/Classes/FileDialogCOM/FileDialogNative.cs b/CollapseLauncher/Classes/FileDialogCOM/FileDialogNative.cs
index b4bfbee85..b0649ec4c 100644
--- a/CollapseLauncher/Classes/FileDialogCOM/FileDialogNative.cs
+++ b/CollapseLauncher/Classes/FileDialogCOM/FileDialogNative.cs
@@ -44,7 +44,7 @@ private static ValueTask