Merge branch 'dev'

Author: VolcanicArts

.gitignore

@@ -3,7 +3,6 @@ obj/
 /build
 /releases
 /publish
-/publish.sh
 /packages/
 riderModule.iml
 /_ReSharper.Caches/

LICENSE

@@ -620,7 +620,7 @@ copy of the Program in return for a fee.
 
                      END OF TERMS AND CONDITIONS
 
-    Copyright (C) 2022-2024 VolcanicArts
+    Copyright (C) 2022-2025 VolcanicArts
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -633,4 +633,4 @@ copy of the Program in return for a fee.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.

VRCOSC.App/Actions/CallbackProgressAction.cs

@@ -0,0 +1,32 @@
+// Copyright (c) VolcanicArts. Licensed under the GPL-3.0 License.
+// See the LICENSE file in the repository root for full license text.
+
+using System;
+using System.Threading.Tasks;
+
+namespace VRCOSC.App.Actions;
+
+public class CallbackProgressAction : ProgressAction
+{
+    public override string Title { get; }
+    private readonly Action? callback;
+    private readonly Func<Task?>? taskCallback;
+
+    public CallbackProgressAction(string title, Action callback)
+    {
+        Title = title;
+        this.callback = callback;
+    }
+
+    public CallbackProgressAction(string title, Func<Task?> callback)
+    {
+        Title = title;
+        taskCallback = callback;
+    }
+
+    protected override async Task Perform()
+    {
+        callback?.Invoke();
+        await (taskCallback?.Invoke() ?? Task.CompletedTask);
+    }
+}

VRCOSC.App/Actions/CompositeProgressAction.cs

@@ -5,17 +5,16 @@
 using System.Threading.Tasks;
 using VRCOSC.App.Utils;
 
-namespace VRCOSC.App.Actions.Files;
+namespace VRCOSC.App.Actions;
 
 public class FileDownloadAction : ProgressAction
 {
     private readonly Storage targetStorage;
     private readonly Uri url;
     private readonly string assetName;
 
-    private float localProgress;
-
     public override string Title => $"Downloading {assetName}";
+    public override bool UseProgressBar => true;
 
     public FileDownloadAction(Uri url, Storage targetStorage, string assetName)
     {
@@ -26,14 +25,8 @@ public FileDownloadAction(Uri url, Storage targetStorage, string assetName)
 
     protected override async Task Perform()
     {
-        localProgress = 0f;
-
         var fileDownload = new FileDownload();
-        fileDownload.ProgressChanged += p => localProgress = p;
+        fileDownload.ProgressChanged += p => OnProgressChanged?.Invoke(p);
         await fileDownload.DownloadFileAsync(url, targetStorage.GetFullPath(assetName, true));
-
-        localProgress = 1f;
     }
-
-    public override float GetProgress() => localProgress;
 }