Refactor , move some class from Models to Modules

charles7668 · Nov 17, 2024 · 735a7db · 735a7db
1 parent 8b80d1d
commit 735a7db
Show file tree

Hide file tree

Showing 35 changed files with 65 additions and 47 deletions.
diff --git a/GameManager/App.xaml.cs b/GameManager/App.xaml.cs
@@ -1,6 +1,5 @@
 using GameManager.DB;
 using GameManager.DB.Models;
-using GameManager.Models.TaskManager;
 using GameManager.Services;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;

diff --git a/GameManager/Components/Layout/MainLayout.razor.cs b/GameManager/Components/Layout/MainLayout.razor.cs
@@ -1,5 +1,5 @@
 using GameManager.DB.Models;
-using GameManager.Models.TaskManager;
+using GameManager.Modules.TaskManager;
 using GameManager.Services;
 using Hangfire.Annotations;
 using Microsoft.AspNetCore.Components;

diff --git a/GameManager/Components/Layout/NavMenu.razor b/GameManager/Components/Layout/NavMenu.razor
@@ -1,4 +1,4 @@
-@using GameManager.Models.TaskManager
+@using GameManager.Modules.TaskManager
 <MudNavMenu Class="mud-height-full d-flex flex-column">
     <MudTooltip Text="@Resources.NavMenu_Game">
         <MudNavLink Class="d-flex align-center" Match="NavLinkMatch.All" Icon="@Icons.Material.Filled.GridView" Href="/"></MudNavLink>

diff --git a/GameManager/Components/Layout/NavMenu.razor.cs b/GameManager/Components/Layout/NavMenu.razor.cs
@@ -1,4 +1,4 @@
-using GameManager.Models.TaskManager;
+using GameManager.Modules.TaskManager;
 using Microsoft.AspNetCore.Components;
 
 namespace GameManager.Components.Layout

diff --git a/GameManager/Components/Pages/Home.Razor.cs b/GameManager/Components/Pages/Home.Razor.cs
@@ -1,7 +1,7 @@
 using GameManager.Components.Pages.components;
 using GameManager.DB.Models;
 using GameManager.Enums;
-using GameManager.Models.TaskManager;
+using GameManager.Modules.TaskManager;
 using GameManager.Properties;
 using GameManager.Services;
 using Helper;

diff --git a/GameManager/Components/Pages/Setting.razor.cs b/GameManager/Components/Pages/Setting.razor.cs
@@ -1,8 +1,8 @@
 using GameManager.Components.Pages.components;
 using GameManager.DB.Models;
 using GameManager.Models;
-using GameManager.Models.SecurityProvider;
-using GameManager.Models.TaskManager;
+using GameManager.Modules.SecurityProvider;
+using GameManager.Modules.TaskManager;
 using GameManager.Properties;
 using GameManager.Services;
 using Microsoft.AspNetCore.Components;

diff --git a/GameManager/Components/Pages/Tools.razor b/GameManager/Components/Pages/Tools.razor
@@ -1,5 +1,5 @@
 @page "/tools"
-@using GameManager.Models.ToolInfo
+@using GameManager.Modules.ToolInfo
 
 <div>
     <MudStack Row="true">

diff --git a/GameManager/Components/Pages/Tools.razor.cs b/GameManager/Components/Pages/Tools.razor.cs
@@ -1,6 +1,6 @@
 using GameManager.DB.Models;
 using GameManager.Models;
-using GameManager.Models.ToolInfo;
+using GameManager.Modules.ToolInfo;
 using GameManager.Services;
 using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Configuration;

diff --git a/GameManager/Components/Pages/components/ActionBar.razor.cs b/GameManager/Components/Pages/components/ActionBar.razor.cs
@@ -2,7 +2,7 @@
 using GameManager.Enums;
 using GameManager.Extractor;
 using GameManager.Models;
-using GameManager.Models.GameInstallAnalyzer;
+using GameManager.Modules.GameInstallAnalyzer;
 using GameManager.Properties;
 using GameManager.Services;
 using Helper;

