Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Lewis <jtl1728@rit.edu>2010-01-06 16:55:42 (GMT)
committer Justin Lewis <jtl1728@rit.edu>2010-01-06 16:55:42 (GMT)
commite78b17ad4aa3249a64a75e82c8573865d2eae57b (patch)
tree38294ad7a261c8ad3c3771afcdfc21d473bb228e
parent37340af0b5ecc6e609bb2987fd49e8aeb7727afd (diff)
Added notice when file download fails
-rw-r--r--FileShare.activity/FileInfo.py5
-rw-r--r--FileShare.activity/FileShareActivity.py18
2 files changed, 17 insertions, 6 deletions
diff --git a/FileShare.activity/FileInfo.py b/FileShare.activity/FileInfo.py
index 46a946d..a497a79 100644
--- a/FileShare.activity/FileInfo.py
+++ b/FileShare.activity/FileInfo.py
@@ -54,6 +54,11 @@ class FileInfo(object):
self.aquired = self.size
self.installed = True
+ def set_failed(self):
+ self.status = _("Download Failed")
+ self.aquired = 0
+ self.installed = False
+
def share_dump(self):
return [self.id, self.title, self.desc, self.tags, self.size]
diff --git a/FileShare.activity/FileShareActivity.py b/FileShare.activity/FileShareActivity.py
index baa8603..c97f1cb 100644
--- a/FileShare.activity/FileShareActivity.py
+++ b/FileShare.activity/FileShareActivity.py
@@ -346,7 +346,7 @@ class FileShareActivity(Activity):
model.row_changed(model.get_path(iter), iter)
- def set_installed( self, id ):
+ def set_installed( self, id, sucessful=True ):
model = self.treeview.get_model()
iter = model.get_iter_first()
while iter:
@@ -356,7 +356,10 @@ class FileShareActivity(Activity):
if iter:
obj = model.get_value( iter, 1 )
- obj.set_installed()
+ if sucessful:
+ obj.set_installed()
+ else:
+ obj.set_failed()
model.set_value( iter, 1, obj)
modle.row_changed(model.get_path(iter), iter)
@@ -522,10 +525,13 @@ class FileShareActivity(Activity):
def _download_result_cb(self, getter, tmp_file, suggested_name, fileId):
_logger.debug("Got document %s (%s)", tmp_file, suggested_name)
- metadata = self._installBundle( tmp_file )
-
- self._alert( _("File Downloaded"), metadata['title'])
- self.set_installed( fileId )
+ try:
+ metadata = self._installBundle( tmp_file )
+ self._alert( _("File Downloaded"), metadata['title'])
+ self.set_installed( fileId )
+ except:
+ self._alert( _("File Download Failed") )
+ self.set_installed( fileId, False )
def _download_progress_cb(self, getter, bytes_downloaded, fileId):
self.update_progress( fileId, bytes_downloaded )