mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

GetActualCasing can partially fix the path for non-existing paths.

This commit is contained in:
kay.one 2013-08-29 18:26:03 -07:00
parent 5dc3a3223d
commit ef32431682
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
NzbDrone.Common.Test/PathExtensionFixture.cs
View File

@ -102,10 +102,18 @@ namespace NzbDrone.Common.Test
} }
[Test] [Test]
public void get_actual_casing_for_none_existing_file_should_throw() public void get_actual_casing_for_none_existing_file_return_partially_fixed_result()
{ {
WindowsOnly(); WindowsOnly();
Assert.Throws<DirectoryNotFoundException>(() => "C:\\InValidFolder\\invalidfile.exe".GetActualCasing()); "C:\\WINDOWS\\invalidfile.exe".GetActualCasing().Should().Be("C:\\Windows\\invalidfile.exe");
}
[Test]
public void get_actual_casing_for_none_existing_folder_return_partially_fixed_result()
{
WindowsOnly();
"C:\\WINDOWS\\SYSTEM32\\FAKEFOLDER\\invalidfile.exe".GetActualCasing().Should().Be("C:\\Windows\\System32\\FAKEFOLDER\\invalidfile.exe");
} }
[Test] [Test]
@ -117,14 +125,7 @@ namespace NzbDrone.Common.Test
path.ToLower().GetActualCasing().Should().Be(path); path.ToLower().GetActualCasing().Should().Be(path);
} }
[Test]
public void get_actual_casing_should_return_origibal_value_in_linux()
{
LinuxOnly();
var path = Process.GetCurrentProcess().MainModule.FileName;
path.GetActualCasing().Should().Be(path);
path.GetActualCasing().Should().Be(path);
}
[Test] [Test]
public void get_actual_casing_should_return_actual_casing_for_local_dir_in_windows() public void get_actual_casing_should_return_actual_casing_for_local_dir_in_windows()

14
NzbDrone.Common/PathExtensions.cs
View File

@ -63,23 +63,27 @@ namespace NzbDrone.Common
public static string GetActualCasing(this string path) public static string GetActualCasing(this string path)
{ {
var attributes = File.GetAttributes(path);
if (OsInfo.IsLinux || path.StartsWith("\\")) if (OsInfo.IsLinux || path.StartsWith("\\"))
{ {
return path; return path;
} }
if ((attributes & FileAttributes.Directory) == FileAttributes.Directory) if (Directory.Exists(path) && (File.GetAttributes(path) & FileAttributes.Directory) == FileAttributes.Directory)
{ {
return GetProperCapitalization(new DirectoryInfo(path)); return GetProperCapitalization(new DirectoryInfo(path));
} }
var fileInfo = new FileInfo(path); var fileInfo = new FileInfo(path);
var dirInfo = fileInfo.Directory;
var fileName = fileInfo.Name;
DirectoryInfo dirInfo = fileInfo.Directory; if (dirInfo != null && fileInfo.Exists)
return Path.Combine(GetProperCapitalization(dirInfo), dirInfo.GetFiles(fileInfo.Name)[0].Name); {
fileName = dirInfo.GetFiles(fileInfo.Name)[0].Name;
}
return Path.Combine(GetProperCapitalization(dirInfo), fileName);
} }
public static string GetAppDataPath(this IAppFolderInfo appFolderInfo) public static string GetAppDataPath(this IAppFolderInfo appFolderInfo)