align mock with upstream

also align with upstream

azure-pipelines.yml

@@ -9,7 +9,7 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '2.3.2'
+  majorVersion: '2.3.0'
   minorVersion: $[counter('minorVersion', 1)]
   prowlarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(prowlarrVersion)'
@@ -18,9 +18,9 @@ variables:
   dotnetVersion: '8.0.405'
   nodeVersion: '20.X'
   innoVersion: '6.2.2'
-  windowsImage: 'windows-2025'
-  linuxImage: 'ubuntu-24.04'
-  macImage: 'macOS-15'
+  windowsImage: 'windows-2022'
+  linuxImage: 'ubuntu-22.04'
+  macImage: 'macOS-13'
 
 trigger:
   branches:

src/NzbDrone.Common/Composition/AssemblyLoader.cs

@@ -14,7 +14,6 @@ namespace NzbDrone.Common.Composition
         static AssemblyLoader()
         {
             AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(ContainerResolveEventHandler);
-            RegisterSQLiteResolver();
         }
 
         public static IList<Assembly> Load(IList<string> assemblyNames)
@@ -23,6 +22,10 @@ namespace NzbDrone.Common.Composition
             toLoad.Add("Prowlarr.Common");
             toLoad.Add(OsInfo.IsWindows ? "Prowlarr.Windows" : "Prowlarr.Mono");
 
+            var toRegisterResolver = new List<string> { "System.Data.SQLite" };
+            toRegisterResolver.AddRange(assemblyNames.Intersect(new[] { "Prowlarr.Core" }));
+            RegisterNativeResolver(toRegisterResolver);
+
             var startupPath = AppDomain.CurrentDomain.BaseDirectory;
 
             return toLoad
@@ -43,27 +46,46 @@ namespace NzbDrone.Common.Composition
             return AssemblyLoadContext.Default.LoadFromAssemblyPath(assemblyPath);
         }
 
-        public static void RegisterSQLiteResolver()
+        public static void RegisterNativeResolver(IEnumerable<string> assemblyNames)
         {
-            // This ensures we look for sqlite3 using libsqlite3.so.0 on Linux and not libsqlite3.so which
-            // is less likely to exist.
-            var sqliteAssembly = AssemblyLoadContext.Default.LoadFromAssemblyPath(
-                Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "System.Data.SQLite.dll"));
+            foreach (var name in assemblyNames)
+            {
+                // This ensures we look for sqlite3 using libsqlite3.so.0 on Linux and not libsqlite3.so which
+                // is less likely to exist.
+                var assembly = AssemblyLoadContext.Default.LoadFromAssemblyPath(
+                    Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"{name}.dll"));
 
-            try
-            {
-                NativeLibrary.SetDllImportResolver(sqliteAssembly, LoadSqliteNativeLib);
-            }
-            catch (InvalidOperationException)
-            {
-                // This can only be set once per assembly
-                // Catch required for NzbDrone.Host tests
+                try
+                {
+                    NativeLibrary.SetDllImportResolver(assembly, LoadNativeLib);
+                }
+                catch (InvalidOperationException)
+                {
+                    // This can only be set once per assembly
+                    // Catch required for NzbDrone.Host tests
+                }
             }
         }
 
-        private static IntPtr LoadSqliteNativeLib(string libraryName, Assembly assembly, DllImportSearchPath? dllImportSearchPath)
+        private static IntPtr LoadNativeLib(string libraryName, Assembly assembly, DllImportSearchPath? dllImportSearchPath)
         {
-            var mappedName = OsInfo.IsLinux && libraryName == "sqlite3" ? "libsqlite3.so.0" : libraryName;
+            ArgumentException.ThrowIfNullOrWhiteSpace(libraryName);
+
+            var mappedName = libraryName;
+
+            if (libraryName is "sqlite3" or "e_sqlite3")
+            {
+                if (OsInfo.IsLinux)
+                {
+                    if (NativeLibrary.TryLoad(libraryName, assembly, dllImportSearchPath, out var libHandle))
+                    {
+                        return libHandle;
+                    }
+
+                    mappedName = "libsqlite3.so.0";
+                }
+            }
+
             return NativeLibrary.Load(mappedName, assembly, dllImportSearchPath);
         }
     }

