Skip to content

Commit 1a1f889

Browse files
committed
Un submoduled BytexDigital.Steam
1 parent daf8abc commit 1a1f889

File tree

5 files changed

+6
-19
lines changed

5 files changed

+6
-19
lines changed

.gitmodules

-3
This file was deleted.

BytexDigital.Steam

-1
This file was deleted.

FASTER.sln

-6
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FASTERTests", "FASTERTests\
2222
EndProject
2323
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FASTER Maintenance", "FASTER Maintenance\FASTER Maintenance.csproj", "{465FB100-A08C-4E4F-A321-EC85C5C177B3}"
2424
EndProject
25-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BytexDigital.Steam", "BytexDigital.Steam\BytexDigital.Steam\BytexDigital.Steam.csproj", "{6E75A863-F718-4374-94B7-97B480F9E274}"
26-
EndProject
2725
Global
2826
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2927
Debug|Any CPU = Debug|Any CPU
@@ -40,10 +38,6 @@ Global
4038
{65FDF864-BF9B-414A-A6E6-3473BCFB62BE}.Release|Any CPU.Build.0 = Release|Any CPU
4139
{465FB100-A08C-4E4F-A321-EC85C5C177B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4240
{465FB100-A08C-4E4F-A321-EC85C5C177B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
43-
{6E75A863-F718-4374-94B7-97B480F9E274}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
44-
{6E75A863-F718-4374-94B7-97B480F9E274}.Debug|Any CPU.Build.0 = Debug|Any CPU
45-
{6E75A863-F718-4374-94B7-97B480F9E274}.Release|Any CPU.ActiveCfg = Release|Any CPU
46-
{6E75A863-F718-4374-94B7-97B480F9E274}.Release|Any CPU.Build.0 = Release|Any CPU
4741
EndGlobalSection
4842
GlobalSection(SolutionProperties) = preSolution
4943
HideSolutionNode = FALSE

FASTER/FASTER.csproj

+1-3
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
</ItemGroup>
6464
<ItemGroup>
6565
<PackageReference Include="Autoupdater.NET.Official" Version="1.9.2" />
66+
<PackageReference Include="BytexDigital.Steam" Version="0.8.6-preview.1728774783" />
6667
<PackageReference Include="FontAwesome.WPF" Version="4.7.0.9" />
6768
<PackageReference Include="LiveCharts.Wpf" Version="0.9.7" />
6869
<PackageReference Include="MahApps.Metro" Version="2.4.10" />
@@ -74,7 +75,4 @@
7475
<PackageReference Include="System.Text.Json" Version="8.0.5" />
7576
<PackageReference Include="WindowsAPICodePack-Shell" Version="1.1.1" />
7677
</ItemGroup>
77-
<ItemGroup>
78-
<ProjectReference Include="..\BytexDigital.Steam\BytexDigital.Steam\BytexDigital.Steam.csproj" />
79-
</ItemGroup>
8078
</Project>

FASTER/ViewModel/SteamUpdaterViewModel.cs

+5-6
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,11 @@ public async Task<int> RunModsUpdater(ObservableCollection<ArmaMod> mods)
461461

462462
var downloadHandler = SteamContentClient.GetPublishedFileDataAsync(mod.WorkshopId, manifestId, tokenSource.Token);
463463
DownloadForMultiple(downloadHandler.Result, mod.Path).Wait();
464+
465+
mod.Status = ArmaModStatus.UpToDate;
466+
var nx = DateTime.UnixEpoch;
467+
var ts = DateTime.UtcNow - nx;
468+
mod.LocalLastUpdated = (ulong)ts.TotalSeconds;
464469
}
465470
catch (TaskCanceledException)
466471
{
@@ -473,18 +478,12 @@ public async Task<int> RunModsUpdater(ObservableCollection<ArmaMod> mods)
473478
mod.Status = ArmaModStatus.NotComplete;
474479
Parameters.Output += $"\nError: {ex.Message}{(ex.InnerException != null ? $" Inner Exception: {ex.InnerException.Message}" : "")}";
475480
}
476-
477481
sw.Stop();
478-
mod.Status = ArmaModStatus.UpToDate;
479-
var nx = DateTime.UnixEpoch;
480-
var ts = DateTime.UtcNow - nx;
481-
mod.LocalLastUpdated = (ulong) ts.TotalSeconds;
482482

483483
mod.CheckModSize();
484484

485485
Parameters.Output += $"\n Download {mod.WorkshopId} completed, it took {sw.Elapsed.Minutes + sw.Elapsed.Hours*60}m {sw.Elapsed.Seconds}s {sw.Elapsed.Milliseconds}ms";
486486

487-
488487
}, TaskCreationOptions.LongRunning).ContinueWith((_) =>
489488
{
490489
finished += 1;

0 commit comments

Comments
 (0)