- moving helper functions from Program to lib/Converter

- adding versions of functions that handle strings instead of files

Author: gmriggs

EmoteScript/Program.cs

@@ -46,14 +46,14 @@ public static void Main(string[] args)
             if (fi.Extension.Equals(".sql", StringComparison.OrdinalIgnoreCase))
             {
                 // convert sql to es
-                sql2es(fi);
+                Converter.sql2es(fi);
                 return;
             }
 
             if (fi.Extension.Equals(".json", StringComparison.OrdinalIgnoreCase))
             {
                 // convert json to es
-                json2es(fi);
+                Converter.json2es(fi);
                 return;
             }
 
@@ -68,7 +68,7 @@ public static void Main(string[] args)
             //emoteTable.BuildLinks();
             //emoteTable.ClearLinks();
 
-            emoteTable.Wcid = GetObjectId(fi);
+            emoteTable.Wcid = Converter.GetObjectId(fi);
             //emoteTable.Wcid = 33970;
 
             //ShowSQL(emoteTable);
@@ -80,212 +80,15 @@ public static void Main(string[] args)
             if (args.Length < 2 || !args[1].Contains("json", StringComparison.OrdinalIgnoreCase))
             {
                 // convert script to sql
-                es2sql(emoteTable, fi);
+                Converter.es2sql(emoteTable, fi);
             }
             else
             {
                 // convert script to json
-                es2json(emoteTable, fi);
+                Converter.es2json(emoteTable, fi);
             }
         }
 
