Fix Slskd track search

Author: Meyn

.gitignore

@@ -367,3 +367,4 @@ FodyWeavers.xsd
 /_plugins/Tubifarry
 /enc_temp_folder/f7b6bdaa49df014838e55dd376c78df
 /_plugins/UnitTest
+/enc_temp_folder

Submodules/Lidarr

@@ -55,7 +55,7 @@ public override async Task<string> Download(RemoteAlbum remoteAlbum, IIndexer in
                     RemoveItemAsync(item).Wait();
                 }
                 catch { }
-                return null!;
+                throw;
             }
             return item.ID;
         }
@@ -221,7 +221,7 @@ private ReleaseInfo CreateReleaseInfoFromDownloadDirectory(string username, Slsk
         {
             SlskdFolderData folderData = dir.CreateFolderData(username);
 
-            SlskdSearchData searchData = new(null, null, false, 1);
+            SlskdSearchData searchData = new(null, null, false, false, 1);
 
             IGrouping<string, SlskdFileData> directory = dir.ToSlskdFileDataList().GroupBy(_ => dir.Directory).First();
 

Tubifarry/Download/Clients/Soulseek/SlskdClient.cs

@@ -95,8 +95,19 @@ public record SlskdSearchData(
         [property: JsonPropertyName("artist")] string? Artist,
         [property: JsonPropertyName("album")] string? Album,
         [property: JsonPropertyName("interactive")] bool Interactive,
+        [property: JsonPropertyName("expandDirectory")] bool ExpandDirectory,
         [property: JsonPropertyName("mimimumFiles")] int MinimumFiles)
     {
         public static SlskdSearchData FromJson(string jsonString) => JsonSerializer.Deserialize<SlskdSearchData>(jsonString, new JsonSerializerOptions() { PropertyNameCaseInsensitive = true })!;
     }
+
+    public record SlskdDirectoryApiResponse(
+      [property: JsonPropertyName("files")] List<SlskdDirectoryApiFile> Files
+  );
+
+    public record SlskdDirectoryApiFile(
+        [property: JsonPropertyName("filename")] string Filename,
+        [property: JsonPropertyName("size")] long Size,
+        [property: JsonPropertyName("code")] int Code
+    );
 }

Tubifarry/Indexers/Soulseek/SlsdkRecords.cs

@@ -1,4 +1,5 @@
-using NLog;
+using FuzzySharp;
+using NLog;
 using NzbDrone.Common.Http;
 using NzbDrone.Common.Instrumentation;
 using NzbDrone.Core.Download;
@@ -8,6 +9,7 @@
 using NzbDrone.Core.Parser.Model;
 using System.Text.Json;
 using Tubifarry.Core.Model;
+using Tubifarry.Core.Utilities;
 
 namespace Tubifarry.Indexers.Soulseek
 {
@@ -45,7 +47,6 @@ public IList<ReleaseInfo> ParseResponse(IndexerResponse indexerResponse)
                 }
 
                 SlskdSearchData searchTextData = SlskdSearchData.FromJson(indexerResponse.HttpRequest.ContentSummary);
-
                 HashSet<string>? ignoredUsers = GetIgnoredUsers(Settings.IgnoreListPath);
 
                 foreach (SlskdFolderData response in searchResponse.Responses)
@@ -55,7 +56,7 @@ public IList<ReleaseInfo> ParseResponse(IndexerResponse indexerResponse)
 
                     IEnumerable<SlskdFileData> filteredFiles = SlskdFileData.GetFilteredFiles(response.Files, Settings.OnlyAudioFiles, Settings.IncludeFileExtensions);
 
-                    foreach (IGrouping<string, SlskdFileData> directoryGroup in filteredFiles.GroupBy(f => GetDirectoryFromFilename(f.Filename)))
+                    foreach (IGrouping<string, SlskdFileData> directoryGroup in filteredFiles.GroupBy(f => SlskdTextProcessor.GetDirectoryFromFilename(f.Filename)))
                     {
                         if (string.IsNullOrEmpty(directoryGroup.Key))
                             continue;
@@ -72,9 +73,11 @@ public IList<ReleaseInfo> ParseResponse(IndexerResponse indexerResponse)
                             FileCount = response.FileCount
                         };
 
-                        AlbumData albumData = SlskdItemsParser.CreateAlbumData(searchResponse.Id, directoryGroup, searchTextData, folderData, Settings);
+                        if (searchTextData.ExpandDirectory && ShouldExpandDirectory(albumDatas, searchResponse, searchTextData, directoryGroup, folderData))
+                            continue;
 
-                        albumDatas.Add(albumData);
+                        AlbumData originalAlbumData = SlskdItemsParser.CreateAlbumData(searchResponse.Id, directoryGroup, searchTextData, folderData, Settings);
+                        albumDatas.Add(originalAlbumData);
                     }
                 }
 
