michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

trim trailing slashes from path substitutions

Browse Source
This commit is contained in:
Luke Pulverenti 2014-02-06 20:31:53 -05:00
parent 65903c56de
commit 57c92fa948
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
View File

@ -96,10 +96,36 @@ namespace MediaBrowser.Server.Implementations.Configuration
ValidateItemByNamePath(newConfig);
ValidateTranscodingTempPath(newConfig);
ValidatePathSubstitutions(newConfig);
base.ReplaceConfiguration(newConfiguration);
}
private void ValidatePathSubstitutions(ServerConfiguration newConfig)
{
foreach (var map in newConfig.PathSubstitutions)
{
if (string.IsNullOrWhiteSpace(map.From) || string.IsNullOrWhiteSpace(map.To))
{
throw new ArgumentException("Invalid path substitution");
}
if (!map.From.EndsWith(":\\") && !map.From.EndsWith(":/"))
{
map.From = map.From.TrimEnd('/').TrimEnd('\\');
}
if (!map.To.EndsWith(":\\") && !map.To.EndsWith(":/"))
{
map.To = map.To.TrimEnd('/').TrimEnd('\\');
}
if (string.IsNullOrWhiteSpace(map.From) || string.IsNullOrWhiteSpace(map.To))
{
throw new ArgumentException("Invalid path substitution");
}
}
}
/// <summary>
/// Replaces the item by name path.
/// </summary>