Cutlery/Kavita
1
0
Fork 0
mirror of https://github.com/Kareadita/Kavita.git synced 2025-05-30 19:54:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix/manga reader pad zeros (#288)

Browse Source 
* Switched to using existing NaturalSortComparer for ordering filenames before we reprocess them to ensure they are in the correct natural reading order.

Co-authored-by: Joseph Milazzo <joseph.v.milazzo@gmail.com>
This commit is contained in:
Robbie Davis 2021-06-08 09:59:47 -04:00 committed by GitHub
parent 7dae1da92f
commit 4f29cf7cc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
API/Extensions/DirectoryInfoExtensions.cs
View File

@ -1,12 +1,12 @@
using System; using System.IO;
using System.IO;
using System.Linq; using System.Linq;
using API.Services; using API.Comparators;
namespace API.Extensions namespace API.Extensions
{ {
public static class DirectoryInfoExtensions public static class DirectoryInfoExtensions
{ {
private static readonly NaturalSortComparer Comparer = new NaturalSortComparer();
public static void Empty(this DirectoryInfo directory) public static void Empty(this DirectoryInfo directory)
{ {
foreach(FileInfo file in directory.EnumerateFiles()) file.Delete(); foreach(FileInfo file in directory.EnumerateFiles()) file.Delete();
@ -49,12 +49,13 @@ namespace API.Extensions
if (!root.FullName.Equals(directory.FullName)) if (!root.FullName.Equals(directory.FullName))
{ {
var fileIndex = 1; var fileIndex = 1;
foreach (var file in directory.EnumerateFiles())
foreach (var file in directory.EnumerateFiles().OrderBy(file => file.FullName, Comparer))
{ {
if (file.Directory == null) continue; if (file.Directory == null) continue;
var paddedIndex = Parser.Parser.PadZeros(directoryIndex + ""); var paddedIndex = Parser.Parser.PadZeros(directoryIndex + "");
// We need to rename the files so that after flattening, they are in the order we found them // We need to rename the files so that after flattening, they are in the order we found them
var newName = $"{paddedIndex}_{fileIndex}.{file.Extension}"; var newName = $"{paddedIndex}_{Parser.Parser.PadZeros(fileIndex + "")}{file.Extension}";
var newPath = Path.Join(root.FullName, newName); var newPath = Path.Join(root.FullName, newName);
if (!File.Exists(newPath)) file.MoveTo(newPath); if (!File.Exists(newPath)) file.MoveTo(newPath);
fileIndex++; fileIndex++;