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

rider is a prick

Browse Source
This commit is contained in:
cvium 2021-03-06 19:07:02 +01:00
parent bc661c16e1
commit 54211b921c
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Emby.Server.Implementations/Library/PathExtensions.cs
View File

@ -2,6 +2,7 @@
using System;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Text.RegularExpressions;
namespace Emby.Server.Implementations.Library
@ -60,19 +61,11 @@ namespace Emby.Server.Implementations.Library
/// <exception cref="ArgumentNullException"><paramref name="path" />, <paramref name="newSubPath" /> or <paramref name="newSubPath" /> is empty.</exception>
public static bool TryReplaceSubPath(this string path, string subPath, string newSubPath, [NotNullWhen(true)] out string? newPath)
{
if (string.IsNullOrWhiteSpace(path))
{
throw new ArgumentNullException(nameof(path));
}
newPath = null;
if (string.IsNullOrWhiteSpace(subPath))
if (path.Length == 0 || subPath.Length == 0 || newSubPath.Length == 0 || subPath.Length > path.Length)
{
throw new ArgumentNullException(nameof(subPath));
}
if (string.IsNullOrWhiteSpace(newSubPath))
{
throw new ArgumentNullException(nameof(newSubPath));
return false;
}
char oldDirectorySeparatorChar;
@ -91,15 +84,8 @@ namespace Emby.Server.Implementations.Library
newDirectorySeparatorChar = '\\';
}
if (path.Contains(oldDirectorySeparatorChar, StringComparison.Ordinal))
{
path = path.Replace(oldDirectorySeparatorChar, newDirectorySeparatorChar);
}
if (subPath.Contains(oldDirectorySeparatorChar, StringComparison.Ordinal))
{
subPath = subPath.Replace(oldDirectorySeparatorChar, newDirectorySeparatorChar);
}
path = path.Replace(oldDirectorySeparatorChar, newDirectorySeparatorChar);
subPath = subPath.Replace(oldDirectorySeparatorChar, newDirectorySeparatorChar);
// We have to ensure that the sub path ends with a directory separator otherwise we'll get weird results
// when the sub path matches a similar but in-complete subpath