Fix Audiobook bugs

Author: LNA-DEV

OpenMediaServer.Test/Services/DiscoveryAudiobookServiceShould.cs

@@ -43,6 +43,7 @@ public DiscoveryAudiobookServiceShould()
     [Theory]
     [InlineData("/media/Audiobooks/Quality Land/QualityLand 2.0 Kikis Geheimnis/QualityLand 2.0 Kikis Geheimnis.m4b", "QualityLand 2.0 Kikis Geheimnis", "/media/Audiobooks/Quality Land/QualityLand 2.0 Kikis Geheimnis")]
     [InlineData("/media/Audiobooks/Das Känguru-Manifest/Das Känguru-Manifest.m4b", "Das Känguru-Manifest", "/media/Audiobooks/Das Känguru-Manifest")]
+    [InlineData("/media/Audiobooks/The Witcher/Ödets Svärd.mp3", "Ödets Svärd", "/media/Audiobooks/The Witcher")]
     public async Task Create_FirstItemBook(string path, string title, string? folderPath)
     {
         // Arrange
@@ -67,5 +68,33 @@ public async Task Create_FirstItemBook(string path, string title, string? folder
         versions.First().Id.ShouldNotBe(Guid.Empty);
         versions.First().Path.ShouldBe(path);
         resultItem.FolderPath.ShouldBe(folderPath);
+    }    
+    
+    [Theory]
+    [InlineData("/media/Audiobooks/Asterix bei den Schweizern/Track 1.wav", "Asterix bei den Schweizern", "/media/Audiobooks/Asterix bei den Schweizern/")]
+    public async Task MultiPart(string path, string title, string? folderPath)
+    {
+        // Arrange
+        var paths = new List<string>
+        {
+            path
+        };
+
+        // Act
+        await _inventoryBookService.CreateAudiobook(path);
+        var resultJson = _storageRepository.WrittenObjects.First();
+        var resultItem = JsonSerializer.Deserialize<InventoryItem>(resultJson, Globals.JsonOptions);
+        var versions = await _versionService.List();
+
+        // Assert
+        resultItem.Id.ShouldNotBe(Guid.Empty);
+        resultItem.Title.ShouldBe(title);
+        resultItem.Category.ShouldBe("Audiobook");
+        resultItem.MetadataId.ShouldNotBe(Guid.Empty);
+        versions.ShouldNotBeNull();
+        versions.Count().ShouldBe(1);
+        versions.First().Id.ShouldNotBe(Guid.Empty);
+        versions.First().Path.ShouldBe(folderPath);
+        resultItem.FolderPath.ShouldBe(folderPath);
     }
 }

OpenMediaServer/Services/Discovery/ContentDiscoveryService.cs

@@ -15,7 +15,8 @@ public class ContentDiscoveryService(
     IAddonService addonService,
     IFileInfoService fileInfo,
     IDiscoveryAudiobookService audiobookDiscoveryService,
-    IVersionService versionService) : IContentDiscoveryService
+    IVersionService versionService,
+    IPartService partService) : IContentDiscoveryService
 {
     private FileSystemWatcher? _watcher;
     private readonly SemaphoreSlim _semaphore = new(1, 1);
@@ -308,9 +309,32 @@ private async Task HandleDelete(IEnumerable<string> paths, IEnumerable<Inventory
                 {
                     if (!paths.Contains(version.Path))
                     {
-                        await versionService.Delete(version.Id);
-
-                        await fileInfo.DeleteFileInfo(version.FileInfoId);
+                        var parts = await partService.ListItems(i => i.InventoryItemVersionId == version.Id);
+
+                        if (parts != null)
+                        {
+                            foreach (var part in parts)
+                            {
+                                if (!paths.Contains(part.Path))
+                                {
+                                    await partService.DeletePart(part.Id);
+                                    await fileInfo.DeleteFileInfo(part.FileInfoId);
+                                }
+                            }
+                            
+                            parts = await partService.ListItems(i => i.InventoryItemVersionId == version.Id);
+
+                            if (!parts.Any())
+                            {
+                                await versionService.Delete(version.Id);
+                            }
+                        }
+                        else
+                        {
+                            await versionService.Delete(version.Id);
+
+                            await fileInfo.DeleteFileInfo(version.FileInfoId);
+                        }
                     }
                 }
 

OpenMediaServer/Services/Discovery/DiscoveryAudiobookService.cs

@@ -60,17 +60,8 @@ public async Task CreateAudiobook(string path)
             }
 
             var books = await inventoryService.ListItems("Audiobook");
-            var existingVersion = (await versionService.List(i => i.Path == path) ?? []).FirstOrDefault();
-            var existingVersionId = existingVersion?.Id;
-
             InventoryItem? existingBook = null;
-
-            if (existingVersionId != null)
-            {
-                existingBook = await inventoryService.GetItem(existingVersionId);
-            }
-
-
+            
             string? folderPath = null;
 
             if (!string.IsNullOrEmpty(folderTitle))
@@ -84,6 +75,8 @@ public async Task CreateAudiobook(string path)
 
                 existingBook = books?.Where(i => i.FolderPath == folderPath).FirstOrDefault();
             }
+            
+            var existingVersion = (await versionService.List(i => i.Path == folderPath) ?? []).FirstOrDefault();
 
             if (existingBook != null)
             {
@@ -118,7 +111,7 @@ public async Task CreateAudiobook(string path)
                     var version = new InventoryItemVersion
                     {
                         Id = Guid.NewGuid(),
-                        Path = path,
+                        Path = folderPath,
                         InventoryItemId = existingBook.Id,
                     };
 
@@ -211,7 +204,6 @@ public async Task CreateAudiobook(string path)
             if (!string.IsNullOrEmpty(folderTitle))
             {
                 folderPath = path.Replace($"/{title}.{extension}", "");
-                existingBook = books?.Where(i => i.FolderPath == folderPath).FirstOrDefault();
             }
 
             if (existingBook != null)