@@ -88,12 +91,39 @@ public IList<ReleaseInfo> ParseResponse(IndexerResponse indexerResponse)
             return albumDatas.OrderByDescending(x => x.Priotity).Select(a => a.ToReleaseInfo()).ToList();
         }
 
-        private static string GetDirectoryFromFilename(string? filename)
+        private bool ShouldExpandDirectory(List<AlbumData> albumDatas, SlskdSearchResponse searchResponse, SlskdSearchData searchTextData, IGrouping<string, SlskdFileData> directoryGroup, SlskdFolderData folderData)
         {
-            if (string.IsNullOrEmpty(filename))
-                return "";
-            int lastBackslashIndex = filename.LastIndexOf('\\');
-            return lastBackslashIndex >= 0 ? filename[..lastBackslashIndex] : "";
+            if (string.IsNullOrEmpty(searchTextData.Artist) || string.IsNullOrEmpty(searchTextData.Album))
+                return false;
+
+            bool artistMatch = Fuzz.PartialRatio(folderData.Artist, searchTextData.Artist) > 85;
+            bool albumMatch = Fuzz.PartialRatio(folderData.Album, searchTextData.Album) > 85;
+
+            if (!artistMatch || !albumMatch)
+                return false;
+
+            SlskdFileData? originalTrack = directoryGroup.FirstOrDefault(x => AudioFormatHelper.GetAudioCodecFromExtension(x.Extension?.ToLowerInvariant() ?? Path.GetExtension(x.Filename) ?? "") != AudioFormat.Unknown);
+
+            if (originalTrack == null)
+                return false;
+
+            _logger.Trace($"Expanding directory for: {folderData.Username}:{directoryGroup.Key}");
+
+            SlskdRequestGenerator? requestGenerator = _indexer.GetExtendedRequestGenerator() as SlskdRequestGenerator;
+            IGrouping<string, SlskdFileData>? expandedGroup = requestGenerator?.ExpandDirectory(folderData.Username, directoryGroup.Key, originalTrack).Result;
+
+            if (expandedGroup != null)
+            {
+                _logger.Debug($"Successfully expanded directory to {expandedGroup.Count()} files");
+                AlbumData albumData = SlskdItemsParser.CreateAlbumData(searchResponse.Id, expandedGroup, searchTextData, folderData, Settings);
+                albumDatas.Add(albumData);
+                return true;
+            }
+            else
+            {
+                _logger.Warn($"Failed to expand directory for {folderData.Username}:{directoryGroup.Key}");
+            }
+            return false;
         }
 
         public void RemoveSearch(string searchId, bool delay = false)
@@ -172,7 +202,7 @@ private async Task ExecuteRemovalAsync(SlskdSettings settings, string searchId)
                     _logger.Trace($"Using cached ignore list from: {ignoreListPath} with {cached.IgnoredUsers.Count} users");
                     return cached.IgnoredUsers;
                 }
-                HashSet<string> ignoredUsers = ParseIgnoreListContent(File.ReadAllText(ignoreListPath));
+                HashSet<string> ignoredUsers = SlskdTextProcessor.ParseListContent(File.ReadAllText(ignoreListPath));
                 _ignoreListCache[ignoreListPath] = (ignoredUsers, fileSize);
                 _logger.Trace($"Loaded ignore list with {ignoredUsers.Count} users from: {ignoreListPath}");
                 return ignoredUsers;
@@ -183,18 +213,5 @@ private async Task ExecuteRemovalAsync(SlskdSettings settings, string searchId)
                 return null;
             }
         }
-
-        private static HashSet<string> ParseIgnoreListContent(string content)
-        {
-            if (string.IsNullOrWhiteSpace(content))
-                return new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-
-            return content
-                .Split(new[] { '\t', '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
-                .Where(username => !string.IsNullOrWhiteSpace(username))
-                .Select(username => username.Trim())
-                .ToHashSet(StringComparer.OrdinalIgnoreCase);
-        }
-
     }
 }