I think I finally got that bug

Foxlider · Jun 4, 2023 · 76968ab · 76968ab
1 parent 6aca3ae
commit 76968ab
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 11 deletions.
diff --git a/FASTER/FASTER.csproj b/FASTER/FASTER.csproj
@@ -52,7 +52,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Autoupdater.NET.Official" Version="1.8.2" />
-    <PackageReference Include="BytexDigital.Steam" Version="0.8.2-preview.1685575037" />
+    <PackageReference Include="BytexDigital.Steam" Version="0.8.2-preview.1685631065" />
     <PackageReference Include="FontAwesome.WPF" Version="4.7.0.9" />
     <PackageReference Include="LiveCharts.Wpf" Version="0.9.7" />
     <PackageReference Include="MahApps.Metro" Version="2.4.9" />

diff --git a/FASTER/ViewModel/SteamUpdaterViewModel.cs b/FASTER/ViewModel/SteamUpdaterViewModel.cs
@@ -48,19 +48,17 @@ private SteamUpdaterViewModel(SteamUpdaterModel model)
             };
             timer.Tick += Timer_Tick;
             timer.IsEnabled = true;
-
-
         }
 
         private bool _isLoggingIn;
         private bool _isDlOverride;
         private bool _updaterOnline;
         private bool _updaterFaulted;
 
-        public SteamUpdaterModel            Parameters        { get; set; }
+        public SteamUpdaterModel Parameters { get; set; }
 
 
-        public  IDialogCoordinator      DialogCoordinator { get; set; }
+        public IDialogCoordinator DialogCoordinator { get; set; }
         private CancellationTokenSource tokenSource = new();
 
         public bool IsDownloading => DownloadTasks.Count > 0 || IsLoggingIn || IsDlOverride;
@@ -294,12 +292,17 @@ internal async Task<int> RunServerUpdater(string path, uint appId, List<(uint id
 
                     Parameters.Output += $"\nFetching informations of app {appId}, depot {depot.id} from Steam ({depots.IndexOf(depot)+1}/{depots.Count})... ";
                     var downloadHandler = await SteamContentClient.GetAppDataAsync(appId, depot.id, manifestId, tokenSource.Token);
-                    if(downloadHandler.TotalFileSize == 0 && downloadHandler.TotalFileCount == 0)
+
+                    await Download(downloadHandler, path);
+                }
+                catch (ArgumentException ex)
+                {
+                    if(ex.Message.Contains("'tasks'"))
+                        Parameters.Output += "\nSkipped...";
+                    else
                     {
-                        Parameters.Output += $"\nNothing to do for {appId}, depot {depot.id}. Skipping...";
-                        continue;
+                        throw;
                     }
-                    await Download(downloadHandler, path);
                 }
                 catch (Exception ex)
                 {
@@ -548,8 +551,13 @@ private void SyncDeleteRemovedFiles(string targetDir, Manifest manifest)
         private async Task Download(IDownloadHandler downloadHandler, string targetDir)
         {
             ulong downloadedSize = 0;
+            bool skipDownload = false;
             downloadHandler.FileVerified          += (_, args) => Parameters.Output += $"{(args.RequiresDownload ? $"\nFile verified : {args.ManifestFile.FileName} ({Functions.ParseFileSize(args.ManifestFile.TotalSize)})" : "")}";
-            downloadHandler.VerificationCompleted += (_, args) => Parameters.Output += $"\nVerification completed, {args.QueuedFiles.Count} files queued for download. ({args.QueuedFiles.Sum(f => (double)f.TotalSize)} bytes)";
+            downloadHandler.VerificationCompleted += (_, args) => {
+                Parameters.Output += $"\nVerification completed, {args.QueuedFiles.Count} files queued for download. ({args.QueuedFiles.Sum(f => (double)f.TotalSize)} bytes)"; 
+                if (args.QueuedFiles.Count == 0) 
+                    {skipDownload = true; } 
+                };
             downloadHandler.FileDownloaded        += (_, args) =>
                                                      {
                                                          downloadedSize    += args.TotalSize;
@@ -569,8 +577,9 @@ private async Task Download(IDownloadHandler downloadHandler, string targetDir)
             DownloadTasks.Add(downloadTask);
 
             Parameters.Output += $"\nDownloading {downloadHandler.TotalFileCount} files with total size of {Functions.ParseFileSize(downloadHandler.TotalFileSize)}...";
+            Parameters.Output += $"\nVerifying Install...";
             Parameters.Progress = 0;
-            while (!downloadTask.IsCompleted && !downloadTask.IsCanceled && !tokenSource.Token.IsCancellationRequested)
+            while (!downloadTask.IsCompleted && !downloadTask.IsCanceled && !tokenSource.Token.IsCancellationRequested && !skipDownload)
             {
 
                 var delayTask = Task.Delay(500, tokenSource.Token);
@@ -582,6 +591,16 @@ private async Task Download(IDownloadHandler downloadHandler, string targetDir)
                 Parameters.Progress = downloadHandler.TotalProgress * 100;
             }
 
+            if (skipDownload)
+            {
+                Parameters.Output += "\nSkipping Download...";
+                Parameters.Progress = 0;
+                await downloadHandler.DisposeAsync();
+                DownloadTasks.Remove(downloadTask);
+                return;
+            }
+
+
             if (downloadTask.IsCanceled)
             {