Fixed: Fix NullRef in Subtitle Service due to #4924

(cherry picked from commit 89ee7d4452ae3b476e24aede89b668a3df2344fc)

azure-pipelines.yml

@@ -9,7 +9,7 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '4.2.1'
+  majorVersion: '4.2.2'
   minorVersion: $[counter('minorVersion', 2000)]
   radarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(radarrVersion)'

frontend/src/Store/Actions/movieActions.js

@@ -116,7 +116,7 @@ export const filterPredicates = {
     const predicate = filterTypePredicates[type];
     const { collection } = item;
 
-    return predicate(collection ? collection.name : '', filterValue);
+    return predicate(collection ? collection.title : '', filterValue);
   },
 
   originalLanguage: function(item, filterValue, type) {

frontend/src/Store/Actions/movieIndexActions.js

@@ -341,8 +341,8 @@ export const defaultState = {
         const collectionList = items.reduce((acc, movie) => {
           if (movie.collection) {
             acc.push({
-              id: movie.collection.name,
+              id: movie.collection.title,
-              name: movie.collection.name
+              name: movie.collection.title
             });
           }
 

src/NzbDrone.Common/Instrumentation/CleanseLogMessage.cs

@@ -18,7 +18,7 @@ namespace NzbDrone.Common.Instrumentation
                 new Regex(@"iptorrents\.com/[/a-z0-9?&;]*?(?:[?&;](u|tp)=(?<secret>[^&=;]+?))+(?= |;|&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                 new Regex(@"/fetch/[a-z0-9]{32}/(?<secret>[a-z0-9]{32})", RegexOptions.Compiled),
                 new Regex(@"getnzb.*?(?<=\?|&)(r)=(?<secret>[^&=]+?)(?= |&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
-                new Regex(@"(?<=[?& ;])[^=]*?(_?(?<!use|get_)token|username|passwo?rd)=(?<secret>[^&=]+?)(?= |&|$|;)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
+                new Regex(@"\b[^;=]*?(_?(?<!use|get_)token|username|passwo?rd)=(?<secret>[^&=]+?)(?= |&|$|;)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
 
                 // Trackers Announce Keys; Designed for Qbit Json; should work for all in theory
                 new Regex(@"announce(\.php)?(/|%2f|%3fpasskey%3d)(?<secret>[a-z0-9]{16,})|(?<secret>[a-z0-9]{16,})(/|%2f)announce"),

src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/EditionTagsFixture.cs

@@ -0,0 +1,67 @@
+using System.Collections.Generic;
+using System.Linq;
+using FizzWare.NBuilder;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.CustomFormats;
+using NzbDrone.Core.MediaFiles;
+using NzbDrone.Core.Movies;
+using NzbDrone.Core.Organizer;
+using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
+{
+    [TestFixture]
+    public class EditionTagsFixture : CoreTest<FileNameBuilder>
+    {
+        private Movie _movie;
+        private MovieFile _movieFile;
+        private NamingConfig _namingConfig;
+
+        [SetUp]
+        public void Setup()
+        {
+            _movie = Builder<Movie>
+                .CreateNew()
+                .With(s => s.Title = "South Park")
+                .Build();
+
+            _movieFile = new MovieFile { Quality = new QualityModel(), ReleaseGroup = "SonarrTest" };
+
+            _namingConfig = NamingConfig.Default;
+            _namingConfig.RenameMovies = true;
+
+            Mocker.GetMock<INamingConfigService>()
+                  .Setup(c => c.GetConfig()).Returns(_namingConfig);
+
+            Mocker.GetMock<IQualityDefinitionService>()
+                .Setup(v => v.Get(Moq.It.IsAny<Quality>()))
+                .Returns<Quality>(v => Quality.DefaultQualityDefinitions.First(c => c.Quality == v));
+
+            Mocker.GetMock<ICustomFormatService>()
+                .Setup(v => v.All())
+                .Returns(new List<CustomFormat>());
+        }
+
+        [Test]
+        public void should_add_edition_tag()
+        {
+            _movieFile.Edition = "Uncut";
+            _namingConfig.StandardMovieFormat = "{Movie Title} [{Edition Tags}]";
+
+            Subject.BuildFileName(_movie, _movieFile)
+                   .Should().Be("South Park [Uncut]");
+        }
+
+        [TestCase("{Movie Title} {edition-{Edition Tags}}")]
+        public void should_conditional_hide_edition_tags_in_plex_format(string movieFormat)
+        {
+            _movieFile.Edition = "";
+            _namingConfig.StandardMovieFormat = movieFormat;
+
+            Subject.BuildFileName(_movie, _movieFile)
+                   .Should().Be("South Park");
+        }
+    }
+}

src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/IdFixture.cs

@@ -1,4 +1,4 @@
-using FizzWare.NBuilder;
+using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
 using NUnit.Framework.Internal;
@@ -47,5 +47,25 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
             Subject.GetMovieFolder(_movie)
                    .Should().Be($"Movie Title ({_movie.TmdbId})");
         }
+
+        [Test]
+        public void should_add_imdb_tag()
+        {
+            _namingConfig.MovieFolderFormat = "{Movie Title} {imdb-{ImdbId}}";
+
+            Subject.GetMovieFolder(_movie)
+                   .Should().Be($"Movie Title {{imdb-{_movie.ImdbId}}}");
+        }
+
+        [Test]
+        public void should_skip_imdb_tag_if_null()
+        {
+            _namingConfig.MovieFolderFormat = "{Movie Title} {imdb-{ImdbId}}";
+
+            _movie.ImdbId = null;
+
+            Subject.GetMovieFolder(_movie)
+                   .Should().Be($"Movie Title");
+        }
     }
 }

src/NzbDrone.Core.Test/ParserTests/LanguageParserFixture.cs

@@ -342,6 +342,16 @@ namespace NzbDrone.Core.Test.ParserTests
             result.Languages.Should().BeEquivalentTo(Language.Bengali);
         }
 
+        [TestCase("Movie.Title.1994.HDTV.x264.SK-iCZi")]
+        [TestCase("Movie.Title.2019.1080p.HDTV.x265.iNTERNAL.SK-iCZi")]
+        [TestCase("Movie.Title.2018.SLOVAK.DUAL.2160p.UHD.BluRay.x265-iCZi")]
+        [TestCase("Movie.Title.1990.SLOVAK.HDTV.x264-iCZi")]
+        public void should_parse_language_slovak(string postTitle)
+        {
+            var result = Parser.Parser.ParseMovieTitle(postTitle);
+            result.Languages.Should().BeEquivalentTo(Language.Slovak);
+        }
+
         [TestCase("Movie.Title.en.sub")]
         [TestCase("Movie Title.eng.sub")]
         [TestCase("Movie.Title.eng.forced.sub")]

src/NzbDrone.Core/CustomFormats/Specifications/SizeSpecification.cs

@@ -10,7 +10,7 @@ namespace NzbDrone.Core.CustomFormats
     {
         public SizeSpecificationValidator()
         {
-            RuleFor(c => c.Min).GreaterThan(0);
+            RuleFor(c => c.Min).GreaterThanOrEqualTo(0);
             RuleFor(c => c.Max).GreaterThan(c => c.Min);
         }
     }

src/NzbDrone.Core/Extras/Subtitles/SubtitleFile.cs

@@ -5,6 +5,11 @@ namespace NzbDrone.Core.Extras.Subtitles
 {
     public class SubtitleFile : ExtraFile
     {
+        public SubtitleFile()
+        {
+            LanguageTags = new List<string>();
+        }
+
         public Language Language { get; set; }
     }
 }

src/NzbDrone.Core/Languages/Language.cs

@@ -105,6 +105,7 @@ namespace NzbDrone.Core.Languages
         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 Slovak => new Language(35, "Slovak");
         public static Language Any => new Language(-1, "Any");
         public static Language Original => new Language(-2, "Original");
 
@@ -149,6 +150,7 @@ namespace NzbDrone.Core.Languages
                     Ukrainian,
                     Persian,
                     Bengali,
+                    Slovak,
                     Any,
                     Original
                 };

src/NzbDrone.Core/Localization/Core/de.json

@@ -1142,5 +1142,6 @@
     "UnableToLoadCollections": "Sammlungen können nicht geladen werden",
     "InstanceName": "Instanzname",
     "InstanceNameHelpText": "Instanzname im Browser-Tab und für Syslog-Anwendungsname",
-    "RottenTomatoesRating": "Tomato Bewertung"
+    "RottenTomatoesRating": "Tomato Bewertung",
+    "TotalMovies": "Filme insgesamt"
 }

src/NzbDrone.Core/Localization/Core/ro.json

@@ -44,7 +44,7 @@
     "Activity": "Activitate",
     "Actions": "Acțiuni",
     "About": "Despre",
-    "IndexerStatusCheckAllClientMessage": "Niciun indexator nu este disponibil datorită eșuărilor",
+    "IndexerStatusCheckAllClientMessage": "Niciun indexator nu este disponibil datorită erorilor",
     "IndexersSettingsSummary": "Restricții pentru indexatori și apariții",
     "IndexerSearchCheckNoInteractiveMessage": "Niciun indexator cu Căutare interactivă nu este activ, Radarr nu va afișa niciun rezultat de căutare interactivă",
     "IndexerSearchCheckNoAvailableIndexersMessage": "Toți indexatorii ce suportă căutare sunt indisponibili temporar datorită erorilor",
@@ -62,11 +62,11 @@
     "Ignored": "Ignorat",
     "iCalLink": "Legătură iCal",
     "Host": "Gazdă",
-    "History": "Istorie",
+    "History": "Istoric",
     "HideAdvanced": "Ascunde Avansat",
     "Health": "Sănătate",
     "GrabSelected": "Prinderea selectată",
-    "Grabbed": "Prins",
+    "Grabbed": "În curs de descărcare",
     "Genres": "Genuri",
     "GeneralSettingsSummary": "Port, SSL, utilizator/parolă, proxy, statistici și actualizări",
     "General": "General",
@@ -76,7 +76,7 @@
     "Folder": "Dosar",
     "Filter": "Filtru",
     "Files": "Fișiere",
-    "Filename": "Numele Fișierului",
+    "Filename": "Numele fișierului",
     "FileManagement": "Administrarea de fișiere",
     "FailedDownloadHandling": "Procesarea descărcării a eșuat",
     "Failed": "Eșuat",
@@ -84,7 +84,7 @@
     "Events": "Evenimente",
     "Edit": "Editează",
     "Downloaded": "Descărcat",
-    "DownloadClientStatusCheckSingleClientMessage": "Clienții de descărcare sunt indisponibili datorită erorii: {0}",
+    "DownloadClientStatusCheckSingleClientMessage": "Clienții de descărcare sunt indisponibili datorită erorilor: {0}",
     "DownloadClientStatusCheckAllClientMessage": "Toți clienții de descărcare sunt indisponibili datorită erorilor",
     "ProfilesSettingsSummary": "Calitate, Limbă și Profile de Întârziere",
     "Profiles": "Profile",
@@ -143,9 +143,9 @@
     "Language": "Limbă",
     "KeyboardShortcuts": "Scurtături din tastatură",
     "Info": "Info",
-    "IndexerStatusCheckSingleClientMessage": "Indexator indisponibil datorită erorilor: {0}",
+    "IndexerStatusCheckSingleClientMessage": "Indexatoare indisponibile datorită erorilor: {0}",
     "ImportExistingMovies": "Importă Filme Existente",
-    "HealthNoIssues": "Nicio problemă în configurare",
+    "HealthNoIssues": "Nicio problemă de configurare",
     "HardlinkCopyFiles": "Hardlink/Copiază Fișiere",
     "Extension": "Extensie",
     "Error": "Eroare",
@@ -168,7 +168,7 @@
     "QualityProfile": "Profil de Calitate",
     "QualityDefinitions": "Definiții de calitate",
     "Quality": "Calitate",
-    "PtpOldSettingsCheckMessage": "Următorul indexer PassThePopcorn are setări depreciate și ar trebui actualizate: {0}",
+    "PtpOldSettingsCheckMessage": "Următoarele indexatoare PassThePopcorn au setări depreciate și ar trebui actualizate: {0}",
     "ProxyCheckResolveIpMessage": "Nu am putut găsi adresa IP pentru Hostul Proxy Configurat {0}",
     "ProxyCheckFailedToTestMessage": "Nu am putut testa proxy: {0}",
     "ProxyCheckBadRequestMessage": "Testul proxy a eșuat. StatusCode: {0}",
@@ -260,7 +260,7 @@
     "Queue": "Coadă",
     "QualitySettingsSummary": "Calitate - mărimi și denumiri",
     "AutoRedownloadFailedHelpText": "Căutați automat și încercați să descărcați o versiune diferită",
-    "BackupIntervalHelpText": "Interval între copiile de rezervă automate",
+    "BackupIntervalHelpText": "Interval între crearea copiile de siguranță automate",
     "ApplyTagsHelpTexts1": "Cum se aplică etichete filmelor selectate",
     "CustomFormatUnknownCondition": "Stare necunoscută pentru formatul personalizat „{0}”",
     "QualitySettings": "Setări de calitate",
@@ -337,7 +337,7 @@
     "ThisCannotBeCancelled": "Acest lucru nu poate fi anulat odată pornit fără a reporni Radarr.",
     "TorrentDelayHelpText": "Întârziați în câteva minute pentru a aștepta înainte de a apuca un torent",
     "Trigger": "Declanșator",
-    "UnableToAddANewIndexerPleaseTryAgain": "Imposibil de adăugat un nou indexer, încercați din nou.",
+    "UnableToAddANewIndexerPleaseTryAgain": "Nu se poate adăuga un nou indexator, vă rugăm să încercați din nou.",
     "UnableToAddANewNotificationPleaseTryAgain": "Imposibil de adăugat o nouă notificare, încercați din nou.",
     "UnableToAddANewRemotePathMappingPleaseTryAgain": "Imposibil de adăugat o nouă mapare a căilor la distanță, încercați din nou.",
     "UnableToImportCheckLogs": "Descărcat - Imposibil de importat: verificați jurnalele pentru detalii",
@@ -369,7 +369,7 @@
     "Importing": "Importând",
     "AcceptConfirmationModal": "Acceptați Modul de confirmare",
     "LastExecution": "Ultima executare",
-    "DBMigration": "Migrarea DB",
+    "DBMigration": "Migrarea BD",
     "Manual": "Manual",
     "OnHealthIssue": "Cu privire la problema sănătății",
     "OnImport": "La import",
@@ -388,8 +388,8 @@
     "AvailabilityDelayHelpText": "Suma de timp înainte sau după data disponibilă pentru căutarea filmului",
     "Announced": "Anunțat",
     "AddRemotePathMapping": "Adăugați maparea căilor la distanță",
-    "BackupRetentionHelpText": "Copiile de rezervă automate mai vechi de perioada de păstrare vor fi curățate automat",
+    "BackupRetentionHelpText": "Copiile de siguranță automate mai vechi decât perioada de păstrare vor fi curățate automat",
-    "Backups": "Copii de rezervă",
+    "Backups": "Copii de siguranță",
     "BeforeUpdate": "Înainte de actualizare",
     "BindAddress": "Adresa de legare",
     "CancelProcessing": "Anulați procesarea",
@@ -404,7 +404,7 @@
     "DeleteMovieFolderLabel": "Ștergeți dosarul filmului",
     "DockerUpdater": "actualizați containerul de andocare pentru a primi actualizarea",
     "EditGroups": "Editați grupurile",
-    "EditIndexer": "Editați Indexer",
+    "EditIndexer": "Editați indexator",
     "Enabled": "Activat",
     "ExcludeMovie": "Excludeți filmul",
     "ExcludeTitle": "Excludeți {0}? Acest lucru îl va împiedica pe Radarr să adauge automat prin sincronizarea listei.",
@@ -413,7 +413,7 @@
     "HttpHttps": "HTTP (S)",
     "ICalFeed": "Feed iCal",
     "ICalHttpUrlHelpText": "Copiați această adresă URL către clienții dvs. sau faceți clic pentru a vă abona dacă browserul dvs. acceptă webcal",
-    "Add": "Adăuga",
+    "Add": "Adaugă",
     "AddCustomFormat": "Adăugați format personalizat",
     "AddDelayProfile": "Adăugați un profil de întârziere",
     "AddDownloadClient": "Adăugați client de descărcare",
@@ -440,7 +440,7 @@
     "ChmodFolderHelpTextWarning": "Acest lucru funcționează numai dacă utilizatorul care rulează Radarr este proprietarul fișierului. Este mai bine să vă asigurați că clientul de descărcare setează corect permisiunile.",
     "ChmodGroup": "chmod Group",
     "ChmodGroupHelpText": "Numele grupului sau gid. Utilizați gid pentru sistemele de fișiere la distanță.",
-    "DeleteBackup": "Ștergeți Backup",
+    "DeleteBackup": "Ștergeți copie de siguranță",
     "DeleteCustomFormat": "Ștergeți formatul personalizat",
     "DeletedMsg": "Filmul a fost șters din TMDb",
     "DeleteDownloadClient": "Ștergeți clientul de descărcare",
@@ -448,12 +448,12 @@
     "Connection": "Conexiuni",
     "CantFindMovie": "De ce nu-mi găsesc filmul?",
     "CertificateValidationHelpText": "Modificați cât de strictă este validarea certificării HTTPS",
-    "AddIndexer": "Adăugați Indexer",
+    "AddIndexer": "Adăugați Indexator",
     "AutomaticSearch": "Căutare automată",
     "ClientPriority": "Prioritatea clientului",
     "CertificationCountry": "Țara certificării",
     "CertificationCountryHelpText": "Selectați Țara pentru certificări de film",
-    "HomePage": "Pagina principala",
+    "HomePage": "Pagina principală",
     "IncludeHealthWarningsHelpText": "Includeți avertismente de sănătate",
     "InvalidFormat": "Format invalid",
     "LastDuration": "lastDuration",
@@ -508,7 +508,7 @@
     "ShowGenres": "Afișați genurile",
     "SuggestTranslationChange": "Sugerează modificarea traducerii",
     "TestAllClients": "Testați toți clienții",
-    "TestAllIndexers": "Testați toți indexatorii",
+    "TestAllIndexers": "Testați toate indexatoarele",
     "TestAllLists": "Testați toate listele",
     "Queued": "În așteptare",
     "TMDb": "TMDb",
@@ -524,8 +524,8 @@
     "DetailedProgressBarHelpText": "Afișați textul pe bara de progres",
     "EnableSSL": "Activați SSL",
     "IncludeCustomFormatWhenRenaming": "Includeți format personalizat la redenumire",
-    "IndexerLongTermStatusCheckAllClientMessage": "Toți indexatorii nu sunt disponibili din cauza unor eșecuri de mai mult de 6 ore",
+    "IndexerLongTermStatusCheckAllClientMessage": "Toți indexatorii sunt indisponibili datorită erorilor de mai mult de 6 ore",
-    "IndexerLongTermStatusCheckSingleClientMessage": "Indexatori indisponibili din cauza unor eșecuri de mai mult de 6 ore: {0}",
+    "IndexerLongTermStatusCheckSingleClientMessage": "Indexatori indisponibili datorită erorilor de mai mult de 6 ore: {0}",
     "LoadingMovieCreditsFailed": "Încărcarea creditelor filmului nu a reușit",
     "LoadingMovieExtraFilesFailed": "Încărcarea fișierelor suplimentare ale filmului nu a reușit",
     "LoadingMovieFilesFailed": "Încărcarea fișierelor film a eșuat",
@@ -559,7 +559,7 @@
     "CleanLibraryLevel": "Nivel de bibliotecă curat",
     "BranchUpdate": "Sucursală de utilizat pentru actualizarea Radarr",
     "BranchUpdateMechanism": "Ramură utilizată de mecanismul extern de actualizare",
-    "BypassProxyForLocalAddresses": "Bypass Proxy pentru adrese locale",
+    "BypassProxyForLocalAddresses": "Nu folosiți Proxy pentru adrese locale",
     "MovieTitleHelpText": "Titlul filmului de exclus (poate avea orice sens)",
     "Local": "Local",
     "MovieYear": "Anul filmului",
@@ -641,7 +641,7 @@
     "ClickToChangeQuality": "Faceți clic pentru a schimba calitatea",
     "CloneFormatTag": "Etichetă de format clonare",
     "CloneIndexer": "Clonă Indexer",
-    "CloneProfile": "Profil de clonare",
+    "CloneProfile": "Clonați profil",
     "CloseCurrentModal": "Închideți modul curent",
     "ColonReplacement": "Înlocuirea colonului",
     "ColonReplacementFormatHelpText": "Schimbați modul în care Radarr gestionează înlocuirea colonului",
@@ -666,7 +666,7 @@
     "DefaultDelayProfile": "Acesta este profilul implicit. Se aplică tuturor filmelor care nu au un profil explicit.",
     "DelayingDownloadUntilInterp": "Întârzierea descărcării până la {0} la {1}",
     "DelayProfile": "Profile de întârziere",
-    "DeleteBackupMessageText": "Sigur doriți să ștergeți copia de rezervă „{0}”?",
+    "DeleteBackupMessageText": "Sigur doriți să ștergeți copia de siguranță „{0}”?",
     "DeleteDelayProfile": "Ștergeți profilul de întârziere",
     "DeleteDownloadClientMessageText": "Sigur doriți să ștergeți clientul de descărcare „{0}”?",
     "DeleteEmptyFolders": "Ștergeți folderele goale",
@@ -686,13 +686,13 @@
     "DestinationPath": "Calea de destinație",
     "DestinationRelativePath": "Calea relativă a destinației",
     "DetailedProgressBar": "Bara de progres detaliată",
-    "Discord": "Discordie",
+    "Discord": "Discord",
-    "Docker": "Docher",
+    "Docker": "Docker",
     "Donations": "Donații",
     "DoneEditingGroups": "Efectuat editarea grupurilor",
     "DoNotPrefer": "Nu preferați",
     "DoNotUpgradeAutomatically": "Nu faceți upgrade automat",
-    "DownloadClientSettings": "Descărcați setările clientului",
+    "DownloadClientSettings": "Setări client de descărcare",
     "DownloadClientUnavailable": "Clientul de descărcare nu este disponibil",
     "DownloadedAndMonitored": "Descărcat (monitorizat)",
     "DownloadedButNotMonitored": "Descărcat (fără monitorizare)",
@@ -708,10 +708,10 @@
     "EditPerson": "Editați persoana",
     "EditQualityProfile": "Editați profilul de calitate",
     "EditRestriction": "Editați restricția",
-    "Enable": "Permite",
+    "Enable": "Activați",
     "EnableAutoHelpText": "Dacă este activată, Filme vor fi adăugate automat la Radarr din această listă",
     "EnableAutomaticAdd": "Activați adăugarea automată",
-    "EnableAutomaticSearch": "Activați Căutarea automată",
+    "EnableAutomaticSearch": "Activați căutarea automată",
     "EnableAutomaticSearchHelpText": "Va fi utilizat atunci când căutările automate sunt efectuate prin interfața de utilizare sau de către Radarr",
     "EnableColorImpairedMode": "Activați modul afectat de culoare",
     "EnableColorImpairedModeHelpText": "Stil modificat pentru a permite utilizatorilor cu deficiențe de culoare să distingă mai bine informațiile codificate prin culoare",
@@ -722,7 +722,7 @@
     "EnableMediaInfoHelpText": "Extrageți informații video, cum ar fi rezoluția, runtime și informații despre codec din fișiere. Acest lucru necesită ca Radarr să citească părți ale fișierului care pot provoca activitate ridicată pe disc sau rețea în timpul scanărilor.",
     "EnableRSS": "Activați RSS",
     "EnableSslHelpText": " Necesită repornirea în funcție de administrator pentru a intra în vigoare",
-    "Ended": "Încheiat",
+    "Ended": "Finalizat",
     "ErrorLoadingContents": "Eroare la încărcarea conținutului",
     "ErrorLoadingPreviews": "Eroare la încărcarea previzualizărilor",
     "ErrorRestoringBackup": "Eroare la restaurarea copiei de rezervă",
@@ -751,7 +751,7 @@
     "FollowPerson": "Urmărește persoana",
     "ForMoreInformationOnTheIndividualDownloadClients": "Pentru mai multe informații despre clienții individuali de descărcare, faceți clic pe butoanele de informații.",
     "ForMoreInformationOnTheIndividualIndexers": "Pentru mai multe informații despre indexatorii individuali, faceți clic pe butoanele de informații.",
-    "GeneralSettings": "setari generale",
+    "GeneralSettings": "Setări generale",
     "Global": "Global",
     "GoToInterp": "Accesați {0}",
     "Grab": "Apuca",
@@ -776,7 +776,7 @@
     "IncludeRecommendationsHelpText": "Includeți filmele recomandate de Radarr în vizualizarea descoperire",
     "IncludeUnmonitored": "Includeți Unmonitored",
     "ImportMovies": "Importați filme",
-    "IndexerPriority": "Prioritatea indexerului",
+    "IndexerPriority": "Prioritatea indexatorului",
     "IndexerPriorityHelpText": "Prioritatea indexerului de la 1 (cea mai mare) la 50 (cea mai mică). Implicit: 25.",
     "IndexerSettings": "Setări Indexer",
     "InstallLatest": "Instalați cele mai recente",
@@ -875,7 +875,7 @@
     "Retention": "Retenţie",
     "RetentionHelpText": "Numai Usenet: Setați la zero pentru a seta pentru păstrarea nelimitată",
     "RSS": "RSS",
-    "RSSIsNotSupportedWithThisIndexer": "RSS nu este acceptat cu acest indexer",
+    "RSSIsNotSupportedWithThisIndexer": "RSS nu este suportat de acest indexator",
     "RSSSyncInterval": "Interval de sincronizare RSS",
     "RSSSyncIntervalHelpTextWarning": "Acest lucru se va aplica tuturor indexatorilor, vă rugăm să urmați regulile stabilite de aceștia",
     "SaveSettings": "Salvează setările",
@@ -974,7 +974,7 @@
     "UnableToLoadGeneralSettings": "Nu se pot încărca setările generale",
     "UnableToLoadHistory": "Istoricul nu poate fi încărcat",
     "UnableToLoadIndexerOptions": "Nu se pot încărca opțiunile indexerului",
-    "UnableToLoadIndexers": "Imposibil de încărcat indexatori",
+    "UnableToLoadIndexers": "Nu se pot încărca indexatoarele",
     "UnableToLoadLanguages": "Nu se pot încărca limbile",
     "UnableToLoadListExclusions": "Imposibil de încărcat excluderile din listă",
     "UnableToLoadManualImportItems": "Imposibil de încărcat articole de import manual",
@@ -1052,7 +1052,7 @@
     "Blocklisted": "Listă Neagră",
     "AreYouSureYouWantToRemoveSelectedItemFromQueue": "Sigur doriți să eliminați {0} elementul {1} din coadă?",
     "BlocklistReleases": "Lansare pe lista neagră",
-    "Filters": "Filtru",
+    "Filters": "Filtre",
     "List": "Liste",
     "LocalPath": "Calea locală",
     "RemotePath": "Calea la distanță",

src/NzbDrone.Core/Localization/Core/ru.json

@@ -170,7 +170,7 @@
     "ExcludeTitle": "Исключить {0}? Radarr не будет автоматически добавлять сканируя лист.",
     "InCinemasMsg": "Фильмы в кинотеатрах",
     "IncludeRecommendationsHelpText": "Включить в отображении найденного фильмы рекомендованные Radar",
-    "IndexerPriorityHelpText": "Приоритет индексаторов от 1 (наивысший) до 50 (низший). По-умолчанию: 25.",
+    "IndexerPriorityHelpText": "Приоритет индексатора от 1 (самый высокий) до 50 (самый низкий). По умолчанию: 25. Используется при захвате выпусков в качестве средства разрешения конфликтов для равных в остальном выпусков, Radarr по-прежнему будет использовать все включенные индексаторы для синхронизации и поиска RSS.",
     "IndexerSearchCheckNoAvailableIndexersMessage": "Все индексаторы с возможностью поиска временно выключены из-за ошибок",
     "KeyboardShortcuts": "Горячие клавиши",
     "CantFindMovie": "Почему я не могу найти фильм?",
@@ -244,7 +244,7 @@
     "ApplyTagsHelpTexts2": "Добавить: добавить ярлыки к существующему списку",
     "AptUpdater": "Используйте apt для установки обновления",
     "AuthForm": "Формы (Страница авторизации)",
-    "AreYouSureYouWantToRemoveSelectedItemsFromQueue": "Вы уверены, что хотите удалить {0} элемент{1} из очереди?",
+    "AreYouSureYouWantToRemoveSelectedItemsFromQueue": "Вы уверены, что хотите удалить {0} элемент из очереди?",
     "BeforeUpdate": "До обновления",
     "BuiltIn": "Встроено",
     "CalendarOptions": "Настройки календаря",
@@ -742,12 +742,12 @@
     "ChmodFolderHelpText": "Восьмеричный, применяется при импорте / переименовании к медиа-папкам и файлам (без битов выполнения)",
     "CheckDownloadClientForDetails": "проверьте клиент загрузки для более подробной информации",
     "CertValidationNoLocal": "Отключено для локальных адресов",
-    "CertificateValidationHelpText": "Изменить строгое подтверждение сертификации НТТР",
+    "CertificateValidationHelpText": "Измените строгую проверку сертификации HTTPS. Не меняйте, если вы не понимаете риски.",
     "BypassProxyForLocalAddresses": "Обход прокси для локальных адресов",
     "BranchUpdateMechanism": "Ветвь, используемая внешним механизмом обновления",
     "BranchUpdate": "Ветвь для обновления Radarr",
     "Branch": "Ветка",
-    "BindAddressHelpText": "Действительный IP4-адрес или '*' для всех интерфейсов",
+    "BindAddressHelpText": "Действительный IPv4-адрес или '*' для всех интерфейсов",
     "BackupFolderHelpText": "Относительные пути будут в каталоге AppData Radarr",
     "AvailabilityDelayHelpText": "Время до или после доступной даты для поиска фильма",
     "AvailabilityDelay": "Задержка доступности",
@@ -908,7 +908,7 @@
     "TimeFormat": "Формат времени",
     "Time": "Время",
     "ThisConditionMatchesUsingRegularExpressions": "Это условие соответствует использованию регулярных выражений. Обратите внимание, что символы {0} имеют особое значение и требуют экранирования с помощью {1}",
-    "ThisCannotBeCancelled": "Нельзя отменить после запуска без перезапуска Radarr.",
+    "ThisCannotBeCancelled": "Это действие нельзя отменить после запуска без отключения всех ваших индексаторов.",
     "TheLogLevelDefault": "Уровень журнала по умолчанию - «Информация» и может быть изменен в",
     "TestAllLists": "Тестировать все листы",
     "TestAllIndexers": "Тестировать все индексаторы",
@@ -982,7 +982,7 @@
     "ShowCertification": "Показать сертификаты",
     "ShowAsAllDayEvents": "Показывать как мероприятия на весь день",
     "ShowAdvanced": "Показать расширенные",
-    "ShouldMonitorHelpText": "Если включено, фильмы, добавленные в этот список, добавляются и отслеживаются",
+    "ShouldMonitorHelpText": "Если включено, фильмы или коллекции, добавленные в этот список, будут добавлены, как отслеживаемые",
     "SettingsWeekColumnHeaderHelpText": "Отображается над каждым столбцом, когда неделя активна",
     "SettingsWeekColumnHeader": "Заголовок столбца недели",
     "SettingsTimeFormat": "Формат времени",
@@ -1015,7 +1015,7 @@
     "Security": "Безопасность",
     "Seconds": "Секунды",
     "SearchSelected": "Искать выделенные",
-    "SearchOnAddHelpText": "Искать фильмы в этом списке при добавлении в Radarr",
+    "SearchOnAddHelpText": "Искать фильмы в этом списке при добавлении в библиотеку",
     "SearchOnAdd": "Искать при добавлении",
     "SearchMovie": "Поиск фильма",
     "SearchMissing": "Поиск пропавших",
@@ -1103,10 +1103,44 @@
     "ImdbVotes": "IMDb оценок",
     "Duration": "Длительность",
     "Rating": "Рейтинг",
-    "List": "Списки",
+    "List": "Список",
-    "RssSyncHelpText": "Интервал в минутах. Установите 0 чтобы выключить (остановит все автоматические захваты релизов)",
+    "RssSyncHelpText": "Интервал в минутах. Установите 0, чтобы выключить (остановит все автоматические захваты релизов)",
-    "AllCollectionsHiddenDueToFilter": "Все фильмы спрятаны в соответствии с фильтром.",
+    "AllCollectionsHiddenDueToFilter": "Все фильмы скрыты в соответствии с фильтром.",
-    "Collections": "Коллекция",
+    "Collections": "Коллекции",
     "MonitorMovies": "Отслеживать фильм",
-    "NoCollections": "Фильмов не найдено. Для начала вам нужно добавить новый фильм или импортировать уже существующие."
+    "NoCollections": "Коллекции не найдены. Для начала вам нужно добавить новый фильм или импортировать несколько существующих.",
+    "CollectionOptions": "Параметры коллекции",
+    "CollectionShowDetailsHelpText": "Показать статус и свойства коллекции",
+    "CollectionShowOverviewsHelpText": "Показать обзоры коллекций",
+    "CollectionShowPostersHelpText": "Показать постеры предметов коллекции",
+    "EditCollection": "Редактировать коллекцию",
+    "Auto": "Авто",
+    "MonitorCollection": "Отслеживание коллекции",
+    "MonitoredCollectionHelpText": "Контролировать, чтобы фильмы из этой коллекции автоматически добавлялись в библиотеку",
+    "MovieAndCollection": "Фильм и коллекция",
+    "MovieCollectionMissingRoot": "Отсутствует корневая папка для коллекции фильмов: {0}",
+    "MovieCollectionMultipleMissingRoots": "Для коллекций фильмов отсутствуют несколько корневых папок: {0}",
+    "MovieOnly": "Только фильм",
+    "ShowCollectionDetails": "Показать статус коллекции",
+    "OnMovieAddedHelpText": "Добавлено в фильм",
+    "RefreshCollections": "Обновить коллекции",
+    "RefreshMonitoredIntervalHelpText": "Как часто обновлять отслеживаемые загрузки с клиентов загрузки, минимум 1 минута",
+    "Never": "Никогда",
+    "OriginalTitle": "Оригинальное название",
+    "CollectionsSelectedInterp": "{0} коллекций выбрано",
+    "UnableToLoadCollections": "Не удалось загрузить коллекции",
+    "OnMovieAdded": "Добавлено в фильм",
+    "OriginalLanguage": "Язык оригинала",
+    "SearchOnAddCollectionHelpText": "Поиск фильмов в этой коллекции при добавлении в библиотеку",
+    "ShowOverview": "Показать обзор",
+    "ShowPosters": "Показать постеры",
+    "TotalMovies": "Всего фильмов",
+    "Waiting": "Ожидание",
+    "ChooseImportMode": "Выберите режим импорта",
+    "InstanceName": "Имя экземпляра",
+    "InstanceNameHelpText": "Имя экземпляра на вкладке и для имени приложения системного журнала",
+    "RottenTomatoesRating": "Tomato рейтинг",
+    "Started": "Запущено",
+    "Database": "База данных",
+    "From": "из"
 }

src/NzbDrone.Core/Localization/Core/zh_CN.json

@@ -637,7 +637,7 @@
     "InstallLatest": "安装最新版",
     "IndexerStatusCheckSingleClientMessage": "搜刮器因错误不可用：{0}",
     "IndexerStatusCheckAllClientMessage": "所有搜刮器都因错误不可用",
-    "IndexerSearchCheckNoInteractiveMessage": "没有任何索引器开启了手动搜索，Radarr 不会提供任何手动搜索的结果",
+    "IndexerSearchCheckNoInteractiveMessage": "没有任何索引器开启了手动搜索，因此Radarr 不会提供任何手动搜索的结果",
     "IndexerRssHealthCheckNoIndexers": "没有任何索引器开启了RSS同步，Radarr不会自动抓取新发布的影片",
     "IndexerLongTermStatusCheckSingleClientMessage": "由于故障6小时，下列索引器都已不可用：{0}",
     "IndexerLongTermStatusCheckAllClientMessage": "由于故障超过6小时，所有索引器均不可用",
@@ -1142,5 +1142,6 @@
     "RottenTomatoesRating": "烂番茄指数",
     "ShowPosters": "显示海报",
     "OnMovieAdded": "电影添加时",
-    "OnMovieAddedHelpText": "电影添加时"
+    "OnMovieAddedHelpText": "电影添加时",
+    "TotalMovies": "电影总数"
 }

