New search field: Finished/IsFinished.

All work complete except db migration
rmcrackan · Sep 11, 2024 · 2fd8ea9 · 2fd8ea9
1 parent 92ee0b2
commit 2fd8ea9
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 5 deletions.
diff --git a/Source/ApplicationServices/LibraryCommands.cs b/Source/ApplicationServices/LibraryCommands.cs
@@ -126,7 +126,8 @@ public static async Task<List<LibraryBook>> FindInactiveBooks(Func<Account, Task
 					    | LibraryOptions.ResponseGroupOptions.Contributors | LibraryOptions.ResponseGroupOptions.ProvidedReview
 					    | LibraryOptions.ResponseGroupOptions.ProductPlans | LibraryOptions.ResponseGroupOptions.Series
 					    | LibraryOptions.ResponseGroupOptions.CategoryLadders | LibraryOptions.ResponseGroupOptions.ProductExtendedAttrs
-					    | LibraryOptions.ResponseGroupOptions.PdfUrl | LibraryOptions.ResponseGroupOptions.OriginAsin,
+					    | LibraryOptions.ResponseGroupOptions.PdfUrl | LibraryOptions.ResponseGroupOptions.OriginAsin
+                        | LibraryOptions.ResponseGroupOptions.IsFinished,
 					ImageSizes = LibraryOptions.ImageSizeOptions._500 | LibraryOptions.ImageSizeOptions._1215
                 };
                 var importItems = await scanAccountsAsync(apiExtendedfunc, accounts, libraryOptions);

diff --git a/Source/ApplicationServices/LibraryExporter.cs b/Source/ApplicationServices/LibraryExporter.cs
@@ -115,6 +115,9 @@ public static string GetName(string fieldName)
 
 		[Name("LastDownloadedVersion")]
         public string LastDownloadedVersion { get; set; }
+
+		[Name("IsFinished")]
+        public bool IsFinished { get; set; }
     }
 	public static class LibToDtos
 	{
@@ -153,8 +156,8 @@ public static List<ExportDto> ToDtos(this IEnumerable<LibraryBook> library)
 				Language = a.Book.Language,
 				LastDownloaded = a.Book.UserDefinedItem.LastDownloaded,
 				LastDownloadedVersion = a.Book.UserDefinedItem.LastDownloadedVersion?.ToString() ?? "",
-
-			}).ToList();
+                IsFinished = a.Book.UserDefinedItem.IsFinished
+            }).ToList();
 	}
 	public static class LibraryExporter
 	{
@@ -229,6 +232,7 @@ public static void ToXlsx(string saveFilePath)
                 nameof(ExportDto.Language),
                 nameof(ExportDto.LastDownloaded),
                 nameof(ExportDto.LastDownloadedVersion),
+                nameof(ExportDto.IsFinished)
             };
 			var col = 0;
 			foreach (var c in columns)
@@ -306,6 +310,7 @@ public static void ToXlsx(string saveFilePath)
 				}
 
                 row.CreateCell(++col).SetCellValue(dto.LastDownloadedVersion);
+                row.CreateCell(++col).SetCellValue(dto.IsFinished);
 
                 rowIndex++;
 			}

diff --git a/Source/AudibleUtilities/AudibleUtilities.csproj b/Source/AudibleUtilities/AudibleUtilities.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="9.1.2.1" />
+    <PackageReference Include="AudibleApi" Version="9.2.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Source/DataLayer/EfClasses/UserDefinedItem.cs b/Source/DataLayer/EfClasses/UserDefinedItem.cs
@@ -195,7 +195,23 @@ internal set
                 }
             }
         }
-		#endregion
+        #endregion
+
+        #region IsFinished
+        private bool _isFinished;
+        public bool IsFinished
+        {
+            get => _isFinished;
+            set
+            {
+                if (value != _isFinished)
+                {
+                    _isFinished = value;
+                    OnItemChanged(nameof(IsFinished));
+                }
+            }
+        }
+        #endregion
 
         public override string ToString() => $"{Book} {Rating} {Tags}";
 	}

diff --git a/Source/DtoImporterService/BookImporter.cs b/Source/DtoImporterService/BookImporter.cs
@@ -164,6 +164,9 @@ private void updateBook(ImportItem importItem, Book book)
 			if (item.PictureLarge is not null)
 				book.PictureLarge = item.PictureLarge;
 
+			if (item.IsFinished is not null)
+                book.UserDefinedItem.IsFinished = item.IsFinished.Value;
+
             // 2023-02-01
             // updateBook must update language on books which were imported before the migration which added language.
             // Can eventually delete this

diff --git a/Source/LibationSearchEngine/SearchEngine.cs b/Source/LibationSearchEngine/SearchEngine.cs
@@ -55,6 +55,7 @@ private static bool isAuthorNarrated(Book book)
             { FieldType.Bool, lb => lb.Book.IsEpisodeChild().ToString(), "Podcast", "Podcasts", "IsPodcast", "Episode", "Episodes", "IsEpisode" },
             { FieldType.Bool, lb => lb.AbsentFromLastScan.ToString(), "AbsentFromLastScan", "Absent" },
             { FieldType.Bool, lb => (!string.IsNullOrWhiteSpace(lb.Book.SeriesNames())).ToString(), "IsInSeries", "InSeries" },
+            { FieldType.Bool, lb => lb.Book.UserDefinedItem.IsFinished.ToString(), nameof(UserDefinedItem.IsFinished), "Finished", "IsFinished" },
             // all numbers are padded to 8 char.s
             // This will allow a single method to auto-pad numbers. The method will match these as well as date: yyyymmdd
             { FieldType.Number, lb => lb.Book.LengthInMinutes.ToLuceneString(), nameof(Book.LengthInMinutes), "Length", "Minutes" },