From ded87375e1cd5b75b9fa11dd77f1b140e8bfe2ee Mon Sep 17 00:00:00 2001 From: Meiam <91270@qq.com> Date: Thu, 23 May 2024 16:58:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=96=B0=E7=89=88=20Jellyfin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Emby.MeiamSub.DevTool/Emby.MeiamSub.DevTool.csproj | 4 ++-- Emby.MeiamSub.DevTool/Program.cs | 7 ++++--- Emby.MeiamSub.Shooter/Emby.MeiamSub.Shooter.csproj | 10 +++++----- Emby.MeiamSub.Thunder/Emby.MeiamSub.Thunder.csproj | 10 +++++----- .../Jellyfin.MeiamSub.Shooter.csproj | 10 +++++----- .../Jellyfin.MeiamSub.Thunder.csproj | 8 ++++---- Jellyfin.MeiamSub.Thunder/ThunderProvider.cs | 6 +++--- 7 files changed, 28 insertions(+), 27 deletions(-) diff --git a/Emby.MeiamSub.DevTool/Emby.MeiamSub.DevTool.csproj b/Emby.MeiamSub.DevTool/Emby.MeiamSub.DevTool.csproj index c73e0d1..21114b1 100644 --- a/Emby.MeiamSub.DevTool/Emby.MeiamSub.DevTool.csproj +++ b/Emby.MeiamSub.DevTool/Emby.MeiamSub.DevTool.csproj @@ -1,8 +1,8 @@ - + Exe - netcoreapp3.1 + net8.0 diff --git a/Emby.MeiamSub.DevTool/Program.cs b/Emby.MeiamSub.DevTool/Program.cs index b898ae1..ce4b235 100644 --- a/Emby.MeiamSub.DevTool/Program.cs +++ b/Emby.MeiamSub.DevTool/Program.cs @@ -1,5 +1,6 @@ using System; using System.IO; +using System.Runtime.Intrinsics.Arm; using System.Security.Cryptography; using System.Text; @@ -19,12 +20,12 @@ namespace Emby.Subtitle.DevTool var stream = new FileStream(filePath, FileMode.Open, FileAccess.Read); var reader = new BinaryReader(stream); var fileSize = new FileInfo(filePath).Length; - var SHA1 = new SHA1CryptoServiceProvider(); + var sha1 = SHA1.Create(); var buffer = new byte[0xf000]; if (fileSize < 0xf000) { reader.Read(buffer, 0, (int)fileSize); - buffer = SHA1.ComputeHash(buffer, 0, (int)fileSize); + buffer = sha1.ComputeHash(buffer, 0, (int)fileSize); } else { @@ -34,7 +35,7 @@ namespace Emby.Subtitle.DevTool stream.Seek(fileSize - 0x5000, SeekOrigin.Begin); reader.Read(buffer, 0xa000, 0x5000); - buffer = SHA1.ComputeHash(buffer, 0, 0xf000); + buffer = sha1.ComputeHash(buffer, 0, 0xf000); } var result = ""; foreach (var i in buffer) diff --git a/Emby.MeiamSub.Shooter/Emby.MeiamSub.Shooter.csproj b/Emby.MeiamSub.Shooter/Emby.MeiamSub.Shooter.csproj index 7e07c24..c868033 100644 --- a/Emby.MeiamSub.Shooter/Emby.MeiamSub.Shooter.csproj +++ b/Emby.MeiamSub.Shooter/Emby.MeiamSub.Shooter.csproj @@ -1,8 +1,8 @@  - 1.0.9.0 - 1.0.9.0 - 1.0.9 + 1.0.10.0 + 1.0.10.0 + 1.0.10 netcoreapp3.1 @@ -20,8 +20,8 @@ - - + + diff --git a/Emby.MeiamSub.Thunder/Emby.MeiamSub.Thunder.csproj b/Emby.MeiamSub.Thunder/Emby.MeiamSub.Thunder.csproj index eef5003..1cbaa07 100644 --- a/Emby.MeiamSub.Thunder/Emby.MeiamSub.Thunder.csproj +++ b/Emby.MeiamSub.Thunder/Emby.MeiamSub.Thunder.csproj @@ -1,9 +1,9 @@  - 1.0.9.0 - 1.0.9.0 - 1.0.9 + 1.0.10.0 + 1.0.10.0 + 1.0.10 @@ -23,8 +23,8 @@ - - + + diff --git a/Jellyfin.MeiamSub.Shooter/Jellyfin.MeiamSub.Shooter.csproj b/Jellyfin.MeiamSub.Shooter/Jellyfin.MeiamSub.Shooter.csproj index 5da53de..f3bffa0 100644 --- a/Jellyfin.MeiamSub.Shooter/Jellyfin.MeiamSub.Shooter.csproj +++ b/Jellyfin.MeiamSub.Shooter/Jellyfin.MeiamSub.Shooter.csproj @@ -1,10 +1,10 @@  - net5.0 - 1.0.9 - 1.0.9.0 - 1.0.9.0 + net8.0 + 1.0.10 + 1.0.10.0 + 1.0.10.0 @@ -12,7 +12,7 @@ - + diff --git a/Jellyfin.MeiamSub.Thunder/Jellyfin.MeiamSub.Thunder.csproj b/Jellyfin.MeiamSub.Thunder/Jellyfin.MeiamSub.Thunder.csproj index 5aecd8b..8846528 100644 --- a/Jellyfin.MeiamSub.Thunder/Jellyfin.MeiamSub.Thunder.csproj +++ b/Jellyfin.MeiamSub.Thunder/Jellyfin.MeiamSub.Thunder.csproj @@ -2,11 +2,11 @@ Library - net5.0 + net8.0 - 1.0.9 - 1.0.9.0 + 1.0.10 + 1.0.10.0 @@ -14,7 +14,7 @@ - + diff --git a/Jellyfin.MeiamSub.Thunder/ThunderProvider.cs b/Jellyfin.MeiamSub.Thunder/ThunderProvider.cs index 8588636..ff32882 100644 --- a/Jellyfin.MeiamSub.Thunder/ThunderProvider.cs +++ b/Jellyfin.MeiamSub.Thunder/ThunderProvider.cs @@ -256,12 +256,12 @@ namespace Jellyfin.MeiamSub.Thunder var stream = new FileStream(filePath, FileMode.Open, FileAccess.Read); var reader = new BinaryReader(stream); var fileSize = new FileInfo(filePath).Length; - var SHA1 = new SHA1CryptoServiceProvider(); + var sha1 = SHA1.Create(); var buffer = new byte[0xf000]; if (fileSize < 0xf000) { reader.Read(buffer, 0, (int)fileSize); - buffer = SHA1.ComputeHash(buffer, 0, (int)fileSize); + buffer = sha1.ComputeHash(buffer, 0, (int)fileSize); } else { @@ -271,7 +271,7 @@ namespace Jellyfin.MeiamSub.Thunder stream.Seek(fileSize - 0x5000, SeekOrigin.Begin); reader.Read(buffer, 0xa000, 0x5000); - buffer = SHA1.ComputeHash(buffer, 0, 0xf000); + buffer = sha1.ComputeHash(buffer, 0, 0xf000); } var result = ""; foreach (var i in buffer)