Merge pull request #24 from MrWoafer/add-pac-extension-to-config

Added pac file extension to config
MrWoafer · Oct 24, 2024 · 261c1e8 · 261c1e8
2 parents a4661a7 + 8ccdb1d
commit 261c1e8
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/Assets/Scripts/Config.cs b/Assets/Scripts/Config.cs
@@ -4,6 +4,11 @@ namespace PAC
 {
     public static class Config
     {
+        public static class Files
+        {
+            public const string pacFileExtension = "pac";
+        }
+
         public static class Tools
         {
             public const int minBrushSize = 1;

diff --git a/Assets/Scripts/Files/File.cs b/Assets/Scripts/Files/File.cs
@@ -168,7 +168,7 @@ public static File OpenFile(string filePath)
             {
                 return OpenJPEG(filePath);
             }
-            else if (Path.GetExtension(filePath) == ".pac")
+            else if (Path.GetExtension(filePath) == "." + Config.Files.pacFileExtension)
             {
                 return OpenPAC(filePath);
             }
@@ -241,7 +241,7 @@ public static File OpenPAC(string filePath)
             {
                 throw new System.Exception("filePath doesn't exist: " + filePath);
             }
-            if (Path.GetExtension(filePath) != ".pac")
+            if (Path.GetExtension(filePath) != "." + Config.Files.pacFileExtension)
             {
                 throw new System.Exception("The file is not a PAC file. File extension: " + Path.GetExtension(filePath));
             }
@@ -303,7 +303,7 @@ public void SaveAsPAC(string filePath)
             {
                 throw new System.Exception("filePath not fully qualified: " + filePath);
             }
-            if (Path.GetExtension(filePath) != ".pac")
+            if (Path.GetExtension(filePath) != "." + Config.Files.pacFileExtension)
             {
                 throw new System.Exception("The file is not a PAC file. File extension: " + Path.GetExtension(filePath));
             }

diff --git a/Assets/Scripts/Files/FileManager.cs b/Assets/Scripts/Files/FileManager.cs
@@ -177,8 +177,11 @@ public void NewFile(int width, int height)
 
         public void OpenFileDialog()
         {
-            ExtensionFilter[] extensions = new ExtensionFilter[] { new ExtensionFilter("Any File ", "png", "jpeg", "jpg", "pac"), new ExtensionFilter("Image File ", "png", "jpeg", "jpg"),
-                new ExtensionFilter("Pixel Art Creator File ", "pac") };
+            ExtensionFilter[] extensions = new ExtensionFilter[] {
+                new ExtensionFilter("Any File ", "png", "jpeg", "jpg",
+                    Config.Files.pacFileExtension), new ExtensionFilter("Image File ", "png", "jpeg", "jpg"),
+                new ExtensionFilter("Pixel Art Creator File ", Config.Files.pacFileExtension)
+                };
             string[] fileNames = StandaloneFileBrowser.OpenFilePanel("Open File", "", extensions, false);
             if (fileNames.Length > 0)
             {
@@ -218,8 +221,11 @@ public bool OpenFile(string filePath)
 
         public void ImportDialog()
         {
-            ExtensionFilter[] extensions = new ExtensionFilter[] { new ExtensionFilter("Any File ", "png", "jpeg", "jpg", "pac"), new ExtensionFilter("Image File ", "png", "jpeg", "jpg"),
-                new ExtensionFilter("Pixel Art Creator File ", "pac") };
+            ExtensionFilter[] extensions = new ExtensionFilter[] {
+                new ExtensionFilter("Any File ", "png", "jpeg", "jpg",
+                Config.Files.pacFileExtension), new ExtensionFilter("Image File ", "png", "jpeg", "jpg"),
+                new ExtensionFilter("Pixel Art Creator File ", Config.Files.pacFileExtension)
+            };
             string[] fileNames = StandaloneFileBrowser.OpenFilePanel("Import", "", extensions, false);
             if (fileNames.Length > 0)
             {
@@ -235,7 +241,7 @@ public void ImportDialog()
                         currentFile.ImportImage(fileNames[0]);
                     }
                 }
-                else if (Path.GetExtension(fileNames[0]) == ".pac")
+                else if (Path.GetExtension(fileNames[0]) == "." + Config.Files.pacFileExtension)
                 {
                     File file = File.OpenPAC(fileNames[0]);
                     if (file.width != currentFile.width || file.height != currentFile.height)
@@ -309,7 +315,7 @@ public void SaveFileDialog(File file)
         {
             if (file.mostRecentSavePath == null)
             {
-                ExtensionFilter[] extensions = new ExtensionFilter[] { new ExtensionFilter("Pixel Art Creator File ", "pac") };
+                ExtensionFilter[] extensions = new ExtensionFilter[] { new ExtensionFilter("Pixel Art Creator File ", Config.Files.pacFileExtension) };
                 string fileName = StandaloneFileBrowser.SaveFilePanel("Save", "", file.name, extensions);
                 if (fileName != "")
                 {
@@ -331,7 +337,7 @@ public void SaveAsCurrentFileDialog()
         }
         public void SaveAsFileDialog(File file)
         {
-            ExtensionFilter[] extensions = new ExtensionFilter[] { new ExtensionFilter("Pixel Art Creator File ", "pac") };
+            ExtensionFilter[] extensions = new ExtensionFilter[] { new ExtensionFilter("Pixel Art Creator File ", Config.Files.pacFileExtension) };
             string fileName = StandaloneFileBrowser.SaveFilePanel("Save As", "", file.name, extensions);
             if (fileName != "")
             {