suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Extra debugging for file sync hangs on slow connections"

Browse Source 
This reverts commit 46cce5a2bd.

Conflicts:
	chrome/content/zotero/xpcom/storage/streamListener.js
This commit is contained in:
Dan Stillman 2013-07-22 02:35:53 -04:00
parent 78b5bc6727
commit 4907489707
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
chrome/content/zotero/xpcom/storage/streamListener.js
View File

@ -44,12 +44,17 @@ Zotero.Sync.Storage.StreamListener.prototype = {
// nsIProgressEventSink // nsIProgressEventSink
onProgress: function (request, context, progress, progressMax) { onProgress: function (request, context, progress, progressMax) {
Zotero.debug("onProgress with " + progress + "/" + progressMax); // Workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=451991
// (fixed in Fx3.1)
if (progress > progressMax) {
progress = progressMax;
}
//Zotero.debug("onProgress with " + progress + "/" + progressMax);
this._onProgress(request, progress, progressMax); this._onProgress(request, progress, progressMax);
}, },
onStatus: function (request, context, status, statusArg) { onStatus: function (request, context, status, statusArg) {
Zotero.debug('onStatus with ' + status); //Zotero.debug('onStatus');
}, },
// nsIRequestObserver // nsIRequestObserver
@ -62,7 +67,7 @@ Zotero.Sync.Storage.StreamListener.prototype = {
}, },
onStopRequest: function (request, context, status) { onStopRequest: function (request, context, status) {
Zotero.debug('onStopRequest with ' + status); Zotero.debug('onStopRequest');
switch (status) { switch (status) {
case 0: case 0:
@ -79,7 +84,7 @@ Zotero.Sync.Storage.StreamListener.prototype = {
// nsIWebProgressListener // nsIWebProgressListener
onProgressChange: function (wp, request, curSelfProgress, onProgressChange: function (wp, request, curSelfProgress,
maxSelfProgress, curTotalProgress, maxTotalProgress) { maxSelfProgress, curTotalProgress, maxTotalProgress) {
Zotero.debug("onProgressChange with " + curTotalProgress + "/" + maxTotalProgress); //Zotero.debug("onProgressChange with " + curTotalProgress + "/" + maxTotalProgress);
// onProgress gets called too, so this isn't necessary // onProgress gets called too, so this isn't necessary
//this._onProgress(request, curTotalProgress, maxTotalProgress); //this._onProgress(request, curTotalProgress, maxTotalProgress);
@ -103,12 +108,8 @@ Zotero.Sync.Storage.StreamListener.prototype = {
onStatusChange: function (progress, request, status, message) { onStatusChange: function (progress, request, status, message) {
Zotero.debug("onStatusChange with '" + message + "'"); Zotero.debug("onStatusChange with '" + message + "'");
}, },
onLocationChange: function () { onLocationChange: function () {},
Zotero.debug('onLocationChange'); onSecurityChange: function () {},
},
onSecurityChange: function () {
Zotero.debug('onSecurityChange');
},
// nsIStreamListener // nsIStreamListener
onDataAvailable: function (request, context, stream, sourceOffset, length) { onDataAvailable: function (request, context, stream, sourceOffset, length) {
@ -118,9 +119,7 @@ Zotero.Sync.Storage.StreamListener.prototype = {
.createInstance(Components.interfaces.nsIScriptableInputStream); .createInstance(Components.interfaces.nsIScriptableInputStream);
scriptableInputStream.init(stream); scriptableInputStream.init(stream);
var data = scriptableInputStream.read(length); this._response += scriptableInputStream.read(length);
Zotero.debug(data);
this._response += data;
}, },
// nsIChannelEventSink // nsIChannelEventSink