refactor: Fix up namespaces

furality · Apr 3, 2024 · d15f989 · d15f989
1 parent 99ef640
commit d15f989
Show file tree

Hide file tree

Showing 33 changed files with 126 additions and 129 deletions.
diff --git a/Assets/Furality/FuralitySDK/Editor/DependencyResolving/DependencyResolver.cs b/Assets/Furality/FuralitySDK/Editor/DependencyResolving/DependencyResolver.cs
@@ -1,11 +1,14 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
+using Furality.SDK.Editor.DependencyResolving.Providers;
+using Furality.SDK.Editor.DependencyResolving.Providers.External;
+using Furality.SDK.Editor.DependencyResolving.Providers.Internal;
+using Furality.SDK.Editor.External.AssetHandling;
 using Furality.SDK.Editor.External.VCC;
 using Furality.SDK.Editor.Helpers;
 using UnityEngine;
 
-namespace Furality.SDK.DependencyResolving
+namespace Furality.SDK.Editor.DependencyResolving
 {
     public class DependencyResolver
     {

diff --git a/Assets/Furality/FuralitySDK/Editor/DependencyResolving/Providers/External/ProjectPackage.cs b/Assets/Furality/FuralitySDK/Editor/DependencyResolving/Providers/External/ProjectPackage.cs
@@ -1,9 +1,8 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
+using Furality.SDK.Editor.External.AssetHandling;
 using Furality.SDK.Editor.External.VCC;
-using UnityEngine;
 
-namespace Furality.SDK.DependencyResolving
+namespace Furality.SDK.Editor.DependencyResolving.Providers.External
 {
     public class ProjectPackage : IDependencyProvider
     {

diff --git a/Assets/Furality/FuralitySDK/Editor/DependencyResolving/Providers/IDependencyProvider.cs b/Assets/Furality/FuralitySDK/Editor/DependencyResolving/Providers/IDependencyProvider.cs
@@ -1,7 +1,7 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
+using Furality.SDK.Editor.External.AssetHandling;
 
-namespace Furality.SDK.DependencyResolving
+namespace Furality.SDK.Editor.DependencyResolving.Providers
 {
     public interface IDependencyProvider
     {

diff --git a/...lity/FuralitySDK/Editor/DependencyResolving/Providers/Internal/LocalDependencyProvider.cs b/...lity/FuralitySDK/Editor/DependencyResolving/Providers/Internal/LocalDependencyProvider.cs
@@ -1,13 +1,12 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using Furality.SDK.Editor;
+using Furality.SDK.Editor.External.AssetHandling;
 using Furality.SDK.Editor.Helpers;
-using Furality.SDK.External.Assets;
 using UnityEditor;
 using UnityEngine;
 
-namespace Furality.SDK.DependencyResolving
+namespace Furality.SDK.Editor.DependencyResolving.Providers.Internal
 {
     /**
      * Local dependency resolver is responsible for removing our requirement for the VCC.

diff --git a/Assets/Furality/FuralitySDK/Editor/External/AssetHandling/AssetClass.cs b/Assets/Furality/FuralitySDK/Editor/External/AssetHandling/AssetClass.cs
@@ -5,7 +5,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Furality.SDK.External.Assets
+namespace Furality.SDK.Editor.External.AssetHandling
 {
     public class AssetClass
     {

diff --git a/Assets/Furality/FuralitySDK/Editor/External/AssetHandling/FuralityPackage.cs b/Assets/Furality/FuralitySDK/Editor/External/AssetHandling/FuralityPackage.cs
@@ -1,7 +1,7 @@
 using System;
-using Furality.SDK.External.Api;
+using Furality.SDK.Editor.External.FoxApi;
 
-namespace Furality.SDK.External.Assets
+namespace Furality.SDK.Editor.External.AssetHandling
 {
     public class FuralityPackage : Package
     {

diff --git a/Assets/Furality/FuralitySDK/Editor/External/AssetHandling/IPackageDataSource.cs b/Assets/Furality/FuralitySDK/Editor/External/AssetHandling/IPackageDataSource.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
 
-namespace Furality.SDK.External.Assets
+namespace Furality.SDK.Editor.External.AssetHandling
 {
     public interface IPackageDataSource
     {

diff --git a/Assets/Furality/FuralitySDK/Editor/External/AssetHandling/Package.cs b/Assets/Furality/FuralitySDK/Editor/External/AssetHandling/Package.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Furality.SDK
+namespace Furality.SDK.Editor.External.AssetHandling
 {
     public class Package
     {

diff --git a/Assets/Furality/FuralitySDK/Editor/External/AssetHandling/PrivilegeCategory.cs b/Assets/Furality/FuralitySDK/Editor/External/AssetHandling/PrivilegeCategory.cs
@@ -1,11 +1,11 @@
 using System.Collections.Generic;
 using System.Linq;
+using Furality.SDK.Editor.External.FoxApi;
 using Furality.SDK.Editor.Pages;
-using Furality.SDK.External.Api;
 using UnityEditor;
 using UnityEngine;
 
-namespace Furality.SDK.External.Assets
+namespace Furality.SDK.Editor.External.AssetHandling
 {
     public class PrivilegeCategory
     {

diff --git a/Assets/Furality/FuralitySDK/Editor/External/Boop/BoopAuth.cs b/Assets/Furality/FuralitySDK/Editor/External/Boop/BoopAuth.cs
@@ -1,11 +1,10 @@
 using System;
+using Furality.SDK.Editor.External.Boop.Types;
 using Furality.SDK.Editor.Helpers;
-using Furality.SDK.External.Api;
-using JetBrains.Annotations;
 using UnityEngine;
 using UnityEngine.Networking;
 
-namespace Furality.SDK.External.Boop
+namespace Furality.SDK.Editor.External.Boop
 {
     // AuthManager is our one port of call for authentication, be it initiating a login or logout, or monitoring our login state
     public static class BoopAuth

diff --git a/Assets/Furality/FuralitySDK/Editor/External/Boop/HttpCallbackManager.cs b/Assets/Furality/FuralitySDK/Editor/External/Boop/HttpCallbackManager.cs
@@ -3,7 +3,7 @@
 using System.Net.Sockets;
 using System.Threading;
 
-namespace Furality.SDK.External.Boop
+namespace Furality.SDK.Editor.External.Boop
 {
     // Probably violates some http spec requirements, but it doesn't need to that secure given that its only use is for 
     // handling the callback from the browser

diff --git a/Assets/Furality/FuralitySDK/Editor/External/Boop/Types/TokenResponse.cs b/Assets/Furality/FuralitySDK/Editor/External/Boop/Types/TokenResponse.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Furality.SDK.External.Boop
+namespace Furality.SDK.Editor.External.Boop.Types
 {
     [Serializable]
     public class TokenResponse

diff --git a/Assets/Furality/FuralitySDK/Editor/External/Boop/Types/UserData.cs b/Assets/Furality/FuralitySDK/Editor/External/Boop/Types/UserData.cs
@@ -1,7 +1,6 @@
 using System;
-using Furality.SDK.External.Api;
 
-namespace Furality.SDK.External.Boop
+namespace Furality.SDK.Editor.External.Boop.Types
 {
     [Serializable]
     public class UserData

diff --git a/Assets/Furality/FuralitySDK/Editor/External/FoxApi/AttendanceLevel.cs b/Assets/Furality/FuralitySDK/Editor/External/FoxApi/AttendanceLevel.cs
@@ -1,4 +1,4 @@
-namespace Furality.SDK.External.Api
+namespace Furality.SDK.Editor.External.FoxApi
 {
     public enum AttendanceLevel
     {

diff --git a/Assets/Furality/FuralitySDK/Editor/External/FoxApi/Endpoints/FoxFiles.cs b/Assets/Furality/FuralitySDK/Editor/External/FoxApi/Endpoints/FoxFiles.cs
@@ -2,15 +2,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Furality.SDK.DependencyResolving;
+using Furality.SDK.Editor.DependencyResolving.Providers;
+using Furality.SDK.Editor.External.AssetHandling;
+using Furality.SDK.Editor.External.FoxApi.Models.Files;
 using Furality.SDK.Editor.Helpers;
-using Furality.SDK.External.Api.Models.Files;
-using Furality.SDK.External.Assets;
-using JetBrains.Annotations;
-using UnityEditor;
 using UnityEngine;
 
-namespace Furality.SDK.External.Api.Endpoints
+namespace Furality.SDK.Editor.External.FoxApi.Endpoints
 {
     public class FoxFiles : FoxResource, IDependencyProvider, IPackageDataSource
     { 

diff --git a/Assets/Furality/FuralitySDK/Editor/External/FoxApi/Endpoints/FoxUsers.cs b/Assets/Furality/FuralitySDK/Editor/External/FoxApi/Endpoints/FoxUsers.cs
@@ -1,6 +1,6 @@
-using Furality.SDK.External.Api.Models.User;
+using Furality.SDK.Editor.External.FoxApi.Models.User;
 
-namespace Furality.SDK.External.Api.Endpoints
+namespace Furality.SDK.Editor.External.FoxApi.Endpoints
 {
     public class FoxUsers : FoxResource
     {

diff --git a/Assets/Furality/FuralitySDK/Editor/External/FoxApi/FoxApi.cs b/Assets/Furality/FuralitySDK/Editor/External/FoxApi/FoxApi.cs
@@ -1,12 +1,13 @@
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
-using Furality.SDK.External.Api.Endpoints;
-using Furality.SDK.External.Boop;
+using Furality.SDK.Editor.External.Boop;
+using Furality.SDK.Editor.External.Boop.Types;
+using Furality.SDK.Editor.External.FoxApi.Endpoints;
 using UnityEditor;
 using UnityEngine;
 
-namespace Furality.SDK.External.Api
+namespace Furality.SDK.Editor.External.FoxApi
 {
     public class FoxApi
     {

diff --git a/Assets/Furality/FuralitySDK/Editor/External/FoxApi/FoxResource.cs b/Assets/Furality/FuralitySDK/Editor/External/FoxApi/FoxResource.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Furality.SDK.External.Api
+namespace Furality.SDK.Editor.External.FoxApi
 {
     public abstract class FoxResource : IDisposable
     {

diff --git a/Assets/Furality/FuralitySDK/Editor/External/FoxApi/Models/Files/FileResponse.cs b/Assets/Furality/FuralitySDK/Editor/External/FoxApi/Models/Files/FileResponse.cs
@@ -1,4 +1,4 @@
-namespace Furality.SDK.External.Api.Models.Files
+namespace Furality.SDK.Editor.External.FoxApi.Models.Files
 {
     public class FileResponse
     {

diff --git a/Assets/Furality/FuralitySDK/Editor/External/FoxApi/Models/Files/FoxFileDto.cs b/Assets/Furality/FuralitySDK/Editor/External/FoxApi/Models/Files/FoxFileDto.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
-using Furality.SDK.External.Assets;
+using Furality.SDK.Editor.External.AssetHandling;
 
-namespace Furality.SDK.External.Api.Models.Files
+namespace Furality.SDK.Editor.External.FoxApi.Models.Files
 {
     [Serializable]
     public class FoxFileDto : FuralityPackage

diff --git a/Assets/Furality/FuralitySDK/Editor/External/FoxApi/Models/Files/FoxFilesDto.cs b/Assets/Furality/FuralitySDK/Editor/External/FoxApi/Models/Files/FoxFilesDto.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Furality.SDK.External.Api.Models.Files
+namespace Furality.SDK.Editor.External.FoxApi.Models.Files
 {
     [Serializable]
     public class FoxFilesDto

diff --git a/Assets/Furality/FuralitySDK/Editor/External/FoxApi/Models/User/FoxPatreonDto.cs b/Assets/Furality/FuralitySDK/Editor/External/FoxApi/Models/User/FoxPatreonDto.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Furality.SDK.External.Api.Models.User
+namespace Furality.SDK.Editor.External.FoxApi.Models.User
 {
     [Serializable]
     public class FoxPatreonDto

diff --git a/Assets/Furality/FuralitySDK/Editor/External/FoxApi/Models/User/FoxProfileDto.cs b/Assets/Furality/FuralitySDK/Editor/External/FoxApi/Models/User/FoxProfileDto.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Furality.SDK.External.Api.Models.User
+namespace Furality.SDK.Editor.External.FoxApi.Models.User
 {
     [Serializable]
     public class FoxProfileDto

diff --git a/Assets/Furality/FuralitySDK/Editor/External/FoxApi/Models/User/FoxUserDto.cs b/Assets/Furality/FuralitySDK/Editor/External/FoxApi/Models/User/FoxUserDto.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Furality.SDK.External.Api.Models.User
+namespace Furality.SDK.Editor.External.FoxApi.Models.User
 {
     [Serializable]
     public class FoxUserDto

diff --git a/Assets/Furality/FuralitySDK/Editor/External/FoxApi/PatreonLevel.cs b/Assets/Furality/FuralitySDK/Editor/External/FoxApi/PatreonLevel.cs
@@ -1,4 +1,4 @@
-namespace Furality.SDK.External.Api
+namespace Furality.SDK.Editor.External.FoxApi
 {
     public enum PatreonLevel
     {

diff --git a/Assets/Furality/FuralitySDK/Editor/External/VCC/Models/VccResponse.cs b/Assets/Furality/FuralitySDK/Editor/External/VCC/Models/VccResponse.cs
@@ -0,0 +1,8 @@
+namespace Furality.SDK.Editor.External.VCC.Models
+{
+    public class VccResponse<T>
+    {
+        public bool success;
+        public T data;
+    }
+}
diff --git a/Assets/Furality/FuralitySDK/Editor/External/VCC/VccComms.cs b/Assets/Furality/FuralitySDK/Editor/External/VCC/VccComms.cs
@@ -1,49 +1,43 @@
 using System;
 using System.Net.Http;
 using System.Threading.Tasks;
+using Furality.SDK.Editor.External.VCC.Models;
 using UnityEngine;
 
 namespace Furality.SDK.Editor.External.VCC
 {
     public static class VccComms
     {
-        public class VccResponse<T>
-        {
-            public bool success;
-            public T data;
-        }
-
         private const string VccUrl = "http://localhost:5477/api/";
 
         public static async Task<VccResponse<T>> Request<T>(string endpoint, string method, dynamic body = null)
         {
             // Send an HTTP request to the VCC
-            using (HttpClient client = new HttpClient())
-            {
-                client.DefaultRequestHeaders.Add("Origin", "http://localhost:5477/");
-                client.DefaultRequestHeaders.Host = "localhost";
+            using HttpClient client = new HttpClient();
+
+            client.DefaultRequestHeaders.Add("Origin", "http://localhost:5477/");
+            client.DefaultRequestHeaders.Host = "localhost";
 
-                client.Timeout = TimeSpan.FromSeconds(1);
+            client.Timeout = TimeSpan.FromSeconds(1);
 
-                var request = new HttpRequestMessage(new HttpMethod(method), VccUrl+endpoint);
-                if (body != null)
-                    request.Content = new StringContent(JsonUtility.ToJson(body), System.Text.Encoding.UTF8, "application/json");
+            var request = new HttpRequestMessage(new HttpMethod(method), VccUrl+endpoint);
+            if (body != null)
+                request.Content = new StringContent(JsonUtility.ToJson(body), System.Text.Encoding.UTF8, "application/json");
 
-                HttpResponseMessage response;
-                try
-                {
-                    response = await client.SendAsync(request);
-                }
-                catch (Exception e)
-                {
-                    return null;
-                }
+            HttpResponseMessage response;
+            try
+            {
+                response = await client.SendAsync(request);
+            }
+            catch (Exception e)
+            {
+                return null;
+            }
 
-                string responseBody = await response.Content.ReadAsStringAsync();
+            string responseBody = await response.Content.ReadAsStringAsync();
 
-                // Deserialize the response content into VccResponse<T> and return
-                return JsonUtility.FromJson<VccResponse<T>>(responseBody);
-            }
+            // Deserialize the response content into VccResponse<T> and return
+            return JsonUtility.FromJson<VccResponse<T>>(responseBody);
         }
     }
 }
diff --git a/Assets/Furality/FuralitySDK/Editor/Helpers/DependencyManager.cs b/Assets/Furality/FuralitySDK/Editor/Helpers/DependencyManager.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Threading.Tasks;
-using Furality.SDK.DependencyResolving;
+using Furality.SDK.Editor.DependencyResolving;
+using Furality.SDK.Editor.DependencyResolving.Providers;
+using Furality.SDK.Editor.External.AssetHandling;
 using Furality.SDK.Editor.External.VCC;
 using UnityEditor;
 using UnityEngine;

diff --git a/Assets/Furality/FuralitySDK/Editor/Pages/DownloadsPage.cs b/Assets/Furality/FuralitySDK/Editor/Pages/DownloadsPage.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using Furality.SDK.External.Assets;
+using Furality.SDK.Editor.External.AssetHandling;
 using UnityEditor;
 using UnityEngine;
 

diff --git a/Assets/Furality/FuralitySDK/Editor/Pages/MainWindow.cs b/Assets/Furality/FuralitySDK/Editor/Pages/MainWindow.cs
@@ -1,9 +1,8 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
+using Furality.SDK.Editor.External.Boop;
+using Furality.SDK.Editor.External.FoxApi;
 using Furality.SDK.Editor.Helpers;
-using Furality.SDK.External.Api;
-using Furality.SDK.External.Boop;
 using UnityEditor;
 using UnityEditor.PackageManager;
 using UnityEngine;
@@ -13,7 +12,6 @@ namespace Furality.SDK.Editor.Pages
     [InitializeOnLoad]
     public class MainWindow : EditorWindow
     {
-        private readonly Queue<Action> _dispatchQueue = new Queue<Action>();
         private Dictionary<string, MenuPage> _pages = new Dictionary<string, MenuPage>();
 
         private MenuPage _currentPage;