Fix unknown MP3 and remove from download queue

Author: Meyn

README.md

@@ -1,4 +1,3 @@
-Here’s the complete README with the added short notice under the **Troubleshooting** section:
 # 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/Core/AlbumData.cs

@@ -89,7 +89,7 @@ private string ConstructTitle()
             if (calculatedBitrate <= 0 && Size.HasValue && Duration > 0)
                 calculatedBitrate = (int)((Size.Value * 8) / (Duration * 1000));
 
-            if (AudioFormatHelper.IsLossyFormat(Codec))
+            if (AudioFormatHelper.IsLossyFormat(Codec) && calculatedBitrate != 0)
                 title += $" [{Codec} {calculatedBitrate}kbps] [WEB]";
             else
                 title += $" [{Codec}] [WEB]";

Tubifarry/Core/AudioFormat.cs

@@ -31,6 +31,9 @@ internal static class AudioFormatHelper
             AudioFormat.WMA
         };
 
+
+        private static readonly int[] _standardBitrates = { 0, 96, 128, 160, 192, 256, 320 };
+
         /// <summary>
         /// Returns the correct file extension for a given audio codec.
         /// </summary>
@@ -121,5 +124,8 @@ internal static class AudioFormatHelper
             "wma" => AudioFormat.WMA,
             _ => AudioFormat.Unknown // Default for unknown extensions
         };
+
+
+        public static int RoundToStandardBitrate(int bitrateKbps) => _standardBitrates.OrderBy(b => Math.Abs(b - bitrateKbps)).First();
     }
 }

Tubifarry/Download/Clients/Soulseek/SlskdClient.cs

@@ -16,15 +16,14 @@ namespace NzbDrone.Core.Download.Clients.Soulseek
     public class SlskdClient : DownloadClientBase<SlskdProviderSettings>
     {
         private readonly IHttpClient _httpClient;
-        private readonly IHistoryService _historyService;
 
         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,IHistoryService history, IRemotePathMappingService remotePathMappingService, Logger logger)
-            : base(configService, diskProvider, remotePathMappingService, logger) { _httpClient = httpClient; _historyService = history; }
+        public SlskdClient(IHttpClient httpClient, IConfigService configService, IDiskProvider diskProvider, IHistoryService history, IRemotePathMappingService remotePathMappingService, Logger logger)
+            : base(configService, diskProvider, remotePathMappingService, logger) => _httpClient = httpClient;
 
 
         public override async Task<string> Download(RemoteAlbum remoteAlbum, IIndexer indexer)
@@ -56,7 +55,7 @@ public override void RemoveItem(DownloadClientItem clientItem, bool deleteData)
             if (!deleteData) return;
             SlskdDownloadItem? slskdItem = GetDownloadItem(clientItem.DownloadId);
             if (slskdItem == null) return;
-            RemoveItemAsync(slskdItem).Wait();
+            _ = RemoveItemAsync(slskdItem);
             RemoveDownloadItem(clientItem.DownloadId);
         }
 
@@ -203,14 +202,20 @@ private HttpRequest BuildHttpRequest(string endpoint, HttpMethod? method = null,
             return request;
         }
 
-        private async Task RemoveItemAsync(SlskdDownloadItem item)
+        private async Task RemoveItemAsync(SlskdDownloadItem downloadItem)
         {
-            HttpResponse response = await _httpClient.ExecuteAsync(BuildHttpRequest($"/api/v0/transfers/downloads/{item.Username}/{item.ID}", HttpMethod.Delete));
+            List<SlskdDownloadFile> files = downloadItem.SlskdDownloadDirectory?.Files ?? new List<SlskdDownloadFile>();
 
-            if (response.StatusCode != HttpStatusCode.NoContent)
-                _logger.Warn($"Failed to remove download with ID {item.ID}. Status Code: {response.StatusCode}");
-            else
-                _logger.Trace($"Successfully removed download with ID {item.ID}.");
+            await Task.WhenAll(files.Select(async file =>
+            {
+                if (!file.State.Contains("Completed"))
+                {
+                    await _httpClient.ExecuteAsync(BuildHttpRequest($"/api/v0/transfers/downloads/{downloadItem.Username}/{file.Id}", HttpMethod.Delete));
+                    await Task.Delay(1000);
+                }
+                await _httpClient.ExecuteAsync(BuildHttpRequest($"/api/v0/transfers/downloads/{downloadItem.Username}/{file.Id}?remove=true", HttpMethod.Delete));
+                _logger.Trace($"Removed download with ID {file.Id}.");
+            }));
         }
 
         private async Task<HttpResponse> ExecuteAsync(HttpRequest request) => await _httpClient.ExecuteAsync(request);

