支持新版本 Emby ， 迅雷调整到新接口

Emby.MeiamSub.Shooter/Emby.MeiamSub.Shooter.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <AssemblyVersion>1.0.10.0</AssemblyVersion>
-    <FileVersion>1.0.10.0</FileVersion>
-    <Version>1.0.10</Version>
+    <AssemblyVersion>1.0.11.0</AssemblyVersion>
+    <FileVersion>1.0.11.0</FileVersion>
+    <Version>1.0.11</Version>
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

Emby.MeiamSub.Shooter/Plugin.cs

@@ -1,4 +1,5 @@
-using MediaBrowser.Common.Plugins;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Plugins;
 using MediaBrowser.Model.Drawing;
 using System;
 using System.IO;
@@ -11,6 +12,12 @@ namespace Emby.MeiamSub.Shooter
     /// </summary>
     public class Plugin : BasePlugin, IHasThumbImage
     {
+
+        public Plugin(IApplicationPaths applicationPaths)
+        {
+            Instance = this;
+        }
+
         /// <summary>
         /// 插件ID
         /// </summary>
@@ -31,6 +38,9 @@ namespace Emby.MeiamSub.Shooter
         /// </summary>
         public ImageFormat ThumbImageFormat => ImageFormat.Gif;
 
+
+        public static Plugin Instance { get; private set; }
+
         /// <summary>
         /// 缩略图资源文件
         /// </summary>

Emby.MeiamSub.Shooter/ShooterProvider.cs

@@ -8,14 +8,12 @@ using MediaBrowser.Model.Serialization;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
-using static System.Net.Mime.MediaTypeNames;
 
 namespace Emby.MeiamSub.Shooter
 {

Emby.MeiamSub.Thunder/Emby.MeiamSub.Thunder.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <AssemblyVersion>1.0.10.0</AssemblyVersion>
-    <FileVersion>1.0.10.0</FileVersion>
-    <Version>1.0.10</Version>
+    <AssemblyVersion>1.0.11.0</AssemblyVersion>
+    <FileVersion>1.0.11.0</FileVersion>
+    <Version>1.0.11</Version>
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -28,6 +28,11 @@
     <PackageReference Include="MediaBrowser.Server.Core" Version="4.8.10" />
   </ItemGroup>
 
+  
+  <ItemGroup>
+    <Folder Include="Configuration\" />
+  </ItemGroup>
+
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
     <Exec Command="Copy $(TargetDir)$(TargetFileName) $(SolutionDir)$(ConfigurationName)\$(TargetFileName) /y&#xD;&#xA;" />
   </Target>

Emby.MeiamSub.Thunder/Model/SubtitleResponseRoot.cs

@@ -2,39 +2,30 @@
 
 namespace Emby.MeiamSub.Thunder.Model
 {
-    public class SublistItem
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        public string scid { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public string sname { get; set; }
-        /// <summary>
-        /// 未知语言
-        /// </summary>
-        public string language { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public string rate { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public string surl { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public int svote { get; set; }
-    }
 
     public class SubtitleResponseRoot
     {
-        /// <summary>
-        /// 
-        /// </summary>
-        public List<SublistItem> sublist { get; set; }
+        public int Code { get; set; }
+        public List<SublistItem> Data { get; set; }
+        public string Result { get; set; }
     }
+
+    public class SublistItem
+    {
+        public string Gcid { get; set; }
+        public string Cid { get; set; }
+        public string Url { get; set; }
+        public string Ext { get; set; }
+        public string Name { get; set; }
+        public int Duration { get; set; }
+        public string[] Languages { get; set; }
+
+        public string Langs=> Languages != null ? string.Join(",", Languages) : string.Empty;
+
+        public int Source { get; set; }
+        public int Score { get; set; }
+        public int FingerprintfScore { get; set; }
+        public string ExtraName { get; set; }
+    }
+
 }

Emby.MeiamSub.Thunder/Plugin.cs

@@ -1,5 +1,8 @@
-using MediaBrowser.Common.Plugins;
+using MediaBrowser.Common;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Plugins;
 using MediaBrowser.Model.Drawing;
+using MediaBrowser.Model.Serialization;
 using System;
 using System.IO;
 
@@ -11,6 +14,12 @@ namespace Emby.MeiamSub.Thunder
     /// </summary>
     public class Plugin : BasePlugin, IHasThumbImage
     {
+
+        public Plugin(IApplicationPaths applicationPaths)
+        {
+            Instance = this;
+        }
+
         /// <summary>
         /// 插件ID
         /// </summary>
@@ -31,6 +40,9 @@ namespace Emby.MeiamSub.Thunder
         /// </summary>
         public ImageFormat ThumbImageFormat => ImageFormat.Gif;
 
+
+        public static Plugin Instance { get; private set; }
+
         /// <summary>
         /// 缩略图资源文件
         /// </summary>

Emby.MeiamSub.Thunder/ThunderProvider.cs

@@ -14,7 +14,7 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Web;
+using static System.Net.WebRequestMethods;
 
 namespace Emby.MeiamSub.Thunder
 {
@@ -28,11 +28,12 @@ namespace Emby.MeiamSub.Thunder
         public const string SSA = "ssa";
         public const string SRT = "srt";
 
-        private readonly ILogger _logger;
+        protected readonly ILogger _logger;
         private readonly IJsonSerializer _jsonSerializer;
         private readonly IHttpClient _httpClient;
 
         public int Order => 1;
+
         public string Name => "MeiamSub.Thunder";
 
         /// <summary>
@@ -61,7 +62,7 @@ namespace Emby.MeiamSub.Thunder
         /// <returns></returns>
         public async Task<IEnumerable<RemoteSubtitleInfo>> Search(SubtitleSearchRequest request, CancellationToken cancellationToken)
         {
-            _logger.Info($"{0} Search | SubtitleSearchRequest -> {1}", new object[2] { Name, _jsonSerializer.SerializeToString(request) });
+            _logger.Info("{0} Search | SubtitleSearchRequest -> {1}", new object[2] { Name, _jsonSerializer.SerializeToString(request) });
 
             var subtitles = await SearchSubtitlesAsync(request);
 
@@ -85,55 +86,62 @@ namespace Emby.MeiamSub.Thunder
 
             var cid = GetCidByFile(request.MediaPath);
 
-            _logger.Info($"{0} Search | FileHash -> {1}", new object[2] { Name, cid });     
+            _logger.Info("{0} Search | FileHash -> {1}", new object[2] { Name, cid });
 
-            var response = await _httpClient.GetResponse(new HttpRequestOptions
+
+            HttpRequestOptions options = new HttpRequestOptions
             {
-                //Url = $"http://sub.xmp.sandai.net:8000/subxl/{cid}.json",
-                Url = $"http://subtitle.kankan.xunlei.com:8000/subxl/{cid}.json",
+                Url = $"https://api-shoulei-ssl.xunlei.com/oracle/subtitle?&name={Path.GetFileName(request.MediaPath)}",
                 UserAgent = $"{Name}",
                 TimeoutMs = 30000,
                 AcceptHeader = "*/*",
-            });
+            };
+            var response = await _httpClient.GetResponse(options);
 
-            _logger.Info($"{0} Search | Response -> {1}", new object[2] { Name, _jsonSerializer.SerializeToString(response) });
+            _logger.Info("{0} Search | Response -> {1}", new object[2] { Name, _jsonSerializer.SerializeToString(response) });
 
             if (response.StatusCode == HttpStatusCode.OK)
             {
                 var subtitleResponse = _jsonSerializer.DeserializeFromStream<SubtitleResponseRoot>(response.Content);
 
-                if (subtitleResponse != null)
+                if (subtitleResponse.Code == 0)
                 {
-                    _logger.Info($"{0} Search | Response -> {1}", new object[2] { Name, _jsonSerializer.SerializeToString(subtitleResponse) });
+                    _logger.Info("{0} Search | Response -> {1}", new object[2] { Name, _jsonSerializer.SerializeToString(subtitleResponse) });
 
-                    var subtitles = subtitleResponse.sublist.Where(m => !string.IsNullOrEmpty(m.sname));
+                    var subtitles = subtitleResponse.Data.Where(m => !string.IsNullOrEmpty(m.Name));
+
+                    var remoteSubtitleInfos = new List<RemoteSubtitleInfo>();
 
                     if (subtitles.Count() > 0)
                     {
-                        _logger.Info($"{0} Search | Summary -> Get  {1}  Subtitles", new object[2] { Name, subtitles.Count() });
-
-                        return subtitles.Select(m => new RemoteSubtitleInfo()
+                        foreach (var item in subtitles)
                         {
-                            Id = Base64Encode(_jsonSerializer.SerializeToString(new DownloadSubInfo
+                            remoteSubtitleInfos.Add(new RemoteSubtitleInfo()
                             {
-                                Url = m.surl,
-                                Format = ExtractFormat(m.sname),
-                                Language = request.Language,
-                                IsForced = request.IsForced
-                            })),
-                            Name = $"[MEIAMSUB] { Path.GetFileName(request.MediaPath) } | {m.language} | 迅雷",
-                            Author = "Meiam ",
-                            CommunityRating = Convert.ToSingle(m.rate),
-                            ProviderName = $"{Name}",
-                            Format = ExtractFormat(m.sname),
-                            Comment = $"Format : { ExtractFormat(m.sname)}  -  Rate : { m.rate }",
-                            IsHashMatch = true
-                        }).OrderByDescending(m => m.CommunityRating);
+                                Id = Base64Encode(_jsonSerializer.SerializeToString(new DownloadSubInfo
+                                {
+                                    Url = item.Url,
+                                    Format = item.Ext,
+                                    Language = request.Language,
+                                    IsForced = request.IsForced
+                                })),
+                                Name = $"[MEIAMSUB] {item.Name} | {(item.Langs == string.Empty ? "未知" : item.Langs)} | 迅雷",
+                                Author = "Meiam ",
+                                ProviderName = $"{Name}",
+                                Format = item.Ext,
+                                Comment = $"Format : {item.Ext}",
+                                IsHashMatch = cid == item.Cid,
+                            });
+                        }
                     }
+
+                    _logger.Info("{0} Search | Summary -> Get  {1}  Subtitles", new object[2] { Name, remoteSubtitleInfos.Count });
+
+                    return remoteSubtitleInfos;
                 }
             }
 
-            _logger.Info($"{0} Search | Summary -> Get  0  Subtitles", new object[1] { Name });
+            _logger.Info("{0} Search | Summary -> Get  0  Subtitles", new object[1] { Name });
 
 
             return Array.Empty<RemoteSubtitleInfo>();
@@ -149,7 +157,7 @@ namespace Emby.MeiamSub.Thunder
         /// <returns></returns>
         public async Task<SubtitleResponse> GetSubtitles(string id, CancellationToken cancellationToken)
         {
-            _logger.Info($"{0} DownloadSub | Request -> {1}", new object[2] { Name, id });  
+            _logger.Info("{0} DownloadSub | Request -> {1}", new object[2] { Name, id });  
 
             return await DownloadSubAsync(id);
         }
@@ -168,7 +176,7 @@ namespace Emby.MeiamSub.Thunder
                 return new SubtitleResponse();
             }
 
-            _logger.Info($"{0} DownloadSub | Url -> {1}  |  Format -> {2} |  Language -> {3} ",
+            _logger.Info("{0} DownloadSub | Url -> {1}  |  Format -> {2} |  Language -> {3} ",
                 new object[4] { Name, downloadSub.Url, downloadSub.Format, downloadSub.Language });
 
             var response = await _httpClient.GetResponse(new HttpRequestOptions
@@ -179,7 +187,7 @@ namespace Emby.MeiamSub.Thunder
                 AcceptHeader = "*/*",
             });
 
-            _logger.Info($"{0} DownloadSub | Response -> {1}", new object[2] { Name, response.StatusCode });
+            _logger.Info("{0} DownloadSub | Response -> {1}", new object[2] { Name, response.StatusCode });
 
             if (response.StatusCode == HttpStatusCode.OK)
             {

Jellyfin.MeiamSub.Shooter/Jellyfin.MeiamSub.Shooter.csproj

@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <Version>1.0.10</Version>
-    <AssemblyVersion>1.0.10.0</AssemblyVersion>
-    <FileVersion>1.0.10.0</FileVersion>
+    <Version>1.0.11</Version>
+    <AssemblyVersion>1.0.11.0</AssemblyVersion>
+    <FileVersion>1.0.11.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Jellyfin.Controller" Version="10.9.11" />
+    <PackageReference Include="Jellyfin.Controller" Version="10.10.3" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Jellyfin.MeiamSub.Shooter/ShooterProvider.cs

@@ -39,7 +39,7 @@ namespace Jellyfin.MeiamSub.Shooter
 
         private string apiUrl => "https://www.shooter.cn/api/subapi.php";
 
-        public int Order => 1000;
+        public int Order => 1;
 
         public string Name => "MeiamSub.Shooter";
 

Jellyfin.MeiamSub.Thunder/Jellyfin.MeiamSub.Thunder.csproj

@@ -5,8 +5,8 @@
     <TargetFramework>net8.0</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
-    <Version>1.0.10</Version>
-    <AssemblyVersion>1.0.10.0</AssemblyVersion>
+    <Version>1.0.11</Version>
+    <AssemblyVersion>1.0.11.0</AssemblyVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Jellyfin.Controller" Version="10.9.11" />
+    <PackageReference Include="Jellyfin.Controller" Version="10.10.3" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Jellyfin.MeiamSub.Thunder/Model/SubtitleResponseRoot.cs

@@ -2,39 +2,28 @@
 
 namespace Jellyfin.MeiamSub.Thunder.Model
 {
-    public class SublistItem
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        public string scid { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public string sname { get; set; }
-        /// <summary>
-        /// 未知语言
-        /// </summary>
-        public string language { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public string rate { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public string surl { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public int svote { get; set; }
-    }
-
     public class SubtitleResponseRoot
     {
-        /// <summary>
-        /// 
-        /// </summary>
-        public List<SublistItem> sublist { get; set; }
+        public int Code { get; set; }
+        public List<SublistItem> Data { get; set; }
+        public string Result { get; set; }
+    }
+
+    public class SublistItem
+    {
+        public string Gcid { get; set; }
+        public string Cid { get; set; }
+        public string Url { get; set; }
+        public string Ext { get; set; }
+        public string Name { get; set; }
+        public int Duration { get; set; }
+        public string[] Languages { get; set; }
+
+        public string Langs => Languages != null ? string.Join(",", Languages) : string.Empty;
+
+        public int Source { get; set; }
+        public int Score { get; set; }
+        public int FingerprintfScore { get; set; }
+        public string ExtraName { get; set; }
     }
 }

Jellyfin.MeiamSub.Thunder/ThunderProvider.cs

@@ -85,8 +85,7 @@ namespace Jellyfin.MeiamSub.Thunder
             using var options = new HttpRequestMessage
             {
                 Method = HttpMethod.Get,
-                //RequestUri = new Uri($"http://sub.xmp.sandai.net:8000/subxl/{cid}.json"),
-                RequestUri = new Uri($"http://subtitle.kankan.xunlei.com:8000/subxl/{cid}.json"),
+                RequestUri = new Uri($"https://api-shoulei-ssl.xunlei.com/oracle/subtitle?&name={Path.GetFileName(request.MediaPath)}"),
                 Headers =
                     {
                         UserAgent = { new ProductInfoHeaderValue(new ProductHeaderValue($"{Name}")) },
@@ -106,30 +105,36 @@ namespace Jellyfin.MeiamSub.Thunder
                 {
                     _logger.LogInformation($"{Name} Search | Response -> { JsonSerializer.Serialize(subtitleResponse) }");
 
-                    var subtitles = subtitleResponse.sublist.Where(m => !string.IsNullOrEmpty(m.sname));
+                    var subtitles = subtitleResponse.Data.Where(m => !string.IsNullOrEmpty(m.Name));
+
+                    var remoteSubtitleInfos = new List<RemoteSubtitleInfo>();
 
                     if (subtitles.Count() > 0)
                     {
-                        _logger.LogInformation($"{Name} Search | Summary -> Get  { subtitles.Count() }  Subtitles");
-
-                        return subtitles.Select(m => new RemoteSubtitleInfo()
+                        foreach (var item in subtitles)
                         {
-                            Id = Base64Encode(JsonSerializer.Serialize(new DownloadSubInfo
+                            remoteSubtitleInfos.Add(new RemoteSubtitleInfo()
                             {
-                                Url = m.surl,
-                                Format = ExtractFormat(m.sname),
-                                Language = request.Language,
-                                TwoLetterISOLanguageName = request.TwoLetterISOLanguageName,
-                            })),
-                            Name = $"[MEIAMSUB] { Path.GetFileName(request.MediaPath) } | {request.TwoLetterISOLanguageName} | 迅雷",
-                            Author = "Meiam ",
-                            CommunityRating = Convert.ToSingle(m.rate),
-                            ProviderName = $"{Name}",
-                            Format = ExtractFormat(m.sname),
-                            Comment = $"Format : { ExtractFormat(m.sname)}  -  Rate : { m.rate }",
-                            IsHashMatch = true
-                        }).OrderByDescending(m => m.CommunityRating);
+                                Id = Base64Encode(JsonSerializer.Serialize(new DownloadSubInfo
+                                {
+                                    Url = item.Url,
+                                    Format = item.Ext,
+                                    Language = request.Language,
+                                    TwoLetterISOLanguageName = request.TwoLetterISOLanguageName,
+                                })),
+                                Name = $"[MEIAMSUB] {item.Name} | {(item.Langs == string.Empty ? "未知" : item.Langs)} | 迅雷",
+                                Author = "Meiam ",
+                                ProviderName = $"{Name}",
+                                Format = item.Ext,
+                                Comment = $"Format : {item.Ext}",
+                                IsHashMatch = cid == item.Cid,
+                            });
+                        }
                     }
+
+                    _logger.LogInformation($"{Name} Search | Summary -> Get  {subtitles.Count()}  Subtitles");
+
+                    return remoteSubtitleInfos;
                 }
             }