
# Added - Added support for PDFs within Kavita. PDFs will open in the Manga reader and you can read through them as images. PDFs are heavier than archives, so they may take longer to open for reading. (Fixes #187) # Changed - Changed: Major change in how Kavita libraries work. Kavita libraries will now allow for mixed media types, that means you can have raw images, archives, epubs, and pdfs all within your Manga library. In the case that the same Series exists between 2 different types of medias, they will be separated and an icon will show to help you identify the types. The correct reader will open regardless of what library you are on. Note: Nightly users need to delete their Raw Images libraries before updating. # Fixed - Fixed: Fixed an issue where checking if a file was modified since last scan always returned true, meaning we would do more I/O than was needed (Fixes #415) - Fixed: There wasn't enough spacing on the top menu bar on the Manga reader - Fixed: Fixed a bug where user preferences dark mode control always showed true, even if you were not using dark mode # Dev stuff - For image extraction, if there is only 1 image we will extract just that, else we will extract only images - Refactored all the Parser code out of the ScannerService into a self contained class. The class should be created for any scans, allowing multiple tasks to run without any chance of cross over. * Fixed indentation for cs files * Fixed an issue where the logic for if a file had been modified or not was not working and always saying modified, meaning we were doing more file I/O than needed. * Implemented the ability to have PDF books. No reader functionality. * Implemented a basic form of scanning for PDF files. Reworked Image based libraries to remove the need to separate in a special library and instead just work within the Manga/Comic library. * Removed the old library types. * Removed some extra code around old raw library types * Fully implemented PDF support into Kavita by using docnet. Removed old libraries we tried that did not work. PDFs take about 200ms to save the file to disk, so they are much slower than reading archives. * Refactored Libraries so that they can have any file extension and the UI will decide which reader to use. * Reworked the Series Parsing code. We now use a separate instance for each task call, so there should be no cross over if 2 tasks are running at the same time. Second, we now store Format with the Series, so we can have duplicate Series with the same name, but a different type of files underneath. * Fixed PDF transparency issues - Used this code to fix an issue when a PDF page doesn't have a background. https://github.com/GowenGit/docnet/issues/8#issuecomment-538985672 - This also fixes the same issue for cover images * Fixed an issue where if a raw image was in a directory with non-image files, those would get moved to cache when trying to open the file. * For image extraction, if there is only 1 image, just copy that to cache instead of everything else in the directory that is an image. * Add some spacing to the top menu bar * Added an icon to the card to showcase the type of file * Added a tag badge to the series detail page * Fixed a bug in user preferences where dark mode control would default to true, even if you weren't on it * Fixed some tests up * Some code smells Co-authored-by: Robbie Davis <robbie@therobbiedavis.com>
399 lines
15 KiB
C#
399 lines
15 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Collections.Immutable;
|
|
using System.IO;
|
|
using System.Linq;
|
|
using System.Text.RegularExpressions;
|
|
using System.Threading.Tasks;
|
|
using API.Interfaces.Services;
|
|
using Microsoft.Extensions.Logging;
|
|
|
|
namespace API.Services
|
|
{
|
|
public class DirectoryService : IDirectoryService
|
|
{
|
|
private readonly ILogger<DirectoryService> _logger;
|
|
private static readonly Regex ExcludeDirectories = new Regex(
|
|
@"@eaDir|\.DS_Store",
|
|
RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
|
|
|
public DirectoryService(ILogger<DirectoryService> logger)
|
|
{
|
|
_logger = logger;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Given a set of regex search criteria, get files in the given path.
|
|
/// </summary>
|
|
/// <param name="path">Directory to search</param>
|
|
/// <param name="searchPatternExpression">Regex version of search pattern (ie \.mp3|\.mp4). Defaults to * meaning all files.</param>
|
|
/// <param name="searchOption">SearchOption to use, defaults to TopDirectoryOnly</param>
|
|
/// <returns>List of file paths</returns>
|
|
private static IEnumerable<string> GetFilesWithCertainExtensions(string path,
|
|
string searchPatternExpression = "",
|
|
SearchOption searchOption = SearchOption.TopDirectoryOnly)
|
|
{
|
|
if (!Directory.Exists(path)) return ImmutableList<string>.Empty;
|
|
var reSearchPattern = new Regex(searchPatternExpression, RegexOptions.IgnoreCase);
|
|
return Directory.EnumerateFiles(path, "*", searchOption)
|
|
.Where(file =>
|
|
reSearchPattern.IsMatch(Path.GetExtension(file)));
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// Returns a list of folders from end of fullPath to rootPath. If a file is passed at the end of the fullPath, it will be ignored.
|
|
///
|
|
/// Example) (C:/Manga/, C:/Manga/Love Hina/Specials/Omake/) returns [Omake, Specials, Love Hina]
|
|
/// </summary>
|
|
/// <param name="rootPath"></param>
|
|
/// <param name="fullPath"></param>
|
|
/// <returns></returns>
|
|
public static IEnumerable<string> GetFoldersTillRoot(string rootPath, string fullPath)
|
|
{
|
|
var separator = Path.AltDirectorySeparatorChar;
|
|
if (fullPath.Contains(Path.DirectorySeparatorChar))
|
|
{
|
|
fullPath = fullPath.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
|
|
}
|
|
|
|
if (rootPath.Contains(Path.DirectorySeparatorChar))
|
|
{
|
|
rootPath = rootPath.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
|
|
}
|
|
|
|
|
|
|
|
var path = fullPath.EndsWith(separator) ? fullPath.Substring(0, fullPath.Length - 1) : fullPath;
|
|
var root = rootPath.EndsWith(separator) ? rootPath.Substring(0, rootPath.Length - 1) : rootPath;
|
|
var paths = new List<string>();
|
|
// If a file is at the end of the path, remove it before we start processing folders
|
|
if (Path.GetExtension(path) != string.Empty)
|
|
{
|
|
path = path.Substring(0, path.LastIndexOf(separator));
|
|
}
|
|
|
|
while (Path.GetDirectoryName(path) != Path.GetDirectoryName(root))
|
|
{
|
|
var folder = new DirectoryInfo(path).Name;
|
|
paths.Add(folder);
|
|
path = path.Substring(0, path.LastIndexOf(separator));
|
|
}
|
|
|
|
return paths;
|
|
}
|
|
|
|
public bool Exists(string directory)
|
|
{
|
|
var di = new DirectoryInfo(directory);
|
|
return di.Exists;
|
|
}
|
|
|
|
public IEnumerable<string> GetFiles(string path, string searchPatternExpression = "",
|
|
SearchOption searchOption = SearchOption.TopDirectoryOnly)
|
|
{
|
|
if (searchPatternExpression != string.Empty)
|
|
{
|
|
if (!Directory.Exists(path)) return ImmutableList<string>.Empty;
|
|
var reSearchPattern = new Regex(searchPatternExpression, RegexOptions.IgnoreCase);
|
|
return Directory.EnumerateFiles(path, "*", searchOption)
|
|
.Where(file =>
|
|
reSearchPattern.IsMatch(file));
|
|
}
|
|
|
|
return !Directory.Exists(path) ? Array.Empty<string>() : Directory.GetFiles(path);
|
|
}
|
|
|
|
public void CopyFileToDirectory(string fullFilePath, string targetDirectory)
|
|
{
|
|
var fileInfo = new FileInfo(fullFilePath);
|
|
if (fileInfo.Exists)
|
|
{
|
|
fileInfo.CopyTo(Path.Join(targetDirectory, fileInfo.Name));
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Copies a Directory with all files and subdirectories to a target location
|
|
/// </summary>
|
|
/// <param name="sourceDirName"></param>
|
|
/// <param name="destDirName"></param>
|
|
/// <param name="searchPattern">Defaults to *, meaning all files</param>
|
|
/// <returns></returns>
|
|
/// <exception cref="DirectoryNotFoundException"></exception>
|
|
public bool CopyDirectoryToDirectory(string sourceDirName, string destDirName, string searchPattern = "*")
|
|
{
|
|
if (string.IsNullOrEmpty(sourceDirName)) return false;
|
|
|
|
var di = new DirectoryInfo(sourceDirName);
|
|
if (!di.Exists) return false;
|
|
|
|
// Get the subdirectories for the specified directory.
|
|
var dir = new DirectoryInfo(sourceDirName);
|
|
|
|
if (!dir.Exists)
|
|
{
|
|
throw new DirectoryNotFoundException(
|
|
"Source directory does not exist or could not be found: "
|
|
+ sourceDirName);
|
|
}
|
|
|
|
var dirs = dir.GetDirectories();
|
|
|
|
// If the destination directory doesn't exist, create it.
|
|
Directory.CreateDirectory(destDirName);
|
|
|
|
// Get the files in the directory and copy them to the new location.
|
|
var files = GetFilesWithExtension(dir.FullName, searchPattern).Select(n => new FileInfo(n));
|
|
foreach (var file in files)
|
|
{
|
|
var tempPath = Path.Combine(destDirName, file.Name);
|
|
file.CopyTo(tempPath, false);
|
|
}
|
|
|
|
// If copying subdirectories, copy them and their contents to new location.
|
|
foreach (var subDir in dirs)
|
|
{
|
|
var tempPath = Path.Combine(destDirName, subDir.Name);
|
|
CopyDirectoryToDirectory(subDir.FullName, tempPath);
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
|
|
|
|
public string[] GetFilesWithExtension(string path, string searchPatternExpression = "")
|
|
{
|
|
if (searchPatternExpression != string.Empty)
|
|
{
|
|
return GetFilesWithCertainExtensions(path, searchPatternExpression).ToArray();
|
|
}
|
|
|
|
return !Directory.Exists(path) ? Array.Empty<string>() : Directory.GetFiles(path);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns the total number of bytes for a given set of full file paths
|
|
/// </summary>
|
|
/// <param name="paths"></param>
|
|
/// <returns>Total bytes</returns>
|
|
public static long GetTotalSize(IEnumerable<string> paths)
|
|
{
|
|
return paths.Sum(path => new FileInfo(path).Length);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns true if the path exists and is a directory. If path does not exist, this will create it. Returns false in all fail cases.
|
|
/// </summary>
|
|
/// <param name="directoryPath"></param>
|
|
/// <returns></returns>
|
|
public static bool ExistOrCreate(string directoryPath)
|
|
{
|
|
var di = new DirectoryInfo(directoryPath);
|
|
if (di.Exists) return true;
|
|
try
|
|
{
|
|
Directory.CreateDirectory(directoryPath);
|
|
}
|
|
catch (Exception)
|
|
{
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Deletes all files within the directory, then the directory itself.
|
|
/// </summary>
|
|
/// <param name="directoryPath"></param>
|
|
public static void ClearAndDeleteDirectory(string directoryPath)
|
|
{
|
|
if (!Directory.Exists(directoryPath)) return;
|
|
|
|
DirectoryInfo di = new DirectoryInfo(directoryPath);
|
|
|
|
ClearDirectory(directoryPath);
|
|
|
|
di.Delete(true);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Deletes all files within the directory.
|
|
/// </summary>
|
|
/// <param name="directoryPath"></param>
|
|
/// <returns></returns>
|
|
public static void ClearDirectory(string directoryPath)
|
|
{
|
|
var di = new DirectoryInfo(directoryPath);
|
|
if (!di.Exists) return;
|
|
|
|
foreach (var file in di.EnumerateFiles())
|
|
{
|
|
file.Delete();
|
|
}
|
|
foreach (var dir in di.EnumerateDirectories())
|
|
{
|
|
dir.Delete(true);
|
|
}
|
|
}
|
|
|
|
public bool CopyFilesToDirectory(IEnumerable<string> filePaths, string directoryPath)
|
|
{
|
|
string currentFile = null;
|
|
try
|
|
{
|
|
foreach (var file in filePaths)
|
|
{
|
|
currentFile = file;
|
|
var fileInfo = new FileInfo(file);
|
|
if (fileInfo.Exists)
|
|
{
|
|
fileInfo.CopyTo(Path.Join(directoryPath, fileInfo.Name));
|
|
}
|
|
else
|
|
{
|
|
_logger.LogWarning("Tried to copy {File} but it doesn't exist", file);
|
|
}
|
|
|
|
}
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
_logger.LogError(ex, "Unable to copy {File} to {DirectoryPath}", currentFile, directoryPath);
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
public IEnumerable<string> ListDirectory(string rootPath)
|
|
{
|
|
if (!Directory.Exists(rootPath)) return ImmutableList<string>.Empty;
|
|
|
|
var di = new DirectoryInfo(rootPath);
|
|
var dirs = di.GetDirectories()
|
|
.Where(dir => !(dir.Attributes.HasFlag(FileAttributes.Hidden) || dir.Attributes.HasFlag(FileAttributes.System)))
|
|
.Select(d => d.Name).ToImmutableList();
|
|
|
|
return dirs;
|
|
}
|
|
|
|
public async Task<byte[]> ReadFileAsync(string path)
|
|
{
|
|
if (!File.Exists(path)) return Array.Empty<byte>();
|
|
return await File.ReadAllBytesAsync(path);
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// Recursively scans files and applies an action on them. This uses as many cores the underlying PC has to speed
|
|
/// up processing.
|
|
/// </summary>
|
|
/// <param name="root">Directory to scan</param>
|
|
/// <param name="action">Action to apply on file path</param>
|
|
/// <param name="searchPattern">Regex pattern to search against</param>
|
|
/// <param name="logger"></param>
|
|
/// <exception cref="ArgumentException"></exception>
|
|
public static int TraverseTreeParallelForEach(string root, Action<string> action, string searchPattern, ILogger logger)
|
|
{
|
|
//Count of files traversed and timer for diagnostic output
|
|
var fileCount = 0;
|
|
|
|
// Determine whether to parallelize file processing on each folder based on processor count.
|
|
var procCount = Environment.ProcessorCount;
|
|
|
|
// Data structure to hold names of subfolders to be examined for files.
|
|
var dirs = new Stack<string>();
|
|
|
|
if (!Directory.Exists(root)) {
|
|
throw new ArgumentException("The directory doesn't exist");
|
|
}
|
|
dirs.Push(root);
|
|
|
|
while (dirs.Count > 0) {
|
|
var currentDir = dirs.Pop();
|
|
IEnumerable<string> subDirs;
|
|
string[] files;
|
|
|
|
try {
|
|
subDirs = Directory.GetDirectories(currentDir).Where(path => ExcludeDirectories.Matches(path).Count == 0);
|
|
}
|
|
// Thrown if we do not have discovery permission on the directory.
|
|
catch (UnauthorizedAccessException e) {
|
|
Console.WriteLine(e.Message);
|
|
logger.LogError(e, "Unauthorized access on {Directory}", currentDir);
|
|
continue;
|
|
}
|
|
// Thrown if another process has deleted the directory after we retrieved its name.
|
|
catch (DirectoryNotFoundException e) {
|
|
Console.WriteLine(e.Message);
|
|
logger.LogError(e, "Directory not found on {Directory}", currentDir);
|
|
continue;
|
|
}
|
|
|
|
try {
|
|
files = GetFilesWithCertainExtensions(currentDir, searchPattern)
|
|
.ToArray();
|
|
}
|
|
catch (UnauthorizedAccessException e) {
|
|
Console.WriteLine(e.Message);
|
|
continue;
|
|
}
|
|
catch (DirectoryNotFoundException e) {
|
|
Console.WriteLine(e.Message);
|
|
continue;
|
|
}
|
|
catch (IOException e) {
|
|
Console.WriteLine(e.Message);
|
|
continue;
|
|
}
|
|
|
|
// Execute in parallel if there are enough files in the directory.
|
|
// Otherwise, execute sequentially. Files are opened and processed
|
|
// synchronously but this could be modified to perform async I/O.
|
|
try {
|
|
// if (files.Length < procCount) {
|
|
// foreach (var file in files) {
|
|
// action(file);
|
|
// fileCount++;
|
|
// }
|
|
// }
|
|
// else {
|
|
// Parallel.ForEach(files, () => 0, (file, _, localCount) =>
|
|
// { action(file);
|
|
// return ++localCount;
|
|
// },
|
|
// (c) => {
|
|
// Interlocked.Add(ref fileCount, c);
|
|
// });
|
|
// }
|
|
foreach (var file in files) {
|
|
action(file);
|
|
fileCount++;
|
|
}
|
|
}
|
|
catch (AggregateException ae) {
|
|
ae.Handle((ex) => {
|
|
if (ex is UnauthorizedAccessException) {
|
|
// Here we just output a message and go on.
|
|
Console.WriteLine(ex.Message);
|
|
return true;
|
|
}
|
|
// Handle other exceptions here if necessary...
|
|
|
|
return false;
|
|
});
|
|
}
|
|
|
|
// Push the subdirectories onto the stack for traversal.
|
|
// This could also be done before handing the files.
|
|
foreach (var str in subDirs)
|
|
dirs.Push(str);
|
|
}
|
|
|
|
return fileCount;
|
|
}
|
|
|
|
}
|
|
}
|