Merge lp:~thisfred/u1db/cosas-bg-sync into lp:u1db

[Eric Casteleijn]

Added background synchronisation to cosas.

Added background synchronisation to cosas.

Still to do:

- error handling
- conflict handling
- storing of the configuration, so it doesn't get forgotten on startup
- a way to store credentials for non u1 servers

[Roberto Alsina (ralsina)]

Please don't start depending on qt4reactor :-)

review: Needs Fixing

[lp:~thisfred/u1db/cosas-bg-sync]

373. By Eric Casteleijn on 2012-08-06

s/reactor.callLater/QTimer.setSingleShot/

374. By Eric Casteleijn on 2012-08-06

store actual timer

375. By Eric Casteleijn on 2012-08-06

hmmmm

376. By Eric Casteleijn on 2012-08-06

fixed by not abusing singleshot

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'cosas/cosas.ui'
--- cosas/cosas.ui	2012-08-01 20:34:31 +0000
+++ cosas/cosas.ui	2012-08-06 18:51:19 +0000
@@ -60,7 +60,6 @@
    border: 1px solid rgb(102,102,102);
 }
 
-*[foo="bar"] {color:red;}
 </string>
   </property>
   <property name="toolButtonStyle">
@@ -212,6 +211,7 @@
    </widget>
    <addaction name="menu_File"/>
   </widget>
+  <widget class="QStatusBar" name="statusBar"/>
   <action name="action_synchronize">
    <property name="text">
     <string>&amp;Synchronize</string>

=== modified file 'cosas/sync.ui'
--- cosas/sync.ui	2012-05-11 14:16:36 +0000
+++ cosas/sync.ui	2012-08-06 18:51:19 +0000
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>329</width>
-    <height>169</height>
+    <height>200</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -114,13 +114,24 @@
         </item>
        </layout>
       </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QCheckBox" name="auto_sync">
+          <property name="text">
+           <string>Automatically sync every 30 minutes</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QPushButton" name="sync_button">
      <property name="text">
-      <string>Syn&amp;chronize</string>
+      <string>Syn&amp;chronize now</string>
      </property>
     </widget>
    </item>

=== modified file 'cosas/ui.py'
--- cosas/ui.py	2012-08-02 14:32:47 +0000
+++ cosas/ui.py	2012-08-06 18:51:19 +0000
@@ -44,6 +44,8 @@
     (159, 197, 232),
     (180, 167, 214),
     (213, 166, 189)]
+U1_URL = 'https://u1db.one.ubuntu.com/~/cosas'
+TIMEOUT = 1000 * 0.5 * 60 * 60  # 30 minutes
 
 
 class UITask(QtGui.QTreeWidgetItem):
@@ -131,58 +133,73 @@
         uifile = os.path.join(
             os.path.abspath(os.path.dirname(__file__)), 'sync.ui')
         uic.loadUi(uifile, self)
-        self.connect_events()
         self.other = other
+        if other.auto_sync:
+            self.auto_sync.setChecked(True)
+        if other.sync_target == U1_URL:
+            self.u1_radio.setChecked(True)
+            self.url_radio.setChecked(False)
+        else:
+            self.url_radio.setChecked(True)
+            self.u1_radio.setChecked(False)
+            self.url_edit.setText(other.sync_target)
+        self.connect_events()
 
     def connect_events(self):
         """Hook up all the signal handlers."""
         self.sync_button.clicked.connect(self.synchronize)
+        self.u1_radio.toggled.connect(self.toggle_u1)
+        self.url_radio.toggled.connect(self.toggle_url)
+        self.auto_sync.toggled.connect(self.toggle_sync)
+        self.url_edit.editingFinished.connect(self.url_changed)
 
-    def get_ubuntuone_credentials(self):
-        cmt = CredentialsManagementTool()
-        return cmt.find_credentials()
+    def enable_button(self, _=None):
+        self.sync_button.setEnabled(True)
 
     def synchronize(self):
         self.sync_button.setEnabled(False)
