diff options
| author | Sascha Silbe <silbe@activitycentral.com> | 2011-05-29 11:50:00 (GMT) |
|---|---|---|
| committer | Sascha Silbe <silbe@activitycentral.com> | 2011-06-07 16:28:47 (GMT) |
| commit | ebde204986b7165310c9c7b48a2dfbdf8665f9c1 (patch) | |
| tree | cfdfe297d6878d678cb13df3cc0c0b7cbac70e33 | |
| parent | 8f1932171a2f143e98648a00668d460b907a8c3d (diff) | |
Generalise GetSourceListener to SaveListener
Slightly enhance and rename GetSourceListener so it can be used for waiting
for completion of any save operation, not just GetSource.
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
| -rw-r--r-- | browser.py | 24 |
1 files changed, 15 insertions, 9 deletions
@@ -44,18 +44,24 @@ from progresslistener import ProgressListener _ZOOM_AMOUNT = 0.1 -class GetSourceListener(object): +class SaveListener(object): _com_interfaces_ = interfaces.nsIWebProgressListener - def __init__(self, file_path, async_cb, async_err_cb): - self._file_path = file_path - self._async_cb = async_cb - self._async_err_cb = async_err_cb + def __init__(self, user_data, callback): + self._user_data = user_data + self._callback = callback def onStateChange(self, webProgress, request, stateFlags, status): - if (stateFlags & interfaces.nsIWebProgressListener.STATE_IS_REQUEST and - stateFlags & interfaces.nsIWebProgressListener.STATE_STOP): - self._async_cb(self._file_path) + listener_class = interfaces.nsIWebProgressListener + if (stateFlags & listener_class.STATE_IS_REQUEST and + stateFlags & listener_class.STATE_STOP): + self._callback(self._user_data) + + # Contrary to the documentation, STATE_IS_REQUEST is _not_ always set + # if STATE_IS_DOCUMENT is set. + if (stateFlags & listener_class.STATE_IS_DOCUMENT and + stateFlags & listener_class.STATE_STOP): + self._callback(self._user_data) def onProgressChange(self, progress, request, curSelfProgress, maxSelfProgress, curTotalProgress, maxTotalProgress): @@ -328,7 +334,7 @@ class Browser(WebView): local_file = cls.createInstance(interfaces.nsILocalFile) local_file.initWithPath(file_path) - progresslistener = GetSourceListener(file_path, async_cb, async_err_cb) + progresslistener = SaveListener(file_path, async_cb) persist.progressListener = xpcom.server.WrapObject( progresslistener, interfaces.nsIWebProgressListener) |