Move Models.Progress to Core assembly

1 year ago · cbcfcb8217
31 changed files with 34 additions and 34 deletions
--- a/StabilityMatrix.Core/StabilityMatrix.Core/Exceptions/ProcessException.cs
+++ b/StabilityMatrix.Core/StabilityMatrix.Core/Exceptions/ProcessException.cs
@ -1,6 +1,4 @@
-using System;
-
-namespace StabilityMatrix.Exceptions;
+namespace StabilityMatrix.Core.Exceptions;

 /// <summary>
 /// Exception that is thrown when a process fails.
--- a/StabilityMatrix.Core/StabilityMatrix.Core/Models/Progress/ProgressReport.cs
+++ b/StabilityMatrix.Core/StabilityMatrix.Core/Models/Progress/ProgressReport.cs
@ -1,6 +1,4 @@
-using System;
-
-namespace StabilityMatrix.Models.Progress;
+namespace StabilityMatrix.Core.Models.Progress;

 public record struct ProgressReport
 {
--- a/StabilityMatrix.Core/StabilityMatrix.Core/Models/Progress/ProgressState.cs
+++ b/StabilityMatrix.Core/StabilityMatrix.Core/Models/Progress/ProgressState.cs
@ -1,4 +1,4 @@
-namespace StabilityMatrix.Models.Progress;
+namespace StabilityMatrix.Core.Models.Progress;

 public enum ProgressState
 {
--- a/StabilityMatrix.Core/StabilityMatrix.Core/Models/Progress/ProgressType.cs
+++ b/StabilityMatrix.Core/StabilityMatrix.Core/Models/Progress/ProgressType.cs
@ -1,4 +1,4 @@
-namespace StabilityMatrix.Models.Progress;
+namespace StabilityMatrix.Core.Models.Progress;

 public enum ProgressType
 {
--- a/StabilityMatrix/DesignData/MockFirstLaunchSetupViewModel.cs
+++ b/StabilityMatrix/DesignData/MockFirstLaunchSetupViewModel.cs
@ -1,4 +1,4 @@
-using StabilityMatrix.Models.Progress;
+using StabilityMatrix.Core.Models.Progress;
 using StabilityMatrix.ViewModels;

 namespace StabilityMatrix.DesignData;
--- a/StabilityMatrix/Helper/ArchiveHelper.cs
+++ b/StabilityMatrix/Helper/ArchiveHelper.cs
@ -9,7 +9,7 @@ using System.Windows.Threading;
 using NLog;
 using SharpCompress.Common;
 using SharpCompress.Readers;
-using StabilityMatrix.Models.Progress;
+using StabilityMatrix.Core.Models.Progress;

 namespace StabilityMatrix.Helper;

--- a/StabilityMatrix/Helper/FileHash.cs
+++ b/StabilityMatrix/Helper/FileHash.cs
@ -4,7 +4,7 @@ using System.IO;
 using System.Security.Cryptography;
 using System.Threading.Tasks;
 using Blake3;
-using StabilityMatrix.Models.Progress;
+using StabilityMatrix.Core.Models.Progress;

 namespace StabilityMatrix.Helper;

--- a/StabilityMatrix/Helper/FileTransfers.cs
+++ b/StabilityMatrix/Helper/FileTransfers.cs
@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using StabilityMatrix.Models.Progress;
+using StabilityMatrix.Core.Models.Progress;

 namespace StabilityMatrix.Helper;

--- a/StabilityMatrix/Helper/IPrerequisiteHelper.cs
+++ b/StabilityMatrix/Helper/IPrerequisiteHelper.cs
@ -1,6 +1,6 @@
 using System;
 using System.Threading.Tasks;
-using StabilityMatrix.Models.Progress;
+using StabilityMatrix.Core.Models.Progress;

 namespace StabilityMatrix.Helper;

--- a/StabilityMatrix/Helper/PrerequisiteHelper.cs
+++ b/StabilityMatrix/Helper/PrerequisiteHelper.cs
@ -8,7 +8,7 @@ using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Microsoft.Win32;
 using Octokit;
-using StabilityMatrix.Models.Progress;
+using StabilityMatrix.Core.Models.Progress;
 using StabilityMatrix.Python;
 using StabilityMatrix.Services;

--- a/StabilityMatrix/Helper/ProcessRunner.cs
+++ b/StabilityMatrix/Helper/ProcessRunner.cs
@ -6,7 +6,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using NLog;
-using StabilityMatrix.Exceptions;
+using StabilityMatrix.Core.Exceptions;

 namespace StabilityMatrix.Helper;

--- a/StabilityMatrix/Models/CheckpointFile.cs
+++ b/StabilityMatrix/Models/CheckpointFile.cs
@ -11,9 +11,9 @@ using AsyncAwaitBestPractices;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using NLog;
+using StabilityMatrix.Core.Models.Progress;
 using StabilityMatrix.Extensions;
 using StabilityMatrix.Helper;
-using StabilityMatrix.Models.Progress;

 namespace StabilityMatrix.Models;

--- a/StabilityMatrix/Models/CheckpointFolder.cs
+++ b/StabilityMatrix/Models/CheckpointFolder.cs
@ -8,10 +8,10 @@ using System.Threading.Tasks;
 using System.Windows;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using StabilityMatrix.Core.Models.Progress;
 using StabilityMatrix.Extensions;
 using StabilityMatrix.Helper;
 using StabilityMatrix.Models.FileInterfaces;
-using StabilityMatrix.Models.Progress;
 using StabilityMatrix.Services;
 using StabilityMatrix.ViewModels;

--- a/StabilityMatrix/Models/Packages/A3WebUI.cs
+++ b/StabilityMatrix/Models/Packages/A3WebUI.cs
@ -6,9 +6,9 @@ using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using StabilityMatrix.Core.Models.Progress;
 using StabilityMatrix.Helper;
 using StabilityMatrix.Helper.Cache;
-using StabilityMatrix.Models.Progress;
 using StabilityMatrix.Services;

 namespace StabilityMatrix.Models.Packages;
--- a/StabilityMatrix/Models/Packages/BaseGitPackage.cs
+++ b/StabilityMatrix/Models/Packages/BaseGitPackage.cs
@ -7,9 +7,9 @@ using System.Linq;
 using System.Threading.Tasks;
 using NLog;
 using Octokit;
+using StabilityMatrix.Core.Models.Progress;
 using StabilityMatrix.Helper;
 using StabilityMatrix.Helper.Cache;
-using StabilityMatrix.Models.Progress;
 using StabilityMatrix.Python;
 using StabilityMatrix.Services;

--- a/StabilityMatrix/Models/Packages/BasePackage.cs
+++ b/StabilityMatrix/Models/Packages/BasePackage.cs
@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Octokit;
-using StabilityMatrix.Models.Progress;
+using StabilityMatrix.Core.Models.Progress;

 namespace StabilityMatrix.Models.Packages;

--- a/StabilityMatrix/Models/Packages/ComfyUI.cs
+++ b/StabilityMatrix/Models/Packages/ComfyUI.cs
@ -6,9 +6,9 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using NLog;
+using StabilityMatrix.Core.Models.Progress;
 using StabilityMatrix.Helper;
 using StabilityMatrix.Helper.Cache;
-using StabilityMatrix.Models.Progress;
 using StabilityMatrix.Services;

 namespace StabilityMatrix.Models.Packages;
--- a/StabilityMatrix/Models/Packages/VladAutomatic.cs
+++ b/StabilityMatrix/Models/Packages/VladAutomatic.cs
@ -7,9 +7,9 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using NLog;
+using StabilityMatrix.Core.Models.Progress;
 using StabilityMatrix.Helper;
 using StabilityMatrix.Helper.Cache;
-using StabilityMatrix.Models.Progress;
 using StabilityMatrix.Python;
 using StabilityMatrix.Services;

--- a/StabilityMatrix/Services/DownloadService.cs
+++ b/StabilityMatrix/Services/DownloadService.cs
@ -5,7 +5,7 @@ using System.Net.Http.Headers;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Polly.Contrib.WaitAndRetry;
-using StabilityMatrix.Models.Progress;
+using StabilityMatrix.Core.Models.Progress;

 namespace StabilityMatrix.Services;

--- a/StabilityMatrix/Services/IDownloadService.cs
+++ b/StabilityMatrix/Services/IDownloadService.cs
@ -1,6 +1,6 @@
 using System;
 using System.Threading.Tasks;
-using StabilityMatrix.Models.Progress;
+using StabilityMatrix.Core.Models.Progress;

 namespace StabilityMatrix.Services;

--- a/StabilityMatrix/StabilityMatrix.csproj
+++ b/StabilityMatrix/StabilityMatrix.csproj
@ -105,5 +105,9 @@
  <ItemGroup>
    <ProjectReference Include="..\StabilityMatrix.Core\StabilityMatrix.Core\StabilityMatrix.Core.csproj" />
  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Models\Progress\" />
+  </ItemGroup>
  
 </Project>
--- a/StabilityMatrix/Updater/IUpdateHelper.cs
+++ b/StabilityMatrix/Updater/IUpdateHelper.cs
@ -1,6 +1,6 @@
 using System;
 using System.Threading.Tasks;
-using StabilityMatrix.Models.Progress;
+using StabilityMatrix.Core.Models.Progress;

 namespace StabilityMatrix.Updater;

--- a/StabilityMatrix/Updater/UpdateHelper.cs
+++ b/StabilityMatrix/Updater/UpdateHelper.cs
@ -7,10 +7,10 @@ using System.Threading.Tasks;
 using System.Windows.Threading;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using StabilityMatrix.Core.Models.Progress;
 using StabilityMatrix.Extensions;
 using StabilityMatrix.Helper;
 using StabilityMatrix.Models.Configs;
-using StabilityMatrix.Models.Progress;
 using StabilityMatrix.Services;

 namespace StabilityMatrix.Updater;
--- a/StabilityMatrix/ViewModels/CheckpointBrowserCardViewModel.cs
+++ b/StabilityMatrix/ViewModels/CheckpointBrowserCardViewModel.cs
@ -10,12 +10,12 @@ using AsyncAwaitBestPractices;
 using CommunityToolkit.Mvvm.Input;
 using NLog;
 using Refit;
+using StabilityMatrix.Core.Models.Progress;
 using StabilityMatrix.Extensions;
 using StabilityMatrix.Helper;
 using StabilityMatrix.Models;
 using StabilityMatrix.Models.Api;
 using StabilityMatrix.Models.FileInterfaces;
-using StabilityMatrix.Models.Progress;
 using StabilityMatrix.Services;
 using Wpf.Ui.Controls;

--- a/StabilityMatrix/ViewModels/InstallerViewModel.cs
+++ b/StabilityMatrix/ViewModels/InstallerViewModel.cs
@ -11,10 +11,10 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.Logging;
 using Octokit;
+using StabilityMatrix.Core.Models.Progress;
 using StabilityMatrix.Helper;
 using StabilityMatrix.Models;
 using StabilityMatrix.Models.Packages;
-using StabilityMatrix.Models.Progress;
 using StabilityMatrix.Python;
 using StabilityMatrix.Services;
 using Wpf.Ui.Contracts;
--- a/StabilityMatrix/ViewModels/OneClickInstallViewModel.cs
+++ b/StabilityMatrix/ViewModels/OneClickInstallViewModel.cs
@ -4,10 +4,10 @@ using System.Windows;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.Logging;
+using StabilityMatrix.Core.Models.Progress;
 using StabilityMatrix.Helper;
 using StabilityMatrix.Models;
 using StabilityMatrix.Models.Packages;
-using StabilityMatrix.Models.Progress;
 using StabilityMatrix.Python;
 using EventManager = StabilityMatrix.Helper.EventManager;

--- a/StabilityMatrix/ViewModels/PackageManagerViewModel.cs
+++ b/StabilityMatrix/ViewModels/PackageManagerViewModel.cs
@ -11,7 +11,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.Logging;
 using Polly;
-using StabilityMatrix.Models.Progress;
+using StabilityMatrix.Core.Models.Progress;
 using Wpf.Ui.Contracts;
 using Wpf.Ui.Controls;
 using Wpf.Ui.Controls.ContentDialogControl;
--- a/StabilityMatrix/ViewModels/RefreshBadgeViewModel.cs
+++ b/StabilityMatrix/ViewModels/RefreshBadgeViewModel.cs
@ -5,7 +5,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using NLog;
 using StabilityMatrix.Controls;
-using StabilityMatrix.Models.Progress;
+using StabilityMatrix.Core.Models.Progress;
 using Wpf.Ui.Common;
 using Wpf.Ui.Controls;
 using Wpf.Ui.Controls.IconElements;
--- a/StabilityMatrix/ViewModels/SelectInstallLocationsViewModel.cs
+++ b/StabilityMatrix/ViewModels/SelectInstallLocationsViewModel.cs
@ -9,8 +9,8 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using NLog;
 using Ookii.Dialogs.Wpf;
+using StabilityMatrix.Core.Models.Progress;
 using StabilityMatrix.Helper;
-using StabilityMatrix.Models.Progress;
 using StabilityMatrix.Models.Settings;

 namespace StabilityMatrix.ViewModels;
--- a/StabilityMatrix/ViewModels/SettingsViewModel.cs
+++ b/StabilityMatrix/ViewModels/SettingsViewModel.cs
@ -20,10 +20,10 @@ using Ookii.Dialogs.Wpf;
 using Polly.Timeout;
 using Refit;
 using StabilityMatrix.Api;
+using StabilityMatrix.Core.Models.Progress;
 using StabilityMatrix.Database;
 using StabilityMatrix.Helper;
 using StabilityMatrix.Models;
-using StabilityMatrix.Models.Progress;
 using StabilityMatrix.Python;
 using Wpf.Ui.Appearance;
 using Wpf.Ui.Contracts;
--- a/StabilityMatrix/ViewModels/UpdateWindowViewModel.cs
+++ b/StabilityMatrix/ViewModels/UpdateWindowViewModel.cs
@ -5,8 +5,8 @@ using System.Threading.Tasks;
 using System.Windows;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using StabilityMatrix.Core.Models.Progress;
 using StabilityMatrix.Helper;
-using StabilityMatrix.Models.Progress;
 using StabilityMatrix.Updater;
 using Wpf.Ui.Controls.Window;