fixed Paths stuff and added Templates (forgot)

Author: maxijabase

UI/Windows/NewFileWindow.xaml.cs

@@ -8,6 +8,7 @@
 using System.Xml;
 using MahApps.Metro;
 using Microsoft.Win32;
+using SPCode.Utils;
 
 namespace SPCode.UI.Windows
 {
@@ -78,9 +79,9 @@ public ICommand TextBoxButtonFileCmd
         private void ParseTemplateFile()
         {
             TemplateDictionary = new Dictionary<string, TemplateInfo>();
-            if (File.Exists("sourcepawn\\templates\\Templates.xml"))
+            if (File.Exists(Paths.GetTemplatesFilePath()))
             {
-                using Stream stream = File.OpenRead("sourcepawn\\templates\\Templates.xml");
+                using Stream stream = File.OpenRead(Paths.GetTemplatesFilePath());
                 var doc = new XmlDocument();
                 doc.Load(stream);
                 if (doc.ChildNodes.Count <= 0)
@@ -104,7 +105,7 @@ private void ParseTemplateFile()
                         var NewNameStr = attributes?["NewName"].Value;
 
                         Debug.Assert(FileNameStr != null, nameof(FileNameStr) + " != null");
-                        var FilePathStr = Path.Combine("sourcepawn\\templates\\", FileNameStr);
+                        var FilePathStr = Path.Combine(Paths.GetTemplatesDirectory(), FileNameStr);
                         if (File.Exists(FilePathStr))
                         {
                             Debug.Assert(NameStr != null, nameof(NameStr) + " != null");

Utils/Paths.cs

@@ -35,14 +35,14 @@ public static string GetConfigsDirectory()
 
         public static string GetErrorFilesDirectory()
         {
-            var appDataPath = SPCodeAppDataPath + @"\spcode\sourcepawn\errorfiles";
+            var appDataPath = SPCodeAppDataPath + @"\sourcepawn\errorfiles";
             var localPath = @".\sourcepawn\errorfiles";
             return LocalInstallation ? localPath : appDataPath;
         }
 
         public static string GetCrashLogDirectory()
         {
-            var appDataPath = SPCodeAppDataPath + @$"\spcode\crashlogs";
+            var appDataPath = SPCodeAppDataPath + @"\crashlogs";
             var localPath = @".\crashlogs";
             if (LocalInstallation && !Directory.Exists(localPath))
             {
@@ -54,11 +54,18 @@ public static string GetCrashLogDirectory()
 
         public static string GetTempDirectory()
         {
-            var appDataPath = SPCodeAppDataPath + @$"\spcode\sourcepawn\temp";
+            var appDataPath = SPCodeAppDataPath + @"\sourcepawn\temp";
             var localPath = @".\sourcepawn\temp";
             return LocalInstallation ? localPath : appDataPath;
         }
 
+        public static string GetTemplatesDirectory()
+        {
+            var appDataPath = SPCodeAppDataPath + @"\sourcepawn\templates";
+            var localPath = @".\sourcepawn\templates";
+            return LocalInstallation ? localPath : appDataPath;
+        }
+
         public static string GetConfigFilePath()
         {
             var appDataPath = SPCodeAppDataPath + @"\sourcepawn\configs\Configs.xml";
@@ -68,14 +75,16 @@ public static string GetConfigFilePath()
 
         public static string GetTemplatesFilePath()
         {
-            var appDataPath = SPCodeAppDataPath + @"\spcode\sourcepawn\templates\Templates.xml";
+            var appDataPath = SPCodeAppDataPath + @"\sourcepawn\templates\Templates.xml";
             var localPath = @".\sourcepawn\templates\Templates.xml";
             return LocalInstallation ? localPath : appDataPath;
         }
 
         public static string GetOptionsFilePath()
         {
-            return LocalInstallation ? @".\options_0.dat" : SPCodeAppDataPath + @"\options_0.dat";
+            var appDataPath = SPCodeAppDataPath + @"\options_0.dat";
+            var localPath = @".\options_0.dat";
+            return LocalInstallation ? localPath : appDataPath;
         }
     }
 }