mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-12-25 01:20:32 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'comic_sort/comic_reader_sort'

Browse Source
This commit is contained in:
Ozzie Isaacs 2021-10-16 11:50:46 +02:00
commit cea10d3945
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cps/static/js/kthoom.js
View File

@ -180,13 +180,15 @@ function initProgressClick() {
function loadFromArrayBuffer(ab) { function loadFromArrayBuffer(ab) {
var lastCompletion = 0; var lastCompletion = 0;
const collator = new Intl.Collator('en', { numeric: true, sensitivity: 'base' });
loadArchiveFormats(['rar', 'zip', 'tar'], function() { loadArchiveFormats(['rar', 'zip', 'tar'], function() {
// Open the file as an archive // Open the file as an archive
archiveOpenFile(ab, function (archive) { archiveOpenFile(ab, function (archive) {
if (archive) { if (archive) {
totalImages = archive.entries.length totalImages = archive.entries.length
console.info('Uncompressing ' + archive.archive_type + ' ...'); console.info('Uncompressing ' + archive.archive_type + ' ...');
archive.entries.forEach(function(e, i) { entries = archive.entries.sort((a,b) => collator.compare(a.name, b.name));
entries.forEach(function(e, i) {
updateProgress( (i + 1)/ totalImages * 100); updateProgress( (i + 1)/ totalImages * 100);
if (e.is_file) { if (e.is_file) {
e.readData(function(d) { e.readData(function(d) {