Refactor classes and fix issues

Author: Meyn

README.md

@@ -1,9 +1,9 @@
 # Tubifarry for Lidarr 🎶  
 ![Downloads](https://img.shields.io/github/downloads/TypNull/Tubifarry/total)  ![GitHub release (latest by date)](https://img.shields.io/github/v/release/TypNull/Tubifarry)  ![GitHub last commit](https://img.shields.io/github/last-commit/TypNull/Tubifarry)  ![License](https://img.shields.io/github/license/TypNull/Tubifarry)  ![GitHub stars](https://img.shields.io/github/stars/TypNull/Tubifarry)  
 
-Tubifarry is a plugin for **Lidarr** that fetches metadata from **Spotify** and **YouTube**, enabling direct music downloads from YouTube. Built on the foundation of trevTV's projects, it leverages the YouTube API for seamless integration. 🛠️  
+Tubifarry is a versatile plugin for **Lidarr** that enhances your music library by fetching metadata from **Spotify** and enabling direct music downloads from **YouTube**. While it is not explicitly a Spotify-to-YouTube downloader, it leverages the YouTube API to seamlessly integrate music downloads into your Lidarr setup. Built on the foundation of trevTV's projects, Tubifarry also supports **Slskd**, the Soulseek client, as both an **indexer** and **downloader**, allowing you to tap into the vast music collection available on the Soulseek network. 🛠️  
 
-Additionally, Tubifarry supports fetching soundtracks from **Sonarr** (series) and **Radarr** (movies) and adding them to Lidarr using the **Arr-Soundtracks** import list feature. This allows you to easily manage and download soundtracks for your favorite movies and TV shows. 🎬🎵  
+Additionally, Tubifarry supports fetching soundtracks from **Sonarr** (series) and **Radarr** (movies) and adding them to Lidarr using the **Arr-Soundtracks** import list feature. This makes it easy to manage and download soundtracks for your favorite movies and TV shows. 🎬🎵  
 
 ---
 
@@ -26,40 +26,39 @@ To switch to the Plugins Branch:
 ---
 
 ### Plugin Installation 📥  
-
-#### **For Docker Users**:  
-1. **Install the Plugin**:  
-   - In Lidarr, go to `System -> Plugins`.  
-   - Paste `https://github.com/TypNull/Tubifarry` into the GitHub URL box and click **Install**.  
-
-2. **Configure the Indexer**:  
-   - Navigate to `Settings -> Indexers` and click **Add**.  
-   - In the modal, select `Tubifarry` (located under **Other** at the bottom).  
-
-3. **Set Up the Download Client**:  
-   - Go to `Settings -> Download Clients` and click **Add**.  
-   - In the modal, choose `Youtube` (under **Other** at the bottom).  
-   - Set the download path and adjust other settings as needed.  
-   - **Optional**: If using FFmpeg, ensure the FFmpeg path is correctly configured.  
+- In Lidarr, go to `System -> Plugins`.  
+- Paste `https://github.com/TypNull/Tubifarry` into the GitHub URL box and click **Install**.  
 
 ---
 
-### Fetching Soundtracks from Sonarr and Radarr 🎬🎵  
-Tubifarry also supports fetching soundtracks from **Sonarr** (for TV series) and **Radarr** (for movies) and adding them to Lidarr using the **Arr-Soundtracks** import list feature. This allows you to easily manage and download soundtracks for your favorite movies and TV shows.  
+### Soulseek (Slskd) Setup 🎧  
+Tubifarry supports **Slskd**, the Soulseek client, as both an **indexer** and **downloader**. Follow the steps below to configure it.  
 
-To enable this feature:  
-1. **Set Up the Import List**:  
-   - Navigate to `Settings -> Import Lists` in Lidarr.  
-   - Add a new import list and select the option for **Arr-Soundtracks**.  
-   - Configure the settings to match your Sonarr and Radarr instances.  
-   - Provide a cache path to store responses from MusicBrainz for faster lookups.  
+#### **Setting Up the Soulseek Indexer**:  
+1. Navigate to `Settings -> Indexers` and click **Add**.  
+2. Select `Slskd` from the list of indexers.  
+3. Configure the following settings:  
+   - **URL**: The URL of your Slskd instance (e.g., `http://localhost:5030`).  
+   - **API Key**: The API key for your Slskd instance (found in Slskd's settings under 'Options').  
+   - **Include Only Audio Files**: Enable to filter search results to audio files only (beta).  
 
-2. **Enjoy Soundtracks**:  
-   - Once configured, Tubifarry will automatically fetch soundtracks from your Sonarr and Radarr libraries and add them to Lidarr for download and management.  
+#### **Setting Up the Soulseek Download Client**:  
+1. Go to `Settings -> Download Clients` and click **Add**.  
+2. Select `Slskd` from the list of download clients.  
+3. Set the **download path** where downloaded files will be downloaded.  
 
 ---
 
-### Optional: FFmpeg and Audio Quality 🎧  
+### YouTube Downloader Setup 🎥  
+Tubifarry allows you to download music directly from YouTube. Follow the steps below to configure the YouTube downloader.  
+
+#### **Setting Up the YouTube Download Client**:  
+1. Go to `Settings -> Download Clients` and click **Add**.  
+2. Select `Youtube` from the list of download clients.  
+3. Set the download path and adjust other settings as needed.  
+4. **Optional**: If using FFmpeg, ensure the FFmpeg path is correctly configured.  
+
+#### **FFmpeg and Audio Conversion**:  
 1. **FFmpeg**: FFmpeg can be used to extract audio from downloaded files, which are typically embedded in MP4 containers. If you choose to use FFmpeg, ensure it is installed and accessible in your system's PATH or the specified FFmpeg path. If not, the plugin does attempt to download it automatically during setup. Without FFmpeg, songs will be downloaded in their original format, which may not require additional processing.  
 
    **Important Note**: If FFmpeg is not used, Lidarr may incorrectly interpret the MP4 container as corrupt. While FFmpeg usage is **recommended**, it is not strictly necessary. However, to avoid potential issues, you can choose to extract audio without re-encoding, but this may lead to better compatibility with Lidarr.
@@ -76,6 +75,21 @@ To enable this feature:
 
 ---
 
+### Fetching Soundtracks from Sonarr and Radarr 🎬🎵  
+Tubifarry also supports fetching soundtracks from **Sonarr** (for TV series) and **Radarr** (for movies) and adding them to Lidarr using the **Arr-Soundtracks** import list feature. This allows you to easily manage and download soundtracks for your favorite movies and TV shows.  
+
+To enable this feature:  
+1. **Set Up the Import List**:  
+   - Navigate to `Settings -> Import Lists` in Lidarr.  
+   - Add a new import list and select the option for **Arr-Soundtracks**.  
+   - Configure the settings to match your Sonarr and Radarr instances.  
+   - Provide a cache path to store responses from MusicBrainz for faster lookups.  
+
+2. **Enjoy Soundtracks**:  
+   - Once configured, Tubifarry will automatically fetch soundtracks from your Sonarr and Radarr libraries and add them to Lidarr for download and management.  
+
+---
+
 ### Troubleshooting 🛠️  
 - **Optional: FFmpeg Issues**: If you choose to use FFmpeg and songs fail to process, verify that FFmpeg is correctly installed and accessible in your system's PATH. If not, try reinstalling or downloading it manually.  
 - **Metadata Issues**: If metadata is not being added to downloaded files, confirm that the files are in a supported format. If using FFmpeg, ensure it is extracting audio to formats like AAC embedded in MP4 containers (check debug logs).  
@@ -90,7 +104,7 @@ To enable this feature:
 ---
 
 ## Acknowledgments 🙌  
-Special thanks to **trevTV** for laying the groundwork with [Lidarr.Plugin.Tidal](https://github.com/TrevTV/Lidarr.Plugin.Tidal), [Lidarr.Plugin.Deezer](https://github.com/TrevTV/Lidarr.Plugin.Deezer), and [Lidarr.Plugin.Qobuz](https://github.com/TrevTV/Lidarr.Plugin.Qobuz). Additionally, thanks to [IcySnex/YouTubeMusicAPI](https://github.com/IcySnex/YouTubeMusicAPI) for providing the YouTube API. 🎉  
+Special thanks to [**trevTV**](https://github.com/TrevTV) for laying the groundwork with his plugins. Additionally, thanks to [**IcySnex**](https://github.com/IcySnex) for providing the YouTube API. 🎉  
 
 ---
 
@@ -100,8 +114,8 @@ If you'd like to contribute to Tubifarry, feel free to open issues or submit pul
 ---
 
 ## License 📄  
-Tubifarry is licensed under the MIT License. See the [LICENSE](https://github.com/TypNull/Tubifarry/blob/main/LICENSE) file for more details.  
+Tubifarry is licensed under the MIT License. See the [LICENSE](https://github.com/TypNull/Tubifarry/blob/master/LICENSE) file for more details.  
 
 ---
 
-Enjoy seamless music downloads with Tubifarry! 🎧  
+Enjoy seamless music downloads with Tubifarry! 🎧

Tubifarry/Core/AlbumData.cs

@@ -31,6 +31,7 @@ public class AlbumData
 
         // Soulseek
         public long? Size { get; set; }
+        public int Priotity { get; set; }
 
         // Not used
         public AudioFormat Codec { get; set; } = AudioFormat.AAC;
@@ -47,7 +48,7 @@ public class AlbumData
             Album = AlbumName,
             DownloadUrl = AlbumId,
             InfoUrl = InfoUrl,
-            PublishDate = ReleaseDateTime,
+            PublishDate = ReleaseDateTime == DateTime.MinValue ? DateTime.UtcNow : ReleaseDateTime,
             DownloadProtocol = nameof(YoutubeDownloadProtocol),
             Title = ConstructTitle(),
             Codec = Codec.ToString(),

Tubifarry/Core/AudioFormat.cs

@@ -22,13 +22,14 @@ public enum AudioFormat
     internal static class AudioFormatHelper
     {
         private static readonly AudioFormat[] _lossyFormats = new[] {
-        AudioFormat.AAC,
-        AudioFormat.MP3,
-        AudioFormat.Opus,
-        AudioFormat.Vorbis,
-        AudioFormat.MP4,
-        AudioFormat.AMR,
-        AudioFormat.WMA  };
+            AudioFormat.AAC,
+            AudioFormat.MP3,
+            AudioFormat.Opus,
+            AudioFormat.Vorbis,
+            AudioFormat.MP4,
+            AudioFormat.AMR,
+            AudioFormat.WMA
+        };
 
         /// <summary>
         /// Returns the correct file extension for a given audio codec.
@@ -46,9 +47,6 @@ internal static class AudioFormatHelper
             _ => ".aac" // Default to AAC if the codec is unknown
         };
 
-        public static bool IsLossyFormat(AudioFormat format) => _lossyFormats.Contains(format);
-
-
         /// <summary>
         /// Determines the audio format from a given codec string.
         /// </summary>
@@ -79,7 +77,13 @@ internal static class AudioFormatHelper
             AudioFormat.Vorbis => ".ogg",
             AudioFormat.FLAC => ".flac",
             AudioFormat.WAV => ".wav",
-            _ => ".aac"
+            AudioFormat.AIFF => ".aiff",
+            AudioFormat.MIDI => ".midi",
+            AudioFormat.AMR => ".amr",
+            AudioFormat.WMA => ".wma",
+            AudioFormat.MP4 => ".mp4",
+            AudioFormat.OGG => ".ogg",
+            _ => ".aac" // Default to AAC if the format is unknown
         };
 
         /// <summary>
@@ -93,5 +97,29 @@ internal static class AudioFormatHelper
             ReEncodeOptions.Vorbis => AudioFormat.Vorbis,
             _ => AudioFormat.Unknown
         };
+
+        /// <summary>
+        /// Determines if a given format is lossy.
+        /// </summary>
+        public static bool IsLossyFormat(AudioFormat format) => _lossyFormats.Contains(format);
+
+        /// <summary>
+        /// Determines the audio format from a given file extension.
+        /// </summary>
+        public static AudioFormat GetAudioCodecFromExtension(string extension) => extension?.ToLowerInvariant().TrimStart('.') switch
+        {
+            // Common file extensions
+            "m4a" or "mp4" or "aac" => AudioFormat.AAC,
+            "mp3" => AudioFormat.MP3,
+            "opus" => AudioFormat.Opus,
+            "ogg" or "vorbis" => AudioFormat.Vorbis,
+            "flac" or "alac" => AudioFormat.FLAC,
+            "wav" => AudioFormat.WAV,
+            "aiff" or "aif" or "aifc" => AudioFormat.AIFF,
+            "mid" or "midi" => AudioFormat.MIDI,
+            "amr" => AudioFormat.AMR,
+            "wma" => AudioFormat.WMA,
+            _ => AudioFormat.Unknown // Default for unknown extensions
+        };
     }
 }

Tubifarry/Download/Clients/Soulseek/SlskdClient.cs

@@ -15,41 +15,35 @@ namespace NzbDrone.Core.Download.Clients.Soulseek
     public class SlskdClient : DownloadClientBase<SlskdProviderSettings>
     {
         private readonly IHttpClient _httpClient;
-        private Dictionary<string, SlskdDownloadItem> _downloadMapping;
-        private string _downloadPath = string.Empty;
-        private bool _isLocalhost = false;
-
-        public SlskdClient(IHttpClient httpClient, IConfigService configService, IDiskProvider diskProvider, IRemotePathMappingService remotePathMappingService, Logger logger)
-            : base(configService, diskProvider, remotePathMappingService, logger)
-        {
-            _httpClient = httpClient;
-            _downloadMapping = new Dictionary<string, SlskdDownloadItem>();
-        }
+        private static readonly Dictionary<DownloadKey, SlskdDownloadItem> _downloadMappings = new();
 
         public override string Name => "Slskd";
 
         public override string Protocol => nameof(SoulseekDownloadProtocol);
 
+        public SlskdClient(IHttpClient httpClient, IConfigService configService, IDiskProvider diskProvider, IRemotePathMappingService remotePathMappingService, Logger logger)
+            : base(configService, diskProvider, remotePathMappingService, logger) => _httpClient = httpClient;
+
+
         public override async Task<string> Download(RemoteAlbum remoteAlbum, IIndexer indexer)
         {
-            SlskdDownloadItem item = new(Guid.NewGuid().ToString(), remoteAlbum);
+            SlskdDownloadItem item = new(remoteAlbum);
             HttpRequest request = BuildHttpRequest(remoteAlbum.Release.DownloadUrl, HttpMethod.Post, remoteAlbum.Release.Source);
             HttpResponse response = await _httpClient.ExecuteAsync(request);
 
             if (response.StatusCode != HttpStatusCode.Created)
                 throw new DownloadClientException("Failed to create download.");
-
-            _downloadMapping[item.ID] = item;
-            return item.ID;
+            AddDownloadItem(item);
+            return item.ID.ToString();
         }
 
+
         public override IEnumerable<DownloadClientItem> GetItems()
         {
             UpdateDownloadItemsAsync().Wait();
             DownloadClientItemClientInfo clientInfo = DownloadClientItemClientInfo.FromDownloadClient(this, false);
-            foreach (KeyValuePair<string, SlskdDownloadItem> kpv in _downloadMapping)
+            foreach (DownloadClientItem? clientItem in GetDownloadItems().Select(x => x.GetDownloadClientItem(Settings.DownloadPath)))
             {
-                DownloadClientItem clientItem = kpv.Value.GetDownloadClientItem(_downloadPath);
                 clientItem.DownloadClientInfo = clientInfo;
                 yield return clientItem;
             }
@@ -58,10 +52,10 @@ public override IEnumerable<DownloadClientItem> GetItems()
         public override void RemoveItem(DownloadClientItem clientItem, bool deleteData)
         {
             if (!deleteData) return;
-            _downloadMapping.TryGetValue(clientItem.DownloadId, out SlskdDownloadItem? slskdItem);
+            SlskdDownloadItem? slskdItem = GetDownloadItem(clientItem.DownloadId);
             if (slskdItem == null) return;
             RemoveItemAsync(slskdItem).Wait();
-            _downloadMapping.Remove(clientItem.DownloadId);
+            RemoveDownloadItem(clientItem.DownloadId);
         }
 
         private async Task UpdateDownloadItemsAsync()
@@ -78,7 +72,10 @@ private async Task UpdateDownloadItemsAsync()
                 IEnumerable<SlskdDownloadDirectory> data = SlskdDownloadDirectory.GetDirectories(directoriesElement);
                 foreach (SlskdDownloadDirectory dir in data)
                 {
-                    SlskdDownloadItem? item = _downloadMapping.Values.FirstOrDefault(x => x.FileData.Any(y => y.Filename?.Contains(dir.Directory!) ?? false));
+                    HashCode hash = new();
+                    foreach (SlskdDownloadFile file in dir.Files ?? new List<SlskdDownloadFile>())
+                        hash.Add(file.Filename);
+                    SlskdDownloadItem? item = GetDownloadItem(hash.ToHashCode());
                     if (item == null)
                         continue;
                     item.Username ??= user.GetProperty("username").GetString()!;
@@ -114,16 +111,18 @@ private async Task UpdateDownloadItemsAsync()
             return null;
         }
 
-        public override DownloadClientInfo GetStatus()
+        public override DownloadClientInfo GetStatus() => new()
         {
-            if (string.IsNullOrEmpty(_downloadPath))
-                _downloadPath = string.IsNullOrEmpty(Settings.DownloadPath) ? FetchDownloadPathAsync().Result ?? Settings.DownloadPath : Settings.DownloadPath;
-            return new DownloadClientInfo
-            {
-                IsLocalhost = _isLocalhost,
-                OutputRootFolders = new List<OsPath> { _remotePathMappingService.RemapRemoteToLocal(Settings.BaseUrl, new OsPath(_downloadPath)) }
-            };
-        }
+            IsLocalhost = Settings.IsLocalhost,
+            OutputRootFolders = new List<OsPath> { Settings.IsRemotePath ? _remotePathMappingService.RemapRemoteToLocal(Settings.BaseUrl, new OsPath(Settings.DownloadPath)) : new OsPath(Settings.DownloadPath) }
+        };
+
+        private SlskdDownloadItem? GetDownloadItem(string downloadId) => GetDownloadItem(int.Parse(downloadId));
+        private SlskdDownloadItem? GetDownloadItem(int downloadId) => _downloadMappings.TryGetValue(new DownloadKey(Definition.Id, downloadId), out SlskdDownloadItem? item) ? item : null;
+        private IEnumerable<SlskdDownloadItem> GetDownloadItems() => _downloadMappings.Where(kvp => kvp.Key.OuterKey == Definition.Id).Select(kvp => kvp.Value);
+        private void AddDownloadItem(SlskdDownloadItem item) => _downloadMappings[new DownloadKey(Definition.Id, item.ID)] = item;
+        private bool RemoveDownloadItem(string downloadId) => _downloadMappings.Remove(new DownloadKey(Definition.Id, int.Parse(downloadId)));
+
 
         protected override void Test(List<ValidationFailure> failures) => failures.AddIfNotNull(TestConnection().Result);
 
@@ -134,7 +133,7 @@ protected async Task<ValidationFailure> TestConnection()
                 Uri uri = new(Settings.BaseUrl);
                 if (uri.Host.Equals("localhost", StringComparison.OrdinalIgnoreCase) ||
                     IPAddress.TryParse(uri.Host, out IPAddress? ipAddress) && IPAddress.IsLoopback(ipAddress))
-                    _isLocalhost = true;
+                    Settings.IsLocalhost = true;
             }
             catch (UriFormatException ex)
             {
@@ -164,10 +163,12 @@ protected async Task<ValidationFailure> TestConnection()
                 if (string.IsNullOrEmpty(serverState) || !serverState.Contains("Connected"))
                     return new ValidationFailure("BaseUrl", $"Slskd server is not connected. State: {serverState}");
 
-
-                _downloadPath = string.IsNullOrEmpty(Settings.DownloadPath) ? await FetchDownloadPathAsync() ?? Settings.DownloadPath : Settings.DownloadPath;
-                if (string.IsNullOrEmpty(_downloadPath))
-                    return new ValidationFailure("DownloadPath", "DownloadPath could not be found or is invalid.");
+                if (string.IsNullOrEmpty(Settings.DownloadPath))
+                {
+                    Settings.DownloadPath = await FetchDownloadPathAsync() ?? string.Empty;
+                    if (string.IsNullOrEmpty(Settings.DownloadPath))
+                        return new ValidationFailure("DownloadPath", "DownloadPath could not be found or is invalid.");
+                }
                 return null!;
             }
             catch (HttpException ex)