Update Sentry to 3.18.0

Update Swashbuckle to 6.3.1
Bump dotnet to 6.0.6
2026-04-17 21:44:48 -04:00 · 2022-06-25 18:26:37 -05:00 · 2022-06-25 18:26:07 -05:00 · 2022-06-25 18:24:44 -05:00 · 2022-06-25 18:22:28 -05:00 · 2022-06-25 18:06:40 -05:00
12 changed files with 49 additions and 206 deletions
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -9,13 +9,13 @@ variables:
  testsFolder: './_tests'
  yarnCacheFolder: $(Pipeline.Workspace)/.yarn
  nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '0.4.0'
+  majorVersion: '0.4.1'
  minorVersion: $[counter('minorVersion', 1)]
  prowlarrVersion: '$(majorVersion).$(minorVersion)'
  buildName: '$(Build.SourceBranchName).$(prowlarrVersion)'
  sentryOrg: 'servarr'
  sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '6.0.201'
+  dotnetVersion: '6.0.301'
  innoVersion: '6.2.0'
  nodeVersion: '16.x'
  windowsImage: 'windows-2022'
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
    "@fortawesome/free-regular-svg-icons": "6.1.1",
    "@fortawesome/free-solid-svg-icons": "6.1.1",
    "@fortawesome/react-fontawesome": "0.1.18",
-    "@microsoft/signalr": "6.0.3",
+    "@microsoft/signalr": "6.0.6",
    "@sentry/browser": "6.19.2",
    "@sentry/integrations": "6.19.2",
    "chart.js": "3.7.1",
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -94,7 +94,7 @@
  
  <!-- Standard testing packages -->
  <ItemGroup Condition="'$(TestProject)'=='true'">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
    <PackageReference Include="NUnit" Version="3.13.3" />
    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
    <PackageReference Include="NunitXml.TestLogger" Version="3.0.117" />
--- a/src/NzbDrone.Common/Prowlarr.Common.csproj
+++ b/src/NzbDrone.Common/Prowlarr.Common.csproj
@@ -10,7 +10,7 @@
    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
    <PackageReference Include="NLog" Version="4.7.14" />
-    <PackageReference Include="Sentry" Version="3.15.0" />
+    <PackageReference Include="Sentry" Version="3.18.0" />
    <PackageReference Include="SharpZipLib" Version="1.3.3" />
    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
    <PackageReference Include="System.Data.SQLite.Core.Servarr" Version="1.0.115.5-18" />
--- a/src/NzbDrone.Core/Datastore/Migration/018_minimum_seeders.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/018_minimum_seeders.cs
@@ -3,7 +3,7 @@ using NzbDrone.Core.Datastore.Migration.Framework;

 namespace NzbDrone.Core.Datastore.Migration
 {
-    [Migration(18)]
+    [Migration(018)]
    public class minimum_seeders : NzbDroneMigrationBase
    {
        protected override void MainDbUpgrade()
--- a/src/NzbDrone.Core/Datastore/Migration/019_remove_showrss.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/019_remove_showrss.cs
@@ -0,0 +1,15 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(019)]
+    public class remove_showrss : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            // Remove, YML version exists
+            Delete.FromTable("Indexers").Row(new { Implementation = "ShowRSS" });
+        }
+    }
+}
--- a/src/NzbDrone.Core/IndexerSearch/ReleaseAnalyticsService.cs
+++ b/src/NzbDrone.Core/IndexerSearch/ReleaseAnalyticsService.cs
@@ -1,5 +1,7 @@
+using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
+using NLog;
 using NzbDrone.Common.Cloud;
 using NzbDrone.Common.Http;
 using NzbDrone.Common.Serializer;
@@ -14,17 +16,19 @@ namespace NzbDrone.Core.IndexerSearch
        private readonly IHttpClient _httpClient;
        private readonly IHttpRequestBuilderFactory _requestBuilder;
        private readonly IAnalyticsService _analyticsService;
+        private readonly Logger _logger;

