Clean up logging

Author: SteveDesmond-ca

src/App.cs

@@ -20,6 +20,7 @@ public App(ISynchronizer sync, Action<string> setStatus, Action<string> log)
 		public async Task Run(Settings settings)
 		{
 			_setStatus($"Starting...");
+			_log(settings.Name);
 
 			var validation = await _sync.ValidateAccess();
 			if(!validation.Successful)
@@ -28,11 +29,7 @@ public async Task Run(Settings settings)
 			}
 
 			var account = await _sync.GetAccount(settings.Name);
-			_log(string.Empty);
-
 			var repos = await _sync.GetRepositories(account);
-			_log(string.Empty);
-
 			var labels = await _sync.GetAccountLabels(account);
 			_log(string.Empty);
 

src/GitHub.cs

@@ -25,23 +25,23 @@ public async Task<IReadOnlyList<string>> GetAccess()
 			var url = _client.Connection.BaseAddress + "user";
 			var response = await _client.Connection.Get<string>(new Uri(url), null, null);
 			var accessNames = response.HttpResponse.Headers["X-OAuth-Scopes"];
-			_log($"Access: {accessNames}");
+			_log($"{"Access",-13} : {accessNames}");
 			return accessNames.Split(",").Select(a => a.Trim()).ToArray();
 		}
 
 		public async Task<Account> GetOrganization(string name)
 		{
 			_setStatus($"Finding organization for {name}...");
 			var account = await _client.Organization.Get(name);
-			_log($"Organization ID for {name}: {account.Id}");
+			_log($"{"Org ID",-13} : {account.Id}");
 			return account;
 		}
 
 		public async Task<Account> GetUser(string name)
 		{
 			_setStatus($"Finding user for {name}...");
 			var account = await _client.User.Get(name);
-			_log($"User ID for {name}: {account.Id}");
+			_log($"{"User ID",-13} : {account.Id}");
 			return account;
 		}
 
@@ -50,7 +50,7 @@ public async Task<IReadOnlyList<Repository>> GetRepositoriesForOrganization(Acco
 			_setStatus($"Finding repositories for {account.Login}...");
 			var repos = await _client.Repository.GetAllForOrg(account.Login);
 			var repoNames = string.Join(", ", repos.Select(l => l.Name));
-			_log($"{repos.Count} repositories for {account.Login}: {repoNames}");
+			_log($"{repos.Count,3} {"repos",-9} : {repoNames}");
 			return repos;
 		}
 
@@ -59,41 +59,36 @@ public async Task<IReadOnlyList<Repository>> GetRepositoriesForUser(Account acco
 			_setStatus($"Finding repositories for {account.Login}...");
 			var repos = await _client.Repository.GetAllForUser(account.Login);
 			var repoNames = string.Join(", ", repos.Select(l => l.Name));
-			_log($"{repos.Count} repositories for {account.Login}: {repoNames}");
+			_log($"{repos.Count,3} {"repos",-9} : {repoNames}");
 			return repos;
 		}
 
 		public async Task<Repository> CreateTempRepoForOrganization(Account account, string repoName)
 		{
 			_setStatus($"Creating temp repository {repoName}...");
 			var newRepo = new NewRepository(repoName) { Private = true };
-			var repo = await _client.Repository.Create(account.Login, newRepo);
-			_log($"Created temp repository {repoName}");
-			return repo;
+			return await _client.Repository.Create(account.Login, newRepo);
 		}
 
 		public async Task<Repository> CreateTempRepoForUser(Account account, string repoName)
 		{
 			_setStatus($"Creating temp repository {repoName}...");
 			var newRepo = new NewRepository(repoName) { Private = true };
-			var repo = await _client.Repository.Create(newRepo);
-			_log($"Created temp repository {repoName}");
-			return repo;
+			return await _client.Repository.Create(newRepo);
 		}
 
 		public async Task DeleteTempRepo(Account account, string repoName)
 		{
 			_setStatus($"Deleting temp repository {repoName}...");
 			await _client.Repository.Delete(account.Login, repoName);
-			_log($"Deleted temp repository {repoName}");
 		}
 
 		public async Task<IReadOnlyList<Label>> GetLabels(Repository repo)
 		{
 			_setStatus($"Finding labels for {repo.Name}...");
 			var repoLabels = await _client.Issue.Labels.GetAllForRepository(repo.Id);
 			var repoLabelNames = string.Join(", ", repoLabels.Select(l => l.Name));
-			_log($"{repoLabels.Count,2} labels   : {repoLabelNames}");
+			_log($"{repoLabels.Count,3} {"labels",-9} : {repoLabelNames}");
 			return repoLabels;
 		}
 

src/Synchronizer.cs

@@ -49,7 +49,6 @@ public async Task<Account> GetAccount(string name)
 			}
 			catch
 			{
-				_log($"{name} is not an organization");
 				return await _gitHub.GetUser(name);
 			}
 		}
@@ -106,30 +105,30 @@ private void ShowSynchronizedLabels(Repository repo, IEnumerable<Label> accountL
 		{
 			_setStatus($"Finding synchronized labels in {repo.Name}...");
 			var matchingLabels = accountLabels.Where(al => repoLabels.Any(rl => Matching(al, rl))).ToArray();
-			_log($"{matchingLabels.Length,2} sync'd   : {LabelNames(matchingLabels)}");
+			_log($"{matchingLabels.Length,3} {"sync'd",-9} : {LabelNames(matchingLabels)}");
 		}
 
 		private IEnumerable<Label> GetLabelsToAdd(Repository repo, IEnumerable<Label> accountLabels, IEnumerable<Label> repoLabels)
 		{
 			_setStatus($"Finding labels to add to {repo.Name}...");
 			var newLabels = accountLabels.Where(al => repoLabels.All(rl => rl.Name != al.Name && rl.Description != al.Description)).ToArray();
-			_log($"{newLabels.Length,2} to add   : {LabelNames(newLabels)}");
+			_log($"{newLabels.Length,3} {"to add",-9} : {LabelNames(newLabels)}");
 			return newLabels;
 		}
 
 		private IEnumerable<Label> GetLabelsToEdit(Repository repo, IEnumerable<Label> accountLabels, IEnumerable<Label> repoLabels)
 		{
 			_setStatus($"Finding labels to edit in {repo.Name}...");
 			var editLabels = accountLabels.Where(al => repoLabels.Any(rl => NeedsUpdating(al, rl))).ToArray();
-			_log($"{editLabels.Length,2} to edit  : {LabelNames(editLabels)}");
+			_log($"{editLabels.Length,3} {"to edit",-9} : {LabelNames(editLabels)}");
 			return editLabels;
 		}
 
 		private IEnumerable<Label> GetLabelsToDelete(Repository repo, IEnumerable<Label> accountLabels, IEnumerable<Label> repoLabels)
 		{
 			_setStatus($"Finding labels to delete from {repo.Name}...");
 			var oldLabels = repoLabels.Where(rl => accountLabels.All(al => al.Name != rl.Name && al.Description != rl.Description)).ToArray();
-			_log($"{oldLabels.Length,2} to delete: {LabelNames(oldLabels)}");
+			_log($"{oldLabels.Length,3} {"to delete",-9} : {LabelNames(oldLabels)}");
 			return oldLabels;
 		}