Merge pull request #983 from github-for-unity/copyhelper-fixes

StanleyGoldman · web-flow · commit 1cfcaad43816 · 2018-12-12T09:54:06.000-05:00
Fixing the logging of CopyHelper
diff --git a/src/GitHub.Api/Installer/CopyHelper.cs b/src/GitHub.Api/Installer/CopyHelper.cs
@@ -12,7 +12,7 @@ public static class CopyHelper
 
         public static void Copy(NPath fromPath, NPath toPath)
         {
-            Logger.Trace("Copying from " + fromPath + " to " + toPath + ".");
+            Logger.Trace("Copying from {0} to {1}", fromPath, toPath);
             
             try
             {
@@ -28,7 +28,7 @@ public static void Copy(NPath fromPath, NPath toPath)
                 }
                 catch (Exception ex2)
                 {
-                    Logger.Error(ex1, "Error copying contents.");
+                    Logger.Error(ex2, "Error copying contents.");
                     throw;
                 }
             }
@@ -39,15 +39,15 @@ public static void Copy(NPath fromPath, NPath toPath)
         }
         public static void CopyFolder(NPath fromPath, NPath toPath)
         {
-            Logger.Trace("CopyFolder fromPath: {0} toPath:{1}", fromPath.ToString(), toPath.ToString());
+            Logger.Trace("CopyFolder from {0} to {1}", fromPath, toPath);
             toPath.DeleteIfExists();
             toPath.EnsureParentDirectoryExists();
             fromPath.Move(toPath);
         }
 
         public static void CopyFolderContents(NPath fromPath, NPath toPath)
         {
-            Logger.Trace("CopyFolder Contents fromPath: {0} toPath:{1}", fromPath.ToString(), toPath.ToString());
+            Logger.Trace("CopyFolderContents from {0} to {1}", fromPath, toPath);
             toPath.DeleteContents();
             fromPath.MoveFiles(toPath, true);
         }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public static class CopyHelper`
`12`	`12`
`13`	`13`	`public static void Copy(NPath fromPath, NPath toPath)`
`14`	`14`	`{`
`15`		`- Logger.Trace("Copying from " + fromPath + " to " + toPath + ".");`
	`15`	`+ Logger.Trace("Copying from {0} to {1}", fromPath, toPath);`
`16`	`16`
`17`	`17`	`try`
`18`	`18`	`{`
`@@ -28,7 +28,7 @@ public static void Copy(NPath fromPath, NPath toPath)`
`28`	`28`	`}`
`29`	`29`	`catch (Exception ex2)`
`30`	`30`	`{`
`31`		`- Logger.Error(ex1, "Error copying contents.");`
	`31`	`+ Logger.Error(ex2, "Error copying contents.");`
`32`	`32`	`throw;`
`33`	`33`	`}`
`34`	`34`	`}`
`@@ -39,15 +39,15 @@ public static void Copy(NPath fromPath, NPath toPath)`
`39`	`39`	`}`
`40`	`40`	`public static void CopyFolder(NPath fromPath, NPath toPath)`
`41`	`41`	`{`
`42`		`- Logger.Trace("CopyFolder fromPath: {0} toPath:{1}", fromPath.ToString(), toPath.ToString());`
	`42`	`+ Logger.Trace("CopyFolder from {0} to {1}", fromPath, toPath);`
`43`	`43`	`toPath.DeleteIfExists();`
`44`	`44`	`toPath.EnsureParentDirectoryExists();`
`45`	`45`	`fromPath.Move(toPath);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public static void CopyFolderContents(NPath fromPath, NPath toPath)`
`49`	`49`	`{`
`50`		`- Logger.Trace("CopyFolder Contents fromPath: {0} toPath:{1}", fromPath.ToString(), toPath.ToString());`
	`50`	`+ Logger.Trace("CopyFolderContents from {0} to {1}", fromPath, toPath);`
`51`	`51`	`toPath.DeleteContents();`
`52`	`52`	`fromPath.MoveFiles(toPath, true);`
`53`	`53`	`}`