more rfactoring

example map commented
artyfarty · Jan 24, 2012 · 1a54edf · 1a54edf
1 parent f54383a
commit 1a54edf
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 13 deletions.
diff --git a/UniversalEmoticonPackBuilderLib/main.cs b/UniversalEmoticonPackBuilderLib/main.cs
@@ -9,7 +9,7 @@
 namespace UniversalEmoticonPackBuilderLib
 {
     public static class UniversalEmoticonPackBuilder {
-        public static void BuildPacks(PackInfo packinfo, string build_dir, List<string> requested_builders, string mapfile)
+        public static void BuildPacks(PackInfo packinfo, string build_dir, List<string> requested_builders, Dictionary<string, string> map)
         {
             // Cleanup and create build dir
             try
@@ -47,33 +47,41 @@ public static void BuildPacks(PackInfo packinfo, string build_dir, List<string>
                         break;
                 }
 
+            // Build!
+            foreach (var s in map)
+                builders.ForEach(c => c.CopySmiley(s.Key, s.Value.Split(',')));
+
+            builders.ForEach(c => c.Finish());
+        }
 
+        public static void BuildPacks(PackInfo packinfo, string build_dir, List<string> requested_builders, string mapfile) {
             // Load pack
-            Dictionary<string, string> pack = new Dictionary<string, string>();
+            Dictionary<string, string> map = new Dictionary<string, string>();
 
             if (mapfile.Length > 0)
             {
                 string line;
-                var map = new StreamReader(mapfile);
-                while ((line = map.ReadLine()) != null)
+                var mapStream = new StreamReader(mapfile);
+                while ((line = mapStream.ReadLine()) != null)
                 {
                     if (line.IndexOf('#') == 0) continue;
                     var spl = line.Split(new[] { ':' }, 2);
                     if (spl.Length < 2) continue;
 
                     var sname = spl[0];
                     var scode = spl[1];
-                    pack.Add(sname, scode);
+                    map.Add(sname, scode);
                 }
             }
             else
-                throw new Exception("No map defined");// pack = Config.Pack;
+                throw new Exception("No map defined");
 
-            // Build!
-            foreach (var s in pack)
-                builders.ForEach(c => c.CopySmiley(s.Key, s.Value.Split(',')));
-
-            builders.ForEach(c => c.Finish());
+            BuildPacks(
+                packinfo,
+                build_dir,
+                requested_builders,
+                map
+            );
         }
 
         public static void BuildPacks(BuilderConfig Config)

diff --git a/examplePack/map.txt b/examplePack/map.txt
@@ -1,4 +1,11 @@
-ff.gif:(fuu)
+# Comment
+
+# empty lines ok
+#
+# Entry format:
+# imagefile:code[,alternativecode[,alternativecode[,alternativecode ... ]]]
+
+ff.gif:(fuu)
 fi.gif:(gyay)
 fl.gif:(aha)
-ft.gif:(troll)
+ft.gif:(troll),troll.jpg