mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Log error from NetUtil.asyncFetch in Zotero.File.putContentsAsync()

Browse source
This commit is contained in:
Dan Stillman 2016-06-02 03:34:56 -04:00
parent 0d008b4704
commit 3fb2dfe9ac
1 changed files with 41 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
chrome/content/zotero/xpcom/file.js
View file

@ -221,47 +221,54 @@ Zotero.File = new function(){
};
var deferred = Zotero.Promise.defer();
NetUtil.asyncFetch(source, function(inputStream, status) {
if (!Components.isSuccessCode(status)) {
deferred.reject(new Components.Exception("File read operation failed", status));
return;
}
try {
try {
var bytesToFetch = inputStream.available();
}
catch (e) {
// The stream is closed automatically when end-of-file is reached,
// so this throws for empty files
if (e.name == "NS_BASE_STREAM_CLOSED") {
deferred.resolve("");
}
}
if (maxLength && maxLength < bytesToFetch) {
bytesToFetch = maxLength;
}
if (bytesToFetch == 0) {
deferred.resolve("");
try {
NetUtil.asyncFetch(source, function(inputStream, status) {
if (!Components.isSuccessCode(status)) {
deferred.reject(new Components.Exception("File read operation failed", status));
return;
}
deferred.resolve(
NetUtil.readInputStreamToString(
try {
try {
var bytesToFetch = inputStream.available();
}
catch (e) {
// The stream is closed automatically when end-of-file is reached,
// so this throws for empty files
if (e.name == "NS_BASE_STREAM_CLOSED") {
Zotero.debug("RESOLVING2");
deferred.resolve("");
}
deferred.reject(e);
}
if (maxLength && maxLength < bytesToFetch) {
bytesToFetch = maxLength;
}
if (bytesToFetch == 0) {
deferred.resolve("");
return;
}
deferred.resolve(NetUtil.readInputStreamToString(
inputStream,
bytesToFetch,
options
)
);
}
catch (e) {
deferred.reject(e);
}
});
));
}
catch (e) {
deferred.reject(e);
}
});
}
catch(e) {
// Make sure this get logged correctly
Zotero.logError(e);
throw e;
}
return deferred.promise;
};
}
/**