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

Ensure Koreader hash is generated for existing files.

Browse source
This commit is contained in:
Joseph Milazzo 2025-06-02 17:23:39 -05:00
parent 54c572a83b
commit 6498aa7fe5
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
API/Helpers/KoreaderHelper.cs
View file

@ -3,6 +3,7 @@ using System;
using System.IO; using System.IO;
using System.Security.Cryptography; using System.Security.Cryptography;
using System.Text; using System.Text;
using API.Services.Tasks.Scanner.Parser;
namespace API.Helpers; namespace API.Helpers;
@ -15,13 +16,14 @@ public static class KoreaderHelper
/// <summary> /// <summary>
/// Hashes the document according to a custom Koreader hashing algorithm. /// Hashes the document according to a custom Koreader hashing algorithm.
/// Look at the util.partialMD5 method in the attached link. /// Look at the util.partialMD5 method in the attached link.
/// Note: Only applies to epub files
/// </summary> /// </summary>
/// <remarks>The hashing algorithm is relatively quick as it only hashes ~10,000 bytes for the biggest of files.</remarks> /// <remarks>The hashing algorithm is relatively quick as it only hashes ~10,000 bytes for the biggest of files.</remarks>
/// <see href="https://github.com/koreader/koreader/blob/master/frontend/util.lua#L1040"/> /// <see href="https://github.com/koreader/koreader/blob/master/frontend/util.lua#L1040"/>
/// <param name="filePath">The path to the file to hash</param> /// <param name="filePath">The path to the file to hash</param>
public static string HashContents(string filePath) public static string HashContents(string filePath)
{ {
if (string.IsNullOrEmpty(filePath) || !File.Exists(filePath)) if (string.IsNullOrEmpty(filePath) || !File.Exists(filePath) || !Parser.IsEpub(filePath))
{ {
return null; return null;
} }
@ -48,9 +50,9 @@ public static class KoreaderHelper
} }
file.Close(); file.Close();
md5.TransformFinalBlock(Array.Empty<byte>(), 0, 0); md5.TransformFinalBlock([], 0, 0);
return md5.Hash == null ? null : BitConverter.ToString(md5.Hash).Replace("-", string.Empty).ToUpper(); return md5.Hash == null ? null : Convert.ToHexString(md5.Hash).ToUpper();
} }
/// <summary> /// <summary>
@ -63,7 +65,7 @@ public static class KoreaderHelper
var fileNameBytes = Encoding.ASCII.GetBytes(fileName); var fileNameBytes = Encoding.ASCII.GetBytes(fileName);
var bytes = MD5.HashData(fileNameBytes); var bytes = MD5.HashData(fileNameBytes);
return BitConverter.ToString(bytes).Replace("-", string.Empty); return Convert.ToHexString(bytes);
} }
public static void UpdateProgressDto(ProgressDto progress, string koreaderPosition) public static void UpdateProgressDto(ProgressDto progress, string koreaderPosition)

2
API/Services/Tasks/Scanner/ProcessSeries.cs
View file

@ -880,6 +880,8 @@ public class ProcessSeries : IProcessSeries
existingFile.FileName = Parser.Parser.RemoveExtensionIfSupported(existingFile.FilePath); existingFile.FileName = Parser.Parser.RemoveExtensionIfSupported(existingFile.FilePath);
existingFile.FilePath = Parser.Parser.NormalizePath(existingFile.FilePath); existingFile.FilePath = Parser.Parser.NormalizePath(existingFile.FilePath);
existingFile.Bytes = fileInfo.Length; existingFile.Bytes = fileInfo.Length;
existingFile.KoreaderHash = KoreaderHelper.HashContents(existingFile.FilePath);
// We skip updating DB here with last modified time so that metadata refresh can do it // We skip updating DB here with last modified time so that metadata refresh can do it
} }
else else