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

Fix regression from commit 33893f93df - thx ivandrofly/moob :)

Browse Source 
Fix #3785
This commit is contained in:
Nikolaj Olsson 2019-09-30 15:47:33 +02:00
parent 2f33c09c7b
commit b3878fa94c
3 changed files with 73 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libse/Utilities.cs
View File

@ -2777,17 +2777,17 @@ namespace Nikse.SubtitleEdit.Core
return false; return false;
} }
public static string GetFileNameWithoutExtension(string fileName) public static string GetPathAndFileNameWithoutExtension(string fileName)
{ {
if (string.IsNullOrEmpty(fileName)) if (string.IsNullOrEmpty(fileName))
{ {
return fileName; return fileName;
} }
var idx = fileName.LastIndexOf('.'); var indexOfPeriod = fileName.LastIndexOf('.');
if (idx > 0) if (indexOfPeriod > 0 && fileName.LastIndexOf(Path.DirectorySeparatorChar) < indexOfPeriod)
{ {
return fileName.Substring(0, idx); return fileName.Substring(0, indexOfPeriod);
} }
return fileName; return fileName;

82
src/Forms/Main.cs
View File

@ -2140,7 +2140,7 @@ namespace Nikse.SubtitleEdit.Forms
_subtitle = new Subtitle(); _subtitle = new Subtitle();
var mxfFormat = _subtitle.ReloadLoadSubtitle(list, null, null); var mxfFormat = _subtitle.ReloadLoadSubtitle(list, null, null);
SetCurrentFormat(mxfFormat); SetCurrentFormat(mxfFormat);
_fileName = Utilities.GetFileNameWithoutExtension(fileName) + GetCurrentSubtitleFormat().Extension; _fileName = Utilities.GetPathAndFileNameWithoutExtension(fileName) + GetCurrentSubtitleFormat().Extension;
SetTitle(); SetTitle();
ShowStatus(string.Format(_language.LoadedSubtitleX, _fileName)); ShowStatus(string.Format(_language.LoadedSubtitleX, _fileName));
_sourceViewChange = false; _sourceViewChange = false;
@ -2879,7 +2879,7 @@ namespace Nikse.SubtitleEdit.Forms
} }
else if (!string.IsNullOrEmpty(fileName) && (toolStripButtonToggleVideo.Checked || toolStripButtonToggleWaveform.Checked)) else if (!string.IsNullOrEmpty(fileName) && (toolStripButtonToggleVideo.Checked || toolStripButtonToggleWaveform.Checked))
{ {
TryToFindAndOpenVideoFile(Path.Combine(Path.GetDirectoryName(fileName), Utilities.GetFileNameWithoutExtension(fileName))); TryToFindAndOpenVideoFile(Utilities.GetPathAndFileNameWithoutExtension(fileName));
} }
if (_videoFileName == null) if (_videoFileName == null)
@ -3058,7 +3058,7 @@ namespace Nikse.SubtitleEdit.Forms
string title = _languageGeneral.NoVideoLoaded; string title = _languageGeneral.NoVideoLoaded;
if (!string.IsNullOrEmpty(_videoFileName)) if (!string.IsNullOrEmpty(_videoFileName))
{ {
title = Utilities.GetFileNameWithoutExtension(_videoFileName); title = Path.GetFileNameWithoutExtension(_videoFileName);
} }
if (_videoControlsUndocked != null && !_videoControlsUndocked.IsDisposed) if (_videoControlsUndocked != null && !_videoControlsUndocked.IsDisposed)
@ -3414,7 +3414,7 @@ namespace Nikse.SubtitleEdit.Forms
if (!string.IsNullOrWhiteSpace(_fileName) && Configuration.Settings.General.SaveAsUseFileNameFrom.Equals("file", StringComparison.OrdinalIgnoreCase)) if (!string.IsNullOrWhiteSpace(_fileName) && Configuration.Settings.General.SaveAsUseFileNameFrom.Equals("file", StringComparison.OrdinalIgnoreCase))
{ {
saveFileDialog1.FileName = Utilities.GetFileNameWithoutExtension(_fileName); saveFileDialog1.FileName = Utilities.GetPathAndFileNameWithoutExtension(_fileName);
saveFileDialog1.InitialDirectory = Path.GetDirectoryName(_fileName); saveFileDialog1.InitialDirectory = Path.GetDirectoryName(_fileName);
} }
else if (!string.IsNullOrEmpty(_videoFileName) && Configuration.Settings.General.SaveAsUseFileNameFrom.Equals("video", StringComparison.OrdinalIgnoreCase)) else if (!string.IsNullOrEmpty(_videoFileName) && Configuration.Settings.General.SaveAsUseFileNameFrom.Equals("video", StringComparison.OrdinalIgnoreCase))
@ -3425,19 +3425,19 @@ namespace Nikse.SubtitleEdit.Forms
} }
else else
{ {
saveFileDialog1.FileName = Utilities.GetFileNameWithoutExtension(_videoFileName); saveFileDialog1.FileName = Utilities.GetPathAndFileNameWithoutExtension(_videoFileName);
} }
saveFileDialog1.InitialDirectory = Path.GetDirectoryName(_videoFileName); saveFileDialog1.InitialDirectory = Path.GetDirectoryName(_videoFileName);
} }
else if (!string.IsNullOrWhiteSpace(_fileName)) else if (!string.IsNullOrWhiteSpace(_fileName))
{ {
saveFileDialog1.FileName = Utilities.GetFileNameWithoutExtension(_fileName); saveFileDialog1.FileName = Utilities.GetPathAndFileNameWithoutExtension(_fileName);
saveFileDialog1.InitialDirectory = Path.GetDirectoryName(_fileName); saveFileDialog1.InitialDirectory = Path.GetDirectoryName(_fileName);
} }
else if (!string.IsNullOrEmpty(_videoFileName)) else if (!string.IsNullOrEmpty(_videoFileName))
{ {
saveFileDialog1.FileName = Utilities.GetFileNameWithoutExtension(_videoFileName); saveFileDialog1.FileName = Utilities.GetPathAndFileNameWithoutExtension(_videoFileName);
saveFileDialog1.InitialDirectory = Path.GetDirectoryName(_videoFileName); saveFileDialog1.InitialDirectory = Path.GetDirectoryName(_videoFileName);
} }
else else
@ -11413,7 +11413,7 @@ namespace Nikse.SubtitleEdit.Forms
} }
else else
{ {
TryToFindAndOpenVideoFile(Path.Combine(Path.GetDirectoryName(matroska.Path), Utilities.GetFileNameWithoutExtension(matroska.Path))); TryToFindAndOpenVideoFile(Path.Combine(Path.GetDirectoryName(matroska.Path), Path.GetFileNameWithoutExtension(matroska.Path)));
} }
} }
} }
@ -11806,7 +11806,7 @@ namespace Nikse.SubtitleEdit.Forms
SubtitleListview1.FirstVisibleIndex = -1; SubtitleListview1.FirstVisibleIndex = -1;
SubtitleListview1.SelectIndexAndEnsureVisible(0, true); SubtitleListview1.SelectIndexAndEnsureVisible(0, true);
_fileName = Utilities.GetFileNameWithoutExtension(matroska.Path) + GetCurrentSubtitleFormat().Extension; _fileName = Utilities.GetPathAndFileNameWithoutExtension(matroska.Path) + GetCurrentSubtitleFormat().Extension;
_converted = true; _converted = true;
Text = Title; Text = Title;
@ -11901,7 +11901,7 @@ namespace Nikse.SubtitleEdit.Forms
SubtitleListview1.FirstVisibleIndex = -1; SubtitleListview1.FirstVisibleIndex = -1;
SubtitleListview1.SelectIndexAndEnsureVisible(0, true); SubtitleListview1.SelectIndexAndEnsureVisible(0, true);
_fileName = Utilities.GetFileNameWithoutExtension(matroska.Path) + GetCurrentSubtitleFormat().Extension; _fileName = Utilities.GetPathAndFileNameWithoutExtension(matroska.Path) + GetCurrentSubtitleFormat().Extension;
_converted = true; _converted = true;
Text = Title; Text = Title;
@ -12130,7 +12130,7 @@ namespace Nikse.SubtitleEdit.Forms
if (!string.IsNullOrEmpty(formSubOcr.FileName)) if (!string.IsNullOrEmpty(formSubOcr.FileName))
{ {
var currentFormat = GetCurrentSubtitleFormat(); var currentFormat = GetCurrentSubtitleFormat();
_fileName = Utilities.GetFileNameWithoutExtension(formSubOcr.FileName) + currentFormat.Extension; _fileName = Utilities.GetPathAndFileNameWithoutExtension(formSubOcr.FileName) + currentFormat.Extension;
_converted = true; _converted = true;
} }
Text = Title; Text = Title;
@ -12410,7 +12410,7 @@ namespace Nikse.SubtitleEdit.Forms
SubtitleListview1.FirstVisibleIndex = -1; SubtitleListview1.FirstVisibleIndex = -1;
SubtitleListview1.SelectIndexAndEnsureVisible(0, true); SubtitleListview1.SelectIndexAndEnsureVisible(0, true);
_fileName = Utilities.GetFileNameWithoutExtension(fileName) + GetCurrentSubtitleFormat().Extension; _fileName = Utilities.GetPathAndFileNameWithoutExtension(fileName) + GetCurrentSubtitleFormat().Extension;
_converted = true; _converted = true;
Text = Title; Text = Title;
@ -12474,7 +12474,7 @@ namespace Nikse.SubtitleEdit.Forms
SubtitleListview1.FirstVisibleIndex = -1; SubtitleListview1.FirstVisibleIndex = -1;
SubtitleListview1.SelectIndexAndEnsureVisible(0, true); SubtitleListview1.SelectIndexAndEnsureVisible(0, true);
_fileName = Utilities.GetFileNameWithoutExtension(fileName) + GetCurrentSubtitleFormat().Extension; _fileName = Utilities.GetPathAndFileNameWithoutExtension(fileName) + GetCurrentSubtitleFormat().Extension;
_converted = true; _converted = true;
Text = Title; Text = Title;
@ -12856,7 +12856,7 @@ namespace Nikse.SubtitleEdit.Forms
return true; return true;
} }
var idxFileName = Path.Combine(Path.GetDirectoryName(subFileName), Utilities.GetFileNameWithoutExtension(subFileName) + ".idx"); var idxFileName = Utilities.GetPathAndFileNameWithoutExtension(subFileName) + ".idx";
if (File.Exists(idxFileName)) if (File.Exists(idxFileName))
{ {
return true; return true;
@ -17139,7 +17139,7 @@ namespace Nikse.SubtitleEdit.Forms
if (mediaPlayer.VideoPlayer == null && !string.IsNullOrEmpty(_fileName) && !Configuration.Settings.General.DisableVideoAutoLoading) if (mediaPlayer.VideoPlayer == null && !string.IsNullOrEmpty(_fileName) && !Configuration.Settings.General.DisableVideoAutoLoading)
{ {
TryToFindAndOpenVideoFile(Path.Combine(Path.GetDirectoryName(_fileName), Utilities.GetFileNameWithoutExtension(_fileName))); TryToFindAndOpenVideoFile(Utilities.GetPathAndFileNameWithoutExtension(_fileName));
} }
Main_Resize(null, null); Main_Resize(null, null);
@ -19211,7 +19211,7 @@ namespace Nikse.SubtitleEdit.Forms
var language = LanguageAutoDetect.AutoDetectGoogleLanguageOrNull(s); var language = LanguageAutoDetect.AutoDetectGoogleLanguageOrNull(s);
if (language != null && !string.IsNullOrEmpty(_fileName)) if (language != null && !string.IsNullOrEmpty(_fileName))
{ {
_fileName = Utilities.GetFileNameWithoutExtension(_fileName); _fileName = Utilities.GetPathAndFileNameWithoutExtension(_fileName);
var oldLang = "." + LanguageAutoDetect.AutoDetectGoogleLanguage(_subtitleAlternate); var oldLang = "." + LanguageAutoDetect.AutoDetectGoogleLanguage(_subtitleAlternate);
if (oldLang.Length == 3 && _fileName.EndsWith(oldLang, StringComparison.OrdinalIgnoreCase)) if (oldLang.Length == 3 && _fileName.EndsWith(oldLang, StringComparison.OrdinalIgnoreCase))
{ {
@ -19451,7 +19451,7 @@ namespace Nikse.SubtitleEdit.Forms
string title = string.Empty; string title = string.Empty;
if (!string.IsNullOrEmpty(_fileName)) if (!string.IsNullOrEmpty(_fileName))
{ {
title = "_" + Utilities.GetFileNameWithoutExtension(_fileName); title = "_" + Path.GetFileNameWithoutExtension(_fileName);
} }
string fileName = string.Format("{0}{1:0000}-{2:00}-{3:00}_{4:00}-{5:00}-{6:00}{7}{8}", Configuration.AutoBackupDirectory, DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second, title, saveFormat.Extension); string fileName = string.Format("{0}{1:0000}-{2:00}-{3:00}_{4:00}-{5:00}-{6:00}{7}{8}", Configuration.AutoBackupDirectory, DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second, title, saveFormat.Extension);
@ -19504,7 +19504,7 @@ namespace Nikse.SubtitleEdit.Forms
string title = string.Empty; string title = string.Empty;
if (!string.IsNullOrEmpty(_subtitleAlternateFileName)) if (!string.IsNullOrEmpty(_subtitleAlternateFileName))
{ {
title = "_" + Utilities.GetFileNameWithoutExtension(_subtitleAlternateFileName); title = "_" + Path.GetFileNameWithoutExtension(_subtitleAlternateFileName);
} }
string fileName = string.Format("{0}{1:0000}-{2:00}-{3:00}_{4:00}-{5:00}-{6:00}{7}{8}", Configuration.AutoBackupDirectory, DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second, "_Original" + title, saveFormat.Extension); string fileName = string.Format("{0}{1:0000}-{2:00}-{3:00}_{4:00}-{5:00}-{6:00}{7}{8}", Configuration.AutoBackupDirectory, DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second, "_Original" + title, saveFormat.Extension);
@ -21683,11 +21683,11 @@ namespace Nikse.SubtitleEdit.Forms
if (!string.IsNullOrEmpty(_videoFileName)) if (!string.IsNullOrEmpty(_videoFileName))
{ {
saveFileDialog1.FileName = Utilities.GetFileNameWithoutExtension(_videoFileName); saveFileDialog1.FileName = Utilities.GetPathAndFileNameWithoutExtension(_videoFileName);
} }
else if (!string.IsNullOrEmpty(_subtitleAlternateFileName)) else if (!string.IsNullOrEmpty(_subtitleAlternateFileName))
{ {
saveFileDialog1.FileName = Utilities.GetFileNameWithoutExtension(_subtitleAlternateFileName); saveFileDialog1.FileName = Utilities.GetPathAndFileNameWithoutExtension(_subtitleAlternateFileName);
} }
else else
{ {
@ -22406,11 +22406,11 @@ namespace Nikse.SubtitleEdit.Forms
if (!string.IsNullOrEmpty(_videoFileName)) if (!string.IsNullOrEmpty(_videoFileName))
{ {
saveFileDialog1.FileName = Utilities.GetFileNameWithoutExtension(_videoFileName); saveFileDialog1.FileName = Utilities.GetPathAndFileNameWithoutExtension(_videoFileName);
} }
else else
{ {
saveFileDialog1.FileName = Utilities.GetFileNameWithoutExtension(_fileName); saveFileDialog1.FileName = Utilities.GetPathAndFileNameWithoutExtension(_fileName);
} }
if (!string.IsNullOrEmpty(openFileDialog1.InitialDirectory)) if (!string.IsNullOrEmpty(openFileDialog1.InitialDirectory))
@ -22448,11 +22448,11 @@ namespace Nikse.SubtitleEdit.Forms
if (!string.IsNullOrEmpty(_videoFileName)) if (!string.IsNullOrEmpty(_videoFileName))
{ {
saveFileDialog1.FileName = Utilities.GetFileNameWithoutExtension(_videoFileName); saveFileDialog1.FileName = Utilities.GetPathAndFileNameWithoutExtension(_videoFileName);
} }
else else
{ {
saveFileDialog1.FileName = Utilities.GetFileNameWithoutExtension(_fileName); saveFileDialog1.FileName = Utilities.GetPathAndFileNameWithoutExtension(_fileName);
} }
if (!string.IsNullOrEmpty(openFileDialog1.InitialDirectory)) if (!string.IsNullOrEmpty(openFileDialog1.InitialDirectory))
@ -22496,11 +22496,11 @@ namespace Nikse.SubtitleEdit.Forms
if (!string.IsNullOrEmpty(_videoFileName)) if (!string.IsNullOrEmpty(_videoFileName))
{ {
saveFileDialog1.FileName = Utilities.GetFileNameWithoutExtension(_videoFileName); saveFileDialog1.FileName = Utilities.GetPathAndFileNameWithoutExtension(_videoFileName);
} }
else else
{ {
saveFileDialog1.FileName = Utilities.GetFileNameWithoutExtension(_fileName); saveFileDialog1.FileName = Utilities.GetPathAndFileNameWithoutExtension(_fileName);
} }
if (!string.IsNullOrEmpty(openFileDialog1.InitialDirectory)) if (!string.IsNullOrEmpty(openFileDialog1.InitialDirectory))
@ -22538,11 +22538,11 @@ namespace Nikse.SubtitleEdit.Forms
if (!string.IsNullOrEmpty(_videoFileName)) if (!string.IsNullOrEmpty(_videoFileName))
{ {
saveFileDialog1.FileName = Utilities.GetFileNameWithoutExtension(_videoFileName); saveFileDialog1.FileName = Utilities.GetPathAndFileNameWithoutExtension(_videoFileName);
} }
else else
{ {
saveFileDialog1.FileName = Utilities.GetFileNameWithoutExtension(_fileName); saveFileDialog1.FileName = Utilities.GetPathAndFileNameWithoutExtension(_fileName);
} }
if (!string.IsNullOrEmpty(openFileDialog1.InitialDirectory)) if (!string.IsNullOrEmpty(openFileDialog1.InitialDirectory))
@ -22580,11 +22580,11 @@ namespace Nikse.SubtitleEdit.Forms
if (!string.IsNullOrEmpty(_videoFileName)) if (!string.IsNullOrEmpty(_videoFileName))
{ {
saveFileDialog1.FileName = Utilities.GetFileNameWithoutExtension(_videoFileName); saveFileDialog1.FileName = Utilities.GetPathAndFileNameWithoutExtension(_videoFileName);
} }
else else
{ {
saveFileDialog1.FileName = Utilities.GetFileNameWithoutExtension(_fileName); saveFileDialog1.FileName = Utilities.GetPathAndFileNameWithoutExtension(_fileName);
} }
if (!string.IsNullOrEmpty(openFileDialog1.InitialDirectory)) if (!string.IsNullOrEmpty(openFileDialog1.InitialDirectory))
@ -23262,11 +23262,11 @@ namespace Nikse.SubtitleEdit.Forms
if (!string.IsNullOrEmpty(_videoFileName)) if (!string.IsNullOrEmpty(_videoFileName))
{ {
saveFileDialog1.FileName = Utilities.GetFileNameWithoutExtension(_videoFileName); saveFileDialog1.FileName = Utilities.GetPathAndFileNameWithoutExtension(_videoFileName);
} }
else else
{ {
saveFileDialog1.FileName = Utilities.GetFileNameWithoutExtension(_fileName); saveFileDialog1.FileName = Utilities.GetPathAndFileNameWithoutExtension(_fileName);
} }
if (!string.IsNullOrEmpty(openFileDialog1.InitialDirectory)) if (!string.IsNullOrEmpty(openFileDialog1.InitialDirectory))
@ -23304,11 +23304,11 @@ namespace Nikse.SubtitleEdit.Forms
if (!string.IsNullOrEmpty(_videoFileName)) if (!string.IsNullOrEmpty(_videoFileName))
{ {
saveFileDialog1.FileName = Utilities.GetFileNameWithoutExtension(_videoFileName); saveFileDialog1.FileName = Utilities.GetPathAndFileNameWithoutExtension(_videoFileName);
} }
else else
{ {
saveFileDialog1.FileName = Utilities.GetFileNameWithoutExtension(_fileName); saveFileDialog1.FileName = Utilities.GetPathAndFileNameWithoutExtension(_fileName);
} }
if (!string.IsNullOrEmpty(openFileDialog1.InitialDirectory)) if (!string.IsNullOrEmpty(openFileDialog1.InitialDirectory))
@ -23346,11 +23346,11 @@ namespace Nikse.SubtitleEdit.Forms
if (!string.IsNullOrEmpty(_videoFileName)) if (!string.IsNullOrEmpty(_videoFileName))
{ {
saveFileDialog1.FileName = Utilities.GetFileNameWithoutExtension(_videoFileName); saveFileDialog1.FileName = Utilities.GetPathAndFileNameWithoutExtension(_videoFileName);
} }
else else
{ {
saveFileDialog1.FileName = Utilities.GetFileNameWithoutExtension(_fileName); saveFileDialog1.FileName = Utilities.GetPathAndFileNameWithoutExtension(_fileName);
} }
if (!string.IsNullOrEmpty(openFileDialog1.InitialDirectory)) if (!string.IsNullOrEmpty(openFileDialog1.InitialDirectory))
@ -23388,11 +23388,11 @@ namespace Nikse.SubtitleEdit.Forms
if (!string.IsNullOrEmpty(_videoFileName)) if (!string.IsNullOrEmpty(_videoFileName))
{ {
saveFileDialog1.FileName = Utilities.GetFileNameWithoutExtension(_videoFileName); saveFileDialog1.FileName = Utilities.GetPathAndFileNameWithoutExtension(_videoFileName);
} }
else else
{ {
saveFileDialog1.FileName = Utilities.GetFileNameWithoutExtension(_fileName); saveFileDialog1.FileName = Utilities.GetPathAndFileNameWithoutExtension(_fileName);
} }
if (!string.IsNullOrEmpty(openFileDialog1.InitialDirectory)) if (!string.IsNullOrEmpty(openFileDialog1.InitialDirectory))
@ -24371,11 +24371,11 @@ namespace Nikse.SubtitleEdit.Forms
if (!string.IsNullOrEmpty(_videoFileName)) if (!string.IsNullOrEmpty(_videoFileName))
{ {
saveFileDialog1.FileName = Utilities.GetFileNameWithoutExtension(_videoFileName); saveFileDialog1.FileName = Utilities.GetPathAndFileNameWithoutExtension(_videoFileName);
} }
else else
{ {
saveFileDialog1.FileName = Utilities.GetFileNameWithoutExtension(_fileName); saveFileDialog1.FileName = Utilities.GetPathAndFileNameWithoutExtension(_fileName);
} }
if (!string.IsNullOrEmpty(openFileDialog1.InitialDirectory)) if (!string.IsNullOrEmpty(openFileDialog1.InitialDirectory))
@ -25200,7 +25200,7 @@ namespace Nikse.SubtitleEdit.Forms
{ {
ReloadFromSourceView(); ReloadFromSourceView();
string fileName = string.IsNullOrEmpty(_fileName) ? "UntitledSubtitle" : Utilities.GetFileNameWithoutExtension(_fileName); string fileName = string.IsNullOrEmpty(_fileName) ? "UntitledSubtitle" : Path.GetFileNameWithoutExtension(_fileName);
string language = LanguageAutoDetect.AutoDetectGoogleLanguage(_subtitle); string language = LanguageAutoDetect.AutoDetectGoogleLanguage(_subtitle);
var messages = new List<string>(); var messages = new List<string>();
var reportFiles = new List<string>(); var reportFiles = new List<string>();

28
src/Test/Logic/UtilitiesTest.cs
View File

@ -751,5 +751,33 @@ namespace Test.Logic
var result = Utilities.ReverseStartAndEndingForRightToLeft("♫Hey...♫"); var result = Utilities.ReverseStartAndEndingForRightToLeft("♫Hey...♫");
Assert.AreEqual("♫...Hey♫", result); Assert.AreEqual("♫...Hey♫", result);
} }
[TestMethod]
public void GetPathAndFileNameWithoutExtension1()
{
var result = Utilities.GetPathAndFileNameWithoutExtension("file.srt");
Assert.AreEqual("file", result);
}
[TestMethod]
public void GetPathAndFileNameWithoutExtension2()
{
var result = Utilities.GetPathAndFileNameWithoutExtension("how.are.you[eng].srt");
Assert.AreEqual("how.are.you[eng]", result);
}
[TestMethod]
public void GetPathAndFileNameWithoutExtension3()
{
var result = Utilities.GetPathAndFileNameWithoutExtension("C:" + System.IO.Path.DirectorySeparatorChar + "my.files" + System.IO.Path.DirectorySeparatorChar + "file1");
Assert.AreEqual("C:" + System.IO.Path.DirectorySeparatorChar + "my.files" + System.IO.Path.DirectorySeparatorChar + "file1", result);
}
[TestMethod]
public void GetPathAndFileNameWithoutExtension4()
{
var result = Utilities.GetPathAndFileNameWithoutExtension("C:" + System.IO.Path.DirectorySeparatorChar + "my.files" + System.IO.Path.DirectorySeparatorChar + "file1.srt");
Assert.AreEqual("C:" + System.IO.Path.DirectorySeparatorChar + "my.files" + System.IO.Path.DirectorySeparatorChar + "file1", result);
}
} }
} }