Migrated the tree file/directory types to the readonly generator.

MeltyPlayer · Apr 26, 2024 · ad593ef · ad593ef
1 parent 6a28d1c
commit ad593ef
Show file tree

Hide file tree

Showing 23 changed files with 70 additions and 48 deletions.
diff --git a/FinModelUtility/Fin/Fin/Fin.csproj b/FinModelUtility/Fin/Fin/Fin.csproj
@@ -41,6 +41,6 @@
     <PackageReference Include="SubstreamSharp" Version="1.0.3" />
     <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
     <PackageReference Include="System.IO.Abstractions" Version="19.2.51" />
-    <PackageReference Include="schema" Version="0.4.19" />
+    <PackageReference Include="schema" Version="0.4.20" />
   </ItemGroup>
 </Project>
diff --git a/FinModelUtility/Fin/Fin/src/io/Interfaces_Tree.cs b/FinModelUtility/Fin/Fin/src/io/Interfaces_Tree.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 
+using schema.readOnly;
+
 namespace fin.io {
   // TODO: Come up with a better name for these "tree" interfaces?
   // The idea is that:
@@ -11,78 +13,98 @@ namespace fin.io {
   // - system files refer to real files that exist within the file system
   //   - these can be readonly or mutable
 
-  public interface IReadOnlyTreeIoObject<TIoObject, TDirectory, TFile,
+  [GenerateReadOnly]
+  public partial interface ITreeIoObject<TIoObject, TDirectory, TFile,
                                          TFileType>
       : IEquatable<TIoObject>
       where TIoObject :
-      IReadOnlyTreeIoObject<TIoObject, TDirectory, TFile, TFileType>
+      ITreeIoObject<TIoObject, TDirectory, TFile, TFileType>
       where TDirectory :
-      IReadOnlyTreeDirectory<TIoObject, TDirectory, TFile, TFileType>
-      where TFile : IReadOnlyTreeFile<TIoObject, TDirectory, TFile, TFileType> {
+      ITreeDirectory<TIoObject, TDirectory, TFile, TFileType>
+      where TFile : ITreeFile<TIoObject, TDirectory, TFile, TFileType> {
     string FullPath { get; }
     string Name { get; }
 
+    [Const]
     TDirectory AssertGetParent();
+
+    [Const]
     bool TryGetParent(out TDirectory parent);
+
+    [Const]
     IEnumerable<TDirectory> GetAncestry();
   }
 
-  public interface IReadOnlyTreeDirectory<TIoObject, TDirectory, TFile,
+  [GenerateReadOnly]
+  public partial interface ITreeDirectory<TIoObject, TDirectory, TFile,
                                           TFileType>
-      : IReadOnlyTreeIoObject<TIoObject, TDirectory, TFile, TFileType>
+      : ITreeIoObject<TIoObject, TDirectory, TFile, TFileType>
       where TIoObject :
-      IReadOnlyTreeIoObject<TIoObject, TDirectory, TFile, TFileType>
+      ITreeIoObject<TIoObject, TDirectory, TFile, TFileType>
       where TDirectory :
-      IReadOnlyTreeDirectory<TIoObject, TDirectory, TFile, TFileType>
-      where TFile : IReadOnlyTreeFile<TIoObject, TDirectory, TFile, TFileType> {
+      ITreeDirectory<TIoObject, TDirectory, TFile, TFileType>
+      where TFile : ITreeFile<TIoObject, TDirectory, TFile, TFileType> {
     bool IsEmpty { get; }
 
+    [Const]
     IEnumerable<TDirectory> GetExistingSubdirs();
+
+    [Const]
     TDirectory AssertGetExistingSubdir(string path);
 
+    [Const]
     bool TryToGetExistingSubdir(string path, out TDirectory outDirectory);
 
+    [Const]
     IEnumerable<TFile> GetExistingFiles();
+
+    [Const]
     TFile AssertGetExistingFile(string path);
 
+    [Const]
     bool TryToGetExistingFile(string path, out TFile outFile);
 
+    [Const]
     bool TryToGetExistingFileWithFileType(string pathWithoutExtension,
                                           out TFile outFile,
                                           params TFileType[] fileTypes);
 
+    [Const]
     IEnumerable<TFile> GetFilesWithNameRecursive(string name);
+
+    [Const]
     IEnumerable<TFile> GetFilesWithFileType(
         TFileType fileType,
         bool includeSubdirs = false);
   }
 
-  public interface IReadOnlyTreeFile<TIoObject, TDirectory, TFile, TFileType>
-      : IReadOnlyTreeIoObject<TIoObject, TDirectory, TFile, TFileType>,
-        IReadOnlyGenericFile
+  [GenerateReadOnly]
+  public partial interface ITreeFile<TIoObject, TDirectory, TFile, TFileType>
+      : ITreeIoObject<TIoObject, TDirectory, TFile, TFileType>,
+        IGenericFile
       where TIoObject :
-      IReadOnlyTreeIoObject<TIoObject, TDirectory, TFile, TFileType>
+      ITreeIoObject<TIoObject, TDirectory, TFile, TFileType>
       where TDirectory :
-      IReadOnlyTreeDirectory<TIoObject, TDirectory, TFile, TFileType>
-      where TFile : IReadOnlyTreeFile<TIoObject, TDirectory, TFile, TFileType> {
+      ITreeDirectory<TIoObject, TDirectory, TFile, TFileType>
+      where TFile : ITreeFile<TIoObject, TDirectory, TFile, TFileType> {
     TFileType FileType { get; }
 
     string FullNameWithoutExtension { get; }
     string NameWithoutExtension { get; }
   }
 
 
-  public interface IReadOnlyTreeIoObject
-      : IReadOnlyTreeIoObject<IReadOnlyTreeIoObject, IReadOnlyTreeDirectory,
-          IReadOnlyTreeFile, string> { }
+  [GenerateReadOnly]
+  public partial interface ITreeIoObject
+      : ITreeIoObject<ITreeIoObject, ITreeDirectory, ITreeFile, string>;
 
-  public interface IReadOnlyTreeDirectory
-      : IReadOnlyTreeIoObject,
-        IReadOnlyTreeDirectory<IReadOnlyTreeIoObject, IReadOnlyTreeDirectory,
-            IReadOnlyTreeFile, string> { }
+  [GenerateReadOnly]
+  public partial interface ITreeDirectory
+      : ITreeIoObject,
+        ITreeDirectory<ITreeIoObject, ITreeDirectory, ITreeFile, string>;
 
-  public interface IReadOnlyTreeFile
-      : IReadOnlyTreeIoObject,
-        IReadOnlyTreeFile<IReadOnlyTreeIoObject, IReadOnlyTreeDirectory,
-            IReadOnlyTreeFile, string> { }
+  [GenerateReadOnly]
+  public partial interface ITreeFile
+      : ITreeIoObject,
+        ITreeFile<ITreeIoObject, ITreeDirectory, ITreeFile, string>;
 }
diff --git a/FinModelUtility/Formats/Ast/Ast/Ast.csproj b/FinModelUtility/Formats/Ast/Ast/Ast.csproj
@@ -12,6 +12,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.19" />
+    <PackageReference Include="schema" Version="0.4.20" />
   </ItemGroup>
 </Project>
diff --git a/FinModelUtility/Formats/Cmb/Cmb/Cmb.csproj b/FinModelUtility/Formats/Cmb/Cmb/Cmb.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.19" />
+    <PackageReference Include="schema" Version="0.4.20" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/FinModelUtility/Formats/Dat/Dat/Dat.csproj b/FinModelUtility/Formats/Dat/Dat/Dat.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.19" />
+    <PackageReference Include="schema" Version="0.4.20" />
   </ItemGroup>
 
 </Project>
diff --git a/FinModelUtility/Formats/F3dzex2/F3dzex2.csproj b/FinModelUtility/Formats/F3dzex2/F3dzex2.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.19" />
+    <PackageReference Include="schema" Version="0.4.20" />
   </ItemGroup>
 
 </Project>
diff --git a/FinModelUtility/Formats/Glo/Glo/Glo.csproj b/FinModelUtility/Formats/Glo/Glo/Glo.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.19" />
+    <PackageReference Include="schema" Version="0.4.20" />
   </ItemGroup>
 
 </Project>
diff --git a/FinModelUtility/Formats/Granny3d/Granny3d.csproj b/FinModelUtility/Formats/Granny3d/Granny3d.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.19" />
+    <PackageReference Include="schema" Version="0.4.20" />
   </ItemGroup>
 
 </Project>
diff --git a/FinModelUtility/Formats/Gx/Gx.csproj b/FinModelUtility/Formats/Gx/Gx.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.19" />
+    <PackageReference Include="schema" Version="0.4.20" />
   </ItemGroup>
 
 </Project>
diff --git a/FinModelUtility/Formats/JSystem/JSystem/JSystem.csproj b/FinModelUtility/Formats/JSystem/JSystem/JSystem.csproj
@@ -60,7 +60,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.19" />
+    <PackageReference Include="schema" Version="0.4.20" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/FinModelUtility/Formats/Level5/Level5/Level5.csproj b/FinModelUtility/Formats/Level5/Level5/Level5.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.19" />
+    <PackageReference Include="schema" Version="0.4.20" />
     <PackageReference Include="OpenTK" Version="3.3.3" />
   </ItemGroup>
 </Project>
diff --git a/FinModelUtility/Formats/Mdl/Mdl/Mdl.csproj b/FinModelUtility/Formats/Mdl/Mdl/Mdl.csproj
@@ -8,6 +8,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.19" />
+    <PackageReference Include="schema" Version="0.4.20" />
   </ItemGroup>
 </Project>
diff --git a/FinModelUtility/Formats/Mod/Mod/Mod.csproj b/FinModelUtility/Formats/Mod/Mod/Mod.csproj
@@ -58,7 +58,7 @@
 
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
-    <PackageReference Include="schema" Version="0.4.19" />
+    <PackageReference Include="schema" Version="0.4.20" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/FinModelUtility/Formats/Modl/Modl/Modl.csproj b/FinModelUtility/Formats/Modl/Modl/Modl.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.19" />
+    <PackageReference Include="schema" Version="0.4.20" />
   </ItemGroup>
 
 </Project>
diff --git a/FinModelUtility/Formats/Nitro/Nitro/Nitro.csproj b/FinModelUtility/Formats/Nitro/Nitro/Nitro.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.19" />
+    <PackageReference Include="schema" Version="0.4.20" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/FinModelUtility/Formats/Visceral/Visceral/Visceral.csproj b/FinModelUtility/Formats/Visceral/Visceral/Visceral.csproj
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="BCnEncoder.Net" Version="2.1.0" />
-    <PackageReference Include="schema" Version="0.4.19" />
+    <PackageReference Include="schema" Version="0.4.20" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/FinModelUtility/Formats/Xmod/Xmod.csproj b/FinModelUtility/Formats/Xmod/Xmod.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="BCnEncoder.Net" Version="2.1.0" />
-    <PackageReference Include="schema" Version="0.4.19" />
+    <PackageReference Include="schema" Version="0.4.20" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/FinModelUtility/Games/BanjoKazooie/BanjoKazooie.csproj b/FinModelUtility/Games/BanjoKazooie/BanjoKazooie.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.19" />
+    <PackageReference Include="schema" Version="0.4.20" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/FinModelUtility/Games/HaloWars/HaloWarsTools/HaloWarsTools.csproj b/FinModelUtility/Games/HaloWars/HaloWarsTools/HaloWarsTools.csproj
@@ -21,7 +21,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.1.2" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
-    <PackageReference Include="schema" Version="0.4.19" />
+    <PackageReference Include="schema" Version="0.4.20" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...Utility/Games/PaperMarioDirectorsCut/PaperMarioDirectorsCut/PaperMarioDirectorsCut.csproj b/...Utility/Games/PaperMarioDirectorsCut/PaperMarioDirectorsCut/PaperMarioDirectorsCut.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.19" />
+    <PackageReference Include="schema" Version="0.4.20" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/FinModelUtility/Games/SuperMario64/SuperMario64/SuperMario64.csproj b/FinModelUtility/Games/SuperMario64/SuperMario64/SuperMario64.csproj
@@ -67,6 +67,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="OpenTK" Version="3.3.3" />
-    <PackageReference Include="schema" Version="0.4.19" />
+    <PackageReference Include="schema" Version="0.4.20" />
   </ItemGroup>
 </Project>
diff --git a/FinModelUtility/Games/TimeSplitters2/TimeSplitters2/TimeSplitters2.csproj b/FinModelUtility/Games/TimeSplitters2/TimeSplitters2/TimeSplitters2.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.19" />
+    <PackageReference Include="schema" Version="0.4.20" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/FinModelUtility/ModelPluginWrappers/ModelPluginWrappers.csproj b/FinModelUtility/ModelPluginWrappers/ModelPluginWrappers.csproj
@@ -18,7 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="IronPython" Version="3.4.1" />
-    <PackageReference Include="schema" Version="0.4.19" />
+    <PackageReference Include="schema" Version="0.4.20" />
   </ItemGroup>
 
   <ItemGroup>