src/NzbDrone.Core/Indexers/Definitions/AnimeBytes.cs

@@ -669,7 +669,7 @@ namespace NzbDrone.Core.Indexers.Definitions
         {
             var advancedSeasonRegex = new Regex(@"\b(?:(?<season>\d+)(?:st|nd|rd|th) Season|Season (?<season>\d+))\b", RegexOptions.Compiled | RegexOptions.IgnoreCase);
             var seasonCharactersRegex = new Regex(@"(I{2,})$", RegexOptions.Compiled);
-            var seasonNumberRegex = new Regex(@"\b(?<!(Part|No\.)[- ._])(?<!\d[/])(?<!\#)(?:S)?(?<season>[2-9])$", RegexOptions.Compiled);
+            var seasonNumberRegex = new Regex(@"\b(?<!Part[- ._])(?<!\d[/])(?:S)?(?<season>[2-9])$", RegexOptions.Compiled);
 
             foreach (var title in titles)
             {

src/NzbDrone.Core/Indexers/Definitions/Shazbat.cs

@@ -69,8 +69,8 @@ public class Shazbat : TorrentIndexerBase<ShazbatSettings>
             .AddFormParameter("referer", "")
             .AddFormParameter("query", "")
             .AddFormParameter("tv_timezone", "0")
-            .AddFormParameter("username", Settings.Username)
-            .AddFormParameter("password", Settings.Password)
+            .AddFormParameter("tv_login", Settings.Username)
+            .AddFormParameter("tv_password", Settings.Password)
             .SetHeader("Content-Type", "application/x-www-form-urlencoded")
             .SetHeader("Referer", loginUrl)
             .Build();
@@ -92,9 +92,9 @@ public class Shazbat : TorrentIndexerBase<ShazbatSettings>
         _logger.Debug("Authentication succeeded.");
     }
 
-    protected override bool CheckIfLoginNeeded(HttpResponse httpResponse)
+    protected override bool CheckIfLoginNeeded(HttpResponse response)
     {
-        return (httpResponse.HasHttpRedirect && httpResponse.RedirectUrl.ContainsIgnoreCase("login")) || httpResponse.Content.ContainsIgnoreCase("sign in now");
+        return response.Content.ContainsIgnoreCase("sign in now");
     }
 
     private IndexerCapabilities SetCapabilities()
@@ -202,7 +202,7 @@ public class ShazbatRequestGenerator : IIndexerRequestGenerator
     public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
 }
 
