From 8f01a07faa6abccfdc6face00e8b6f95b184abdf Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Tue, 25 Nov 2014 15:42:29 -0200
Subject: Several fixes in Soledad crypto:

  * Adapt to removal of the old multiprocessing safe database, by directly
    querying the sync database.
  * Fix docstrings.
---
 client/src/leap/soledad/client/crypto.py | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'client/src/leap')

diff --git a/client/src/leap/soledad/client/crypto.py b/client/src/leap/soledad/client/crypto.py
index aa8135c0..950576ec 100644
--- a/client/src/leap/soledad/client/crypto.py
+++ b/client/src/leap/soledad/client/crypto.py
@@ -530,8 +530,8 @@ class SyncEncryptDecryptPool(object):
         :param crypto: A SoledadCryto instance to perform the encryption.
         :type crypto: leap.soledad.crypto.SoledadCrypto
 
-        :param sync_db: a database connection handle
-        :type sync_db: handle
+        :param sync_db: A database connection handle
+        :type sync_db: pysqlcipher.dbapi2.Connection
 
         :param write_lock: a write lock for controlling concurrent access
                            to the sync_db
@@ -909,8 +909,7 @@ class SyncDecrypterPool(SyncEncryptDecryptPool):
         if encrypted is not None:
             sql += " WHERE encrypted = %d" % int(encrypted)
         sql += " ORDER BY gen ASC"
-        docs = self._sync_db.select(sql)
-        return docs
+        return self._fetchall(sql)
 
     def get_insertable_docs_by_gen(self):
         """
@@ -927,15 +926,12 @@ class SyncDecrypterPool(SyncEncryptDecryptPool):
         decrypted_docs = self.get_docs_by_generation(encrypted=False)
         insertable = []
         for doc_id, rev, _, gen, trans_id, encrypted in all_docs:
-            try:
-                next_doc_id, _, next_content, _, _, _ = decrypted_docs.next()
+            for next_doc_id, _, next_content, _, _, _ in decrypted_docs:
                 if doc_id == next_doc_id:
                     content = next_content
                     insertable.append((doc_id, rev, content, gen, trans_id))
                 else:
                     break
-            except StopIteration:
-                break
         return insertable
 
     def count_docs_in_sync_db(self, encrypted=None):
@@ -955,9 +951,9 @@ class SyncDecrypterPool(SyncEncryptDecryptPool):
         sql = "SELECT COUNT(*) FROM %s" % (self.TABLE_NAME,)
         if encrypted is not None:
             sql += " WHERE encrypted = %d" % int(encrypted)
-        res = self._sync_db.select(sql)
-        if res is not None:
-            val = res.next()
+        res = self._fetchall(sql)
+        if res:
+            val = res.pop()
             return val[0]
         else:
             return 0
@@ -1035,4 +1031,10 @@ class SyncDecrypterPool(SyncEncryptDecryptPool):
         Empty the received docs table of the sync database.
         """
         sql = "DELETE FROM %s WHERE 1" % (self.TABLE_NAME,)
-        res = self._sync_db.execute(sql)
+        self._sync_db.execute(sql)
+
+    def _fetchall(self, *args, **kwargs):
+        with self._sync_db:
+            c = self._sync_db.cursor()
+            c.execute(*args, **kwargs)
+            return c.fetchall()
-- 
cgit v1.2.3