kiwix/kiwix-js-pwa
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-js-pwa.git synced 2025-09-09 20:32:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Temporary fix for kiwix-js issue 628

Browse Source 
Former-commit-id: 47d106164d425f607e2431f6e8197d7c934ddc32 [formerly 2406b1c4f62d50ee8bc341d92126d310d4366d21]
Former-commit-id: d0cc52d2c9e8d7fe88185ca3da0317b94074f969
This commit is contained in:
Jaifroid 2020-06-28 07:19:33 +01:00
parent 547f00c385
commit 4b631e3491
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
www/js/lib/zimfile.js
View File

@ -216,12 +216,12 @@ define(['xzdec_wrapper', 'util', 'utf8', 'q', 'zimDirEntry'], function(xz, util,
* @param {File} file The ZIM file (or first file in array of files) from which the MIME type list * @param {File} file The ZIM file (or first file in array of files) from which the MIME type list
* is to be extracted * is to be extracted
* @param {Integer} mimeListPos The offset in <file> at which the MIME type list is found * @param {Integer} mimeListPos The offset in <file> at which the MIME type list is found
* @param {Integer} urlPtrPos The offset of the byte after the end of the MIME type list in <file> * @param {Integer} endReadPos The offset of the end of the slice to read
* @returns {Promise} A promise for the MIME Type list as a Map * @returns {Promise} A promise for the MIME Type list as a Map
*/ */
function readMimetypeMap(file, mimeListPos, urlPtrPos) { function readMimetypeMap(file, mimeListPos, endReadPos) {
var typeMap = new Map; var typeMap = new Map;
var size = urlPtrPos - mimeListPos; var size = endReadPos - mimeListPos;
return util.readFileSlice(file, mimeListPos, size).then(function(data) { return util.readFileSlice(file, mimeListPos, size).then(function(data) {
if (data.subarray) { if (data.subarray) {
var i = 0; var i = 0;
@ -264,7 +264,8 @@ define(['xzdec_wrapper', 'util', 'utf8', 'q', 'zimDirEntry'], function(xz, util,
return util.readFileSlice(fileArray[0], 0, 80).then(function(header) { return util.readFileSlice(fileArray[0], 0, 80).then(function(header) {
var mimeListPos = readInt(header, 56, 8); var mimeListPos = readInt(header, 56, 8);
var urlPtrPos = readInt(header, 32, 8); var urlPtrPos = readInt(header, 32, 8);
return readMimetypeMap(fileArray[0], mimeListPos, urlPtrPos).then(function(data) { var endReadPos = urlPtrPos >= 1104 ? 1104 : urlPtrPos;
return readMimetypeMap(fileArray[0], mimeListPos, endReadPos).then(function(data) {
var zf = new ZIMFile(fileArray); var zf = new ZIMFile(fileArray);
zf.articleCount = readInt(header, 24, 4); zf.articleCount = readInt(header, 24, 4);
zf.clusterCount = readInt(header, 28, 4); zf.clusterCount = readInt(header, 28, 4);