diff --git a/GameManager/Components/Pages/components/Card.razor.cs b/GameManager/Components/Pages/components/Card.razor.cs
@@ -1,7 +1,7 @@
 using GameManager.DB.Models;
 using GameManager.Models;
-using GameManager.Models.LaunchProgramStrategies;
-using GameManager.Models.SaveDataManager;
+using GameManager.Modules.LaunchProgramStrategies;
+using GameManager.Modules.SaveDataManager;
 using GameManager.Properties;
 using GameManager.Services;
 using Helper;

diff --git a/GameManager/Components/Pages/components/GameDetail.razor.cs b/GameManager/Components/Pages/components/GameDetail.razor.cs
@@ -1,6 +1,6 @@
 using GameManager.DB.Models;
 using GameManager.Models;
-using GameManager.Models.LaunchProgramStrategies;
+using GameManager.Modules.LaunchProgramStrategies;
 using GameManager.Properties;
 using GameManager.Services;
 using Helper;

diff --git a/GameManager/Components/Pages/components/GameDetailSaveManager.razor.cs b/GameManager/Components/Pages/components/GameDetailSaveManager.razor.cs
@@ -1,6 +1,6 @@
 using GameManager.DB.Models;
 using GameManager.Models;
-using GameManager.Models.SaveDataManager;
+using GameManager.Modules.SaveDataManager;
 using Microsoft.AspNetCore.Components;
 using MudBlazor;
 

diff --git a/GameManager/Extensions/ServiceCollectionExtension.cs b/GameManager/Extensions/ServiceCollectionExtension.cs
@@ -1,9 +1,9 @@
 using GameManager.Extractor;
 using GameManager.GameInfoProvider;
-using GameManager.Models.SecurityProvider;
-using GameManager.Models.Synchronizer;
-using GameManager.Models.Synchronizer.Drivers;
-using GameManager.Models.TaskManager;
+using GameManager.Modules.SecurityProvider;
+using GameManager.Modules.Synchronizer;
+using GameManager.Modules.Synchronizer.Drivers;
+using GameManager.Modules.TaskManager;
 using GameManager.Services;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 

diff --git a/GameManager/GameManager.csproj b/GameManager/GameManager.csproj
@@ -127,4 +127,8 @@
       </None>
     </ItemGroup>
 
+    <ItemGroup>
+      <Folder Include="Modules\" />
+    </ItemGroup>
+
 </Project>
diff --git a/GameManager/MauiProgram.cs b/GameManager/MauiProgram.cs
@@ -3,8 +3,8 @@
 using GameManager.DB;
 using GameManager.Extensions;
 using GameManager.Models;
-using GameManager.Models.GameInstallAnalyzer;
-using GameManager.Models.SaveDataManager;
+using GameManager.Modules.GameInstallAnalyzer;
+using GameManager.Modules.SaveDataManager;
 using GameManager.Services;
 using Hangfire;
 using Hangfire.MemoryStorage;

