Reorganize models

2025-04-12 16:21:29 -07:00 · 2024-09-15 20:58:28 +01:00 · 2024-09-15 20:58:28 +01:00 · 0b20720fdb
commit 0b20720fdb
parent c58a8ab739
23 changed files with 83 additions and 75 deletions
--- a/Bloxstrap/GlobalUsings.cs
+++ b/Bloxstrap/GlobalUsings.cs
@ -3,7 +3,6 @@ global using System.Collections.Generic;
 global using System.Diagnostics;
 global using System.Globalization;
 global using System.IO;
-global using System.IO.Compression;
 global using System.Text;
 global using System.Text.Json;
 global using System.Text.Json.Serialization;
@ -18,10 +17,16 @@ global using Bloxstrap.Enums;
 global using Bloxstrap.Exceptions;
 global using Bloxstrap.Extensions;
 global using Bloxstrap.Models;
+global using Bloxstrap.Models.APIs.Config;
+global using Bloxstrap.Models.APIs.GitHub;
+global using Bloxstrap.Models.APIs.Roblox;
 global using Bloxstrap.Models.Attributes;
 global using Bloxstrap.Models.BloxstrapRPC;
-global using Bloxstrap.Models.RobloxApi;
+global using Bloxstrap.Models.Entities;
 global using Bloxstrap.Models.Manifest;
+global using Bloxstrap.Models.Persistable;
+global using Bloxstrap.Models.SettingTasks;
+global using Bloxstrap.Models.SettingTasks.Base;
 global using Bloxstrap.Resources;
 global using Bloxstrap.UI;
 global using Bloxstrap.Utility;