src/NzbDrone.Core/Movies/MovieService.cs

@@ -119,10 +119,18 @@ namespace NzbDrone.Core.Movies
             return FindByTitle(new List<string> { title }, year, otherTitles, candidates);
         }
 
-        public Movie FindByTitle(List<string> cleanTitles, int? year, List<string> otherTitles, List<Movie> candidates)
+        public Movie FindByTitle(List<string> titles, int? year, List<string> otherTitles, List<Movie> candidates)
         {
+            var cleanTitles = titles.Select(t => t.CleanMovieTitle().ToLowerInvariant());
+
             var result = candidates.Where(x => cleanTitles.Contains(x.MovieMetadata.Value.CleanTitle)).FirstWithYear(year);
 
+            if (result == null)
+            {
+                result =
+                    candidates.Where(movie => cleanTitles.Contains(movie.MovieMetadata.Value.CleanOriginalTitle)).FirstWithYear(year);
+            }
+
             if (result == null)
             {
                 result =

src/NzbDrone.Core/Notifications/Ntfy/Ntfy.cs

@@ -0,0 +1,66 @@
+using System.Collections.Generic;
+
+using FluentValidation.Results;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Movies;
+
+namespace NzbDrone.Core.Notifications.Ntfy
+{
+    public class Ntfy : NotificationBase<NtfySettings>
+    {
+        private readonly INtfyProxy _proxy;
+
+        public Ntfy(INtfyProxy proxy)
+        {
+            _proxy = proxy;
+        }
+
+        public override string Name => "ntfy.sh";
+
+        public override string Link => "https://ntfy.sh/";
+
+        public override void OnGrab(GrabMessage grabMessage)
+        {
+            _proxy.SendNotification(MOVIE_GRABBED_TITLE_BRANDED, grabMessage.Message, Settings);
+        }
+
+        public override void OnDownload(DownloadMessage message)
+        {
+            _proxy.SendNotification(MOVIE_DOWNLOADED_TITLE_BRANDED, message.Message, Settings);
+        }
+
+        public override void OnMovieAdded(Movie movie)
+        {
+            _proxy.SendNotification(MOVIE_ADDED_TITLE_BRANDED, $"{movie.Title} added to library", Settings);
+        }
+
+        public override void OnMovieFileDelete(MovieFileDeleteMessage deleteMessage)
+        {
+            _proxy.SendNotification(MOVIE_FILE_DELETED_TITLE, deleteMessage.Message, Settings);
+        }
+
+        public override void OnMovieDelete(MovieDeleteMessage deleteMessage)
+        {
+            _proxy.SendNotification(MOVIE_DELETED_TITLE, deleteMessage.Message, Settings);
+        }
+
+        public override void OnHealthIssue(HealthCheck.HealthCheck healthCheck)
+        {
+            _proxy.SendNotification(HEALTH_ISSUE_TITLE_BRANDED, healthCheck.Message, Settings);
+        }
+
+        public override void OnApplicationUpdate(ApplicationUpdateMessage updateMessage)
+        {
+            _proxy.SendNotification(APPLICATION_UPDATE_TITLE_BRANDED, updateMessage.Message, Settings);
+        }
+
+        public override ValidationResult Test()
+        {
+            var failures = new List<ValidationFailure>();
+
+            failures.AddIfNotNull(_proxy.Test(Settings));
+
+            return new ValidationResult(failures);
+        }
+    }
+}

src/NzbDrone.Core/Notifications/Ntfy/NtfyException.cs

@@ -0,0 +1,18 @@
+using System;
+using NzbDrone.Common.Exceptions;
+
+namespace NzbDrone.Core.Notifications.Ntfy
+{
+    public class NtfyException : NzbDroneException
+    {
+        public NtfyException(string message)
+            : base(message)
+        {
+        }
+
+        public NtfyException(string message, Exception innerException, params object[] args)
+            : base(message, innerException, args)
+        {
+        }
+    }
+}

src/NzbDrone.Core/Notifications/Ntfy/NtfyPriority.cs

@@ -0,0 +1,11 @@
+namespace NzbDrone.Core.Notifications.Ntfy
+{
+    public enum NtfyPriority
+    {
+        Min = 1,
+        Low = 2,
+        Default = 3,
+        High = 4,
+        Max = 5
+    }
+}

src/NzbDrone.Core/Notifications/Ntfy/NtfyProxy.cs

@@ -0,0 +1,138 @@
+using System;
+using System.Linq;
+using System.Net;
+
+using FluentValidation.Results;
+using NLog;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Common.Http;
+
+namespace NzbDrone.Core.Notifications.Ntfy
+{
+    public interface INtfyProxy
+    {
+        void SendNotification(string title, string message, NtfySettings settings);
+
+        ValidationFailure Test(NtfySettings settings);
+    }
+
+    public class NtfyProxy : INtfyProxy
+    {
+        private const string DEFAULT_PUSH_URL = "https://ntfy.sh";
+
+        private readonly IHttpClient _httpClient;
+
+        private readonly Logger _logger;
+
+        public NtfyProxy(IHttpClient httpClient, Logger logger)
+        {
+            _httpClient = httpClient;
+            _logger = logger;
+        }
+
+        public void SendNotification(string title, string message, NtfySettings settings)
+        {
+            var error = false;
+
+            var serverUrl = settings.ServerUrl.IsNullOrWhiteSpace() ? NtfyProxy.DEFAULT_PUSH_URL : settings.ServerUrl;
+
+            foreach (var topic in settings.Topics)
+            {
+                var request = BuildTopicRequest(serverUrl, topic);
+
+                try
+                {
+                    SendNotification(title, message, request, settings);
+                }
+                catch (NtfyException ex)
+                {
+                    _logger.Error(ex, "Unable to send test message to {0}", topic);
+                    error = true;
+                }
+            }
+
+            if (error)
+            {
+                throw new NtfyException("Unable to send Ntfy notifications to all topics");
+            }
+        }
+
+        private HttpRequestBuilder BuildTopicRequest(string serverUrl, string topic)
+        {
+            var trimServerUrl = serverUrl.TrimEnd('/');
+
+            var requestBuilder = new HttpRequestBuilder($"{trimServerUrl}/{topic}").Post();
+
+            return requestBuilder;
+        }
+
+        public ValidationFailure Test(NtfySettings settings)
+        {
+            try
+            {
+                const string title = "Radarr - Test Notification";
+
+                const string body = "This is a test message from Radarr";
+
+                SendNotification(title, body, settings);
+            }
+            catch (HttpException ex)
+            {
+                if (ex.Response.StatusCode == HttpStatusCode.Unauthorized || ex.Response.StatusCode == HttpStatusCode.Forbidden)
+                {
+                    _logger.Error(ex, "Authorization is required");
+                    return new ValidationFailure("UserName", "Authorization is required");
+                }
+
+                _logger.Error(ex, "Unable to send test message");
+                return new ValidationFailure("ServerUrl", "Unable to send test message");
+            }
+            catch (Exception ex)
+            {
+                _logger.Error(ex, "Unable to send test message");
+                return new ValidationFailure("", "Unable to send test message");
+            }
+
+            return null;
+        }
+
+        private void SendNotification(string title, string message, HttpRequestBuilder requestBuilder, NtfySettings settings)
+        {
+            try
+            {
+                requestBuilder.Headers.Add("X-Title", title);
+                requestBuilder.Headers.Add("X-Message", message);
+                requestBuilder.Headers.Add("X-Priority", settings.Priority.ToString());
+
+                if (settings.Tags.Any())
+                {
+                    requestBuilder.Headers.Add("X-Tags", settings.Tags.Join(","));
+                }
+
+                if (!settings.ClickUrl.IsNullOrWhiteSpace())
+                {
+                    requestBuilder.Headers.Add("X-Click", settings.ClickUrl);
+                }
+
+                var request = requestBuilder.Build();
+
+                if (!settings.UserName.IsNullOrWhiteSpace() && !settings.Password.IsNullOrWhiteSpace())
+                {
+                    request.Credentials = new BasicNetworkCredential(settings.UserName, settings.Password);
+                }
+
+                _httpClient.Execute(request);
+            }
+            catch (HttpException ex)
+            {
+                if (ex.Response.StatusCode == HttpStatusCode.Unauthorized || ex.Response.StatusCode == HttpStatusCode.Forbidden)
+                {
+                    _logger.Error(ex, "Authorization is required");
+                    throw;
+                }
+
+                throw new NtfyException("Unable to send text message: {0}", ex, ex.Message);
+            }
+        }
+    }
+}

src/NzbDrone.Core/Notifications/Ntfy/NtfySettings.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using FluentValidation;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Annotations;
+using NzbDrone.Core.ThingiProvider;
+using NzbDrone.Core.Validation;
+
+namespace NzbDrone.Core.Notifications.Ntfy
+{
+    public class NtfySettingsValidator : AbstractValidator<NtfySettings>
+    {
+        public NtfySettingsValidator()
+        {
+            RuleFor(c => c.Topics).NotEmpty();
+            RuleFor(c => c.Priority).InclusiveBetween(1, 5);
+            RuleFor(c => c.ServerUrl).IsValidUrl().When(c => !c.ServerUrl.IsNullOrWhiteSpace());
+            RuleFor(c => c.ClickUrl).IsValidUrl().When(c => !c.ClickUrl.IsNullOrWhiteSpace());
+            RuleFor(c => c.UserName).NotEmpty().When(c => !c.Password.IsNullOrWhiteSpace());
+            RuleFor(c => c.Password).NotEmpty().When(c => !c.UserName.IsNullOrWhiteSpace());
+            RuleForEach(c => c.Topics).NotEmpty().Matches("[a-zA-Z0-9_-]+").Must(c => !InvalidTopics.Contains(c)).WithMessage("Invalid topic");
+        }
+
+        private static List<string> InvalidTopics => new List<string> { "announcements", "app", "docs", "settings", "stats", "mytopic-rw", "mytopic-ro", "mytopic-wo" };
+    }
+
+    public class NtfySettings : IProviderConfig
+    {
+        private static readonly NtfySettingsValidator Validator = new NtfySettingsValidator();
+
+        public NtfySettings()
+        {
+            Topics = Array.Empty<string>();
+            Priority = 3;
+        }
+
+        [FieldDefinition(0, Label = "Server Url", Type = FieldType.Url, HelpLink = "https://ntfy.sh/docs/install/", HelpText = "Leave blank to use public server (https://ntfy.sh)", Placeholder = "https://ntfy.sh")]
+        public string ServerUrl { get; set; }
+
+        [FieldDefinition(1, Label = "User Name", HelpText = "Optional Authorization", Privacy = PrivacyLevel.UserName)]
+        public string UserName { get; set; }
+
+        [FieldDefinition(2, Label = "Password", Type = FieldType.Password, HelpText = "Optional Password", Privacy = PrivacyLevel.Password)]
+        public string Password { get; set; }
+
+        [FieldDefinition(3, Label = "Priority", Type = FieldType.Select, SelectOptions = typeof(NtfyPriority))]
+        public int Priority { get; set; }
+
+        [FieldDefinition(4, Label = "Topics", HelpText = "List of Topics to send notifications to", Type = FieldType.Tag, Placeholder = "Topic1234,Topic4321")]
+        public IEnumerable<string> Topics { get; set; }
+
+        [FieldDefinition(5, Label = "Ntfy Tags and Emojis", Type = FieldType.Tag, HelpText = "Optional list of tags or emojis to use", Placeholder = "warning,skull", HelpLink = "https://ntfy.sh/docs/emojis/")]
+        public IEnumerable<string> Tags { get; set; }
+
+        [FieldDefinition(6, Label = "Click Url", Type = FieldType.Url, HelpText = "Optional link when user clicks notification", Placeholder = "https://myserver.example.com/radarr")]
+        public string ClickUrl { get; set; }
+
+        public NzbDroneValidationResult Validate()
+        {
+            return new NzbDroneValidationResult(Validator.Validate(this));
+        }
+    }
+}

src/NzbDrone.Core/Organizer/FileNameBuilder.cs

@@ -38,20 +38,9 @@ namespace NzbDrone.Core.Organizer
         private readonly ICustomFormatService _formatService;
         private readonly Logger _logger;
 
-        private static readonly Regex TitleRegex = new Regex(@"\{(?<prefix>[- ._\[(]*)(?<token>(?:[a-z0-9]+)(?:(?<separator>[- ._]+)(?:[a-z0-9]+))?)(?::(?<customFormat>[a-z0-9|]+))?(?<suffix>[- ._)\]]*)\}",
+        private static readonly Regex TitleRegex = new Regex(@"(?<tag>\{(?:imdb-|edition-))?\{(?<prefix>[- ._\[(]*)(?<token>(?:[a-z0-9]+)(?:(?<separator>[- ._]+)(?:[a-z0-9]+))?)(?::(?<customFormat>[a-z0-9|]+))?(?<suffix>[-} ._)\]]*)\}",
                                                              RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
 
-        private static readonly Regex TagsRegex = new Regex(@"(?<tags>\{tags(?:\:0+)?})",
-                                                               RegexOptions.Compiled | RegexOptions.IgnoreCase);
-
-        public static readonly Regex SeasonEpisodePatternRegex = new Regex(@"(?<separator>(?<=})[- ._]+?)?(?<seasonEpisode>s?{season(?:\:0+)?}(?<episodeSeparator>[- ._]?[ex])(?<episode>{episode(?:\:0+)?}))(?<separator>[- ._]+?(?={))?",
-                                                                            RegexOptions.Compiled | RegexOptions.IgnoreCase);
-
-        public static readonly Regex AbsoluteEpisodePatternRegex = new Regex(@"(?<separator>(?<=})[- ._]+?)?(?<absolute>{absolute(?:\:0+)?})(?<separator>[- ._]+?(?={))?",
-                                                                    RegexOptions.Compiled | RegexOptions.IgnoreCase);
-
-        public static readonly Regex AirDateRegex = new Regex(@"\{Air(\s|\W|_)Date\}", RegexOptions.Compiled | RegexOptions.IgnoreCase);
-
         public static readonly Regex MovieTitleRegex = new Regex(@"(?<token>\{((?:(Movie|Original))(?<separator>[- ._])(Clean|Original)?(Title|Filename)(The)?)(?::(?<customFormat>[a-z0-9|]+))?\})",
                                                                             RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
@@ -61,11 +50,6 @@ namespace NzbDrone.Core.Organizer
         private static readonly Regex ScenifyRemoveChars = new Regex(@"(?<=\s)(,|<|>|\/|\\|;|:|'|""|\||`|~|!|\?|@|$|%|^|\*|-|_|=){1}(?=\s)|('|:|\?|,)(?=(?:(?:s|m)\s)|\s|$)|(\(|\)|\[|\]|\{|\})", RegexOptions.Compiled | RegexOptions.IgnoreCase);
         private static readonly Regex ScenifyReplaceChars = new Regex(@"[\/]", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
-        //TODO: Support Written numbers (One, Two, etc) and Roman Numerals (I, II, III etc)
-        private static readonly Regex MultiPartCleanupRegex = new Regex(@"(?:\(\d+\)|(Part|Pt\.?)\s?\d+)$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
-
-        private static readonly char[] EpisodeTitleTrimCharacters = new[] { ' ', '.', '?' };
-
         private static readonly Regex TitlePrefixRegex = new Regex(@"^(The|An|A) (.*?)((?: *\([^)]+\))*)$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         private static readonly Regex ReservedDeviceNamesRegex = new Regex(@"^(?:aux|com[1-9]|con|lpt[1-9]|nul|prn)\.", RegexOptions.Compiled | RegexOptions.IgnoreCase);
@@ -133,7 +117,7 @@ namespace NzbDrone.Core.Organizer
             AddQualityTokens(tokenHandlers, movie, movieFile);
             AddMediaInfoTokens(tokenHandlers, movieFile);
             AddMovieFileTokens(tokenHandlers, movieFile);
-            AddTagsTokens(tokenHandlers, movieFile);
+            AddEditionTagsTokens(tokenHandlers, movieFile);
             AddCustomFormats(tokenHandlers, movie, movieFile, customFormats);
 
             var splitPatterns = pattern.Split(new char[] { '\\', '/' }, StringSplitOptions.RemoveEmptyEntries);
@@ -193,7 +177,7 @@ namespace NzbDrone.Core.Organizer
                 AddQualityTokens(tokenHandlers, movie, movieFile);
                 AddMediaInfoTokens(tokenHandlers, movieFile);
                 AddMovieFileTokens(tokenHandlers, movieFile);
-                AddTagsTokens(tokenHandlers, movieFile);
+                AddEditionTagsTokens(tokenHandlers, movieFile);
             }
             else
             {
@@ -297,7 +281,7 @@ namespace NzbDrone.Core.Organizer
             return movie.Title;
         }
 
-        private void AddTagsTokens(Dictionary<string, Func<TokenMatch, string>> tokenHandlers, MovieFile movieFile)
+        private void AddEditionTagsTokens(Dictionary<string, Func<TokenMatch, string>> tokenHandlers, MovieFile movieFile)
         {
             if (movieFile.Edition.IsNotNullOrWhiteSpace())
             {
@@ -497,6 +481,7 @@ namespace NzbDrone.Core.Organizer
             var tokenMatch = new TokenMatch
             {
                 RegexMatch = match,
+                Tag = match.Groups["tag"].Value,
                 Prefix = match.Groups["prefix"].Value,
                 Separator = match.Groups["separator"].Value,
                 Suffix = match.Groups["suffix"].Value,
@@ -531,7 +516,7 @@ namespace NzbDrone.Core.Organizer
 
             if (!replacementText.IsNullOrWhiteSpace())
             {
-                replacementText = tokenMatch.Prefix + replacementText + tokenMatch.Suffix;
+                replacementText = tokenMatch.Tag + tokenMatch.Prefix + replacementText + tokenMatch.Suffix;
             }
 
             return replacementText;
@@ -598,6 +583,7 @@ namespace NzbDrone.Core.Organizer
     internal sealed class TokenMatch
     {
         public Match RegexMatch { get; set; }
+        public string Tag { get; set; }
         public string Prefix { get; set; }
         public string Separator { get; set; }
         public string Suffix { get; set; }

src/NzbDrone.Core/Parser/IsoLanguages.cs

@@ -42,7 +42,8 @@ namespace NzbDrone.Core.Parser
                                                                new IsoLanguage("uk", "", "ukr", "Ukrainian", Language.Ukrainian),
                                                                new IsoLanguage("fa", "", "fas", "Persian", Language.Persian),
                                                                new IsoLanguage("be", "", "ben", "Bengali", Language.Bengali),
-                                                               new IsoLanguage("lt", "", "lit", "Lithuanian", Language.Lithuanian)
+                                                               new IsoLanguage("lt", "", "lit", "Lithuanian", Language.Lithuanian),
+                                                               new IsoLanguage("sk", "", "slk", "Slovak", Language.Slovak)
                                                            };
 
         public static IsoLanguage Find(string isoCode)

src/NzbDrone.Core/Parser/LanguageParser.cs

@@ -32,7 +32,8 @@ namespace NzbDrone.Core.Parser
         private static readonly Regex CaseSensitiveLanguageRegex = new Regex(@"(?:(?i)(?<!SUB[\W|_|^]))(?:(?<lithuanian>\bLT\b)|
                                                                                                           (?<czech>\bCZ\b)|
                                                                                                           (?<polish>\bPL\b)|
-                                                                                                          (?<bulgarian>\bBG\b))(?:(?i)(?![\W|_|^]SUB))",
+                                                                                                          (?<bulgarian>\bBG\b))(?:(?i)(?![\W|_|^]SUB))|
+                                                                                                          (?<slovak>\bSK\b)",
                                                                 RegexOptions.Compiled | RegexOptions.IgnorePatternWhitespace);
 
         private static readonly Regex SubtitleLanguageRegex = new Regex(".+?[-_. ](?<iso_code>[a-z]{2,3})(?:[-_. ]forced)?$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
@@ -182,6 +183,11 @@ namespace NzbDrone.Core.Parser
                 languages.Add(Language.Bengali);
             }
 
+            if (lowerTitle.Contains("slovak"))
+            {
+                languages.Add(Language.Slovak);
+            }
+
             // Case sensitive
             var caseSensitiveMatch = CaseSensitiveLanguageRegex.Match(title);
 
@@ -205,6 +211,11 @@ namespace NzbDrone.Core.Parser
                 languages.Add(Language.Bulgarian);
             }
 
+            if (caseSensitiveMatch.Groups["slovak"].Captures.Cast<Capture>().Any())
+            {
+                languages.Add(Language.Slovak);
+            }
+
             var matches = LanguageRegex.Matches(title);
 
             foreach (Match match in matches)

src/Radarr.Api.V3/Collections/CollectionController.cs

@@ -53,9 +53,25 @@ namespace Radarr.Api.V3.Collections
         }
 
         [HttpGet]
-        public List<CollectionResource> GetCollections()
+        public List<CollectionResource> GetCollections(int? tmdbId)
         {
-            return MapToResource(_collectionService.GetAllCollections()).ToList();
+            var collectionResources = new List<CollectionResource>();
+
+            if (tmdbId.HasValue)
+            {
+                var collection = _collectionService.FindByTmdbId(tmdbId.Value);
+
+                if (collection != null)
+                {
+                    collectionResources.AddIfNotNull(MapToResource(collection));
+                }
+            }
+            else
+            {
+                collectionResources = MapToResource(_collectionService.GetAllCollections()).ToList();
+            }
+
+            return collectionResources;
         }
 
         [RestPutById]

src/Radarr.Api.V3/openapi.json

@@ -589,6 +589,16 @@
         "tags": [
           "Collection"
         ],
+        "parameters": [
+          {
+            "name": "tmdbId",
+            "in": "query",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
         "responses": {
           "200": {
             "description": "Success",