Bugfix #389 : Handle corrupt cache file

update dependencies
2026-01-14 08:49:19 -05:00 · 2022-11-08 07:22:08 -05:00 · 2022-11-02 16:24:14 -04:00
14 changed files with 36 additions and 35 deletions
--- a/Source/AppScaffolding/AppScaffolding.csproj
+++ b/Source/AppScaffolding/AppScaffolding.csproj
@@ -2,10 +2,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
-    <Version>8.5.0.1</Version>
+    <Version>8.5.1.1</Version>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Octokit" Version="4.0.0" />
+    <PackageReference Include="Octokit" Version="4.0.1" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
--- a/Source/ApplicationServices/ApplicationServices.csproj
+++ b/Source/ApplicationServices/ApplicationServices.csproj
@@ -5,7 +5,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="29.0.0" />
+    <PackageReference Include="CsvHelper" Version="30.0.0" />
    <PackageReference Include="NPOI" Version="2.5.6" />
  </ItemGroup>

--- a/Source/AudibleUtilities/AudibleUtilities.csproj
+++ b/Source/AudibleUtilities/AudibleUtilities.csproj
@@ -5,7 +5,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="4.6.5.1" />
+    <PackageReference Include="AudibleApi" Version="4.6.6.1" />
  </ItemGroup>

  <ItemGroup>
--- a/Source/DataLayer/DataLayer.csproj
+++ b/Source/DataLayer/DataLayer.csproj
@@ -10,7 +10,7 @@
  </PropertyGroup>
  
  <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="5.2.1.1" />
+    <PackageReference Include="Dinah.Core" Version="5.3.0.1" />
    <PackageReference Include="Dinah.EntityFrameworkCore" Version="5.0.2.1" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.10">
      <PrivateAssets>all</PrivateAssets>
--- a/Source/FileManager/FileManager.csproj
+++ b/Source/FileManager/FileManager.csproj
@@ -5,7 +5,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="5.2.1.1" />
+    <PackageReference Include="Dinah.Core" Version="5.3.0.1" />
    <PackageReference Include="Polly" Version="7.2.3" />
  </ItemGroup>

--- a/Source/LibationFileManager/FilePathCache.cs
+++ b/Source/LibationFileManager/FilePathCache.cs
@@ -24,23 +24,24 @@ namespace LibationFileManager
        static FilePathCache()
        {
 			// load json into memory. if file doesn't exist, nothing to do. save() will create if needed
-			if (File.Exists(jsonFile))
-			{
-				var list = JsonConvert.DeserializeObject<List<CacheEntry>>(File.ReadAllText(jsonFile));
+			if (!File.Exists(jsonFile))
+				return;

-				// file exists but deser is null. this will never happen when file is healthy
-				if (list is null)
-				{
-					lock (locker)
-					{
-						Serilog.Log.Logger.Error("Error deserializing file. Wrong format. Possibly corrupt. Deleting file. {@DebugInfo}", new { jsonFile });
-						File.Delete(jsonFile);
-						return;
-					}
-				}
+            try
+            {
+                var list = JsonConvert.DeserializeObject<List<CacheEntry>>(File.ReadAllText(jsonFile));
+                if (list is null)
+                    throw new NullReferenceException("File exists but deserialize is null. This will never happen when file is healthy.");

-				cache = new Cache<CacheEntry>(list);
-			}
+                cache = new Cache<CacheEntry>(list);
+            }
+            catch (Exception ex)
+            {
+                Serilog.Log.Logger.Error(ex, "Error deserializing file. Wrong format. Possibly corrupt. Deleting file. {@DebugInfo}", new { jsonFile });
+                lock (locker)
+                    File.Delete(jsonFile);
+                return;
+            }
        }

        public static bool Exists(string id, FileType type) => GetFirstPath(id, type) is not null;
--- a/Source/LibationWinForms/LibationWinForms.csproj
+++ b/Source/LibationWinForms/LibationWinForms.csproj
@@ -43,8 +43,8 @@


 	<ItemGroup>
-		<PackageReference Include="Autoupdater.NET.Official" Version="1.7.5" />
-		<PackageReference Include="Dinah.Core.WindowsDesktop" Version="5.2.3.1" />
+		<PackageReference Include="Autoupdater.NET.Official" Version="1.7.6" />
+		<PackageReference Include="Dinah.Core.WindowsDesktop" Version="5.2.4.1" />
 	</ItemGroup>

 	<ItemGroup>
--- a/Source/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj
+++ b/Source/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj
@@ -32,7 +32,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Dinah.Core.WindowsDesktop" Version="5.2.3.1" />
+    <PackageReference Include="Dinah.Core.WindowsDesktop" Version="5.2.4.1" />
  </ItemGroup>

  <ItemGroup>
--- a/Source/_Demos/LoadByOS/CrossPlatformClientExe/CrossPlatformClientExe.csproj
+++ b/Source/_Demos/LoadByOS/CrossPlatformClientExe/CrossPlatformClientExe.csproj
@@ -17,7 +17,7 @@
 	</PropertyGroup>

 	<ItemGroup>
-	  <PackageReference Include="Dinah.Core" Version="5.2.1.1" />
+	  <PackageReference Include="Dinah.Core" Version="5.3.0.1" />
 	</ItemGroup>

 </Project>
--- a/Source/_Tests/AudibleUtilities.Tests/AudibleUtilities.Tests.csproj
+++ b/Source/_Tests/AudibleUtilities.Tests/AudibleUtilities.Tests.csproj
@@ -6,12 +6,12 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.7.0" />
+    <PackageReference Include="FluentAssertions" Version="6.8.0" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
    <PackageReference Include="Moq" Version="4.18.2" />
    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/Source/_Tests/FileLiberator.Tests/FileLiberator.Tests.csproj
+++ b/Source/_Tests/FileLiberator.Tests/FileLiberator.Tests.csproj
@@ -6,11 +6,11 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.7.0" />
+    <PackageReference Include="FluentAssertions" Version="6.8.0" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/Source/_Tests/FileManager.Tests/FileManager.Tests.csproj
+++ b/Source/_Tests/FileManager.Tests/FileManager.Tests.csproj
@@ -7,11 +7,11 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.7.0" />
+    <PackageReference Include="FluentAssertions" Version="6.8.0" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/Source/_Tests/LibationFileManager.Tests/LibationFileManager.Tests.csproj
+++ b/Source/_Tests/LibationFileManager.Tests/LibationFileManager.Tests.csproj
@@ -7,11 +7,11 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.7.0" />
+    <PackageReference Include="FluentAssertions" Version="6.8.0" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/Source/_Tests/LibationSearchEngine.Tests/LibationSearchEngine.Tests.csproj
+++ b/Source/_Tests/LibationSearchEngine.Tests/LibationSearchEngine.Tests.csproj
@@ -7,12 +7,12 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.7.0" />
+    <PackageReference Include="FluentAssertions" Version="6.8.0" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
    <PackageReference Include="Moq" Version="4.18.2" />
    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
Author	SHA1	Message	Date
Robert McRackan	7575736991	Bugfix #389 : Handle corrupt cache file	2022-11-08 07:22:08 -05:00
Robert McRackan	06f8d055fc	update dependencies	2022-11-02 16:24:14 -04:00