-        public ReleaseAnalyticsService(IHttpClient httpClient, IProwlarrCloudRequestBuilder requestBuilder, IAnalyticsService analyticsService)
+        public ReleaseAnalyticsService(IHttpClient httpClient, IProwlarrCloudRequestBuilder requestBuilder, IAnalyticsService analyticsService, Logger logger)
        {
            _analyticsService = analyticsService;
            _requestBuilder = requestBuilder.Releases;
            _httpClient = httpClient;
+            _logger = logger;
        }

        public void HandleAsync(IndexerQueryEvent message)
        {
-            if (_analyticsService.IsEnabled)
+            if (_analyticsService.IsEnabled && message.QueryResult?.Releases != null)
            {
                var request = _requestBuilder.Create().Resource("release/push").Build();
                request.Method = HttpMethod.Post;
@@ -34,14 +38,21 @@ namespace NzbDrone.Core.IndexerSearch
                var body = message.QueryResult.Releases.Select(x => new
                {
                    Title = x.Title,
-                    Categories = x.Categories.Where(c => c.Id < 10000).Select(c => c.Id),
+                    Categories = x.Categories?.Where(c => c.Id < 10000).Select(c => c.Id) ?? new List<int>(),
                    Protocol = x.DownloadProtocol.ToString(),
                    Size = x.Size,
                    PublishDate = x.PublishDate
                });

-                request.SetContent(body.ToJson());
-                _httpClient.Post(request);
+                try
+                {
+                    request.SetContent(body.ToJson());
+                    _httpClient.Post(request);
+                }
+                catch
+                {
+                    _logger.Trace("Analytics push failed");
+                }
            }
        }
    }