Tubifarry/Download/Clients/Soulseek/SlskdModels.cs

@@ -1,5 +1,4 @@
 using NzbDrone.Common.Disk;
-using NzbDrone.Common.Instrumentation;
 using NzbDrone.Core.Indexers.Soulseek;
 using NzbDrone.Core.Parser.Model;
 using System.Text.Json;
@@ -14,7 +13,7 @@ public class SlskdDownloadItem
 
         public int ID { get; set; }
         public List<SlskdFileData> FileData { get; set; } = new();
-        public string Username { get; set; } = string.Empty;
+        public string? Username { get; set; }
         public RemoteAlbum RemoteAlbum { get; set; }
         public SlskdDownloadDirectory? SlskdDownloadDirectory { get; set; }
 

Tubifarry/Download/Clients/Soulseek/SlskdProviderSettings.cs

@@ -15,11 +15,6 @@ public SlskdProviderSettingsValidator()
                 .Must(url => !url.EndsWith("/"))
                 .WithMessage("Base URL must not end with a slash ('/').");
 
-            // External URL validation (only if not empty)
-            RuleFor(c => c.ExternalUrl)
-                .Must(url => string.IsNullOrEmpty(url) || (Uri.IsWellFormedUriString(url, UriKind.Absolute) && !url.EndsWith("/")))
-                .WithMessage("External URL must be a valid URL and must not end with a slash ('/').");
-
             // API Key validation
             RuleFor(c => c.ApiKey)
                 .NotEmpty()
@@ -40,9 +35,6 @@ public class SlskdProviderSettings : IProviderConfig
         [FieldDefinition(0, Label = "URL", Type = FieldType.Url, Placeholder = "http://localhost:5030", HelpText = "The URL of your Slskd instance.")]
         public string BaseUrl { get; set; } = "http://localhost:5030";
 
-        [FieldDefinition(1, Label = "External URL", Type = FieldType.Url, Placeholder = "https://slskd.example.com", HelpText = "An optional external URL for additional resources or documentation.", Advanced = true)]
-        public string? ExternalUrl { get; set; } = string.Empty;
-
         [FieldDefinition(2, Label = "API Key", Type = FieldType.Textbox, Privacy = PrivacyLevel.ApiKey, HelpText = "The API key for your Slskd instance. You can find or set this in the Slskd's settings under 'Options'.", Placeholder = "Enter your API key")]
         public string ApiKey { get; set; } = string.Empty;
 

Tubifarry/Indexers/Soulseek/SlskdParser.cs

