Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote branch 'scott/master'

This commit is contained in:
Keivan 2010-11-06 10:23:42 -07:00
parent 7bb63d0451 d5a869ac54
commit ac1a8b4e50
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NzbDrone.Core.Test/ParserTest.cs
View File

@ -58,6 +58,7 @@ namespace NzbDrone.Core.Test
[Row(@"c:\\test\\", @"c:\test")] [Row(@"c:\\test\\", @"c:\test")]
[Row(@"C:\\Test\\", @"c:\test")] [Row(@"C:\\Test\\", @"c:\test")]
[Row(@"C:\\Test\\Test\", @"c:\test\test")] [Row(@"C:\\Test\\Test\", @"c:\test\test")]
[Row(@"\\Testserver\Test\", @"\\testserver\test")]
public void Normalize_Path(string dirty, string clean) public void Normalize_Path(string dirty, string clean)
{ {
var result = Parser.NormalizePath(dirty); var result = Parser.NormalizePath(dirty);

11
NzbDrone.Core/Parser.cs
View File

@ -130,11 +130,20 @@ namespace NzbDrone.Core
return NormalizeRegex.Replace(title, String.Empty).ToLower(); return NormalizeRegex.Replace(title, String.Empty).ToLower();
} }
//Note: changing case on path is a problem for running on mono/*nix
public static string NormalizePath(string path) public static string NormalizePath(string path)
{ {
if (String.IsNullOrEmpty(path)) if (String.IsNullOrEmpty(path))
throw new ArgumentException("Path can not be null or empty"); throw new ArgumentException("Path can not be null or empty");
return new FileInfo(path).FullName.ToLower().Trim('/', '\\', ' ');
var info = new FileInfo(path);
if( info.FullName.StartsWith(@"\\")) //UNC
{
return info.FullName.ToLower().TrimEnd('/', '\\', ' ');
}
return info.FullName.ToLower().Trim('/', '\\', ' ');
} }
} }
} }