AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify parent lookup with Directory.GetParent (#1455)

Browse source 
* Simplify parent lookup with Directory.GetParent

* Address comments
This commit is contained in:
tjarls 2022-08-20 21:31:00 +01:00 • committed by GitHub
parent 66a998425b
commit 329970f01b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

31
API/Services/DirectoryService.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.IO;
@ -554,31 +554,18 @@ namespace API.Services
/// <summary>
/// Returns the parent directories name for a file or folder. Empty string is path is not valid.
/// </summary>
/// <remarks>This does touch I/O with an Attribute lookup</remarks>
/// <param name="fileOrFolder"></param>
/// <returns></returns>
public string GetParentDirectoryName(string fileOrFolder)
{
// TODO: Write Unit tests
try
{
var attr = File.GetAttributes(fileOrFolder);
var isDirectory = attr.HasFlag(FileAttributes.Directory);
if (isDirectory)
{
return Parser.Parser.NormalizePath(FileSystem.DirectoryInfo
.FromDirectoryName(fileOrFolder).Parent
.FullName);
}
return Parser.Parser.NormalizePath(FileSystem.FileInfo
.FromFileName(fileOrFolder).Directory.Parent
.FullName);
}
catch (Exception)
{
return string.Empty;
}
try
{
return Parser.Parser.NormalizePath(Directory.GetParent(fileOrFolder).FullName);
}
catch (Exception)
{
return string.Empty;
}
}
/// <summary>