@@ -90,16 +90,16 @@ private AlbumData CreateAlbumData(string searchId, IGrouping<string, SlskdFileDa
                 bitRate = (int)((totalSize * 8) / (totalDuration * 1000));
 
             List<SlskdFileData>? filesToDownload = directory.GroupBy(f => f.Filename?[..f.Filename.LastIndexOf('\\')]).FirstOrDefault(g => g.Key == directory.Key)?.ToList();
-
+            AudioFormat codec = AudioFormatHelper.GetAudioCodecFromExtension(mostCommonExtension ?? string.Empty);
             return new AlbumData("Slskd")
             {
                 AlbumId = $"/api/v0/transfers/downloads/{folderData.Username}",
                 ArtistName = artist ?? "Unknown Artist",
                 AlbumName = album ?? "Unknown Album",
                 ReleaseDate = folderData.Year,
                 ReleaseDateTime = (string.IsNullOrEmpty(folderData.Year) || !int.TryParse(folderData.Year, out int yearInt) ? DateTime.MinValue : new DateTime(yearInt, 1, 1)),
-                Codec = AudioFormatHelper.GetAudioCodecFromExtension(mostCommonExtension ?? string.Empty),
-                Bitrate = bitRate ?? 0,
+                Codec = codec,
+                Bitrate = (codec == AudioFormat.MP3 ? AudioFormatHelper.RoundToStandardBitrate(bitRate ?? 0) : bitRate) ?? 0,
                 Size = totalSize,
                 Priotity = folderData.CalculatePriority(),
                 CustomString = JsonConvert.SerializeObject(filesToDownload),
@@ -129,7 +129,7 @@ public void RemoveSearch(string searchId, bool delay = false)
             {
                 try
                 {
-                    if (delay) await Task.Delay(30000);
+                    if (delay) await Task.Delay(90000);
                     HttpRequest request = new HttpRequestBuilder($"{Settings.BaseUrl}/api/v0/searches/{searchId}").SetHeader("X-API-KEY", Settings.ApiKey).Build();
                     request.Method = HttpMethod.Delete;
                     HttpResponse response = await _httpClient.ExecuteAsync(request);

Tubifarry/Indexers/Soulseek/SlskdSettings.cs

@@ -68,7 +68,7 @@ public class SlskdSettings : IIndexerSettings
         [FieldDefinition(0, Label = "URL", Type = FieldType.Url, Placeholder = "http://localhost:5030", HelpText = "The URL of your Slskd instance.")]
         public string BaseUrl { get; set; } = "http://localhost:5030";
 
-        [FieldDefinition(1, Label = "External URL", Type = FieldType.Url, Placeholder = "https://slskd.example.com", HelpText = "An optional external URL for additional resources or documentation.", Advanced = true)]
+        [FieldDefinition(1, Label = "External URL", Type = FieldType.Url, Placeholder = "https://slskd.example.com", HelpText = "URL for interactive search redirect", Advanced = true)]
         public string? ExternalUrl { get; set; } = string.Empty;
 
         [FieldDefinition(2, Label = "API Key", Type = FieldType.Textbox, Privacy = PrivacyLevel.ApiKey, HelpText = "The API key for your Slskd instance. You can find or set this in the Slskd's settings under 'Options'.", Placeholder = "Enter your API key")]

Tubifarry/Indexers/Spotify/SpotifyToYoutubeParser.cs

@@ -23,7 +23,6 @@ public interface ISpotifyToYoutubeParser : IParseIndexerResponse
     public class SpotifyToYoutubeParser : ISpotifyToYoutubeParser
     {
         private YouTubeMusicClient _ytClient;
-        private static readonly int[] StandardBitrates = { 96, 128, 160, 192, 256, 320 };
 
         private readonly Logger _logger;
         private string? _cookiePath;
@@ -172,7 +171,7 @@ private async Task AddYoutubeData(AlbumData albumData)
                         if (highestAudioStreamInfo != null)
                         {
                             albumData.Duration = (long)album.Duration.TotalSeconds;
-                            albumData.Bitrate = RoundToStandardBitrate(highestAudioStreamInfo.Bitrate / 1000);
+                            albumData.Bitrate = AudioFormatHelper.RoundToStandardBitrate(highestAudioStreamInfo.Bitrate / 1000);
                             albumData.AlbumId = result.Id;
                             break;
                         }
@@ -214,7 +213,5 @@ private static string NormalizeTitle(string title)
             }
             return title;
         }
-
-        private static int RoundToStandardBitrate(int bitrateKbps) => StandardBitrates.OrderBy(b => Math.Abs(b - bitrateKbps)).First();
     }
 }