--- a/src/NzbDrone.Core/Indexers/Definitions/ShowRSS.cs
+++ b/src/NzbDrone.Core/Indexers/Definitions/ShowRSS.cs
@@ -1,183 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Xml;
-using FluentValidation;
-using NLog;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Annotations;
-using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Indexers.Settings;
-using NzbDrone.Core.IndexerSearch.Definitions;
-using NzbDrone.Core.Messaging.Events;
-using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.ThingiProvider;
-using NzbDrone.Core.Validation;
-
-namespace NzbDrone.Core.Indexers.Definitions
-{
-    public class ShowRSS : TorrentIndexerBase<NoAuthTorrentBaseSettings>
-    {
-        public override string Name => "ShowRSS";
-        public override string[] IndexerUrls => new string[] { "https://showrss.info/" };
-        public override string Language => "en-US";
-        public override string Description => "showRSS is a service that allows you to keep track of your favorite TV shows";
-        public override Encoding Encoding => Encoding.UTF8;
-        public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
-        public override IndexerPrivacy Privacy => IndexerPrivacy.Public;
-        public override IndexerCapabilities Capabilities => SetCapabilities();
-
-        public ShowRSS(IIndexerHttpClient httpClient, IEventAggregator eventAggregator, IIndexerStatusService indexerStatusService, IConfigService configService, Logger logger)
-            : base(httpClient, eventAggregator, indexerStatusService, configService, logger)
-        {
-        }
-
-        public override IIndexerRequestGenerator GetRequestGenerator()
-        {
-            return new ShowRSSRequestGenerator() { Settings = Settings, Capabilities = Capabilities };
-        }
-
-        public override IParseIndexerResponse GetParser()
-        {
-            return new ShowRSSParser(Settings);
-        }
-
-        private IndexerCapabilities SetCapabilities()
-        {
-            var caps = new IndexerCapabilities
-            {
-                TvSearchParams = new List<TvSearchParam>
-                                   {
-                                       TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
-                                   }
-            };
-
-            caps.Categories.AddCategoryMapping(1, NewznabStandardCategory.TV);
-            caps.Categories.AddCategoryMapping(2, NewznabStandardCategory.TVSD);
-            caps.Categories.AddCategoryMapping(3, NewznabStandardCategory.TVHD);
-
-            return caps;
-        }
-    }
-
-    public class ShowRSSRequestGenerator : IIndexerRequestGenerator
-    {
-        public NoAuthTorrentBaseSettings Settings { get; set; }
-        public IndexerCapabilities Capabilities { get; set; }
-
-        public ShowRSSRequestGenerator()
-        {
-        }
-
-        private IEnumerable<IndexerRequest> GetPagedRequests(string term, int[] categories)
-        {
-            var searchUrl = string.Format("{0}/other/all.rss", Settings.BaseUrl.TrimEnd('/'));
-
-            var request = new IndexerRequest(searchUrl, HttpAccept.Html);
-
-            yield return request;
-        }
-
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
-        {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            return pageableRequests;
-        }
-
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
-        {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            return pageableRequests;
-        }
-
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
-        {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories));
-
-            return pageableRequests;
-        }
-
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
-        {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            return pageableRequests;
-        }
-
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
-        {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
-        }
-
-        public Func<IDictionary<string, string>> GetCookies { get; set; }
-        public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
-    }
-
-    public class ShowRSSParser : IParseIndexerResponse
-    {
-        private readonly NoAuthTorrentBaseSettings _settings;
-        private string BrowseUrl => _settings.BaseUrl + "browse/";
-
-        public ShowRSSParser(NoAuthTorrentBaseSettings settings)
-        {
-            _settings = settings;
-        }
-
-        public IList<ReleaseInfo> ParseResponse(IndexerResponse indexerResponse)
-        {
-            var torrentInfos = new List<ReleaseInfo>();
-
-            var xmlDoc = new XmlDocument();
-            xmlDoc.LoadXml(indexerResponse.Content);
-            foreach (XmlNode node in xmlDoc.GetElementsByTagName("item"))
-            {
-                var title = node.SelectSingleNode(".//*[local-name()='raw_title']").InnerText;
-
-                // TODO: Make sure we don't return all sorts of trash
-                //if (!query.MatchQueryStringAND(title))
-                //{
-                //    continue;
-                //}
-                var category = title.Contains("720p") || title.Contains("1080p") ?
-                    NewznabStandardCategory.TVHD :
-                    NewznabStandardCategory.TVSD;
-
-                var magnetUri = node.SelectSingleNode("link")?.InnerText;
-                var publishDate = DateTime.Parse(node.SelectSingleNode("pubDate").InnerText, CultureInfo.InvariantCulture);
-                var infoHash = node.SelectSingleNode(".//*[local-name()='info_hash']").InnerText;
-                var details = BrowseUrl + node.SelectSingleNode(".//*[local-name()='show_id']").InnerText;
-
-                var release = new TorrentInfo
-                {
-                    Title = title,
-                    InfoUrl = details,
-                    Categories = new List<IndexerCategory> { category },
-                    Guid = magnetUri,
-                    PublishDate = publishDate,
-                    InfoHash = infoHash,
-                    MagnetUrl = magnetUri,
-                    Size = 512,
-                    Seeders = 1,
-                    Peers = 2,
-                    DownloadVolumeFactor = 0,
-                    UploadVolumeFactor = 1
-                };
-
-                torrentInfos.Add(release);
-            }
-
-            return torrentInfos.ToArray();
-        }
-
-        public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
-    }
-}
--- a/src/NzbDrone.Core/Prowlarr.Core.csproj
+++ b/src/NzbDrone.Core/Prowlarr.Core.csproj
@@ -3,14 +3,14 @@
    <TargetFrameworks>net6.0</TargetFrameworks>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="AngleSharp.Xml" Version="0.16.0" />
+    <PackageReference Include="AngleSharp.Xml" Version="0.17.0" />
    <PackageReference Include="Dapper" Version="2.0.123" />
    <PackageReference Include="FluentMigrator.Runner" Version="3.3.2" />
    <PackageReference Include="MailKit" Version="3.1.1" />
    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
    <PackageReference Include="NLog.Targets.Syslog" Version="6.0.3" />
    <PackageReference Include="Npgsql" Version="5.0.11" />
-    <PackageReference Include="System.Memory" Version="4.5.4" />
+    <PackageReference Include="System.Memory" Version="4.5.5" />
    <PackageReference Include="System.ServiceModel.Syndication" Version="6.0.0" />
    <PackageReference Include="FluentMigrator.Runner.SQLite" Version="3.3.2" />
    <PackageReference Include="FluentMigrator.Runner.Postgres" Version="3.3.2" />
@@ -20,10 +20,10 @@
    <PackageReference Include="TinyTwitter" Version="1.1.2" />
    <PackageReference Include="Kveer.XmlRPC" Version="1.1.1" />
    <PackageReference Include="System.Data.SQLite.Core.Servarr" Version="1.0.115.5-18" />
