improved json entering to the console

muhammad369 · Sep 24, 2021 · ecc86f0 · ecc86f0
1 parent 137674e
commit ecc86f0
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 30 deletions.
diff --git a/J2dConsole/ClipboardUtil.cs b/J2dConsole/ClipboardUtil.cs
@@ -17,7 +17,7 @@ public static async Task<string> getTextAsync()
             }
             catch (Exception ex)
             {
-                Console.WriteLine(ex.Message);
+                ConsoleUtil.writeError(ex.Message);
                 return null;
             }
         }
@@ -32,7 +32,7 @@ public static async Task<bool> setTextAsync(string text)
             }
             catch (Exception ex)
             {
-                Console.WriteLine(ex.Message);
+                ConsoleUtil.writeError(ex.Message);
                 return false;
             }
         }

diff --git a/J2dConsole/ConsoleUtil.cs b/J2dConsole/ConsoleUtil.cs
@@ -8,20 +8,45 @@ public static class ConsoleUtil
         public static string readConsoleMultiline()
         {
             StringBuilder output = new StringBuilder();
+
+            Console.BackgroundColor = ConsoleColor.DarkBlue;
 
             while(true)
             {
-                ConsoleKeyInfo key = Console.ReadKey();
-                if (key.Key == ConsoleKey.Enter && key.Modifiers == ConsoleModifiers.Control)
+                string line = Console.ReadLine();
+                if (line == "end")
                 {
+                    Console.ResetColor();
                     break;
                 }
                 //
-                output.Append(key.KeyChar);
+                output.AppendLine(line);
             }
 
             //
             return output.ToString();
         }
+
+        public static void writeText(string text)
+        {
+            Console.BackgroundColor = ConsoleColor.DarkBlue;
+            //
+            Console.Write(text);
+            //
+            Console.ResetColor();
+            Console.WriteLine();
+        }
+
+        public static void writeError(string text)
+        {
+            Console.BackgroundColor = ConsoleColor.DarkRed;
+            //
+            Console.Write(text);
+            //
+            //
+            Console.ResetColor();
+            Console.WriteLine();
+        }
+
     }
 }
diff --git a/J2dConsole/FileUtil.cs b/J2dConsole/FileUtil.cs
@@ -17,8 +17,8 @@ public static string readFile(string path)
             }
             catch (Exception ex)
             {
-                Console.WriteLine($"Failed to read file: {path}");
-                Console.WriteLine(ex.Message);
+                ConsoleUtil.writeError($"Failed to read file: {path}");
+                ConsoleUtil.writeError(ex.Message);
                 return null;
             }
         }
@@ -33,8 +33,8 @@ public static bool writeFile(string path, string content)
             }
             catch (Exception ex)
             {
-                Console.WriteLine($"Failed to write file: {path}");
-                Console.WriteLine(ex.Message);
+                ConsoleUtil.writeError($"Failed to write file: {path}");
+                ConsoleUtil.writeError(ex.Message);
                 return false;
             }
         }

diff --git a/J2dConsole/Program.cs b/J2dConsole/Program.cs
@@ -13,7 +13,7 @@ public class Program
         public static async Task Main(string[] args)
         {
             //args = new string[] {"-i" };
-            Console.WriteLine("DartToJson version 1.0.0");
+            Console.WriteLine("DartToJson version 1.0.1");
             //
             if(args.Length == 0)
             {
@@ -37,8 +37,8 @@ public static async Task Main(string[] args)
             }
             else writeHelp();
             //
-            Console.WriteLine("Press any key to exit");
-            Console.ReadKey();
+            //Console.WriteLine("Press any key to exit");
+            //Console.ReadKey();
 
 
         }
@@ -61,7 +61,7 @@ private static async Task provideTheSerializableCodeAsync()
             }
             else if (option == "h")
             {
-                Console.WriteLine(dart);
+                ConsoleUtil.writeText(dart);
             }
             else if (option == "x")
             {
@@ -91,7 +91,7 @@ private static async Task runInteractiveModeAsync()
                 }
                 else if(option == "h")
                 {
-                    Console.WriteLine("Write your json and press CTRL+Enter to finish:");
+                    Console.WriteLine("Write your json, then write 'end' in a seperate line to finish:");
                     input = ConsoleUtil.readConsoleMultiline();
                 }
                 else if(option == "x")
@@ -130,7 +130,7 @@ private static async Task runInteractiveModeAsync()
                 }
                 else if (option == "h")
                 {
-                    Console.WriteLine(dart);
+                    ConsoleUtil.writeText(dart);
                 }
                 else if (option == "x")
                 {
@@ -184,7 +184,7 @@ private static void writeHelp()
             Console.WriteLine("\r\n -f [input file] [(optional) output file] [(optional) class name]\r\n"
                 +" to take json input file and write output dart file \r\n");
 
-            Console.WriteLine(" -c [class name]\r\n "
+            Console.WriteLine(" -c [(optional) class name]\r\n "
                 +"to take input from the clipboard and write to the clipbord\r\n");
 
             Console.WriteLine(" -i \r\n for the interactive mode\r\n");
@@ -200,11 +200,12 @@ static string createDartClass(string jsonText, string className = "RootClass")
             try
             {
                 var jp = new JsonParser();
+
                 var json = jp.Parse(jsonText);
 
                 if (!(json is JsonObject))
                 {
-                    Console.WriteLine("must be json object");
+                    ConsoleUtil.writeError("must be json object");
                     return null;
                 }
                 //
@@ -216,7 +217,7 @@ static string createDartClass(string jsonText, string className = "RootClass")
             }
             catch (Exception ex)
             {
-                Console.WriteLine(ex.Message);
+                ConsoleUtil.writeError(ex.Message);
                 return null;
             }
         }

diff --git a/J2dLib/Json/JsonParser.cs b/J2dLib/Json/JsonParser.cs
@@ -33,17 +33,7 @@ public JsonValue Parse(string text)
             {
                 switch (state)
                 {
-                    //case 0:
-                    //    if (Regex.IsMatch(token.Value, "{"))
-                    //    {
-                    //        state = 1;
-                    //        stack.Push(new JsonObject());
-                    //    }
-                    //    else
-                    //    {
-                    //        parsingError();
-                    //    }
-                    //    break;
+
                     case 1:
                         if ( token.Value == "}")
                         {
@@ -224,6 +214,10 @@ public JsonValue Parse(string text)
                         break;
                 }
             }//end foreach
+            if (stack.Count == 0)
+            {
+                parsingError();
+            }
             return stack.Pop();
 
         }
@@ -232,7 +226,7 @@ public JsonValue Parse(string text)
 
         private void parsingError()
         {
-            throw new Exception("Parsing Error");
+            throw new Exception("Json Parsing Error");
         }