Improve UX of indexer urls error logging

ignore-downstream

Co-authored-by: Jeremi Florczyk <j.m.florczyk@gmail.com>
Co-authored-by: Marcin <ml.cichy@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/pl/
Translation: Servarr/Prowlarr

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -4,18 +4,11 @@ labels: ['Type: Bug', 'Status: Needs Triage']
 body:
 - type: checkboxes
   attributes:
-    label: I attest that there is not an existing issue for this?
+    label: Is there an existing issue for this?
     description: Please search to see if an open or closed issue already exists for the bug you encountered. If a bug exists and is closed note that it may only be fixed in an unstable branch.
     options:
     - label: I have searched the existing open and closed issues
       required: true
-- type: checkboxes
-  attributes:
-    label: I attest this is not related to a Cardigann YML Indexer.
-    description: Please search to see if this is for a tracker [that is yml-based (Cardigann)](https://github.com/Prowlarr/indexers) these are synced to Prowlarr/Indexers from Jackett/Jackett.
-    options:
-    - label: I confirm this is not related to a Cardigann YML Indexer
-      required: true
 - type: textarea
   attributes:
     label: Current Behavior
@@ -80,8 +73,8 @@ body:
     required: true
 - type: checkboxes
   attributes:
-    label: I attest that Trace Logs have been provided as applicable. Reports will be closed if the required logs are not provided.
+    label: Trace Logs have been provided as applicable. Reports may be closed if the required logs are not provided.
     description: Trace logs are generally required for all bug reports and contain `trace`. Info logs are invalid for bug reports and do not contain `debug` nor `trace`
     options:
-    - label: I attest that I have read and followed the steps in the wiki link above and provided the required trace logs - the logs contain `trace` - that are relevant and show this issue.
+    - label: I have read and followed the steps in the wiki link above and provided the required trace logs - the logs contain `trace` - that are relevant and show this issue.
       required: true

azure-pipelines.yml

@@ -9,7 +9,7 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '2.1.2'
+  majorVersion: '2.0.5'
   minorVersion: $[counter('minorVersion', 1)]
   prowlarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(prowlarrVersion)'

frontend/src/Indexer/Add/AddIndexerModalContent.css

@@ -76,6 +76,10 @@
   background-color: var(--hoverBackgroundColor);
 }
 
