Bugfix #389 : Handle corrupt cache file

update dependencies
#367 : New template option "year": year published to audible
2026-01-03 03:18:27 -05:00 · 2022-11-08 07:22:08 -05:00 · 2022-11-02 16:24:14 -04:00 · 2022-10-21 13:41:44 -04:00 · 2022-10-18 08:33:43 -04:00 · 2022-10-05 22:25:40 -04:00
23 changed files with 70 additions and 44 deletions
--- a/Documentation/InstallOnMac.md
+++ b/Documentation/InstallOnMac.md
@@ -21,4 +21,20 @@ sudo spctl --add --label "Libation" ./Libation
 ./Libation
 ```

+## Trouble with Gatekeeper?
+
+If Gatekeeper is giving you trouble with Libation:
+
+Disable the block
+
+`sudo spctl --master-disable`
+
+Launch Libation and login, etc. and allow the rules to update then re-enable the block.
+
+`sudo spctl --master-enable`
+
+Once Gatekeeper reenabled, you can open Libation again without it being blocked.
+
+Thanks [joseph-holland](https://github.com/rmcrackan/Libation/issues/327#issuecomment-1268993349)!
+
 Report bugs to https://github.com/rmcrackan/Libation/issues
--- 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.4.6.1</Version>
+    <Version>8.5.1.1</Version>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Octokit" Version="3.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="28.0.1" />
+    <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.4.1" />
+    <PackageReference Include="AudibleApi" Version="4.6.6.1" />
  </ItemGroup>

  <ItemGroup>
--- a/Source/DataLayer/DataLayer.csproj
+++ b/Source/DataLayer/DataLayer.csproj
@@ -10,14 +10,14 @@
  </PropertyGroup>
  
  <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="5.1.1.1" />
-    <PackageReference Include="Dinah.EntityFrameworkCore" Version="5.0.1.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.9">
+    <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>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.9">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.10">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/Source/FileLiberator/UtilityExtensions.cs
+++ b/Source/FileLiberator/UtilityExtensions.cs
@@ -31,6 +31,7 @@ namespace FileLiberator
 			AudibleProductId = libraryBook.Book.AudibleProductId,
 			Title = libraryBook.Book.Title ?? "",
 			Locale = libraryBook.Book.Locale,
+			YearPublished = libraryBook.Book.DatePublished?.Year,

 			Authors = libraryBook.Book.Authors.Select(c => c.Name).ToList(),

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

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

--- a/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml.cs
@@ -138,6 +138,7 @@ namespace LibationAvalonia.Dialogs
 					AudibleProductId = "123456789",
 					Title = "A Study in Scarlet: A Sherlock Holmes Novel",
 					Locale = "us",
+					YearPublished = 2017,
 					Authors = new List<string> { "Arthur Conan Doyle", "Stephen Fry - introductions" },
 					Narrators = new List<string> { "Stephen Fry" },
 					SeriesName = "Sherlock Holmes",
--- a/Source/LibationFileManager/Configuration.PersistentSettings.cs
+++ b/Source/LibationFileManager/Configuration.PersistentSettings.cs
@@ -259,7 +259,8 @@ namespace LibationFileManager
            }
        }

-        [Description("Auto download episodes? After scan, download new books in 'checked' accounts.")]
+        [Description("Auto download books? After scan, download new books in 'checked' accounts.")]
+        // poorly named setting. Should just be 'AutoDownload'. It is NOT episode specific
        public bool AutoDownloadEpisodes
        {
            get => persistentDictionary.GetNonString<bool>(nameof(AutoDownloadEpisodes));
--- 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/LibationFileManager/LibraryBookDto.cs
+++ b/Source/LibationFileManager/LibraryBookDto.cs
@@ -9,6 +9,7 @@ namespace LibationFileManager
        public string AudibleProductId { get; set; }
        public string Title { get; set; }
        public string Locale { get; set; }
+        public int? YearPublished { get; set; }

        public IEnumerable<string> Authors { get; set; }
        public string AuthorNames => string.Join(", ", Authors);
--- a/Source/LibationFileManager/TemplateTags.cs
+++ b/Source/LibationFileManager/TemplateTags.cs
@@ -39,6 +39,7 @@ namespace LibationFileManager
        public static TemplateTags Channels { get; } = new TemplateTags("channels", "Number of audio channels");
        public static TemplateTags Account { get; } = new TemplateTags("account", "Audible account of this book");
        public static TemplateTags Locale { get; } = new TemplateTags("locale", "Region/country");
+        public static TemplateTags YearPublished { get; } = new TemplateTags("year", "Year published");

        // Special case. Isn't mapped to a replacement in Templates.cs
        // Included here for display by EditTemplateDialog
--- a/Source/LibationFileManager/Templates.cs
+++ b/Source/LibationFileManager/Templates.cs
@@ -142,8 +142,9 @@ namespace LibationFileManager
 			fileNamingTemplate.AddParameterReplacement(TemplateTags.Channels, libraryBookDto.Channels);
 			fileNamingTemplate.AddParameterReplacement(TemplateTags.Account, libraryBookDto.Account);
 			fileNamingTemplate.AddParameterReplacement(TemplateTags.Locale, libraryBookDto.Locale);
+            fileNamingTemplate.AddParameterReplacement(TemplateTags.YearPublished, libraryBookDto.YearPublished?.ToString() ?? "1900");

-			return fileNamingTemplate;
+            return fileNamingTemplate;
 		}
 		#endregion

--- a/Source/LibationWinForms/Dialogs/EditTemplateDialog.cs
+++ b/Source/LibationWinForms/Dialogs/EditTemplateDialog.cs
@@ -76,7 +76,8 @@ namespace LibationWinForms.Dialogs
 				AudibleProductId = "123456789",
 				Title = "A Study in Scarlet: A Sherlock Holmes Novel",
 				Locale = "us",
-				Authors = new List<string> { "Arthur Conan Doyle", "Stephen Fry - introductions" },
+                YearPublished = 2017,
+                Authors = new List<string> { "Arthur Conan Doyle", "Stephen Fry - introductions" },
 				Narrators = new List<string> { "Stephen Fry" },
 				SeriesName = "Sherlock Holmes",
 				SeriesNumber = "1",
--- 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.2.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.2.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.1.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/LibationFileManager.Tests/TemplatesTests.cs
+++ b/Source/_Tests/LibationFileManager.Tests/TemplatesTests.cs
@@ -29,7 +29,8 @@ namespace TemplatesTests
 				AudibleProductId = "asin",
 				Title = "A Study in Scarlet: A Sherlock Holmes Novel",
 				Locale = "us",
-				Authors = new List<string> { "Arthur Conan Doyle", "Stephen Fry - introductions" },
+                YearPublished = 2017,
+                Authors = new List<string> { "Arthur Conan Doyle", "Stephen Fry - introductions" },
 				Narrators = new List<string> { "Stephen Fry" },
 				SeriesName = seriesName ?? "",
 				SeriesNumber = "1",
@@ -87,7 +88,8 @@ namespace TemplatesTests
 		[DataRow("f", @"C:\foo\bar", "ext", @"C:\foo\bar\f.ext")]
 		[DataRow("<id>", @"C:\foo\bar", "ext", @"C:\foo\bar\asin.ext")]
        [DataRow("<bitrate> - <samplerate> - <channels>", @"C:\foo\bar", "ext", @"C:\foo\bar\128 - 44100 - 2.ext")]
-		public void Tests(string template, string dirFullPath, string extension, string expected)
+        [DataRow("<year> - <channels>", @"C:\foo\bar", "ext", @"C:\foo\bar\2017 - 2.ext")]
+        public void Tests(string template, string dirFullPath, string extension, string expected)
 			=> Templates.getFileNamingTemplate(GetLibraryBook(), template, dirFullPath, extension)
 			.GetFilePath(Replacements)
 			.PathWithoutPrefix
--- 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
Robert McRackan	d64e043fe8	#367 : New template option "year": year published to audible	2022-10-21 13:41:44 -04:00
Robert McRackan	99564d9c25	update dependencies	2022-10-18 08:33:43 -04:00
rmcrackan	29bccd3e33	Update InstallOnMac.md Gatekeeper instructions	2022-10-05 22:25:40 -04:00
Robert McRackan	20f65f6534	Fix description of poorly named AutoDownloadEpisodes	2022-09-28 15:49:16 -04:00