sudacode/mokuro-reader
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Allow single zip upload + improve manga extraction

Browse Source
This commit is contained in:
ZXY101
2024-02-04 04:48:15 +02:00
parent 3b2c0bedc3
commit 5226393eac
2 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/upload/index.ts
View File

@@ -26,10 +26,17 @@ export async function unzipManga(file: File) {
for (const entry of sortedEntries) { for (const entry of sortedEntries) {
const mime = getMimeType(entry.filename); const mime = getMimeType(entry.filename);
if (imageTypes.includes(mime)) { const isMokuroFile = entry.filename.split('.').pop() === 'mokuro'
if (imageTypes.includes(mime) || isMokuroFile) {
const blob = await entry.getData?.(new BlobWriter(mime)); const blob = await entry.getData?.(new BlobWriter(mime));
if (blob) { if (blob) {
const file = new File([blob], entry.filename, { type: mime }); const file = new File([blob], entry.filename, { type: mime });
if (!file.webkitRelativePath) {
Object.defineProperty(file, 'webkitRelativePath', {
value: file.name
})
}
unzippedFiles[entry.filename] = file; unzippedFiles[entry.filename] = file;
} }
} }
@@ -162,6 +169,11 @@ export async function processFiles(_files: File[]) {
if (ext && zipTypes.includes(ext)) { if (ext && zipTypes.includes(ext)) {
const unzippedFiles = await unzipManga(file); const unzippedFiles = await unzipManga(file);
if (files.length === 1) {
processFiles(Object.values(unzippedFiles))
return;
}
volumes[path] = { volumes[path] = {
...volumes[path], ...volumes[path],
files: unzippedFiles files: unzippedFiles

35
src/lib/util/zip.ts
View File

@@ -6,40 +6,17 @@ import {
ZipWriter, ZipWriter,
} from "@zip.js/zip.js"; } from "@zip.js/zip.js";
async function zipVolumes(manga: Volume[]) { export async function zipManga(manga: Volume[]) {
const volumeZips = [] const zipWriter = new ZipWriter(new BlobWriter("application/zip"));
for (const volume of manga) { const promises = manga.map((volume) => {
const files = Object.values(volume.files); const imagePromises = Object.values(volume.files).map((file) => {
const zipWriter = new ZipWriter(new BlobWriter("application/zip"));
const promises = files.map((file) => {
return zipWriter.add(file.name, new BlobReader(file)) return zipWriter.add(file.name, new BlobReader(file))
}) })
await Promise.all(promises);
volumeZips.push({
zipName: decodeURI(volume.volumeName),
zipBlob: await zipWriter.close(),
mokuroData: JSON.stringify(volume.mokuroData)
});
}
return volumeZips;
}
export async function zipManga(manga: Volume[]) {
const volumeZips = await zipVolumes(manga)
const zipWriter = new ZipWriter(new BlobWriter("application/zip"));
const promises = volumeZips.map((volumeZip) => {
return [ return [
zipWriter.add(`${volumeZip.zipName}.mokuro`, new TextReader(volumeZip.mokuroData)), zipWriter.add(`${volume.volumeName}.mokuro`, new TextReader(JSON.stringify(volume.mokuroData))),
zipWriter.add(`${volumeZip.zipName}.zip`, new BlobReader(volumeZip.zipBlob)) ...imagePromises,
] ]
}) })