Stop hardcoding 'signs' directory everywhere

Author: UnknownShadow200

fCraft/Commands/ZoneCommands.cs

@@ -270,9 +270,13 @@ static void SignAddHandler(Player player, CommandReader cmd)
                 }
                 else
                 {
-                    if (!Directory.Exists("./Signs/")) Directory.CreateDirectory("./Signs/");
-                    if (!Directory.Exists("./Signs/" + player.World.Name + "/")) Directory.CreateDirectory("./Signs/" + player.World.Name + "/");
-                    File.WriteAllText("./Signs/" + player.World.Name + "/" + newZone.Name + ".txt", cmd.NextAll());
+                    string path = Paths.SignsPath;
+                    if (!Directory.Exists(path)) Directory.CreateDirectory(path);
+                    path = Path.Combine(path, player.World.Name);
+                    if (!Directory.Exists(path)) Directory.CreateDirectory(path);
+                    
+                    path = Path.Combine(path, newZone.Name + ".txt");
+                    File.WriteAllText(path, newZone.Sign);
                     player.Message("Message for sign {0}&S is: {1}", newZone.ClassyName, newZone.Sign);
                     newZone.Sign = null;
                 }
@@ -369,27 +373,26 @@ static void ZoneEditHandler( Player player, CommandReader cmd ) {
 
             //player.Message(cmd.RawMessage);
             //player.Message(cmd.RawMessage.Substring(cmd.Offset));
-            if (cmd.RawMessage.Substring(cmd.Offset + 1).StartsWith("#"))
-                {
-                    zone.Sign = cmd.NextAll().Substring(1);
-                    if (zone.Sign.Length == 0 || zone.Sign == null)
-                    {
-                        if (!Directory.Exists("./Signs/")) Directory.CreateDirectory("./Signs/");
-                        if (!Directory.Exists("./Signs/" + player.World.Name + "/")) Directory.CreateDirectory("./Signs/" + player.World.Name + "/"); 
-                        if (File.Exists("./Signs/" + player.World.Name + "/" + zone.Name + ".txt")) File.Delete("./Signs/" + player.World.Name + "/" + zone.Name + ".txt");
-                        player.Message("Sign Text for zone {0}&S was removed.", zone.ClassyName);
-                        zone.Sign = null;
-                    }
-                    else
-                    {
-                        if (!Directory.Exists("./Signs/")) Directory.CreateDirectory("./Signs/");
-                        if (!Directory.Exists("./Signs/" + player.World.Name + "/")) Directory.CreateDirectory("./Signs/" + player.World.Name + "/"); 
-                        File.WriteAllText("./Signs/" + player.World.Name + "/" + zone.Name + ".txt", cmd.NextAll().Substring(1));
-                        player.Message("Sign Text for zone {0}&S changed to {1}", zone.ClassyName, zone.Sign);
-                        zone.Sign = null;
-                    }
-                    return;
+            if (cmd.RawMessage.Substring(cmd.Offset + 1).StartsWith("#")) {
+                zone.Sign = cmd.NextAll().Substring(1);
+                
+                string path = Paths.SignsPath;
+                if (!Directory.Exists(path)) Directory.CreateDirectory(path);
+                path = Path.Combine(path, player.World.Name);
+                if (!Directory.Exists(path)) Directory.CreateDirectory(path);
+                   
+                path = Path.Combine(path, zone.Name + ".txt");
+                if (zone.Sign.Length == 0 || zone.Sign == null) {
+                    if (File.Exists(path)) File.Delete(path);
+                    player.Message("Sign Text for zone {0}&S was removed.", zone.ClassyName);
+                    zone.Sign = null;
+                } else {
+                    File.WriteAllText(path, zone.Sign);
+                    player.Message("Sign Text for zone {0}&S changed to {1}", zone.ClassyName, zone.Sign);
+                    zone.Sign = null;
                 }
+                return;
+            }
 
             string nextToken;
             while( (nextToken = cmd.Next()) != null ) {

fCraft/Zone/SpecialZone.Affect.cs

@@ -34,7 +34,7 @@ static void HandleSign(Player p, Zone zone) {
             if (TextCooldown(p)) return;
 
             if (zone.Sign == null) {
-                string path = "./Signs/" + p.World.Name + "/" + zone.Name + ".txt";
+                string path = SignPath(p, zone);
                 if (File.Exists(path)) {
                     p.SignLines = File.ReadAllLines(path);
                     p.Message(String.Join("&N", p.SignLines));
@@ -55,7 +55,7 @@ static void HandleCommandBlock(Player p, Zone zone) {
             if (p.IsCommandBlockRunning || TextCooldown(p)) return;
 
             if (zone.Sign == null) {
-                string path = "./Signs/" + p.World.Name + "/" + zone.Name + ".txt";
+                string path = SignPath(p, zone);
                 if (File.Exists(path)) {
                     p.SignLines = File.ReadAllLines(path);
 

fCraft/Zone/SpecialZone.cs

@@ -54,13 +54,17 @@ public static bool CanManage(string name, Player player, string action) {
         }
 
         static string GetSignMessage(Player p, Zone zone) {
-            string path = "./Signs/" + p.World.Name + "/" + zone.Name + ".txt";
-            if (!File.Exists(path)) return null;
-            
+            string path = SignPath(p, zone);
+            if (!File.Exists(path)) return null;            
             string[] lines = File.ReadAllLines(path);
             return String.Join("&N", lines);
         }
 
+        static string SignPath(Player p, Zone zone) {
+            string path = Path.Combine(Paths.SignsPath, p.World.Name);
+            return Path.Combine(path, zone.Name + ".txt");
+        }
+        
         static void SendZoneMessage(Player p, string message) {
             if ((DateTime.UtcNow - p.LastZoneNotification).Seconds <= 2) return;
             p.Message(message);