Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2025-01-31 13:01:39 +01:00
Code Issues Projects Releases Wiki Activity

Still trying to get 7-zip working.....w3rw3

Browse Source
This commit is contained in:
Nikolaj Olsson 2024-12-12 20:36:13 +01:00
parent d9a23050e1
commit dd01fb81db
10 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build_beta.bat
View File

@ -183,12 +183,11 @@ COPY /Y /V "NHunspell.dll" "temp_zip\"
COPY /Y /V "UtfUnknown.dll" "temp_zip\"
COPY /Y /V "Vosk.dll" "temp_zip\"
COPY /Y /V "NCalc.dll" "temp_zip\"
COPY /Y /V "SevenZipExtractor.dll" "temp_zip\"
MD "temp_zip\x86"
MD "temp_zip\x64"
COPY /Y /V "x86\7z.dll" "temp_zip\x86\"
COPY /Y /V "x64\7z.dll" "temp_zip\x64\"
COPY /Y /V "..\..\..\DLLs\Interop.QuartzTypeLib.dll" "temp_zip\"
COPY /Y /V "x86\7zxa.dll" "temp_zip\x86\"
COPY /Y /V "x64\7zxa.dll" "temp_zip\x64\"
COPY /Y /V "..\..\..\DLLs\Interop.QuartzTypeLib.dll" "temp_zip\"
COPY /Y /V "System.Net.Http.Extensions.dll" "temp_zip\"
COPY /Y /V "Newtonsoft.Json.dll" "temp_zip\"
COPY /Y /V "System.Net.Http.Primitives.dll" "temp_zip\"

4
src/ui/Forms/AudioToText/WhisperDownload.cs
View File

@ -88,8 +88,8 @@ namespace Nikse.SubtitleEdit.Forms.AudioToText
"a4681b139c93d7b4b6cefbb4d72de175b3980a4c6052499ca9db473e817659479d2ef8096dfd0c50876194671b09b25985f6db56450b6b5f8a4117851cfd9f1f",
};
// private const string DownloadUrlPurfviewFasterWhisperXxl = "https://github.com/Purfview/whisper-standalone-win/releases/download/Faster-Whisper-XXL/Faster-Whisper-XXL_r239.1_windows.7z";
private const string DownloadUrlPurfviewFasterWhisperXxl = "https://github.com/SubtitleEdit/support-files/releases/download/whispercpp-172/test.7z";
private const string DownloadUrlPurfviewFasterWhisperXxl = "https://github.com/Purfview/whisper-standalone-win/releases/download/Faster-Whisper-XXL/Faster-Whisper-XXL_r239.1_windows.7z";
// private const string DownloadUrlPurfviewFasterWhisperXxl = "https://github.com/SubtitleEdit/support-files/releases/download/whispercpp-172/test.7z";
private static readonly string[] Sha512HashesPurfviewFasterWhisperXxl =
{

23
src/ui/Logic/SevenZipExtractor/ArchiveFile.cs
View File

@ -300,25 +300,14 @@ namespace SevenZipExtractor
{
string currentArchitecture = IntPtr.Size == 4 ? "x86" : "x64"; // magic check
if (File.Exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "7z-" + currentArchitecture + ".dll")))
var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, currentArchitecture, "7zxa.dll");
if (File.Exists(path))
{
this.libraryFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "7z-" + currentArchitecture + ".dll");
this.libraryFilePath = path;
}
else if (File.Exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "bin", "7z-" + currentArchitecture + ".dll")))
else if (File.Exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, currentArchitecture, "7zxa.dll")))
{
this.libraryFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "bin", "7z-" + currentArchitecture + ".dll");
}
else if (File.Exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "bin", currentArchitecture, "7z.dll")))
{
this.libraryFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "bin", currentArchitecture, "7z.dll");
}
else if (File.Exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, currentArchitecture, "7z.dll")))
{
this.libraryFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, currentArchitecture, "7z.dll");
}
else if (File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "7-Zip", "7z.dll")))
{
this.libraryFilePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "7-Zip", "7z.dll");
this.libraryFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, currentArchitecture, "7zxa.dll");
}
}
@ -329,7 +318,7 @@ namespace SevenZipExtractor
if (!File.Exists(this.libraryFilePath))
{
throw new SevenZipException("7z.dll not found");
throw new SevenZipException("7zxa.dll not found");
}
try

12
src/ui/SubtitleEdit.csproj
View File

@ -109,9 +109,21 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="x64\7z.dll">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</None>
<None Update="x64\7za.dll">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</None>
<None Update="x64\7zxa.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="x86\7z.dll">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</None>
<None Update="x86\7za.dll">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</None>
<None Update="x86\7zxa.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<Content Include="Languages\ar-EG.xml">

BIN
src/ui/x64/7z.dll
View File

Binary file not shown.

BIN
src/ui/x64/7za.dll Normal file
View File

Binary file not shown.

BIN
src/ui/x64/7zxa.dll Normal file
View File

Binary file not shown.

BIN
src/ui/x86/7z.dll
View File

Binary file not shown.

BIN
src/ui/x86/7za.dll Normal file
View File

Binary file not shown.

BIN
src/ui/x86/7zxa.dll Normal file
View File

Binary file not shown.