+.filterRowCollapsed {
+  display: none !important;
+}
+
 @media only screen and (max-width: $breakpointSmall) {
   .filterInput {
     margin-bottom: 8px;
@@ -98,10 +102,6 @@
     background-color: var(--cardBackgroundColor);
   }
 
-  .filterRowCollapsed {
-    display: none !important;
-  }
-
   .filterContainer {
     margin-right: 0;
     margin-bottom: 8px;

frontend/src/Indexer/Add/AddIndexerModalContent.tsx

@@ -27,6 +27,7 @@ import {
 } from 'Store/Actions/indexerActions';
 import createAllIndexersSelector from 'Store/Selectors/createAllIndexersSelector';
 import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
+import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
 import { SortCallback } from 'typings/callbacks';
 import sortByProp from 'Utilities/Array/sortByProp';
 import getErrorMessage from 'Utilities/Object/getErrorMessage';
@@ -113,7 +114,8 @@ function createAddIndexersSelector() {
   return createSelector(
     createClientSideCollectionSelector('indexers.schema'),
     createAllIndexersSelector(),
-    (indexers: IndexerAppState, allIndexers) => {
+    createDimensionsSelector(),
+    (indexers: IndexerAppState, allIndexers, dimensions) => {
       const { isFetching, isPopulated, error, items, sortDirection, sortKey } =
         indexers;
 
@@ -132,6 +134,7 @@ function createAddIndexersSelector() {
         indexers: indexerList,
         sortKey,
         sortDirection,
+        isSmallScreen: dimensions.isSmallScreen,
       };
     }
   );
@@ -145,8 +148,15 @@ interface AddIndexerModalContentProps {
 function AddIndexerModalContent(props: AddIndexerModalContentProps) {
   const { onSelectIndexer, onModalClose } = props;
 
-  const { isFetching, isPopulated, error, indexers, sortKey, sortDirection } =
-    useSelector(createAddIndexersSelector());
+  const {
+    isFetching,
+    isPopulated,
+    error,
+    indexers,
+    sortKey,
+    sortDirection,
+    isSmallScreen,
+  } = useSelector(createAddIndexersSelector());
   const dispatch = useDispatch();
 
   const [filter, setFilter] = useState('');
@@ -154,7 +164,7 @@ function AddIndexerModalContent(props: AddIndexerModalContentProps) {
   const [filterLanguages, setFilterLanguages] = useState<string[]>([]);
   const [filterPrivacyLevels, setFilterPrivacyLevels] = useState<string[]>([]);
   const [filterCategories, setFilterCategories] = useState<number[]>([]);
-  const [isFiltersCollapsed, setIsFiltersCollapsed] = useState(true);
+  const [isFiltersCollapsed, setIsFiltersCollapsed] = useState(isSmallScreen);
 
   useEffect(
     () => {

src/NzbDrone.Core.Test/IndexerTests/BroadcastheNetTests/BroadcastheNetRequestGeneratorFixture.cs

@@ -140,7 +140,7 @@ namespace NzbDrone.Core.Test.IndexerTests.BroadcastheNetTests
             query.Tvrage.Should().BeNull();
             query.Search.Should().BeNull();
             query.Category.Should().Be("Episode");
-            query.Name.Should().Be("2023.01.03%");
+            query.Name.Should().Be("2023.01.03");
         }
 
         [Test]
@@ -275,7 +275,7 @@ namespace NzbDrone.Core.Test.IndexerTests.BroadcastheNetTests
             query.Tvrage.Should().BeNull();
             query.Search.Should().Be("The%Late%Show%with%Stephen%Colbert");
             query.Category.Should().Be("Episode");
-            query.Name.Should().Be("2023.01.03%");
+            query.Name.Should().Be("2023.01.03");
         }
 
         private static BroadcastheNetTorrentQuery ParseTorrentQueryFromRequest(HttpRequest httpRequest)

src/NzbDrone.Core/Indexers/Definitions/BroadcastheNet/BroadcastheNetRequestGenerator.cs

@@ -74,7 +74,7 @@ namespace NzbDrone.Core.Indexers.BroadcastheNet
             else if (DateTime.TryParseExact($"{searchCriteria.Season} {searchCriteria.Episode}", "yyyy MM/dd", CultureInfo.InvariantCulture, DateTimeStyles.None, out var showDate))
             {
                 // Daily Episode
-                parameters.Name = showDate.ToString("yyyy.MM.dd", CultureInfo.InvariantCulture) + "%";
+                parameters.Name = showDate.ToString("yyyy.MM.dd", CultureInfo.InvariantCulture);
                 parameters.Category = "Episode";
                 pageableRequests.Add(GetPagedRequests(parameters, btnResults, btnOffset));
             }

src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannParser.cs

@@ -426,12 +426,6 @@ namespace NzbDrone.Core.Indexers.Definitions.Cardigann
                 {
                     ((TorrentInfo)c).InfoHash = MagnetLinkBuilder.GetInfoHashFromMagnet(((TorrentInfo)c).MagnetUrl);
                 }
-
-                // Add Internal flag if description starts with Internal
-                if (c.Description.IsNotNullOrWhiteSpace() && c.Description.StartsWith("Internal"))
-                {
-                    c.IndexerFlags.Add(IndexerFlag.Internal);
-                }
             });
 
             _logger.Trace("Cardigann ({0}): Got {1} releases", _definition.Id, releases.Count);

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

@@ -11,17 +11,10 @@ namespace NzbDrone.Core.Indexers.Definitions.FileList;
 public class FileList : TorrentIndexerBase<FileListSettings>
 {
     public override string Name => "FileList.io";
-    public override string[] IndexerUrls => new[]
-    {
-        "https://filelist.io/",
-        "https://thefl.org/",
-    };
+    public override string[] IndexerUrls => new[] { "https://filelist.io/" };
     public override string[] LegacyUrls => new[]
     {
         "https://filelist.io",
-        "https://filelist.ro/",
-        "http://filelist.ro/",
-        "http://flro.org/",
         "https://flro.org/"
     };
     public override string Description => "FileList (FL) is a ROMANIAN Private Torrent Tracker for 0DAY / GENERAL";
@@ -112,7 +105,6 @@ public class FileList : TorrentIndexerBase<FileListSettings>
         caps.Categories.AddCategoryMapping(27, NewznabStandardCategory.TVUHD, "Seriale 4K");
         caps.Categories.AddCategoryMapping(28, NewznabStandardCategory.MoviesForeign, "RO Dubbed");
         caps.Categories.AddCategoryMapping(28, NewznabStandardCategory.TVForeign, "RO Dubbed");
-        caps.Categories.AddCategoryMapping(31, NewznabStandardCategory.TVForeign, "K-Drama");
 
         return caps;
     }

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

@@ -100,7 +100,7 @@ namespace NzbDrone.Core.Indexers.Newznab
                 yield return GetDefinition("Miatrix", GetSettings("https://www.miatrix.com"), categories: new[] { 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000 });
                 yield return GetDefinition("Newz69", GetSettings("https://newz69.keagaming.com"), categories: new[] { 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000 });
                 yield return GetDefinition("NinjaCentral", GetSettings("https://ninjacentral.co.za"), categories: new[] { 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000 });
-                yield return GetDefinition("Nzb.life", GetSettings("https://api.nzb.life"), categories: new[] { 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000 });
+                yield return GetDefinition("Nzb.su", GetSettings("https://api.nzb.su"), categories: new[] { 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000 });
                 yield return GetDefinition("NZBCat", GetSettings("https://nzb.cat"), categories: new[] { 1000, 2000, 3000, 4000, 5000, 6000, 7000 });
                 yield return GetDefinition("NZBFinder", GetSettings("https://nzbfinder.ws"), categories: new[] { 2000, 3000, 5000, 6000, 7000 });
                 yield return GetDefinition("NZBgeek", GetSettings("https://api.nzbgeek.info"), categories: new[] { 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000 });

src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabSettings.cs

@@ -9,10 +9,10 @@ namespace NzbDrone.Core.Indexers.Newznab
 {
     public class NewznabSettingsValidator : AbstractValidator<NewznabSettings>
     {
-        private static readonly string[] ApiKeyAllowList =
+        private static readonly string[] ApiKeyWhiteList =
         {
             "nzbs.org",
-            "nzb.life",
+            "nzb.su",
             "dognzb.cr",
             "nzbplanet.net",
             "nzbid.org",
@@ -22,7 +22,7 @@ namespace NzbDrone.Core.Indexers.Newznab
 
         private static bool ShouldHaveApiKey(NewznabSettings settings)
         {
-            return settings.BaseUrl != null && ApiKeyAllowList.Any(c => settings.BaseUrl.ToLowerInvariant().Contains(c));
+            return settings.BaseUrl != null && ApiKeyWhiteList.Any(c => settings.BaseUrl.ToLowerInvariant().Contains(c));
         }
 
         private static readonly Regex AdditionalParametersRegex = new Regex(@"(&.+?\=.+?)+", RegexOptions.Compiled);

src/NzbDrone.Core/Indexers/Definitions/Torznab/TorznabSettings.cs

@@ -11,11 +11,11 @@ namespace NzbDrone.Core.Indexers.Torznab
 {
     public class TorznabSettingsValidator : AbstractValidator<TorznabSettings>
     {
-        private static readonly string[] ApiKeyAllowList = Array.Empty<string>();
+        private static readonly string[] ApiKeyWhiteList = Array.Empty<string>();
 
         private static bool ShouldHaveApiKey(TorznabSettings settings)
         {
-            return settings.BaseUrl != null && ApiKeyAllowList.Any(c => settings.BaseUrl.ToLowerInvariant().Contains(c));
+            return settings.BaseUrl != null && ApiKeyWhiteList.Any(c => settings.BaseUrl.ToLowerInvariant().Contains(c));
         }
 
         private static readonly Regex AdditionalParametersRegex = new Regex(@"(&.+?\=.+?)+", RegexOptions.Compiled);

src/NzbDrone.Core/Localization/Core/cs.json

@@ -491,7 +491,7 @@
     "EnableRssHelpText": "Povolit kanál RSS pro indexer",
     "DeleteApplication": "Odstranit aplikaci",
     "DeleteSelectedApplications": "Odstranit vybrané aplikace",
-    "DeleteSelectedIndexers": "Smazat vybrané indexery",
+    "DeleteSelectedIndexers": "Odstranit vybrané indexery",
     "DevelopmentSettings": "Nastavení pro vývoj",
     "DisabledUntil": "Zakázáno do",
     "DownloadClientCategory": "Kategorie klienta pro stahování",
@@ -639,10 +639,5 @@
     "DownloadClientUTorrentProviderMessage": "uTorrent má historii zahrnování kryptoměnových těžařů, malwaru a reklam, důrazně vám doporučujeme zvolit jiného klienta.",
     "IndexerSettingsBaseUrlHelpText": "Vyberte, jakou základní URL bude {appName} používat pro požadavky na web",
     "IndexerSettingsPackSeedTimeIndexerHelpText": "Doba, po kterou by měl být balíček (sezóna nebo diskografie) torrentu seedován před zastavením, prázdné pole znamená výchozí nastavení aplikace",
-    "PackSeedTimeHelpText": "Doba, po kterou by měl být balíček (sezóna nebo diskografie) torrentu seedován před zastavením, prázdné pole znamená výchozí nastavení aplikace",
-    "OnApplicationUpdateHelpText": "Při aktualizaci aplikace",
-    "SeedTime": "Doba sdílení",
-    "OnHealthRestoredHelpText": "Při obnovení zdraví",
-    "SeedRatio": "Poměr sdílení",
-    "ThemeHelpText": "Změnit motiv UI, možnost „Auto“ kopíruje nastavení OS pro výběr tmavého nebo světlého režimu. Inspirováno {inspiredBy}."
+    "PackSeedTimeHelpText": "Doba, po kterou by měl být balíček (sezóna nebo diskografie) torrentu seedován před zastavením, prázdné pole znamená výchozí nastavení aplikace"
 }

src/NzbDrone.Core/Localization/Core/nl.json

@@ -149,7 +149,7 @@
     "FullSync": "Volledige synchronisatie",
     "General": "Algemeen",
     "GeneralSettings": "Algemene Instellingen",
-    "GeneralSettingsSummary": "Poort, SSL, gebruikersnaam/wachtwoord, proxy, analytics en updates",
+    "GeneralSettingsSummary": "Poort, SSL, gebruikersnaam/wachtwoord, proxy, statistieken en updates",
     "GrabReleases": "Uitgave Ophalen",
     "Grabbed": "Opgehaalde",
     "Grabs": "Gegrepen",

src/NzbDrone.Core/Localization/Core/pl.json

@@ -146,7 +146,7 @@
     "FocusSearchBox": "Zaznacz pole wyszukiwania",
     "Folder": "Teczka",
     "ForMoreInformationOnTheIndividualDownloadClients": "Aby uzyskać więcej informacji na temat poszczególnych klientów pobierania, kliknij przyciski informacyjne.",
-    "General": "Ogólne",
+    "General": "Generał",
     "GeneralSettings": "Ustawienia główne",
     "GeneralSettingsSummary": "Port, SSL, nazwa użytkownika / hasło, proxy, analizy i aktualizacje",
     "Grabbed": "Złapał",
@@ -279,7 +279,7 @@
     "DeleteTagMessageText": "Czy na pewno chcesz usunąć tag '{label}'?",
     "Details": "Szczegóły",
     "Donations": "Darowizny",
-    "DownloadClients": "Klienci pobierania",
+    "DownloadClients": "Pobierz klientów",
     "DownloadClientSettings": "Pobierz ustawienia klienta",
     "IncludeHealthWarningsHelpText": "Uwzględnij ostrzeżenia zdrowotne",
     "Indexer": "Indeksator",