From 8f9cbda78ecf5dc07e10d4d08f46603a38041df7 Mon Sep 17 00:00:00 2001
From: Carson McManus <carson.mcmanus1@gmail.com>
Date: Tue, 27 Mar 2018 19:16:15 -0400
Subject: [PATCH] fix some logging stuff so it's easier to read

---
 Manifest.cs | 24 +++++++++++++-----------
 Program.cs  | 14 +++++++-------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/Manifest.cs b/Manifest.cs
index 6486cae..874f0a3 100644
--- a/Manifest.cs
+++ b/Manifest.cs
@@ -64,7 +64,7 @@ namespace SteamGuard
 			// If there's no manifest, create it
 			if (!File.Exists(maFile))
 			{
-				if (Program.Verbose) Console.WriteLine("warn: No manifest file found at {0}", maFile);
+				Utils.Verbose("warn: No manifest file found at {0}", maFile);
 				bool? createNewManifest = Program.SteamGuardPath ==
 										  Program.defaultSteamGuardPath.Replace("~", Environment.GetEnvironmentVariable("HOME")) ? true : (bool?) null;
 				while (createNewManifest == null)
@@ -95,6 +95,7 @@ namespace SteamGuard
 
 				_manifest.RecomputeExistingEntries();
 
+				Utils.Verbose($"{_manifest.Entries.Count} accounts loaded");
 				return _manifest;
 			}
 			catch (Exception ex)
@@ -106,7 +107,7 @@ namespace SteamGuard
 
 		private static Manifest _generateNewManifest(bool scanDir = false)
 		{
-			if (Program.Verbose) Console.WriteLine("Generating new manifest...");
+			Utils.Verbose("Generating new manifest...");
 
 			// No directory means no manifest file anyways.
 			Manifest newManifest = new Manifest();
@@ -143,7 +144,7 @@ namespace SteamGuard
 						}
 						catch (Exception ex)
 						{
-							if (Program.Verbose) Console.WriteLine("warn: {0}", ex.Message);
+							Utils.Verbose("warn: {0}", ex.Message);
 						}
 					}
 
@@ -249,9 +250,10 @@ namespace SteamGuard
 			Stream stream = null;
 			RijndaelManaged aes256;
 
+			string filename = Path.Combine(Program.SteamGuardPath, entry.Filename);
 			if (this.Encrypted)
 			{
-				MemoryStream ms = new MemoryStream(Convert.FromBase64String(File.ReadAllText(Path.Combine(Program.SteamGuardPath, entry.Filename))));
+				MemoryStream ms = new MemoryStream(Convert.FromBase64String(File.ReadAllText(filename)));
 				byte[] key = GetEncryptionKey(passKey, entry.Salt);
 
 				aes256 = new RijndaelManaged
@@ -264,14 +266,14 @@ namespace SteamGuard
 
 				ICryptoTransform decryptor = aes256.CreateDecryptor(aes256.Key, aes256.IV);
 				stream = new CryptoStream(ms, decryptor, CryptoStreamMode.Read);
+				Utils.Verbose($"Decrypting {filename}...");
 			}
 			else
 			{
-				FileStream fileStream = File.OpenRead(Path.Combine(Program.SteamGuardPath, entry.Filename));
+				FileStream fileStream = File.OpenRead(filename);
 				stream = fileStream;
 			}
 
-			if (Program.Verbose) Console.WriteLine("Decrypting...");
 			using (StreamReader reader = new StreamReader(stream))
 			{
 				fileText = reader.ReadToEnd();
@@ -325,7 +327,7 @@ namespace SteamGuard
 			string jsonAccount = JsonConvert.SerializeObject(account);
 
 			string filename = account.Session.SteamID.ToString() + ".maFile";
-			if (Program.Verbose) Console.WriteLine($"Saving account {account.AccountName} to {filename}...");
+			Utils.Verbose($"Saving account {account.AccountName} to {filename}...");
 
 			ManifestEntry newEntry = new ManifestEntry()
 			{
@@ -406,7 +408,7 @@ namespace SteamGuard
 			}
 			catch (Exception ex)
 			{
-				if (Program.Verbose) Console.WriteLine("error: {0}", ex.ToString());
+				Utils.Verbose("error: {0}", ex.ToString());
 				return false;
 			}
 		}
@@ -418,12 +420,12 @@ namespace SteamGuard
 			{
 				try
 				{
-					if (Program.Verbose) Console.WriteLine("Creating {0}", Program.SteamGuardPath);
+					Utils.Verbose("Creating {0}", Program.SteamGuardPath);
 					Directory.CreateDirectory(Program.SteamGuardPath);
 				}
 				catch (Exception ex)
 				{
-					if (Program.Verbose) Console.WriteLine($"error: {ex.Message}");
+					Utils.Verbose($"error: {ex.Message}");
 					return false;
 				}
 			}
@@ -436,7 +438,7 @@ namespace SteamGuard
 			}
 			catch (Exception ex)
 			{
-				if (Program.Verbose) Console.WriteLine($"error: {ex.Message}");
+				Utils.Verbose($"error: {ex.Message}");
 				return false;
 			}
 		}
diff --git a/Program.cs b/Program.cs
index 9c15b2b..b71458b 100644
--- a/Program.cs
+++ b/Program.cs
@@ -137,13 +137,13 @@ namespace SteamGuard
 				}
 			}
 
-			if (Verbose)
+			Utils.Verbose($"Action: {action}");
+			if (user.Length > 0)
 			{
-				Console.WriteLine($"Action: {action}");
-				Console.WriteLine($"User: {user}");
-				Console.WriteLine($"Passkey: {passkey}");
-				Console.WriteLine($"maFiles path: {SteamGuardPath}");
+				Utils.Verbose($"User: {user}");
 			}
+			Utils.Verbose($"Passkey: {passkey.Length > 0 ? "[specified]" : "[not specified]" }");
+			Utils.Verbose($"maFiles path: {SteamGuardPath}");
 
 			// Perform desired action
 			switch (action)
@@ -273,14 +273,14 @@ namespace SteamGuard
 				{
 					if (account.AccountName.ToLower() == user.ToLower())
 					{
-						Utils.Verbose("Generating Code...");
+						Utils.Verbose("Generating code for {0}...", account.AccountName);
 						code = account.GenerateSteamGuardCode();
 						break;
 					}
 				}
 				else
 				{
-					Utils.Verbose("Generating Code for {0}...", account.AccountName);
+					Utils.Verbose("Generating code for {0}...", account.AccountName);
 					code = account.GenerateSteamGuardCode();
 					break;
 				}