-    <PackageReference Include="System.Text.Json" Version="6.0.2" />
+    <PackageReference Include="System.Text.Json" Version="6.0.5" />
    <PackageReference Include="MonoTorrent" Version="2.0.5" />
    <PackageReference Include="YamlDotNet" Version="11.2.1" />
-    <PackageReference Include="AngleSharp" Version="0.16.1" />
+    <PackageReference Include="AngleSharp" Version="0.17.1" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\NzbDrone.Common\Prowlarr.Common.csproj" />
--- a/src/NzbDrone.Host/Prowlarr.Host.csproj
+++ b/src/NzbDrone.Host/Prowlarr.Host.csproj
@@ -7,7 +7,7 @@
    <PackageReference Include="NLog.Extensions.Logging" Version="1.7.4" />
    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.3.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.3.1" />
    <PackageReference Include="DryIoc.dll" Version="4.8.8" />
    <PackageReference Include="DryIoc.Microsoft.DependencyInjection" Version="5.1.0" />
  </ItemGroup>
--- a/src/NzbDrone.Integration.Test/Prowlarr.Integration.Test.csproj
+++ b/src/NzbDrone.Integration.Test/Prowlarr.Integration.Test.csproj
@@ -4,7 +4,7 @@
    <OutputType>Library</OutputType>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.6" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\NzbDrone.Test.Common\Prowlarr.Test.Common.csproj" />
--- a/yarn.lock
+++ b/yarn.lock
@@ -1150,15 +1150,15 @@
    "@jridgewell/resolve-uri" "^3.0.3"
    "@jridgewell/sourcemap-codec" "^1.4.10"

-"@microsoft/signalr@6.0.3":
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/@microsoft/signalr/-/signalr-6.0.3.tgz#9904efd48cd488e3c1c80930ff9fbb3c9f55895d"
-  integrity sha512-wWGVC2xi8OxNjyir8iQWuyxWHy3Dkakk2Q3VreCE7pDzFAgZ4pId6abJlRPMVIQxkUvUGc8knMW5l3sv2bJ/yw==
+"@microsoft/signalr@6.0.6":
+  version "6.0.6"
+  resolved "https://registry.yarnpkg.com/@microsoft/signalr/-/signalr-6.0.6.tgz#6ba53623a64df64a80126694db4e37146647d3fe"
+  integrity sha512-3dTLtgwEXUeE9R/3NZQslh1B2WbppeHVXdnpvSZc7Yz+tP5Yiw3KCVUHwKUVnYmd9/2v3DaI/pvCdihrss49zA==
  dependencies:
    abort-controller "^3.0.0"
    eventsource "^1.0.7"
    fetch-cookie "^0.11.0"
-    node-fetch "^2.6.1"
+    node-fetch "^2.6.7"
    ws "^7.4.5"

 "@mrmlnc/readdir-enhanced@^2.2.1":
@@ -4774,7 +4774,7 @@ no-case@^3.0.4:
    lower-case "^2.0.2"
    tslib "^2.0.3"

-node-fetch@^2.6.1:
+node-fetch@^2.6.7:
  version "2.6.7"
  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
Author	SHA1	Message	Date
Qstick	d52516b700	Update Sentry to 3.18.0	2022-06-25 18:26:37 -05:00
Qstick	326a7b5e16	Update Swashbuckle to 6.3.1	2022-06-25 18:26:07 -05:00
Qstick	313a0b459a	Bump dotnet to 6.0.6	2022-06-25 18:24:44 -05:00
Qstick	2ffe88bf6a	Update AngleSharp to 0.17.0	2022-06-25 18:22:28 -05:00
Qstick	a311d13805	Remove ShowRSS C# Implementation	2022-06-25 18:06:40 -05:00
Qstick	0e2d15cb73	Swallow HTTP issues on analytics call	2022-06-25 16:19:55 -05:00
Qstick	d1949d24e0	Fix NullRef in analytics service	2022-06-25 16:12:50 -05:00
Qstick	cdb1f163f8	Bump version to 0.4.1	2022-06-25 13:05:54 -05:00