diff --git a/src/Ombi.Helpers.Tests/Ombi.Helpers.Tests.csproj b/src/Ombi.Helpers.Tests/Ombi.Helpers.Tests.csproj
new file mode 100644
index 000000000..0517af22d
--- /dev/null
+++ b/src/Ombi.Helpers.Tests/Ombi.Helpers.Tests.csproj
@@ -0,0 +1,19 @@
+
+
+
+ netcoreapp2.2
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Ombi.Helpers.Tests/PlexHelperTests.cs b/src/Ombi.Helpers.Tests/PlexHelperTests.cs
new file mode 100644
index 000000000..8ecb3fa0a
--- /dev/null
+++ b/src/Ombi.Helpers.Tests/PlexHelperTests.cs
@@ -0,0 +1,52 @@
+using System;
+using NUnit.Framework;
+using System.Collections.Generic;
+
+namespace Ombi.Helpers.Tests
+{
+ [TestFixture]
+ public class PlexHelperTests
+ {
+
+ [TestCaseSource(nameof(ProviderIdGuidData))]
+ public string GetProviderIdFromPlexGuidTests(string guidInput, ProviderIdType type)
+ {
+ var result = PlexHelper.GetProviderIdFromPlexGuid(guidInput);
+
+ switch (type)
+ {
+ case ProviderIdType.Imdb:
+ Assert.That(result.ImdbId, Is.Not.Null);
+ return result.ImdbId;
+ case ProviderIdType.TvDb:
+ Assert.That(result.TheTvDb, Is.Not.Null);
+ return result.TheTvDb;
+ case ProviderIdType.MovieDb:
+ Assert.That(result.TheMovieDb, Is.Not.Null);
+ return result.TheMovieDb;
+ default:
+ throw new ArgumentOutOfRangeException(nameof(type), type, null);
+ }
+ }
+
+ public static IEnumerable ProviderIdGuidData
+ {
+ get
+ {
+ yield return new TestCaseData("com.plexapp.agents.thetvdb://269586/2/8?lang=en", ProviderIdType.TvDb).Returns("269586").SetName("Regular TvDb Id");
+ yield return new TestCaseData("com.plexapp.agents.themoviedb://390043?lang=en", ProviderIdType.MovieDb).Returns("390043").SetName("Regular MovieDb Id");
+ yield return new TestCaseData("com.plexapp.agents.imdb://tt2543164?lang=en", ProviderIdType.Imdb).Returns("tt2543164").SetName("Regular Imdb Id");
+ yield return new TestCaseData("com.plexapp.agents.agent47://tt2543456?lang=en", ProviderIdType.Imdb).Returns("tt2543456").SetName("Unknown IMDB agent");
+ yield return new TestCaseData("com.plexapp.agents.agent47://456822/1/1?lang=en", ProviderIdType.TvDb).Returns("456822").SetName("Unknown TvDb agent");
+ yield return new TestCaseData("com.plexapp.agents.agent47://456822/999/999?lang=en", ProviderIdType.TvDb).Returns("456822").SetName("Unknown TvDb agent, large episode and season");
+ }
+ }
+
+ public enum ProviderIdType
+ {
+ Imdb,
+ TvDb,
+ MovieDb
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Ombi.Helpers/PlexHelper.cs b/src/Ombi.Helpers/PlexHelper.cs
index 93710022f..de61b8740 100644
--- a/src/Ombi.Helpers/PlexHelper.cs
+++ b/src/Ombi.Helpers/PlexHelper.cs
@@ -27,12 +27,15 @@
using System;
using System.Globalization;
+using System.Text.RegularExpressions;
namespace Ombi.Helpers
{
public class PlexHelper
{
-
+ private const string ImdbMatchExpression = "tt([0-9]{1,10})";
+ private const string TvDbIdMatchExpression = "//[0-9]+/([0-9]{1,3})/([0-9]{1,3})";
+
public static ProviderId GetProviderIdFromPlexGuid(string guid)
{
//com.plexapp.agents.thetvdb://269586/2/8?lang=en
@@ -52,7 +55,7 @@ namespace Ombi.Helpers
{
TheTvDb = guidSplit[1]
};
- }
+ } else
if (guid.Contains("themoviedb", CompareOptions.IgnoreCase))
{
return new ProviderId
@@ -60,6 +63,7 @@ namespace Ombi.Helpers
TheMovieDb = guidSplit[1]
};
}
+ else
if (guid.Contains("imdb", CompareOptions.IgnoreCase))
{
return new ProviderId
@@ -67,6 +71,31 @@ namespace Ombi.Helpers
ImdbId = guidSplit[1]
};
}
+ else
+ {
+ var imdbRegex = new Regex(ImdbMatchExpression, RegexOptions.Compiled);
+ var tvdbRegex = new Regex(TvDbIdMatchExpression, RegexOptions.Compiled);
+ var imdbMatch = imdbRegex.IsMatch(guid);
+ if (imdbMatch)
+ {
+ return new ProviderId
+ {
+ ImdbId = guidSplit[1]
+ };
+ }
+ else
+ {
+ // Check if it matches the TvDb pattern
+ var tvdbMatch = tvdbRegex.IsMatch(guid);
+ if (tvdbMatch)
+ {
+ return new ProviderId
+ {
+ TheTvDb = guidSplit[1]
+ };
+ }
+ }
+ }
}
return new ProviderId();
}
diff --git a/src/Ombi.sln b/src/Ombi.sln
index 1dfaa1dc6..2b9be2c42 100644
--- a/src/Ombi.sln
+++ b/src/Ombi.sln
@@ -94,7 +94,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ombi.Api.SickRage", "Ombi.A
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ombi.Api.Notifications", "Ombi.Api.Notifications\Ombi.Api.Notifications.csproj", "{10D1FE9D-9124-42B7-B1E1-CEB99B832618}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ombi.Api.Lidarr", "Ombi.Api.Lidarr\Ombi.Api.Lidarr.csproj", "{4FA21A20-92F4-462C-B929-2C517A88CC56}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ombi.Api.Lidarr", "Ombi.Api.Lidarr\Ombi.Api.Lidarr.csproj", "{4FA21A20-92F4-462C-B929-2C517A88CC56}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ombi.Helpers.Tests", "Ombi.Helpers.Tests\Ombi.Helpers.Tests.csproj", "{CC8CEFCD-0CB6-45BB-845F-508BCAB5BDC3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -250,6 +252,10 @@ Global
{4FA21A20-92F4-462C-B929-2C517A88CC56}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4FA21A20-92F4-462C-B929-2C517A88CC56}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4FA21A20-92F4-462C-B929-2C517A88CC56}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CC8CEFCD-0CB6-45BB-845F-508BCAB5BDC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CC8CEFCD-0CB6-45BB-845F-508BCAB5BDC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CC8CEFCD-0CB6-45BB-845F-508BCAB5BDC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CC8CEFCD-0CB6-45BB-845F-508BCAB5BDC3}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -286,6 +292,7 @@ Global
{94C9A366-2595-45EA-AABB-8E4A2E90EC5B} = {9293CA11-360A-4C20-A674-B9E794431BF5}
{10D1FE9D-9124-42B7-B1E1-CEB99B832618} = {9293CA11-360A-4C20-A674-B9E794431BF5}
{4FA21A20-92F4-462C-B929-2C517A88CC56} = {9293CA11-360A-4C20-A674-B9E794431BF5}
+ {CC8CEFCD-0CB6-45BB-845F-508BCAB5BDC3} = {6F42AB98-9196-44C4-B888-D5E409F415A1}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {192E9BF8-00B4-45E4-BCCC-4C215725C869}