alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-09 11:52:07 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Apply suggestions from code review

Browse Source 
Co-authored-by: JPVenson <ger-delta-07@hotmail.de>
This commit is contained in:
Joshua M. Boniface
2026-03-23 23:09:56 -04:00
committed by GitHub
parent 8142bbd50e
commit 965b602c68
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Jellyfin.Server.Implementations/StorageHelpers/StorageHelper.cs
View File

@@ -37,24 +37,26 @@ public static class StorageHelper
try
{
// Fully resolve the given path to an actual filesystem target, in case it's a symlink or similar.
string resolvedPath = ResolvePath(path);
var resolvedPath = ResolvePath(path);
// We iterate all filesystems reported by GetDrives() here, and attempt to find the best
// match that contains, as deep as possible, the given path.
// This is required because simply calling `DriveInfo` on a path returns that path as
// the Name and RootDevice, which is not at all how this should work.
DriveInfo[] allDrives = DriveInfo.GetDrives();
DriveInfo bestMatch = null;
var allDrives = DriveInfo.GetDrives();
DriveInfo? bestMatch = null;
foreach (DriveInfo d in allDrives)
{
if (resolvedPath.StartsWith(d.RootDirectory.FullName) &&
(bestMatch == null || d.RootDirectory.FullName.Length > bestMatch.RootDirectory.FullName.Length))
if (resolvedPath.StartsWith(d.RootDirectory.FullName, StringComparison.InvariantCultureIgnoreCase) &&
(bestMatch is null || d.RootDirectory.FullName.Length > bestMatch.RootDirectory.FullName.Length))
{
bestMatch = d;
}
}
if (bestMatch is null) {
throw new InvalidOperationException($"The path `{path}` has no matching parent device. Space check invalid.");
}
return new FolderStorageInfo()
{
Path = path,