Merge pull request #7 from ArabCoders/dev

Added support for playlist.
arabcoders · Sep 11, 2023 · 6994271 · 6994271
2 parents 81b2c86 + 190cb2e
commit 6994271
Show file tree

Hide file tree

Showing 8 changed files with 100 additions and 12 deletions.
diff --git a/Jellyfin.Plugin.YTINFOReader.Providers.Tests/UtilsTests.cs b/Jellyfin.Plugin.YTINFOReader.Providers.Tests/UtilsTests.cs
@@ -50,6 +50,25 @@ public void GetYouTubeChannelIds(string fn, string expected)
             Assert.Equal(expected, result);
         }
 
+        [Theory]
+        [InlineData("Foo", "")]
+        [InlineData("Cool playlist [PLirUFnHsz2_v-j-wQfot7uYSeoRgFv0K0].info.json", "PLirUFnHsz2_v-j-wQfot7uYSeoRgFv0K0")]
+        [InlineData("Cool playlist [youtube-PLirUFnHsz2_v-j-wQfot7uYSeoRgFv0K0].info.json", "PLirUFnHsz2_v-j-wQfot7uYSeoRgFv0K0")]
+        [InlineData("Cool playlist using channel id [UCU_fSrQkYzBBe9jtep0EIIg].info.json", "")]
+        [InlineData("Cool playlist using channel id [youtube-UCU_fSrQkYzBBe9jtep0EIIg].info.json", "")]
+        public void GetYouTubePlaylistIds(string fn, string expected)
+        {
+            var rxp = new Regex(Constants.PLAYLIST_RX, RegexOptions.Compiled | RegexOptions.IgnoreCase);
+            var result = "";
+            if (rxp.IsMatch(fn))
+            {
+                MatchCollection match = rxp.Matches(fn);
+                result = match[0].Groups["id"].ToString();
+            }
+
+            Assert.Equal(expected, result);
+        }
+
         [Fact]
         public void CreatePersonTest()
         {

diff --git a/Jellyfin.Plugin.YTINFOReader/ExternalId.cs b/Jellyfin.Plugin.YTINFOReader/ExternalId.cs
@@ -10,8 +10,7 @@ namespace Jellyfin.Plugin.YTINFOReader
 {
     public class VideoExternalId : IExternalId
     {
-        public bool Supports(IHasProviderIds item)
-            => item is Movie || item is Episode || item is MusicVideo;
+        public bool Supports(IHasProviderIds item) => item is Movie || item is Episode || item is MusicVideo;
 
         public string ProviderName => Constants.PLUGIN_NAME;
 
@@ -24,14 +23,71 @@ public bool Supports(IHasProviderIds item)
 
     public class SeriesExternalId : IExternalId
     {
-        public bool Supports(IHasProviderIds item) => item is Series;
+        public bool Supports(IHasProviderIds item)
+        {
+            if (false == item.ProviderIds.TryGetValue(Constants.PLUGIN_NAME, out var id))
+            {
+                return false;
+            }
+
+            var isChannel = id.StartsWith("UC") || id.StartsWith("HC");
+
+            return item is Series && isChannel;
+        }
 
         public string ProviderName => Constants.PLUGIN_NAME;
 
         public string Key => Constants.PLUGIN_NAME;
 
-        public ExternalIdMediaType? Type => null;
+        public ExternalIdMediaType? Type => ExternalIdMediaType.Series;
 
         public string UrlFormatString => Constants.CHANNEL_URL;
     }
+
+    public class PlaylistExternalId : IExternalId
+    {
+        public bool Supports(IHasProviderIds item)
+        {
+            if (false == item.ProviderIds.TryGetValue(Constants.PLUGIN_NAME, out var id))
+            {
+                return false;
+            }
+
+            var isPlaylist = id.StartsWith("PL") || id.StartsWith("UU") || id.StartsWith("FL") || id.StartsWith("LP") || id.StartsWith("RD");
+
+            return item is Series && isPlaylist;
+        }
+
+        public string ProviderName => Constants.PLUGIN_NAME;
+
+        public string Key => Constants.PLUGIN_NAME;
+
+        public ExternalIdMediaType? Type => ExternalIdMediaType.Series;
+
+        public string UrlFormatString => Constants.PLAYLIST_URL;
+    }
+
+    public class PlaylistSeasonExternalId : IExternalId
+    {
+        public bool Supports(IHasProviderIds item)
+        {
+            if (false == item.ProviderIds.TryGetValue(Constants.PLUGIN_NAME, out var id))
+            {
+                return false;
+            }
+
+            var isPlaylist = id.StartsWith("PL") || id.StartsWith("UU") || id.StartsWith("FL") || id.StartsWith("LP") || id.StartsWith("RD");
+
+            return item is Season && isPlaylist;
+        }
+
+        public string ProviderName => Constants.PLUGIN_NAME;
+
+        public string Key => Constants.PLUGIN_NAME;
+
+        public ExternalIdMediaType? Type => ExternalIdMediaType.Season;
+
+        public string UrlFormatString => Constants.PLAYLIST_URL;
+    }
+
 }
diff --git a/Jellyfin.Plugin.YTINFOReader/Helpers/Constants.cs b/Jellyfin.Plugin.YTINFOReader/Helpers/Constants.cs
@@ -8,5 +8,9 @@ public class Constants
         public const string CHANNEL_RX = @"(?<=\[)(?:youtube-)?(?<id>(UC|HC)[a-zA-Z0-9\-_]{22})(?=\])";
         public const string VIDEO_URL = "https://www.youtube.com/watch?v={0}";
         public const string VIDEO_RX = @"(?<=\[)(?:youtube-)?(?<id>[a-zA-Z0-9\-_]{11})(?=\])";
+
+        public const string PLAYLIST_RX = @"\[(?:youtube\-)?(?<id>PL[^\[\]]{16}|PL[^\[\]]{32}|(UU|FL|LP|RD)[^\[\]]{22})\]";
+
+        public const string PLAYLIST_URL = "https://www.youtube.com/playlist?list={0}";
     }
 }
