Ipv6 logging

Fixes RADARR-7HC
Fixes RADARR-V49

(cherry picked from commit 6f97ca9a55471386454457ca52b93733e18e85e4)
Closes #6993

azure-pipelines.yml

@@ -7,7 +7,7 @@ variables:
   outputFolder: './_output'
   artifactsFolder: './_artifacts'
   testsFolder: './_tests'
-  majorVersion: '4.0.3'
+  majorVersion: '4.0.4'
   minorVersion: $[counter('minorVersion', 2000)]
   radarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(radarrVersion)'

frontend/src/Components/Page/Header/PageHeader.js

@@ -81,7 +81,7 @@ class PageHeader extends Component {
           <IconButton
             className={styles.donate}
             name={icons.HEART}
-            to="https://opencollective.com/radarr"
+            to="https://radarr.video/donate"
             size={14}
           />
           <IconButton

frontend/src/System/Status/Donations/Donations.js

@@ -13,7 +13,7 @@ class Donations extends Component {
     return (
       <FieldSet legend={translate('Donations')}>
         <div className={styles.logoContainer} title="Radarr">
-          <Link to="https://opencollective.com/radarr">
+          <Link to="https://radarr.video/donate">
             <img
               className={styles.logo}
               src={`${window.Radarr.urlBase}/Content/Images/Icons/logo-radarr.png`}
@@ -21,7 +21,7 @@ class Donations extends Component {
           </Link>
         </div>
         <div className={styles.logoContainer} title="Lidarr">
-          <Link to="https://opencollective.com/lidarr">
+          <Link to="https://lidarr.audio/donate">
             <img
               className={styles.logo}
               src={`${window.Radarr.urlBase}/Content/Images/Icons/logo-lidarr.png`}
@@ -29,7 +29,7 @@ class Donations extends Component {
           </Link>
         </div>
         <div className={styles.logoContainer} title="Readarr">
-          <Link to="https://opencollective.com/readarr">
+          <Link to="https://readarr.com/donate">
             <img
               className={styles.logo}
               src={`${window.Radarr.urlBase}/Content/Images/Icons/logo-readarr.png`}
@@ -37,7 +37,7 @@ class Donations extends Component {
           </Link>
         </div>
         <div className={styles.logoContainer} title="Prowlarr">
-          <Link to="https://opencollective.com/prowlarr">
+          <Link to="https://prowlarr.com/donate">
             <img
               className={styles.logo}
               src={`${window.Radarr.urlBase}/Content/Images/Icons/logo-prowlarr.png`}
@@ -45,7 +45,7 @@ class Donations extends Component {
           </Link>
         </div>
         <div className={styles.logoContainer} title="Sonarr">
-          <Link to="https://opencollective.com/sonarr">
+          <Link to="https://sonarr.tv/donate">
             <img
               className={styles.logo}
               src={`${window.Radarr.urlBase}/Content/Images/Icons/logo-sonarr.png`}

src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs

@@ -7,17 +7,21 @@ using System.Net.Sockets;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using NLog;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http.Proxy;
+using NzbDrone.Common.Instrumentation;
 
 namespace NzbDrone.Common.Http.Dispatchers
 {
     public class ManagedHttpDispatcher : IHttpDispatcher
     {
         private const string NO_PROXY_KEY = "no-proxy";
-
         private const int connection_establish_timeout = 2000;
+
+        private static readonly Logger Logger = NzbDroneLogger.GetLogger(typeof(ManagedHttpDispatcher));
+
         private static bool useIPv6 = Socket.OSSupportsIPv6;
         private static bool hasResolvedIPv6Availability;
 
@@ -29,10 +33,10 @@ namespace NzbDrone.Common.Http.Dispatchers
         private readonly ICached<CredentialCache> _credentialCache;
 
         public ManagedHttpDispatcher(IHttpProxySettingsProvider proxySettingsProvider,
-            ICreateManagedWebProxy createManagedWebProxy,
-            ICertificateValidationService certificateValidationService,
-            IUserAgentBuilder userAgentBuilder,
-            ICacheManager cacheManager)
+                                     ICreateManagedWebProxy createManagedWebProxy,
+                                     ICertificateValidationService certificateValidationService,
+                                     IUserAgentBuilder userAgentBuilder,
+                                     ICacheManager cacheManager)
         {
             _proxySettingsProvider = proxySettingsProvider;
             _createManagedWebProxy = createManagedWebProxy;
@@ -235,16 +239,21 @@ namespace NzbDrone.Common.Http.Dispatchers
 
         private static async ValueTask<Stream> onConnect(SocketsHttpConnectionContext context, CancellationToken cancellationToken)
         {
+            Logger.Trace($"useIPv6: {useIPv6} hasResolvedipv6availability: {hasResolvedIPv6Availability}");
+
             // Until .NET supports an implementation of Happy Eyeballs (https://tools.ietf.org/html/rfc8305#section-2), let's make IPv4 fallback work in a simple way.
             // This issue is being tracked at https://github.com/dotnet/runtime/issues/26177 and expected to be fixed in .NET 6.
             if (useIPv6)
             {
+                Logger.Trace("Trying Ipv6");
                 try
                 {
                     var localToken = cancellationToken;
 
                     if (!hasResolvedIPv6Availability)
                     {
+                        Logger.Trace($"Using fast timeout {connection_establish_timeout}");
+
                         // to make things move fast, use a very low timeout for the initial ipv6 attempt.
                         var quickFailCts = new CancellationTokenSource(connection_establish_timeout);
                         var linkedTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, quickFailCts.Token);
@@ -254,8 +263,10 @@ namespace NzbDrone.Common.Http.Dispatchers
 
                     return await attemptConnection(AddressFamily.InterNetworkV6, context, localToken);
                 }
-                catch
+                catch (Exception e)
                 {
+                    Logger.Trace(e, "Error in ipv6 attempt");
+
                     // very naively fallback to ipv4 permanently for this execution based on the response of the first connection attempt.
                     // note that this may cause users to eventually get switched to ipv4 (on a random failure when they are switching networks, for instance)
                     // but in the interest of keeping this implementation simple, this is acceptable.
@@ -267,6 +278,8 @@ namespace NzbDrone.Common.Http.Dispatchers
                 }
             }
 
+            Logger.Trace("Falling back to ipv4");
+
             // fallback to IPv4.
             return await attemptConnection(AddressFamily.InterNetwork, context, cancellationToken);
         }

src/NzbDrone.Core.Test/MediaFiles/MediaInfo/MediaInfoFormatterTests/FormatVideoCodecFixture.cs

@@ -19,6 +19,8 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
         [TestCase("wmv1, WMV1", "Droned.wmv", "WMV")]
         [TestCase("wmv2, WMV2", "Droned.wmv", "WMV")]
         [TestCase("mpeg4, XVID", "", "XviD")]
+        [TestCase("mpeg4, DIVX", "", "DivX")]
+        [TestCase("mpeg4, divx", "", "DivX")]
         [TestCase("mpeg4, DIV3", "spsm.dvdrip.divx.avi'.", "DivX")]
         [TestCase("msmpeg4, DIV3", "Exit the Dragon, Enter the Tiger (1976) 360p MPEG Audio.avi", "DivX")]
         [TestCase("msmpeg4v2, DIV3", "Exit the Dragon, Enter the Tiger (1976) 360p MPEG Audio.avi", "DivX")]

src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrent.cs

@@ -368,9 +368,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
 
             if (Settings.MovieCategory.IsNotNullOrWhiteSpace() && version >= Version.Parse("2.0"))
             {
-                var label = Proxy.GetLabels(Settings)[Settings.MovieCategory];
-
-                if (label.SavePath.IsNotNullOrWhiteSpace())
+                if (Proxy.GetLabels(Settings).TryGetValue(Settings.MovieCategory, out var label) && label.SavePath.IsNotNullOrWhiteSpace())
                 {
                     var labelDir = new OsPath(label.SavePath);
 

src/NzbDrone.Core/Download/Clients/uTorrent/UTorrentSettings.cs

@@ -49,7 +49,7 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
         [FieldDefinition(6, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Radarr avoids conflicts with unrelated downloads, but it's optional")]
         public string MovieCategory { get; set; }
 
-        [FieldDefinition(7, Label = "Post-Import Category", Type = FieldType.Textbox, Advanced = true, HelpText = "Category for Radarr to set after it has imported the download. Sonarr will not remove the torrent if seeding has finished. Leave blank to keep same category.")]
+        [FieldDefinition(7, Label = "Post-Import Category", Type = FieldType.Textbox, Advanced = true, HelpText = "Category for Radarr to set after it has imported the download. Radarr will not remove the torrent if seeding has finished. Leave blank to keep same category.")]
         public string MovieImportedCategory { get; set; }
 
         [FieldDefinition(8, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(UTorrentPriority), HelpText = "Priority to use when grabbing movies that aired within the last 21 days")]

src/NzbDrone.Core/Indexers/HttpIndexerBase.cs

@@ -335,7 +335,7 @@ namespace NzbDrone.Core.Indexers
 
                 if (releases.Empty())
                 {
-                    return new ValidationFailure(string.Empty, "Query successful, but no results were returned from your indexer. This may be an issue with the indexer or your indexer category settings.");
+                    return new ValidationFailure(string.Empty, "Query successful, but no results in the configured categories were returned from your indexer. This may be an issue with the indexer or your indexer category settings.");
                 }
             }
             catch (ApiKeyException ex)

src/NzbDrone.Core/Languages/Language.cs

@@ -102,7 +102,7 @@ namespace NzbDrone.Core.Languages
         public static Language Bulgarian => new Language(29, "Bulgarian");
         public static Language PortugueseBR => new Language(30, "Portuguese (Brazil)");
         public static Language Arabic => new Language(31, "Arabic");
-        public static Language Ukrainian => new Language(32, "Unkrainian");
+        public static Language Ukrainian => new Language(32, "Ukrainian");
         public static Language Persian => new Language(33, "Persian");
         public static Language Bengali => new Language(34, "Bengali");
         public static Language Any => new Language(-1, "Any");

src/NzbDrone.Core/Localization/Core/en.json

@@ -427,7 +427,7 @@
   "IndexerLongTermStatusCheckAllClientMessage": "All indexers are unavailable due to failures for more than 6 hours",
   "IndexerLongTermStatusCheckSingleClientMessage": "Indexers unavailable due to failures for more than 6 hours: {0}",
   "IndexerPriority": "Indexer Priority",
-  "IndexerPriorityHelpText": "Indexer Priority from 1 (Highest) to 50 (Lowest). Default: 25.",
+  "IndexerPriorityHelpText": "Indexer Priority from 1 (Highest) to 50 (Lowest). Default: 25. Used when grabbing releases as a tiebreaker for otherwise equal releases, Radarr will still use all enabled indexers for RSS Sync and Searching",
   "IndexerRssHealthCheckNoAvailableIndexers": "All rss-capable indexers are temporarily unavailable due to recent indexer errors",
   "IndexerRssHealthCheckNoIndexers": "No indexers available with RSS sync enabled, Radarr will not grab new releases automatically",
   "Indexers": "Indexers",
@@ -1113,4 +1113,4 @@
   "YesMoveFiles": "Yes, Move the Files",
   "Yesterday": "Yesterday",
   "YouCanAlsoSearch": "You can also search using TMDb ID or IMDb ID of a movie. e.g. `tmdb:71663`"
-}
+}

src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoFormatter.cs

@@ -217,8 +217,8 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
                 }
 
                 if (videoCodecID == "DIV3" ||
-                    videoCodecID == "DIVX" ||
-                    videoCodecID == "DX50")
+                    videoCodecID == "DX50" ||
+                    videoCodecID.ToUpperInvariant() == "DIVX")
                 {
                     return "DivX";
                 }
@@ -256,7 +256,8 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
                 videoFormat == "rv10" ||
                 videoFormat == "rv20" ||
                 videoFormat == "rv30" ||
-                videoFormat == "rv40")
+                videoFormat == "rv40" ||
+                videoFormat == "cinepak")
             {
                 return "";
             }

src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoModel.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text.Json.Serialization;
 using FFMpegCore;
 using NzbDrone.Core.Datastore;
 
@@ -12,12 +11,6 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
         public string RawFrameData { get; set; }
         public int SchemaRevision { get; set; }
 
-        [JsonIgnore]
-        public IMediaAnalysis Analysis => FFProbe.Analyse(RawStreamData);
-
-        [JsonIgnore]
-        public IMediaAnalysis Frames => FFProbe.Analyse(RawFrameData);
-
         public string ContainerFormat { get; set; }
         public string VideoFormat { get; set; }
 

src/NzbDrone.Core/Notifications/Notifiarr/NotifiarrProxy.cs

@@ -1,10 +1,8 @@
-using System;
-using System.Collections.Generic;
+using System;
 using System.Collections.Specialized;
 using System.Net;
 using FluentValidation.Results;
 using NLog;
-using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Http;
 
 namespace NzbDrone.Core.Notifications.Notifiarr

src/NzbDrone.Core/Parser/IsoLanguages.cs

@@ -40,7 +40,7 @@ namespace NzbDrone.Core.Parser
                                                                new IsoLanguage("ro", "", "ron", "Romanian", Language.Romanian),
                                                                new IsoLanguage("pt", "br", "", "Portuguese (Brazil)", Language.PortugueseBR),
                                                                new IsoLanguage("ar", "", "ara", "Arabic", Language.Arabic),
-                                                               new IsoLanguage("uk", "", "uar", "Ukrainian", Language.Ukrainian),
+                                                               new IsoLanguage("uk", "", "ukr", "Ukrainian", Language.Ukrainian),
                                                                new IsoLanguage("fa", "", "fas", "Persian", Language.Persian),
                                                                new IsoLanguage("be", "", "ben", "Bengali", Language.Bengali)
                                                            };

src/NzbDrone.Core/Radarr.Core.csproj

@@ -5,6 +5,7 @@
   <ItemGroup>
     <PackageReference Include="Dapper" Version="2.0.123" />
     <PackageReference Include="MailKit" Version="2.15.0" />
+    <PackageReference Include="Servarr.FFMpegCore" Version="4.5.0-25" />
     <PackageReference Include="Servarr.FFprobe" Version="4.4.1.63" />
     <PackageReference Include="System.Memory" Version="4.5.4" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
@@ -19,7 +20,6 @@
     <PackageReference Include="System.Data.SQLite.Core.Servarr" Version="1.0.115.5-18" />
     <PackageReference Include="System.Text.Json" Version="6.0.1" />
     <PackageReference Include="MonoTorrent" Version="2.0.1" />
-    <PackageReference Include="FFMpegCore" Version="4.6.16" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NzbDrone.Common\Radarr.Common.csproj" />