Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-23 11:42:36 +01:00
Code Issues Projects Releases Wiki Activity

Try to fix crash getting folder

Browse Source 
Work on #6607
This commit is contained in:
niksedk 2023-01-20 06:51:43 +01:00
parent 35455f3745
commit 3b7eb63d67
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/libse/AudioToText/WhisperHelper.cs
View File

@ -83,7 +83,7 @@ namespace Nikse.SubtitleEdit.Core.AudioToText
return Path.GetDirectoryName(Configuration.Settings.Tools.WhisperXLocation);
}
if (Directory.Exists(Configuration.Settings.Tools.WhisperXLocation) && File.Exists(Path.Combine(location, "whisperx.exe")))
if (Directory.Exists(Configuration.Settings.Tools.WhisperXLocation) && File.Exists(Path.Combine(Configuration.Settings.Tools.WhisperXLocation, "whisperx.exe")))
{
return Configuration.Settings.Tools.WhisperXLocation;
}
@ -129,11 +129,27 @@ namespace Nikse.SubtitleEdit.Core.AudioToText
public static string GetWhisperPathAndFileName()
{
var whisperFolder = GetWhisperFolder();
if (string.IsNullOrEmpty(whisperFolder))
{
if (Configuration.Settings.Tools.WhisperChoice == WhisperChoice.Cpp)
{
return "main";
}
if (Configuration.Settings.Tools.WhisperChoice == WhisperChoice.WhisperX)
{
return "whisperx";
}
return "whisper";
}
if (Configuration.IsRunningOnWindows)
{
if (Configuration.Settings.Tools.WhisperChoice == WhisperChoice.Cpp)
{
var f = Path.Combine(GetWhisperFolder(), "main.exe");
var f = Path.Combine(whisperFolder, "main.exe");
if (File.Exists(f))
{
return f;
@ -141,7 +157,7 @@ namespace Nikse.SubtitleEdit.Core.AudioToText
}
else if (Configuration.Settings.Tools.WhisperChoice == WhisperChoice.WhisperX)
{
var f = Path.Combine(GetWhisperFolder(), "whisperx.exe");
var f = Path.Combine(whisperFolder, "whisperx.exe");
if (File.Exists(f))
{
return f;
@ -149,7 +165,7 @@ namespace Nikse.SubtitleEdit.Core.AudioToText
}
else
{
var f = Path.Combine(GetWhisperFolder(), "whisper.exe");
var f = Path.Combine(whisperFolder, "whisper.exe");
if (File.Exists(f))
{
return f;
@ -159,7 +175,7 @@ namespace Nikse.SubtitleEdit.Core.AudioToText
if (Configuration.IsRunningOnLinux && Configuration.Settings.Tools.WhisperChoice == WhisperChoice.Cpp)
{
var f = Path.Combine(GetWhisperFolder(), "main");
var f = Path.Combine(whisperFolder, "main");
if (File.Exists(f))
{
return f;
@ -167,7 +183,7 @@ namespace Nikse.SubtitleEdit.Core.AudioToText
}
else if (Configuration.IsRunningOnLinux && Configuration.Settings.Tools.WhisperChoice == WhisperChoice.WhisperX)
{
var f = Path.Combine(GetWhisperFolder(), "whisperx");
var f = Path.Combine(whisperFolder, "whisperx");
if (File.Exists(f))
{
return f;