ATITD-Tools/Desert-Paint-Lab Changeset

Changeset - 501aa95c46d7

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Jason Maltzen (jmaltzen) - 9 years ago 2015-12-26 03:01:23
jason.maltzen@unsanctioned.net

Add more search paths to FileUtils for updated data folder locations.

1 file changed with 46 insertions and 0 deletions:

FileUtils.cs

0 comments (0 inline, 0 general)

FileUtils.cs

➞

Show inline comments

@@ ... / @@ -18,4 +18,20 @@ namespace DesertPaintLab @@
                 return dirPath;
+            }
             dirPath = System.IO.Path.Combine(
                 System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location),
                 "data",
                 dirname);
             if (!System.IO.Directory.Exists(dirPath))
+            {
                 // not found
                 dirPath = null;
+            }
             // try "Resources" in case this is a Mac app bundle
             dirPath = System.IO.Path.Combine(
                 Environment.GetFolderPath(Environment.SpecialFolder.Resources), "data", dirname);
             if (System.IO.Directory.Exists(dirPath))
+            {
                 return dirPath;
+            }
             // try "Resources" in case this is a Mac app bundle
             dirPath = System.IO.Path.Combine(
@@ ... / @@ -27,4 +43,13 @@ namespace DesertPaintLab @@
             dirPath = System.IO.Path.Combine(
                 System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location),
                 "Resources", "data",
                 dirname);
             if (!System.IO.Directory.Exists(dirPath))
+            {
                 // not found
                 dirPath = null;
+            }
             dirPath = System.IO.Path.Combine(
                 System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location),
                 "Resources",
                 dirname);
@@ ... / @@ -39,4 +64,5 @@ namespace DesertPaintLab @@
         public static string FindApplicationResourceFile(string filename)
+        {
             // start with the location of the executable
             string filePath = System.IO.Path.Combine(
                     System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location),
@@ ... / @@ -44,4 +70,17 @@ namespace DesertPaintLab @@
             if (!System.IO.File.Exists(filePath))
+            {
                 filePath = System.IO.Path.Combine(
                     System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location),
                     "data",
                     filename);
+            }
             if (!System.IO.File.Exists(filePath))
+            {
                 // try "Resources/data" in case this is a Mac app bundle
                 filePath = System.IO.Path.Combine(
                     Environment.GetFolderPath(Environment.SpecialFolder.Resources), "data", filename);
+            }
             if (!System.IO.File.Exists(filePath))
+            {
                 // try "Resources" in case this is a Mac app bundle
                 filePath = System.IO.Path.Combine(
@@ ... / @@ -52,4 +91,11 @@ namespace DesertPaintLab @@
                 filePath = System.IO.Path.Combine(
                     System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location),
                     "Resources", "data",
                     filename);
+            }
             if (!System.IO.File.Exists(filePath))
+            {
                 filePath = System.IO.Path.Combine(
                     System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location),
                     "Resources",
                     filename);

0 comments (0 inline, 0 general)