Support bilibili ugc collection

cxfksword · Feb 6, 2023 · 3fab33f · 3fab33f
1 parent ca09be8
commit 3fab33f
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 2 deletions.
diff --git a/Jellyfin.Plugin.Danmu.Test/BilibiliApiTest.cs b/Jellyfin.Plugin.Danmu.Test/BilibiliApiTest.cs
@@ -83,5 +83,25 @@ public void TestGetVideoByBvidAsync()
                 }
             }).GetAwaiter().GetResult();
         }
+
+        [TestMethod]
+        public void TestGetVideoByBvidForCollectionAsync()
+        {
+            var bvid = "BV1z34y1h7yQ";
+            var _bilibiliApi = new BilibiliApi(loggerFactory);
+
+            Task.Run(async () =>
+            {
+                try
+                {
+                    var result = await _bilibiliApi.GetVideoByBvidAsync(bvid, CancellationToken.None);
+                    Console.WriteLine(result);
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine(ex.Message);
+                }
+            }).GetAwaiter().GetResult();
+        }
     }
 }
diff --git a/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/Bilibili.cs b/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/Bilibili.cs
@@ -64,9 +64,21 @@ public Bilibili(ILoggerFactory logManager)
 
             media.Id = id;
             media.Name = video.Title;
-            foreach (var (page, idx) in video.Pages.WithIndex())
+            if (video.UgcSeason != null && video.UgcSeason.Sections != null && video.UgcSeason.Sections.Count > 0)
             {
-                media.Episodes.Add(new ScraperEpisode() { Id = "", CommentId = $"{page.Cid}" });
+                // 合集
+                foreach (var (page, idx) in video.UgcSeason.Sections[0].Episodes.WithIndex())
+                {
+                    media.Episodes.Add(new ScraperEpisode() { Id = "", CommentId = $"{page.CId}" });
+                }
+            }
+            else
+            {
+                // 分P
+                foreach (var (page, idx) in video.Pages.WithIndex())
+                {
+                    media.Episodes.Add(new ScraperEpisode() { Id = "", CommentId = $"{page.Cid}" });
+                }
             }
 
             return media;

diff --git a/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/Entity/Video.cs b/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/Entity/Video.cs
@@ -24,5 +24,8 @@ public class Video
 
         [JsonPropertyName("pages")]
         public VideoPart[] Pages { get; set; }
+
+        [JsonPropertyName("ugc_season")]
+        public VideoUgcSeason? UgcSeason { get; set; }
     }
 }
diff --git a/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/Entity/VideoUgcSeason.cs b/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/Entity/VideoUgcSeason.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+
+namespace Jellyfin.Plugin.Danmu.Scrapers.Bilibili.Entity
+{
+    public class VideoUgcSeason
+    {
+        [JsonPropertyName("id")]
+        public long Id { get; set; }
+
+        [JsonPropertyName("title")]
+        public string Title { get; set; }
+
+        [JsonPropertyName("sections")]
+        public List<VideoUgcSection> Sections { get; set; }
+    }
+
+    public class VideoUgcSection
+    {
+        [JsonPropertyName("id")]
+        public long Id { get; set; }
+
+        [JsonPropertyName("episodes")]
+        public List<VideoEpisode> Episodes { get; set; }
+    }
+}