tedkulp/Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2026-04-23 22:45:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleaning paths for top level root folders

Browse Source 
(cherry picked from commit a00121695715feb2cf8f04da246dc18262ab3237)
This commit is contained in:
Bogdan
2024-10-08 01:29:30 +03:00
parent 13c538ff58
commit 96830f975e
3 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Common/Extensions/PathExtensions.cs
+2 -6
View File
@@ -25,8 +25,6 @@ namespace NzbDrone.Common.Extensions
private static readonly string UPDATE_CLIENT_FOLDER_NAME = "Prowlarr.Update" + Path.DirectorySeparatorChar;
private static readonly string UPDATE_LOG_FOLDER_NAME = "UpdateLogs" + Path.DirectorySeparatorChar;
private static readonly Regex PARENT_PATH_END_SLASH_REGEX = new Regex(@"(?<!:)\\$", RegexOptions.Compiled);
public static string CleanFilePath(this string path)
{
if (path.IsNotNullOrWhiteSpace())
@@ -113,11 +111,9 @@ namespace NzbDrone.Common.Extensions
public static string GetCleanPath(this string path)
{
var cleanPath = OsInfo.IsWindows
? PARENT_PATH_END_SLASH_REGEX.Replace(path, "")
: path.TrimEnd(Path.DirectorySeparatorChar);
var osPath = new OsPath(path);
return cleanPath;
return osPath == OsPath.Null ? null : osPath.PathWithoutTrailingSlash;
}
public static bool IsParentPath(this string parentPath, string childPath)