🐛 Fix bugs and improvements

ali4heydari · ali4heydari · commit 3f5c3017ad27 · 2019-06-11T11:07:38.000+04:30
diff --git a/TelegramChatParser/Program.cs b/TelegramChatParser/Program.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.IO;
 using CommandLine;
 using E2.Utils;
 
@@ -16,16 +17,24 @@ public static void Main(string[] args)
                         .ParseArguments<TgParser>(args)
                         .WithParsed<TgParser>(o =>
                         {
+                            if (!File.Exists(o.InputHtmlPath))
+                            {
+                                Console.ForegroundColor = ConsoleColor.Red;
+                                Console.WriteLine("Error: inputHtml dose not exists! aborting...");
+                                Console.ForegroundColor = ConsoleColor.White;
+                                return;
+                            }
+                            
                             TgParser tgParser = new TgParser(o.InputHtmlPath, o.CsvFilePath, o.Verbose, o.Append);
 
                             tgParser.CreateCsv();
                         });
             }
             catch (Exception e)
             {
-                Console.BackgroundColor = ConsoleColor.Red;
+                Console.ForegroundColor = ConsoleColor.Red;
                 Console.WriteLine($"Exception thrown: \nMessage -> {e.Message}\nStackTrace -> {e.StackTrace}");
-                Console.BackgroundColor = ConsoleColor.Black;
+                Console.ForegroundColor = ConsoleColor.White;
             }
         }
     }
diff --git a/TelegramChatParser/TgParser.cs b/TelegramChatParser/TgParser.cs
@@ -39,18 +39,11 @@ public TgParser()
 
         public TgParser(string inputHtmlPath, string csvFilePath, bool verbose = false, bool append = false)
         {
-            if (Append == true && !File.Exists(CsvFilePath))
+            if (append == true && !File.Exists(csvFilePath))
             {
-                Console.BackgroundColor = ConsoleColor.Yellow;
+                Console.ForegroundColor = ConsoleColor.Yellow;
                 Console.WriteLine("Warning: Csv file not exists, Creating new file...");
-                Console.BackgroundColor = ConsoleColor.Black;
-            }
-
-            if (!File.Exists(inputHtmlPath))
-            {
-                Console.BackgroundColor = ConsoleColor.Red;
-                Console.WriteLine("Error: inputHtml dose not exists! aborting...");
-                Console.BackgroundColor = ConsoleColor.Black;
+                Console.ForegroundColor = ConsoleColor.White;
             }
 
             Verbose = verbose;
@@ -107,9 +100,9 @@ private List<Message> GetMessages()
             }
             catch (Exception e)
             {
-                Console.BackgroundColor = ConsoleColor.Red;
+                Console.ForegroundColor = ConsoleColor.Red;
                 Console.WriteLine($"Exception thrown: \nMessage -> {e.Message}\nStackTrace -> {e.StackTrace}");
-                Console.BackgroundColor = ConsoleColor.Black;
+                Console.ForegroundColor = ConsoleColor.White;
             }
 
             return messagesStack.ToList();

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using System.IO;`
`2`	`3`	`using CommandLine;`
`3`	`4`	`using E2.Utils;`
`4`	`5`
`@@ -16,16 +17,24 @@ public static void Main(string[] args)`
`16`	`17`	`.ParseArguments<TgParser>(args)`
`17`	`18`	`.WithParsed<TgParser>(o =>`
`18`	`19`	`{`
	`20`	`+ if (!File.Exists(o.InputHtmlPath))`
	`21`	`+ {`
	`22`	`+ Console.ForegroundColor = ConsoleColor.Red;`
	`23`	`+ Console.WriteLine("Error: inputHtml dose not exists! aborting...");`
	`24`	`+ Console.ForegroundColor = ConsoleColor.White;`
	`25`	`+ return;`
	`26`	`+ }`
	`27`	`+`
`19`	`28`	`TgParser tgParser = new TgParser(o.InputHtmlPath, o.CsvFilePath, o.Verbose, o.Append);`
`20`	`29`
`21`	`30`	`tgParser.CreateCsv();`
`22`	`31`	`});`
`23`	`32`	`}`
`24`	`33`	`catch (Exception e)`
`25`	`34`	`{`
`26`		`- Console.BackgroundColor = ConsoleColor.Red;`
	`35`	`+ Console.ForegroundColor = ConsoleColor.Red;`
`27`	`36`	`Console.WriteLine($"Exception thrown: \nMessage -> {e.Message}\nStackTrace -> {e.StackTrace}");`
`28`		`- Console.BackgroundColor = ConsoleColor.Black;`
	`37`	`+ Console.ForegroundColor = ConsoleColor.White;`
`29`	`38`	`}`
`30`	`39`	`}`
`31`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,18 +39,11 @@ public TgParser()`
`39`	`39`
`40`	`40`	`public TgParser(string inputHtmlPath, string csvFilePath, bool verbose = false, bool append = false)`
`41`	`41`	`{`
`42`		`- if (Append == true && !File.Exists(CsvFilePath))`
	`42`	`+ if (append == true && !File.Exists(csvFilePath))`
`43`	`43`	`{`
`44`		`- Console.BackgroundColor = ConsoleColor.Yellow;`
	`44`	`+ Console.ForegroundColor = ConsoleColor.Yellow;`
`45`	`45`	`Console.WriteLine("Warning: Csv file not exists, Creating new file...");`
`46`		`- Console.BackgroundColor = ConsoleColor.Black;`
`47`		`- }`
`48`		`-`
`49`		`- if (!File.Exists(inputHtmlPath))`
`50`		`- {`
`51`		`- Console.BackgroundColor = ConsoleColor.Red;`
`52`		`- Console.WriteLine("Error: inputHtml dose not exists! aborting...");`
`53`		`- Console.BackgroundColor = ConsoleColor.Black;`
	`46`	`+ Console.ForegroundColor = ConsoleColor.White;`
`54`	`47`	`}`
`55`	`48`
`56`	`49`	`Verbose = verbose;`
`@@ -107,9 +100,9 @@ private List<Message> GetMessages()`
`107`	`100`	`}`
`108`	`101`	`catch (Exception e)`
`109`	`102`	`{`
`110`		`- Console.BackgroundColor = ConsoleColor.Red;`
	`103`	`+ Console.ForegroundColor = ConsoleColor.Red;`
`111`	`104`	`Console.WriteLine($"Exception thrown: \nMessage -> {e.Message}\nStackTrace -> {e.StackTrace}");`
`112`		`- Console.BackgroundColor = ConsoleColor.Black;`
	`105`	`+ Console.ForegroundColor = ConsoleColor.White;`
`113`	`106`	`}`
`114`	`107`
`115`	`108`	`return messagesStack.ToList();`