diff --git a/...meInstallAnalyzer/IGameInstallAnalyzer.cs → ...meInstallAnalyzer/IGameInstallAnalyzer.cs b/...meInstallAnalyzer/IGameInstallAnalyzer.cs → ...meInstallAnalyzer/IGameInstallAnalyzer.cs
@@ -1,4 +1,6 @@
-namespace GameManager.Models.GameInstallAnalyzer
+using GameManager.Models;
+
+namespace GameManager.Modules.GameInstallAnalyzer
 {
     public interface IGameInstallAnalyzer
     {

diff --git a/...lyzer/ProcessTracerGameInstallAnalyzer.cs → ...lyzer/ProcessTracerGameInstallAnalyzer.cs b/...lyzer/ProcessTracerGameInstallAnalyzer.cs → ...lyzer/ProcessTracerGameInstallAnalyzer.cs
@@ -1,7 +1,7 @@
-using ABI.Windows.Security.Isolation;
+using GameManager.Models;
 using System.Text;
 
-namespace GameManager.Models.GameInstallAnalyzer
+namespace GameManager.Modules.GameInstallAnalyzer
 {
     public class ProcessTracerGameInstallAnalyzer : IGameInstallAnalyzer
     {

diff --git a/...s/LaunchProgramStrategies/DirectLaunch.cs → ...s/LaunchProgramStrategies/DirectLaunch.cs b/...s/LaunchProgramStrategies/DirectLaunch.cs → ...s/LaunchProgramStrategies/DirectLaunch.cs
@@ -1,8 +1,9 @@
 using GameManager.DB.Models;
+using GameManager.Models;
 using GameManager.Services;
 using System.Diagnostics;
 
-namespace GameManager.Models.LaunchProgramStrategies
+namespace GameManager.Modules.LaunchProgramStrategies
 {
     public class DirectLaunch(GameInfo gameInfo, Action<int>? tryLaunchVNGTTranslator = null) : IStrategy
     {

diff --git a/...trategies/LaunchProgramStrategyFactory.cs → ...trategies/LaunchProgramStrategyFactory.cs b/...trategies/LaunchProgramStrategyFactory.cs → ...trategies/LaunchProgramStrategyFactory.cs
@@ -1,6 +1,7 @@
 using GameManager.DB.Models;
+using GameManager.Models;
 
-namespace GameManager.Models.LaunchProgramStrategies
+namespace GameManager.Modules.LaunchProgramStrategies
 {
     public class LaunchProgramStrategyFactory
     {

diff --git a/...ramStrategies/LaunchWithLocaleEmulator.cs → ...ramStrategies/LaunchWithLocaleEmulator.cs b/...ramStrategies/LaunchWithLocaleEmulator.cs → ...ramStrategies/LaunchWithLocaleEmulator.cs
@@ -1,11 +1,12 @@
 using GameManager.DB.Models;
+using GameManager.Models;
 using GameManager.Properties;
 using GameManager.Services;
 using System.Diagnostics;
 using System.Xml.Linq;
 using System.Xml.XPath;
 
-namespace GameManager.Models.LaunchProgramStrategies
+namespace GameManager.Modules.LaunchProgramStrategies
 {
     public class LaunchWithLocaleEmulator(GameInfo gameInfo, Action<int>? tryLaunchVNGTTranslator = null) : IStrategy
     {

diff --git a/...hProgramStrategies/LaunchWithSandboxie.cs → ...hProgramStrategies/LaunchWithSandboxie.cs b/...hProgramStrategies/LaunchWithSandboxie.cs → ...hProgramStrategies/LaunchWithSandboxie.cs
@@ -1,11 +1,12 @@
 using GameManager.DB.Models;
+using GameManager.Models;
 using GameManager.Properties;
 using GameManager.Services;
 using System.Diagnostics;
 using System.Xml.Linq;
 using System.Xml.XPath;
 
-namespace GameManager.Models.LaunchProgramStrategies
+namespace GameManager.Modules.LaunchProgramStrategies
 {
     public class LaunchWithSandboxie(GameInfo gameInfo, Action<int>? tryLaunchVNGTTranslator) : IStrategy
     {

diff --git a/...odels/SaveDataManager/ISaveDataManager.cs → ...dules/SaveDataManager/ISaveDataManager.cs b/...odels/SaveDataManager/ISaveDataManager.cs → ...dules/SaveDataManager/ISaveDataManager.cs
@@ -1,7 +1,8 @@
 using GameManager.DB.Models;
 using GameManager.DTOs;
+using GameManager.Models;
 
-namespace GameManager.Models.SaveDataManager
+namespace GameManager.Modules.SaveDataManager
 {
     public interface ISaveDataManager
     {

diff --git a/...Models/SaveDataManager/SaveDataManager.cs → ...odules/SaveDataManager/SaveDataManager.cs b/...Models/SaveDataManager/SaveDataManager.cs → ...odules/SaveDataManager/SaveDataManager.cs
@@ -1,13 +1,14 @@
 using GameManager.DB.Models;
 using GameManager.DTOs;
 using GameManager.Extractor;
+using GameManager.Models;
 using GameManager.Properties;
 using GameManager.Services;
 using Helper;
 using Microsoft.Extensions.Logging;
 using System.IO.Compression;
 
-namespace GameManager.Models.SaveDataManager
+namespace GameManager.Modules.SaveDataManager
 {
     public class SaveDataManager(ILogger<SaveDataManager> logger, IAppPathService appPathService) : ISaveDataManager
     {

diff --git a/...s/SecurityProvider/AESSecurityProvider.cs → ...s/SecurityProvider/AESSecurityProvider.cs b/...s/SecurityProvider/AESSecurityProvider.cs → ...s/SecurityProvider/AESSecurityProvider.cs
@@ -3,7 +3,7 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace GameManager.Models.SecurityProvider
+namespace GameManager.Modules.SecurityProvider
 {
     public class AESSecurityProvider : ISecurityProvider
     {

diff --git a/...els/SecurityProvider/ISecurityProvider.cs → ...les/SecurityProvider/ISecurityProvider.cs b/...els/SecurityProvider/ISecurityProvider.cs → ...les/SecurityProvider/ISecurityProvider.cs
@@ -1,4 +1,4 @@
-namespace GameManager.Models.SecurityProvider
+namespace GameManager.Modules.SecurityProvider
 {
     public interface ISecurityProvider
     {

diff --git a/...els/Synchronizer/Drivers/IWebDAVDriver.cs → ...les/Synchronizer/Drivers/IWebDAVDriver.cs b/...els/Synchronizer/Drivers/IWebDAVDriver.cs → ...les/Synchronizer/Drivers/IWebDAVDriver.cs
@@ -1,4 +1,6 @@
-namespace GameManager.Models.Synchronizer.Drivers
+using FileInfo = GameManager.Models.FileInfo;
+
+namespace GameManager.Modules.Synchronizer.Drivers
 {
     public interface IWebDAVDriver
     {

diff --git a/...ynchronizer/Drivers/WebDAVWebDAVDriver.cs → ...ynchronizer/Drivers/WebDAVWebDAVDriver.cs b/...ynchronizer/Drivers/WebDAVWebDAVDriver.cs → ...ynchronizer/Drivers/WebDAVWebDAVDriver.cs
@@ -4,8 +4,9 @@
 using System.Net;
 using System.Text;
 using System.Xml;
+using FileInfo = GameManager.Models.FileInfo;
 
-namespace GameManager.Models.Synchronizer.Drivers
+namespace GameManager.Modules.Synchronizer.Drivers
 {
     public class WebDAVWebDAVDriver(IWebService webService) : IWebDAVDriver
     {

diff --git a/...ager/Models/Synchronizer/ISynchronizer.cs → ...ger/Modules/Synchronizer/ISynchronizer.cs b/...ager/Models/Synchronizer/ISynchronizer.cs → ...ger/Modules/Synchronizer/ISynchronizer.cs
@@ -1,4 +1,4 @@
-namespace GameManager.Models.Synchronizer
+namespace GameManager.Modules.Synchronizer
 {
     public interface ISynchronizer
     {

diff --git a/...nager/Models/Synchronizer/Synchronizer.cs → ...ager/Modules/Synchronizer/Synchronizer.cs b/...nager/Models/Synchronizer/Synchronizer.cs → ...ager/Modules/Synchronizer/Synchronizer.cs
@@ -1,7 +1,7 @@
 using GameManager.DTOs;
-using GameManager.Models.SaveDataManager;
-using GameManager.Models.SecurityProvider;
-using GameManager.Models.Synchronizer.Drivers;
+using GameManager.Modules.SaveDataManager;
+using GameManager.Modules.SecurityProvider;
+using GameManager.Modules.Synchronizer.Drivers;
 using GameManager.Services;
 using Helper;
 using Microsoft.Extensions.Logging;
@@ -10,9 +10,10 @@
 using System.Text.Json;
 using System.Web;
 using CancellationToken = System.Threading.CancellationToken;
+using FileInfo = GameManager.Models.FileInfo;
 using InvalidOperationException = System.InvalidOperationException;
 
-namespace GameManager.Models.Synchronizer
+namespace GameManager.Modules.Synchronizer
 {
     public class Synchronizer(
         IWebDAVDriver webDAVDriver,

diff --git a/...anager/Models/TaskManager/ITaskManager.cs → ...nager/Modules/TaskManager/ITaskManager.cs b/...anager/Models/TaskManager/ITaskManager.cs → ...nager/Modules/TaskManager/ITaskManager.cs
@@ -1,6 +1,7 @@
-using System.Linq.Expressions;
+using GameManager.Models;
+using System.Linq.Expressions;
 
-namespace GameManager.Models.TaskManager
+namespace GameManager.Modules.TaskManager
 {
     public interface ITaskManager
     {

diff --git a/...anager/Models/TaskManager/TaskExecutor.cs → ...nager/Modules/TaskManager/TaskExecutor.cs b/...anager/Models/TaskManager/TaskExecutor.cs → ...nager/Modules/TaskManager/TaskExecutor.cs
@@ -1,8 +1,8 @@
-using GameManager.Models.Synchronizer;
+using GameManager.Modules.Synchronizer;
 using JetBrains.Annotations;
 using Microsoft.Extensions.Logging;
 
-namespace GameManager.Models.TaskManager
+namespace GameManager.Modules.TaskManager
 {
     public static class TaskExecutor
     {

diff --git a/...Manager/Models/TaskManager/TaskManager.cs → ...anager/Modules/TaskManager/TaskManager.cs b/...Manager/Models/TaskManager/TaskManager.cs → ...anager/Modules/TaskManager/TaskManager.cs
@@ -1,8 +1,9 @@
-using Hangfire;
+using GameManager.Models;
+using Hangfire;
 using Hangfire.Storage;
 using System.Linq.Expressions;
 
-namespace GameManager.Models.TaskManager
+namespace GameManager.Modules.TaskManager
 {
     public class TaskManager
         : ITaskManager

diff --git a/...anager/Models/ToolInfo/BuiltinToolInfo.cs → ...nager/Modules/ToolInfo/BuiltinToolInfo.cs b/...anager/Models/ToolInfo/BuiltinToolInfo.cs → ...nager/Modules/ToolInfo/BuiltinToolInfo.cs
@@ -1,8 +1,9 @@
 using GameManager.Extractor;
+using GameManager.Models;
 using GameManager.Services;
 using System.Text.Json;
 
-namespace GameManager.Models.ToolInfo
+namespace GameManager.Modules.ToolInfo
 {
     public class BuiltinToolInfo(
         string toolName,

diff --git a/...Manager/Models/ToolInfo/CustomToolInfo.cs → ...anager/Modules/ToolInfo/CustomToolInfo.cs b/...Manager/Models/ToolInfo/CustomToolInfo.cs → ...anager/Modules/ToolInfo/CustomToolInfo.cs
@@ -1,7 +1,7 @@
 using GameManager.Services;
 using System.Diagnostics;
 
-namespace GameManager.Models.ToolInfo
+namespace GameManager.Modules.ToolInfo
 {
     public class CustomToolInfo(string toolName, string toolVersion, string exePath, bool runAsAdmin = false)
         : IToolInfo

diff --git a/GameManager/Models/ToolInfo/IToolInfo.cs → GameManager/Modules/ToolInfo/IToolInfo.cs b/GameManager/Models/ToolInfo/IToolInfo.cs → GameManager/Modules/ToolInfo/IToolInfo.cs
@@ -1,4 +1,4 @@
-namespace GameManager.Models.ToolInfo
+namespace GameManager.Modules.ToolInfo
 {
     public interface IToolInfo
     {