Merge lp:~chipaca/indicator-ubuntuone/xfer-progress into lp:~rye/indicator-ubuntuone/indicator-python

[John Lenton]

A first approach at showing the file xfer progress in the menu.

[Roman Yepishev (rye)]

Awesome!

review: Approve (fieldtest)

=== modified file 'ubuntuone-indicator'
--- ubuntuone-indicator	2010-12-01 12:00:45 +0000
+++ ubuntuone-indicator	2010-12-16 15:23:07 +0000
@@ -19,6 +19,7 @@
 import dbus
 import time
 import gobject
+import glib
 import os
 import sys
 import gettext
@@ -94,6 +95,8 @@
         self.content_estimate = 0
         self.content_size = 0
 
+        self.xfer_timer = None
+
     def is_already_running(self):
         """Checks whether our indicator is already running"""
         if self.bus.name_has_owner(INDICATOR_BUS_NAME):
@@ -112,7 +115,10 @@
                             source)
             return
 
-        shutil.copyfile(source, destination)
+        if not os.path.exists(os.path.dirname(destination)):
+            os.makedirs(os.path.dirname(destination))
+
+        #shutil.copyfile(source, destination)
         
     def main(self):
         """Application entry point"""
@@ -399,11 +405,40 @@
         self.content_size = self.get_content_queue_size()
         self.update_estimates()
         cur_time = time.time()
+        if count:
+            if self.xfer_timer is None:
+                self.xfer_timer = glib.timeout_add_seconds(1, self.update_xfer)
+        else:
+            glib.source_remove(self.xfer_timer)
+            self.xfer_timer = None
+            self.indicator.xfer_item.hide()
         if cur_time - self.last_content_size_update >= \
                 Application.CONTENT_QUEUE_UPDATE_INTERVAL:
             self.last_content_size_update = cur_time
             self.update_quota_info()
 
+    def update_xfer(self):
+        xfer = self.client.get_current_xfer()
+        if xfer is not None and 'deflated_size' in xfer:
+            fname = os.path.basename(xfer['path'])
+            if len(fname) > 30:
+                fname = fname[:29] + u"\N{HORIZONTAL ELLIPSIS}"
+
+            # the indicator menus always use_underlines, so I've got to double
+            # them up rather than setting use_underline=False
+            fname = fname.replace('_', '__')
+
+            progress = (100*int(xfer.get('n_bytes_written',
+                                         xfer.get('n_bytes_read', 0)))
+                        /int(xfer['deflated_size']))
+
+            label = u"%s %-30s %s%%" % (xfer['op'], fname, progress)
+
+            self.indicator.xfer_item.set_label(label)
+            self.indicator.xfer_item.show()
+        return True
+
+
 def format_data(value):
     """Utility function to present user-friendly bytes"""
     units = (Application.BYTES_UNIT_LABEL,

=== modified file 'ubuntuone_indicator/__init__.py'
--- ubuntuone_indicator/__init__.py	2010-10-16 11:33:14 +0000
+++ ubuntuone_indicator/__init__.py	2010-12-16 15:23:07 +0000
@@ -221,7 +221,7 @@
         """Handler for UploadStarted signal"""
         pass
 
-    def content_queue_changed_handler(self, data):
+    def content_queue_changed_handler(self, data=None):
         """Handler for ContentQueueChanged signal"""
         self.content_queue_changed_cb(data)
 
@@ -311,6 +311,23 @@
                 info['name'] = 'UNKNOWN'
         return info
 
+    def get_current_xfer(self):
+        if self.is_dbus_ready():
+            xfer = None
+            uploads = self.status_if.current_uploads()
+            if uploads:
+                xfer = uploads[0]
+                xfer['op'] = u'\N{UPWARDS WHITE ARROW}'
+            else:
+                downloads = self.status_if.current_downloads()
+                if downloads:
+                    xfer = downloads[0]
+                    xfer['op'] = u'\N{DOWNWARDS WHITE ARROW}'
+
+            return xfer
+        else:
+            raise DaemonNotRunningError()
+
     def connect_daemon(self):
         """Asks SyncDaemon to connect"""
         if not self.dbus_handlers_installed:
@@ -368,6 +385,8 @@
                 self.status_toggle_item_handler)
         self.status_toggle_item.show()
 
+        self.xfer_item = gtk.MenuItem()
+
         separator = gtk.MenuItem()
         separator.show()
 
@@ -395,6 +414,7 @@
 
         menu.append(self.state_name_item)
         menu.append(self.estimate_item)
+        menu.append(self.xfer_item)
 
         # Separator
         menu.append(separator)