<div class="gmail_quote">On Sat, May 21, 2011 at 10:24 AM, Sascha Silbe <<a href="mailto:silbe@activitycentral.com">silbe@activitycentral.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;"> If downloads were cancelled, Browse could leave a (potentially large) temporary file behind. Now we delete them whenever they get cancelled (but not if Browse crashes). Based on patches by Rafael Ortiz <<a href="mailto:rafael@activitycentral.com">rafael@activitycentral.com</a>> and Sebastian Silva <<a href="mailto:sebastian@somosazucar.org">sebastian@somosazucar.org</a>>. Signed-off-by: Sascha Silbe <<a href="mailto:silbe@activitycentral.com">silbe@activitycentral.com</a>> --- Â downloadmanager.py | Â 37 ++++++++++++++++++++++--------------- Â 1 files changed, 22 insertions(+), 15 deletions(-) diff --git a/downloadmanager.py b/downloadmanager.py index 934693f..a88389f 100644 --- a/downloadmanager.py +++ b/downloadmanager.py @@ -38,7 +38,6 @@ from sugar.graphics.alert import Alert, TimeoutAlert Â from sugar.graphics.icon import Icon Â from sugar.graphics import style Â from sugar.activity import activity - Â # #3903 - this constant can be removed and assumed to be 1 when dbus-python Â # 0.82.3 is the only version used Â import dbus @@ -69,9 +68,8 @@ def remove_all_downloads(): Â Â for download in _active_downloads: Â Â Â Â download.cancelable.cancel(NS_ERROR_FAILURE) Â Â Â Â if download.dl_jobject is not None: - Â Â Â Â Â Â download.datastore_deleted_handler.remove() Â Â Â Â Â Â datastore.delete(download.dl_jobject.object_id) - Â Â Â Â Â Â download.cleanup_datastore_write() + Â Â Â Â download.cleanup() Â class HelperAppLauncherDialog: @@ -170,6 +168,7 @@ class Download: Â Â Â Â elif state_flags & interfaces.nsIWebProgressListener.STATE_STOP: Â Â Â Â Â Â if NS_FAILED(status): Â Â Â Â Â Â Â Â # download cancelled + Â Â Â Â Â Â Â Â self.cleanup() Â Â Â Â Â Â Â Â return Â Â Â Â Â Â self._stop_alert = Alert() @@ -252,14 +251,13 @@ class Download: Â Â Â Â global _active_downloads Â Â Â Â if response_id is gtk.RESPONSE_CANCEL: Â Â Â Â Â Â logging.debug('Download Canceled') + Â Â Â Â Â Â logging.debug('target_path=%r', self._target_file.path) Â Â Â Â Â Â self.cancelable.cancel(NS_ERROR_FAILURE) Â Â Â Â Â Â try: - Â Â Â Â Â Â Â Â self.datastore_deleted_handler.remove() Â Â Â Â Â Â Â Â datastore.delete(self._object_id) Â Â Â Â Â Â except Exception: Â Â Â Â Â Â Â Â logging.exception('Object has been deleted already') - Â Â Â Â Â Â if self.dl_jobject is not None: - Â Â Â Â Â Â Â Â self.cleanup_datastore_write() + Â Â Â Â Â Â self.cleanup() Â Â Â Â Â Â if self._stop_alert is not None: Â Â Â Â Â Â Â Â self._activity.remove_alert(self._stop_alert) @@ -272,21 +270,30 @@ class Download: Â Â Â Â Â Â activity.show_object_in_journal(self._object_id) Â Â Â Â self._activity.remove_alert(alert) - Â Â def cleanup_datastore_write(self): + Â Â def cleanup(self): Â Â Â Â global _active_downloads - Â Â Â Â _active_downloads.remove(self) + Â Â Â Â if self in _active_downloads: + Â Â Â Â Â Â _active_downloads.remove(self) - Â Â Â Â if os.path.isfile(self.dl_jobject.file_path): - Â Â Â Â Â Â os.remove(self.dl_jobject.file_path) - Â Â Â Â self.dl_jobject.destroy() - Â Â Â Â self.dl_jobject = None + Â Â Â Â if self.datastore_deleted_handler is not None: + Â Â Â Â Â Â self.datastore_deleted_handler.remove() + Â Â Â Â Â Â self.datastore_deleted_handler = None + + Â Â Â Â if os.path.isfile(self._target_file.path): + Â Â Â Â Â Â os.remove(self._target_file.path) + Â Â Â Â if os.path.isfile(self._target_file.path + '.part'): + Â Â Â Â Â Â os.remove(self._target_file.path + '.part') + + Â Â Â Â if self.dl_jobject is not None: + Â Â Â Â Â Â self.dl_jobject.destroy() + Â Â Â Â Â Â self.dl_jobject = None Â Â def _internal_save_cb(self): - Â Â Â Â self.cleanup_datastore_write() + Â Â Â Â self.cleanup() Â Â def _internal_save_error_cb(self, err): Â Â Â Â logging.error('Error saving activity object to datastore: %s', err) - Â Â Â Â self.cleanup_datastore_write() + Â Â Â Â self.cleanup() Â Â def onProgressChange64(self, web_progress, request, cur_self_progress, Â Â Â Â Â Â Â Â Â Â Â Â Â Â max_self_progress, cur_total_progress, @@ -348,7 +355,7 @@ class Download: Â Â Â Â if self in _active_downloads: Â Â Â Â Â Â # TODO: Use NS_BINDING_ABORTED instead of NS_ERROR_FAILURE. Â Â Â Â Â Â self.cancelable.cancel(NS_ERROR_FAILURE) - Â Â Â Â Â Â _active_downloads.remove(self) + Â Â Â Â Â Â self.cleanup() Â components.registrar.registerFactory('{23c51569-e9a1-4a92-adeb-3723db82ef7c}', -- 1.7.4.1 </blockquote><div> </div><div>Tested and works as expected, we still need to address the case when browse crashes. Â </div></div> <div>can you apply to mainline ?.Â </div><div> </div>