--- a/Bloxstrap/Models/APIs/Config/Supporter.cs
+++ b/Bloxstrap/Models/APIs/Config/Supporter.cs
@ -1,4 +1,4 @@
-namespace Bloxstrap.Models
+namespace Bloxstrap.Models.APIs.Config
 {
    public class Supporter
    {
--- a/Bloxstrap/Models/APIs/Config/SupporterData.cs
+++ b/Bloxstrap/Models/APIs/Config/SupporterData.cs
@ -1,4 +1,4 @@
-namespace Bloxstrap.Models
+namespace Bloxstrap.Models.APIs.Config
 {
    public class SupporterData
    {
--- a/Bloxstrap/Models/APIs/GitHub/GitHubReleaseAsset.cs
+++ b/Bloxstrap/Models/APIs/GitHub/GitHubReleaseAsset.cs
@ -0,0 +1,8 @@
+public class GithubReleaseAsset
+{
+    [JsonPropertyName("browser_download_url")]
+    public string BrowserDownloadUrl { get; set; } = null!;
+
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = null!;
+}
--- a/Bloxstrap/Models/APIs/GitHub/GithubRelease.cs
+++ b/Bloxstrap/Models/APIs/GitHub/GithubRelease.cs
@ -1,4 +1,4 @@
-namespace Bloxstrap.Models
+namespace Bloxstrap.Models.APIs.GitHub
 {
    public class GithubRelease
    {
@ -7,7 +7,7 @@

        [JsonPropertyName("name")]
        public string Name { get; set; } = null!;
-        
+
        [JsonPropertyName("body")]
        public string Body { get; set; } = null!;

@ -17,13 +17,4 @@
        [JsonPropertyName("assets")]
        public List<GithubReleaseAsset>? Assets { get; set; }
    }
-
-    public class GithubReleaseAsset
-    {
-        [JsonPropertyName("browser_download_url")]
-        public string BrowserDownloadUrl { get; set; } = null!;
-
-        [JsonPropertyName("name")]
-        public string Name { get; set; } = null!;
-    }
 }
--- a/Bloxstrap/Models/APIs/IPInfoResponse.cs
+++ b/Bloxstrap/Models/APIs/IPInfoResponse.cs
@ -1,14 +1,14 @@
-namespace Bloxstrap.Models
-{
-    public class IPInfoResponse
-    {
-        [JsonPropertyName("city")]
-        public string City { get; set; } = null!;
-
-        [JsonPropertyName("country")]
-        public string Country { get; set; } = null!;
-
-        [JsonPropertyName("region")]
-        public string Region { get; set; } = null!;
-    }
-}
+namespace Bloxstrap.Models.APIs
+{
+    public class IPInfoResponse
+    {
+        [JsonPropertyName("city")]
+        public string City { get; set; } = null!;
+
+        [JsonPropertyName("country")]
+        public string Country { get; set; } = null!;
+
+        [JsonPropertyName("region")]
+        public string Region { get; set; } = null!;
+    }
+}
--- a/Bloxstrap/Models/APIs/Roblox/ApiArrayResponse.cs
+++ b/Bloxstrap/Models/APIs/Roblox/ApiArrayResponse.cs
@ -1,4 +1,4 @@
-namespace Bloxstrap.Models.RobloxApi
+namespace Bloxstrap.Models.APIs.Roblox
 {
    /// <summary>
    /// Roblox.Web.WebAPI.Models.ApiArrayResponse
--- a/Bloxstrap/Models/APIs/Roblox/ClientFlagSettings.cs
+++ b/Bloxstrap/Models/APIs/Roblox/ClientFlagSettings.cs
@ -1,4 +1,4 @@
-namespace Bloxstrap.Models
+namespace Bloxstrap.Models.APIs.Roblox
 {
    public class ClientFlagSettings
    {
--- a/Bloxstrap/Models/APIs/Roblox/ClientVersion.cs
+++ b/Bloxstrap/Models/APIs/Roblox/ClientVersion.cs
@ -1,4 +1,4 @@
-namespace Bloxstrap.Models
+namespace Bloxstrap.Models.APIs.Roblox
 {
    public class ClientVersion
    {
--- a/Bloxstrap/Models/APIs/Roblox/GameCreator.cs
+++ b/Bloxstrap/Models/APIs/Roblox/GameCreator.cs
@ -1,4 +1,4 @@
-namespace Bloxstrap.Models.RobloxApi
+namespace Bloxstrap.Models.APIs.Roblox
 {
    /// <summary>
    /// Roblox.Games.Api.Models.Response.GameCreator
--- a/Bloxstrap/Models/APIs/Roblox/GameDetailResponse.cs
+++ b/Bloxstrap/Models/APIs/Roblox/GameDetailResponse.cs
@ -1,4 +1,4 @@
-namespace Bloxstrap.Models.RobloxApi
+namespace Bloxstrap.Models.APIs.Roblox
 {

    /// <summary>
--- a/Bloxstrap/Models/APIs/Roblox/ThumbnailResponse.cs
+++ b/Bloxstrap/Models/APIs/Roblox/ThumbnailResponse.cs
@ -1,4 +1,4 @@
-namespace Bloxstrap.Models.RobloxApi
+namespace Bloxstrap.Models.APIs.Roblox
 {
    /// <summary>
    /// Roblox.Web.Responses.Thumbnails.ThumbnailResponse
--- a/Bloxstrap/Models/APIs/Roblox/UniverseIdResponse.cs
+++ b/Bloxstrap/Models/APIs/Roblox/UniverseIdResponse.cs
@ -1,4 +1,4 @@
-namespace Bloxstrap.Models.RobloxApi
+namespace Bloxstrap.Models.APIs.Roblox
 {
    // lmao its just one property
    public class UniverseIdResponse
--- a/Bloxstrap/Models/Entities/ActivityData.cs
+++ b/Bloxstrap/Models/Entities/ActivityData.cs
@ -1,10 +1,10 @@
 using System.Web;
 using System.Windows;
 using System.Windows.Input;
-
+using Bloxstrap.Models.APIs;
 using CommunityToolkit.Mvvm.Input;

-namespace Bloxstrap.Models
+namespace Bloxstrap.Models.Entities
 {
    public class ActivityData
    {
@ -16,7 +16,7 @@ namespace Bloxstrap.Models
        /// </summary>
        public ActivityData? RootActivity;

-        public long UniverseId 
+        public long UniverseId
        {
            get => _universeId;
            set
@ -28,19 +28,19 @@ namespace Bloxstrap.Models

        public long PlaceId { get; set; } = 0;

-        public string JobId { get; set; } = String.Empty;
+        public string JobId { get; set; } = string.Empty;

        /// <summary>
        /// This will be empty unless the server joined is a private server
        /// </summary>
-        public string AccessCode { get; set; } = String.Empty;
-        
-        public string MachineAddress { get; set; } = String.Empty;
+        public string AccessCode { get; set; } = string.Empty;

-        public bool MachineAddressValid => !String.IsNullOrEmpty(MachineAddress) && !MachineAddress.StartsWith("10.");
+        public string MachineAddress { get; set; } = string.Empty;
+
+        public bool MachineAddressValid => !string.IsNullOrEmpty(MachineAddress) && !MachineAddress.StartsWith("10.");

        public bool IsTeleport { get; set; } = false;
-        
+
        public ServerType ServerType { get; set; } = ServerType.Public;

        public DateTime TimeJoined { get; set; }
@ -52,15 +52,15 @@ namespace Bloxstrap.Models
        /// <summary>
        /// This is intended only for other people to use, i.e. context menu invite link, rich presence joining
        /// </summary>
-        public string RPCLaunchData { get; set; } = String.Empty;
+        public string RPCLaunchData { get; set; } = string.Empty;

        public UniverseDetails? UniverseDetails { get; set; }
-        
+
        public string GameHistoryDescription
        {
            get
            {
-                string desc = String.Format("{0} • {1} - {2}", UniverseDetails?.Data.Creator.Name, TimeJoined.ToString("h:mm tt"), TimeLeft?.ToString("h:mm tt"));
+                string desc = string.Format("{0} • {1} - {2}", UniverseDetails?.Data.Creator.Name, TimeJoined.ToString("h:mm tt"), TimeLeft?.ToString("h:mm tt"));

                if (ServerType != ServerType.Public)
                    desc += " • " + ServerType.ToTranslatedString();
@ -82,7 +82,7 @@ namespace Bloxstrap.Models
            else
                deeplink += "&gameInstanceId=" + JobId;

-            if (launchData && !String.IsNullOrEmpty(RPCLaunchData))
+            if (launchData && !string.IsNullOrEmpty(RPCLaunchData))
                deeplink += "&launchData=" + HttpUtility.UrlEncode(RPCLaunchData);

            return deeplink;
@ -107,7 +107,7 @@ namespace Bloxstrap.Models
            {
                var ipInfo = await Http.GetJson<IPInfoResponse>($"https://ipinfo.io/{MachineAddress}/json");

-                if (String.IsNullOrEmpty(ipInfo.City))
+                if (string.IsNullOrEmpty(ipInfo.City))
                    throw new InvalidHTTPResponseException("Reported city was blank");

                if (ipInfo.City == ipInfo.Region)
@ -127,9 +127,9 @@ namespace Bloxstrap.Models
                serverQuerySemaphore.Release();

                Frontend.ShowConnectivityDialog(
-                    String.Format(Strings.Dialog_Connectivity_UnableToConnect, "ipinfo.io"), 
-                    Strings.ActivityWatcher_LocationQueryFailed, 
-                    MessageBoxImage.Warning, 
+                    string.Format(Strings.Dialog_Connectivity_UnableToConnect, "ipinfo.io"),
+                    Strings.ActivityWatcher_LocationQueryFailed,
+                    MessageBoxImage.Warning,
                    ex
                );
            }
@ -142,7 +142,7 @@ namespace Bloxstrap.Models
        private void RejoinServer()
        {
            string playerPath = Path.Combine(Paths.Roblox, "Player", "RobloxPlayerBeta.exe");
-            
+
            Process.Start(playerPath, GetInviteDeeplink(false));
        }
    }
--- a/Bloxstrap/Models/Entities/ModPresetFileData.cs
+++ b/Bloxstrap/Models/Entities/ModPresetFileData.cs
@ -1,23 +1,23 @@
 using System.Security.Cryptography;
 using System.Windows.Markup;

-namespace Bloxstrap.Models
+namespace Bloxstrap.Models.Entities
 {
    public class ModPresetFileData
    {
        public string FilePath { get; private set; }

        public string FullFilePath => Path.Combine(Paths.Modifications, FilePath);
-        
+
        public FileStream FileStream => File.OpenRead(FullFilePath);

        public string ResourceIdentifier { get; private set; }
-        
+
        public Stream ResourceStream => Resource.GetStream(ResourceIdentifier);

        public byte[] ResourceHash { get; private set; }

-        public ModPresetFileData(string contentPath, string resource) 
+        public ModPresetFileData(string contentPath, string resource)
        {
            FilePath = contentPath;
            ResourceIdentifier = resource;
--- a/Bloxstrap/Models/Entities/UniverseDetails.cs
+++ b/Bloxstrap/Models/Entities/UniverseDetails.cs
@ -1,11 +1,13 @@
-namespace Bloxstrap.Models
+using Bloxstrap.Models.APIs.Roblox;
+
+namespace Bloxstrap.Models.Entities
 {
    public class UniverseDetails
    {
        private static List<UniverseDetails> _cache { get; set; } = new();

        public GameDetailResponse Data { get; set; } = null!;
-        
+
        /// <summary>
        /// Returns data for a 128x128 icon
        /// </summary>
@ -13,9 +15,9 @@

        public static UniverseDetails? LoadFromCache(long id)
        {
-             var cacheQuery = _cache.Where(x => x.Data?.Id == id);
+            var cacheQuery = _cache.Where(x => x.Data?.Id == id);

-             if (cacheQuery.Any())
+            if (cacheQuery.Any())
                return cacheQuery.First();

            return null;
--- a/Bloxstrap/Models/Persistable/AppState.cs
+++ b/Bloxstrap/Models/Persistable/AppState.cs
@ -1,8 +1,8 @@
-namespace Bloxstrap.Models
+namespace Bloxstrap.Models.Persistable
 {
    public class AppState
    {
-        public string VersionGuid { get; set; } = String.Empty;
+        public string VersionGuid { get; set; } = string.Empty;

        public Dictionary<string, string> PackageHashes { get; set; } = new();

--- a/Bloxstrap/Models/Persistable/Settings.cs
+++ b/Bloxstrap/Models/Persistable/Settings.cs
@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;

-namespace Bloxstrap.Models
+namespace Bloxstrap.Models.Persistable
 {
    public class Settings
    {
--- a/Bloxstrap/Models/Persistable/State.cs
+++ b/Bloxstrap/Models/Persistable/State.cs
@ -1,13 +1,13 @@
-namespace Bloxstrap.Models
+namespace Bloxstrap.Models.Persistable
 {
    public class State
    {
        public bool ShowFFlagEditorWarning { get; set; } = true;
-        
+
        public bool PromptWebView2Install { get; set; } = true;

        public AppState Player { get; set; } = new();
-        
+
        public AppState Studio { get; set; } = new();

        public WindowState SettingsWindow { get; set; } = new();
--- a/Bloxstrap/Models/Persistable/WindowState.cs
+++ b/Bloxstrap/Models/Persistable/WindowState.cs
@ -1,13 +1,13 @@
-namespace Bloxstrap.Models
+namespace Bloxstrap.Models.Persistable
 {
    public class WindowState
    {
        public double Width { get; set; }
-        
+
        public double Height { get; set; }
-        
+
        public double Left { get; set; }
-        
+
        public double Top { get; set; }
    }
 }
--- a/Bloxstrap/Models/SettingTasks/EnumModPresetTask.cs
+++ b/Bloxstrap/Models/SettingTasks/EnumModPresetTask.cs
@ -1,4 +1,5 @@
-using Bloxstrap.Models.SettingTasks.Base;
+using Bloxstrap.Models.Entities;
+using Bloxstrap.Models.SettingTasks.Base;

 namespace Bloxstrap.Models.SettingTasks
 {
--- a/Bloxstrap/Models/SettingTasks/ModPresetTask.cs
+++ b/Bloxstrap/Models/SettingTasks/ModPresetTask.cs
@ -1,4 +1,5 @@
-using Bloxstrap.Models.SettingTasks.Base;
+using Bloxstrap.Models.Entities;
+using Bloxstrap.Models.SettingTasks.Base;

 namespace Bloxstrap.Models.SettingTasks
 {
--- a/Bloxstrap/UI/Elements/Settings/MainWindow.xaml.cs
+++ b/Bloxstrap/UI/Elements/Settings/MainWindow.xaml.cs
@ -14,7 +14,7 @@ namespace Bloxstrap.UI.Elements.Settings
    /// </summary>
    public partial class MainWindow : INavigationWindow
    {
-        private Models.WindowState _state => App.State.Prop.SettingsWindow;
+        private Models.Persistable.WindowState _state => App.State.Prop.SettingsWindow;

        public MainWindow(bool showAlreadyRunningWarning)
        {