Merge pull request #2 from vov4uk/Fix_buid

Small improvements
vov4uk · Oct 22, 2019 · 4a393b9 · 4a393b9
2 parents 00abe54 + 09f4543
commit 4a393b9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/HikConsole.png b/HikConsole.png
diff --git a/src/HikConsole.Tests/HikConsole.Tests.csproj b/src/HikConsole.Tests/HikConsole.Tests.csproj
@@ -30,6 +30,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x64</PlatformTarget>
+    <CodeAnalysisRuleSet>UnitTestsRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -39,7 +40,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisRuleSet>..\HikConsole\HikConsole.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>UnitTestsRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="AutoFixture, Version=4.11.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">

diff --git a/src/HikConsole/Helpers/Utils.cs b/src/HikConsole/Helpers/Utils.cs
@@ -80,7 +80,7 @@ public static string FormatBytes(long bytes)
                 dblSByte = bytes / 1024.0;
             }
 
-            return string.Format("{0:0.##} {1}", dblSByte, suffix[i]);
+            return string.Format("{0,6:0.00} {1}", dblSByte, suffix[i]);
         }
 
         public static long GetTotalFreeSpace(string destenation)

diff --git a/src/HikConsole/HikConsole.cs b/src/HikConsole/HikConsole.cs
@@ -140,7 +140,7 @@ public async Task<IList<FindResult>> Find(DateTime periodStart, DateTime periodE
 
         private void PrintFileInfo(FindResult file)
         {
-            C.Write($"{file.FileName}, {file.StartTime}, {file.StopTime}, {Utils.FormatBytes(file.FileSize)} ");
+            C.Write($"{file.FileName}, {file.StartTime.ToString("yyyy.MM.dd HH:mm:ss")}, {file.StopTime.ToString("yyyy.MM.dd HH:mm:ss")}, {Utils.FormatBytes(file.FileSize)} ");
         }
 
         private string GetWorkingDirectory(FindResult file)
@@ -157,7 +157,7 @@ private string GetFullPath(FindResult file, string directory = null)
         private void ResetDownloadStatus()
         {
             this.downloadHandle = -1;
-            this.progress.Dispose();
+            this.progress?.Dispose();
             this.progress = null;
         }
 

diff --git a/src/HikConsole/HikConsole.csproj b/src/HikConsole/HikConsole.csproj
@@ -24,7 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>..\HikConsole.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>HikConsole.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>x64</PlatformTarget>