-        if self.u1_radio.isChecked():
-            d = self.get_ubuntuone_credentials()
-            d.addCallback(self._synchronize)
-        else:
-            # TODO: add ui for entering creds for non u1 servers.
-            self._synchronize()
-
-    def _synchronize(self, creds=None):
-        if self.u1_radio.isChecked():
-            # TODO: not hardcode
-            target = 'https://u1db.one.ubuntu.com/~/cosas'
-        else:
-            target = self.url_edit.text()
-        if target.startswith('http://') or target.startswith('https://'):
-            st = HTTPSyncTarget.connect(target)
-            oauth_creds = {
-                'token_key': creds['token'],
-                'token_secret': creds['token_secret'],
-                'consumer_key': creds['consumer_key'],
-                'consumer_secret': creds['consumer_secret']}
-            if creds:
-                st.set_oauth_credentials(**oauth_creds)
-        else:
-            db = u1db.open(target, create=True)
-            st = db.get_sync_target()
-        syncer = Synchronizer(self.store.db, st)
-        try:
-            syncer.sync()
-        except DatabaseDoesNotExist:
-            # The server does not yet have the database, so create it.
-            if target.startswith('http://') or target.startswith('https://'):
-                db = HTTPDatabase(target)
-                db.set_oauth_credentials(**oauth_creds)
-                db.open(create=True)
-            syncer.sync()
-        self.other.refresh_filter()
+        self.other.synchronize(self.enable_button)
         self.last_synced.setText(
-            '<span style="color:green">%s</span>' % (datetime.now()))
-        self.sync_button.setEnabled(True)
+            '<span style="color:green">%s</span>' % (datetime.now(),))
+
+    def toggle_u1(self, value):
+        if value:
+            self.other.sync_target = U1_URL
+        else:
+            text = unicode(self.url_edit.text(), 'utf-8')
+            if not text:
+                # There was no text in the edit field so do nothing.
+                self.other.sync_target = None
+                return
+        self.other.sync_target = text
+
+    def toggle_url(self, value):
+        if value:
+            text = unicode(self.url_edit.text(), 'utf-8')
+            if not text:
+                # There was no text in the edit field so do nothing.
+                self.other.sync_target = None
+                return
+        else:
+            self.other.sync_target = U1_URL
+        self.other.sync_target = text
+
+    def toggle_sync(self, value):
+        self.other.auto_sync = value
+        if value:
+            self.other.start_auto_sync()
+        else:
+            self.other.stop_auto_sync()
+
+    def url_changed(self):
+        if not self.url_radio.isChecked():
+            return
+        text = unicode(self.url_edit.text(), 'utf-8')
+        if not text:
+            # There was no text in the edit field so do nothing.
+            self.other.sync_target = None
+            return
+        self.other.sync_target = text
 
 
 class Main(QtGui.QMainWindow):
@@ -194,7 +211,6 @@
         uifile = os.path.join(
             os.path.abspath(os.path.dirname(__file__)), 'cosas.ui')
         uic.loadUi(uifile, self)
-        # set the model for the treeview
         self.buttons_frame.hide()
         # hook up the signals to the signal handlers.
         self.connect_events()
@@ -220,6 +236,13 @@
         # Give the edit field focus.
         self.title_edit.setFocus()
         self.editing = False
+        self.last_synced = None
+        self.sync_target = U1_URL
+        self.auto_sync = False
+        self._timer = QtCore.QTimer()
+
+    def update_status_bar(self, message):
+        self.statusBar.showMessage(message)
 
     def keyPressEvent(self, event):
         if event.key() == QtCore.Qt.Key_Delete:
@@ -405,6 +428,61 @@
             return
         item.set_color(WHITE)
 
+    def get_ubuntuone_credentials(self):
+        cmt = CredentialsManagementTool()
+        return cmt.find_credentials()
+
+    def synchronize(self, finalize):
+        if self.sync_target == 'https://u1db.one.ubuntu.com/~/cosas':
+            d = self.get_ubuntuone_credentials()
+            d.addCallback(self._synchronize)
+            d.addCallback(finalize)
+        else:
+            # TODO: add ui for entering creds for non u1 servers.
+            self._synchronize()
+            finalize()
+
+    def _auto_sync(self):
+        self._timer.stop()
+        try:
+            self.synchronize(lambda _: None)
+        finally:
+            self._timer.start(TIMEOUT)
+
+    def start_auto_sync(self):
+        self._timer.timeout.connect(self._auto_sync)
+        self._timer.start(TIMEOUT)
+
+    def stop_auto_sync(self):
+        self._timer.stop()
+
+    def _synchronize(self, creds=None):
+        target = self.sync_target
+        if target.startswith('http://') or target.startswith('https://'):
+            st = HTTPSyncTarget.connect(target)
+            oauth_creds = {
+                'token_key': creds['token'],
+                'token_secret': creds['token_secret'],
+                'consumer_key': creds['consumer_key'],
+                'consumer_secret': creds['consumer_secret']}
+            if creds:
+                st.set_oauth_credentials(**oauth_creds)
+        else:
+            db = u1db.open(target, create=True)
+            st = db.get_sync_target()
+        syncer = Synchronizer(self.store.db, st)
+        try:
+            syncer.sync()
+        except DatabaseDoesNotExist:
+            # The server does not yet have the database, so create it.
+            if target.startswith('http://') or target.startswith('https://'):
+                db = HTTPDatabase(target)
+                db.set_oauth_credentials(**oauth_creds)
+                db.open(create=True)
+            syncer.sync()
+        self.refresh_filter()
+        self.update_status_bar("last synced: %s" % (datetime.now(),))
+
 
 if __name__ == "__main__":
     # TODO: Unfortunately, to be able to use ubuntuone.platform.credentials on

=== modified file 'html-docs/index.rst'
--- html-docs/index.rst	2012-07-16 16:45:45 +0000
+++ html-docs/index.rst	2012-08-06 18:51:19 +0000
@@ -43,7 +43,7 @@
  ===================== =========== ================= ==============
  Ubuntu, Windows, OS X Python      SQLite            :ref:`reference-implementation`
  Ubuntu                Vala        SQLite            `lp:shardbridge <http://launchpad.net/shardbridge/>`_
- Ubuntu, Windows, OS X C           SQLite            planned
+ Ubuntu, Windows, OS X C           SQLite            part of `lp:u1db <http://launchpad.net/u1db/>`_
  Web                   JavaScript  localStorage      planned
  Android               Java        SQLite            planned
  iOS                   Objective C SQLite            planned