-        public static void es2sql(EmoteTable emoteTable, FileInfo esFile)
-        {
-            var sqlFilename = Path.ChangeExtension(esFile.FullName, ".sql");
-            var sqlFile = new FileInfo(sqlFilename);
-
-            // check if file already exists?
-
-            // output sql file
-            OutputSQL(emoteTable, sqlFile);
-        }
-
-        public static void es2json(EmoteTable emoteTable, FileInfo esFile)
-        {
-            var jsonFilename = Path.ChangeExtension(esFile.FullName, ".json");
-            var jsonFile = new FileInfo(jsonFilename);
-
-            emoteTable.NormalRange();
-            
-            var jsonTable = new EmoteScriptLib.JSON.EmoteTable(emoteTable);
-            
-            // check if file already exists?
-            
-            // output json file
-            OutputJSON(jsonTable, jsonFile);
-        }
-
-        public static void sql2es(FileInfo sqlFile)
-        {
-            var sqlLines = File.ReadAllLines(sqlFile.FullName);
-
-            var sqlReader = new EmoteScriptLib.SQL.SQLReader();
-
-            var emoteTable = sqlReader.ReadEmoteTable(sqlLines);
-
-            emoteTable.BuildLinks();
-
-            //ShowScript(emoteTable.EmoteSets);
-
-            var esFilename = Path.ChangeExtension(sqlFile.FullName, ".es");
-
-            // check if file already exists?
-
-            var esFile = new FileInfo(esFilename);
-
-            OutputScript(emoteTable.EmoteSets, esFile);
-        }
-
-        public static void json2es(FileInfo jsonFile)
-        {
-            var settings = new JsonSerializerSettings();
-            settings.ContractResolver = new EmoteScriptLib.JSON.LowercaseContractResolver();
-
-            var json = File.ReadAllText(jsonFile.FullName);
-
-            var jsonEmoteTable = JsonConvert.DeserializeObject<EmoteScriptLib.JSON.EmoteTable>(json, settings);
-
-            var emoteTable = new EmoteTable(jsonEmoteTable);
-            
-            emoteTable.SetValidBranches();
-
-            emoteTable.BuildLinks();
-
-            //ShowScript(emoteTable.EmoteSets);
-
-            var esFilename = Path.ChangeExtension(jsonFile.FullName, ".es");
-
-            // check if file already exists?
-
-            var esFile = new FileInfo(esFilename);
-
-            OutputScript(emoteTable.EmoteSets, esFile);
-        }
-
-        public static void OutputSQL(EmoteTable emoteTable, FileInfo sqlFile)
-        {
-            var sqlLines = BuildSQL(emoteTable);
-
-            File.WriteAllLines(sqlFile.FullName, sqlLines);
-
-            Console.WriteLine($"Compiled {sqlFile.FullName}");
-        }
-
-        public static uint? GetObjectId(FileInfo file)
-        {
-            var match = Regex.Match(file.Name, @"^(\d+)");
-
-            if (match.Success)
-                return uint.Parse(match.Groups[1].Value);
-            else
-                return null;
-        }
-
-        public static List<string> BuildSQL(EmoteTable emoteTable)
-        {
-            emoteTable.NormalRange();
-            
-            return EmoteScriptLib.SQL.SQLWriter.GetSQL(emoteTable);
-        }
-
-        public static void ShowSQL(EmoteTable emoteTable)
-        {
-            var sqlLines = BuildSQL(emoteTable);
-
-            foreach (var sqlLine in sqlLines)
-                Console.WriteLine(sqlLines);
-        }
-
-        public static void OutputJSON(EmoteScriptLib.JSON.EmoteTable emoteTable, FileInfo jsonFile)
-        {
-            var json = BuildJSON(emoteTable);
-
-            File.WriteAllText(jsonFile.FullName, json);
-
-            Console.WriteLine($"Compiled {jsonFile.FullName}");
-        }
-
-        public static string BuildJSON(EmoteScriptLib.JSON.EmoteTable emoteTable)
-        {
-            var settings = new JsonSerializerSettings();
-            settings.NullValueHandling = NullValueHandling.Ignore;
-            settings.Formatting = Formatting.Indented;
-            //settings.ContractResolver = new LowercaseContractResolver();
-            
-            return JsonConvert.SerializeObject(emoteTable, settings);
-        }
-
-        public static void ShowJSON(EmoteTable emoteTable)
-        {
-            var jsonTable = new EmoteScriptLib.JSON.EmoteTable(emoteTable);
-            
-            var json = BuildJSON(jsonTable);
-            
-            Console.WriteLine(json);
-        }
-
-        public static void OutputScript(List<EmoteSet> emoteSets, FileInfo esFile)
-        {
-            var script = BuildScript(emoteSets);
-
-            File.WriteAllLines(esFile.FullName, script);
-
-            Console.WriteLine($"Compiled {esFile.FullName}");
-        }
-
-        public static List<string> BuildScript(List<EmoteSet> emoteSets, int depth = 0)
-        {
-            var scriptLines = new List<string>();
-
-            var indent = string.Concat(Enumerable.Repeat("    ", depth));
-
-            for (var i = 0; i < emoteSets.Count; i++)
-            {
-                var emoteSet = emoteSets[i];
-
-                if (depth == 0 && emoteSet.Inline)
-                    continue;
-
-                if (depth > 0 && !emoteSet.Inline)
-                    continue;
-
-                //Console.WriteLine($"{emoteSet}");
-
-                if (i > 0 && depth == 0)
-                    scriptLines.Add(string.Empty);
-
-                scriptLines.Add($"{indent}{emoteSet.ToString(true)}");
-
-                foreach (var emote in emoteSet.Emotes)
-                    scriptLines.AddRange(BuildScript(emote, depth + 1));
-            }
-            return scriptLines;
-        }
-
-        public static List<string> BuildScript(Emote emote, int depth)
-        {
-            //Console.WriteLine($"{emote}");
-
-            var scriptLines = new List<string>();
-            
-            var indent = string.Concat(Enumerable.Repeat("    ", depth));
-
-            scriptLines.Add($"{indent}- {emote.ToString(true)}");
-
-            if (emote.Branches != null)
-                scriptLines.AddRange(BuildScript(emote.Branches, depth + 1));
-
-            return scriptLines;
-        }
-
-        public static void ShowScript(List<EmoteSet> emoteSets)
-        {
-            var script = BuildScript(emoteSets);
-
-            foreach (var line in script)
-                Console.WriteLine(line);
-        }
-
         public static void ShowUsage()
         {
             Console.WriteLine($"EmoteScript - a scripting language for Asheron's Call emotes");