kiwix/kiwix-js
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-js.git synced 2025-09-24 04:54:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Slightly improve error handling.

Browse Source 
Fixes #57
+ small fix for blockstart value of redirected titles
This commit is contained in:
mossroy 2013-08-22 17:10:55 +02:00
parent 8f0744140d
commit 39b5533959
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/lib/archive.js
View File

@ -466,7 +466,10 @@ define(function(require) {
}
}
if (!dataFile) {
throw "File number " + title.fileNr + " not found";
// TODO can probably be replaced by some error handler at window level
alert("Oops : some files seem to be missing in your archive. Please report it to us by email or through Github (see About section), with the name of the article and the following info : "
+ "File number " + title.fileNr + " not found");
throw new Error("File number " + title.fileNr + " not found");
} else {
var reader = new FileReader();
// Read the article in the dataFile, starting with a chunk of CHUNK_SIZE
@ -500,9 +503,9 @@ define(function(require) {
var compressedArticles = e.target.result;
webworkerBzip2.onerror = function(event){
// TODO can probably be replaced by some error handler at window level
alert("An unexpected error occured. Please report it to us by email or through Github (see About section), with the name of the article and the following info : event.message="
alert("An unexpected error occured during bzip2 decompression. Please report it to us by email or through Github (see About section), with the name of the article and the following info : event.message="
+ event.message + " event.filename=" + event.filename + " event.lineno=" + event.lineno );
throw new Error(event.message + " (" + event.filename + ":" + event.lineno + ")");
throw new Error("Error during bzip2 decompression : " + event.message + " (" + event.filename + ":" + event.lineno + ")");
};
webworkerBzip2.onmessage = function(event){
switch (event.data.cmd){
@ -531,9 +534,9 @@ define(function(require) {
break;
case "error":
// TODO can probably be replaced by some error handler at window level
alert("An unexpected error occured. Please report it to us by email or through Github (see About section), with the name of the article and the following info : event.data.msg="
alert("An unexpected error occured during bzip2 decompression. Please report it to us by email or through Github (see About section), with the name of the article and the following info : event.data.msg="
+ event.data.msg );
throw new Error(event.data.msg);
throw new Error("Error during bzip2 decompression : " + event.data.msg);
break;
}
};
@ -639,12 +642,15 @@ define(function(require) {
var byteArray = new Uint8Array(binaryTitleFile);
if (byteArray.length === 0) {
throw "Unable to find redirected article : offset " + title.blockStart + " not found in title file";
// TODO can probably be replaced by some error handler at window level
alert("Oops : there seems to be something wrong in your archive. Please report it to us by email or through Github (see About section), with the name of the article and the following info : "
+ "Unable to find redirected article for title " + title.name + " : offset " + title.blockStart + " not found in title file");
throw new Error("Unable to find redirected article for title " + title.name + " : offset " + title.blockStart + " not found in title file");
}
var redirectedTitle = title;
redirectedTitle.fileNr = 1 * byteArray[2];
redirectedTitle.blockStart =util. readIntegerFrom4Bytes(byteArray, 3);
redirectedTitle.blockStart = util.readIntegerFrom4Bytes(byteArray, 3);
redirectedTitle.blockOffset = util.readIntegerFrom4Bytes(byteArray, 7);
redirectedTitle.articleLength = util.readIntegerFrom4Bytes(byteArray, 11);

4
js/lib/title.js
View File

@ -36,10 +36,10 @@ define(function(require) {
*/
Title.parseTitle = function(encodedTitle, archive, titleOffset) {
if (archive === null) {
throw "archive cannot be null";
throw new Error("Error while parsing an encoded title line un title File : archive cannot be null");
}
if (titleOffset < 0) {
throw "titleOffset cannot be negative (was " + titleOffset + ")";
throw new Error("Error while parsing an encoded title line un title File : titleOffset cannot be negative (was " + titleOffset + ")");
}
var t = new Title();
t.archive = archive;