-public partial class ShazbatParser : IParseIndexerResponse
+public class ShazbatParser : IParseIndexerResponse
 {
     private readonly ProviderDefinition _definition;
     private readonly ShazbatSettings _settings;
@@ -210,10 +210,8 @@ public partial class ShazbatParser : IParseIndexerResponse
     private readonly IIndexerHttpClient _httpClient;
     private readonly Logger _logger;
 
-    private readonly HashSet<string> _hdResolutions = ["1080p", "1080i", "720p"];
-
-    [GeneratedRegex(@"\((?<size>\d+)\)\s*:(?<seeders>\d+) \/ :(?<leechers>\d+)$", RegexOptions.Compiled)]
-    private static partial Regex TorrentInfoRegex();
+    private readonly Regex _torrentInfoRegex = new(@"\((?<size>\d+)\):(?<seeders>\d+) \/ :(?<leechers>\d+)$", RegexOptions.Compiled);
+    private readonly HashSet<string> _hdResolutions = new() { "1080p", "1080i", "720p" };
 
     public ShazbatParser(ProviderDefinition definition, ShazbatSettings settings, TimeSpan rateLimit, IIndexerHttpClient httpClient, Logger logger)
     {
@@ -280,8 +278,7 @@ public partial class ShazbatParser : IParseIndexerResponse
                 var releaseRequest = new IndexerRequest(showRequest);
                 var releaseResponse = new IndexerResponse(releaseRequest, _httpClient.ExecuteProxied(releaseRequest.HttpRequest, _definition));
 
-                if ((releaseResponse.HttpResponse.HasHttpRedirect && releaseResponse.HttpResponse.RedirectUrl.ContainsIgnoreCase("login")) ||
-                    releaseResponse.HttpResponse.Content.ContainsIgnoreCase("sign in now"))
+                if (releaseResponse.HttpResponse.Content.ContainsIgnoreCase("sign in now"))
                 {
                     // Remove cookie cache
                     CookiesUpdater(null, null);
@@ -327,15 +324,13 @@ public partial class ShazbatParser : IParseIndexerResponse
             var title = ParseTitle(row.QuerySelector("td:nth-of-type(3)"));
 
             var infoString = row.QuerySelector("td:nth-of-type(4)")?.TextContent.Trim() ?? string.Empty;
-            var matchInfo = TorrentInfoRegex().Match(infoString);
+            var matchInfo = _torrentInfoRegex.Match(infoString);
             var size = matchInfo.Groups["size"].Success && long.TryParse(matchInfo.Groups["size"].Value, out var outSize) ? outSize : 0;
             var seeders = matchInfo.Groups["seeders"].Success && int.TryParse(matchInfo.Groups["seeders"].Value, out var outSeeders) ? outSeeders : 0;
             var leechers = matchInfo.Groups["leechers"].Success && int.TryParse(matchInfo.Groups["leechers"].Value, out var outLeechers) ? outLeechers : 0;
 
             var dateTimestamp = row.QuerySelector(".datetime[data-timestamp]")?.GetAttribute("data-timestamp");
-            publishDate = dateTimestamp != null && ParseUtil.TryCoerceLong(dateTimestamp, out var timestamp)
-                ? DateTimeUtil.UnixTimestampToDateTime(timestamp)
-                : publishDate.AddMinutes(-1);
+            publishDate = dateTimestamp != null && ParseUtil.TryCoerceDouble(dateTimestamp, out var timestamp) ? DateTimeUtil.UnixTimestampToDateTime(timestamp) : publishDate.AddMinutes(-1);
 
             var release = new TorrentInfo
             {
@@ -369,10 +364,10 @@ public partial class ShazbatParser : IParseIndexerResponse
         return title?.TextContent.Trim();
     }
 
-    private List<IndexerCategory> ParseCategories(string title)
+    protected virtual List<IndexerCategory> ParseCategories(string title)
     {
-        return
-        [
+        var categories = new List<IndexerCategory>
+        {
             NewznabStandardCategory.TV,
             title switch
             {
@@ -380,7 +375,9 @@ public partial class ShazbatParser : IParseIndexerResponse
                 _ when title.Contains("2160p") => NewznabStandardCategory.TVUHD,
                 _ => NewznabStandardCategory.TVSD
             }
-        ];
+        };
+
+        return categories;
     }
 
     public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }

src/NzbDrone.Host/Startup.cs

@@ -64,8 +64,6 @@ namespace NzbDrone.Host
                 options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("10.0.0.0"), 8));
                 options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("172.16.0.0"), 12));
                 options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("192.168.0.0"), 16));
-                options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("fc00::"), 7));
-                options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("fe80::"), 10));
             });
 
             services.AddRouting(options => options.LowercaseUrls = true);

src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs

@@ -51,7 +51,7 @@ namespace NzbDrone.Test.Common.AutoMoq
 
             if (behavior != MockBehavior.Default && mock.Behavior == MockBehavior.Default)
             {
-                throw new InvalidOperationException("Unable to change be behaviour of a an existing mock.");
+                throw new InvalidOperationException("Unable to change be behaviour of an existing mock.");
             }
 
             return mock;
@@ -139,7 +139,7 @@ namespace NzbDrone.Test.Common.AutoMoq
 
             LoadPlatformLibrary();
 
-            AssemblyLoader.RegisterSQLiteResolver();
+            AssemblyLoader.RegisterNativeResolver(new[] { "System.Data.SQLite", "Prowlarr.Core" });
         }
 
         private Mock<T> TheRegisteredMockForThisType<T>(Type type)