diff --git a/Jellyfin.Plugin.YTINFOReader/Helpers/Utils.cs b/Jellyfin.Plugin.YTINFOReader/Helpers/Utils.cs
@@ -40,6 +40,13 @@ public static string GetYTID(string name)
                 return match[0].Groups["id"].ToString();
             }
 
+            var rxp = new Regex(Constants.PLAYLIST_RX, RegexOptions.Compiled | RegexOptions.IgnoreCase);
+            if (rxp.IsMatch(name))
+            {
+                MatchCollection match = rxp.Matches(name);
+                return match[0].Groups["id"].ToString();
+            }
+
             var rx = new Regex(Constants.VIDEO_RX, RegexOptions.Compiled | RegexOptions.IgnoreCase);
             if (rx.IsMatch(name))
             {

diff --git a/Jellyfin.Plugin.YTINFOReader/Jellyfin.Plugin.YTINFOReader.csproj b/Jellyfin.Plugin.YTINFOReader/Jellyfin.Plugin.YTINFOReader.csproj
@@ -2,9 +2,9 @@
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
 		<RootNamespace>Jellyfin.Plugin.YTINFOReader</RootNamespace>
-		<AssemblyVersion>1.0.0.3</AssemblyVersion>
-		<FileVersion>1.0.0.3</FileVersion>
-		<Version>1.0.0.3</Version>
+		<AssemblyVersion>1.0.0.4</AssemblyVersion>
+		<FileVersion>1.0.0.4</FileVersion>
+		<Version>1.0.0.4</Version>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
 	</PropertyGroup>
 	<ItemGroup>

diff --git a/Jellyfin.Plugin.YTINFOReader/Provider/LocalSeriesImageProvider.cs b/Jellyfin.Plugin.YTINFOReader/Provider/LocalSeriesImageProvider.cs
@@ -31,11 +31,12 @@ private string GetSeriesInfo(string path)
             matcher.AddInclude("**/*.jpg");
             matcher.AddInclude("**/*.png");
             matcher.AddInclude("**/*.webp");
-            Regex rx = new Regex(Constants.CHANNEL_RX, RegexOptions.Compiled | RegexOptions.IgnoreCase);
+            Regex rxc = new Regex(Constants.CHANNEL_RX, RegexOptions.Compiled | RegexOptions.IgnoreCase);
+            Regex rxp = new Regex(Constants.PLAYLIST_RX, RegexOptions.Compiled | RegexOptions.IgnoreCase);
             string infoPath = "";
             foreach (string file in matcher.GetResultsInFullPath(path))
             {
-                if (rx.IsMatch(file))
+                if (rxc.IsMatch(file) || rxp.IsMatch(file))
                 {
                     infoPath = file;
                     break;

diff --git a/Jellyfin.Plugin.YTINFOReader/Provider/LocalSeriesProvider.cs b/Jellyfin.Plugin.YTINFOReader/Provider/LocalSeriesProvider.cs
@@ -30,11 +30,12 @@ private string GetSeriesInfo(string path)
             _logger.LogDebug("YTLocalSeries GetSeriesInfo: {Path}", path);
             Matcher matcher = new();
             matcher.AddInclude("**/*.info.json");
-            Regex rx = new Regex(Constants.CHANNEL_RX, RegexOptions.Compiled | RegexOptions.IgnoreCase);
+            Regex rxc = new Regex(Constants.CHANNEL_RX, RegexOptions.Compiled | RegexOptions.IgnoreCase);
+            Regex rxp = new Regex(Constants.PLAYLIST_RX, RegexOptions.Compiled | RegexOptions.IgnoreCase);
             string infoPath = "";
             foreach (string file in matcher.GetResultsInFullPath(path))
             {
-                if (rx.IsMatch(file))
+                if (rxc.IsMatch(file) || rxp.IsMatch(file))
                 {
                     infoPath = file;
                     break;

diff --git a/build.yaml b/build.yaml
@@ -1,7 +1,7 @@
 ---
 name: "yt-dlp Info Reader"
 guid: "83b77e24-9fce-4ee0-a794-73fdfa972e64"
-version: "1.0.0.3"
+version: "1.0.0.4"
 targetAbi: "10.7.0.0"
 owner: "arabcoders"
 overview: "Read yt-dlp and compatiable INFO json metadata files."