Merge lp:~thisfred/u1db/u1todo-3 into lp:u1db

[Eric Casteleijn]

- u1todo saves the done status when an item is checked or unchecked
- u1todo now saves to a real database, so todo items persist between sessions

- u1todo saves the done status when an item is checked or unchecked
- u1todo now saves to a real database, so todo items persist between sessions

[Alejandro J. Cura (alecu)]

Code looks fine, all tests pass.

review: Approve

[lp:~thisfred/u1db/u1todo-3]

255. By Eric Casteleijn on 2012-04-25

merged trunk

=== modified file 'u1todo/test_u1todo.py'
--- u1todo/test_u1todo.py	2012-04-23 12:59:10 +0000
+++ u1todo/test_u1todo.py	2012-04-23 20:47:18 +0000
@@ -1,3 +1,19 @@
+# Copyright 2012 Canonical Ltd.
+#
+# This file is part of u1db.
+#
+# u1db is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# as published by the Free Software Foundation.
+#
+# u1db is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with u1db.  If not, see <http://www.gnu.org/licenses/>.
+
 """Tests for u1todo example application."""
 
 from testtools import TestCase
@@ -17,6 +33,13 @@
         store.initialize_db()
         self.assertEqual(INDEXES, dict(self.db.list_indexes()))
 
+    def test_reinitialize_db(self):
+        """Creates indexes."""
+        store = TodoStore(self.db)
+        store.new_task()
+        store.initialize_db()
+        self.assertEqual(INDEXES, dict(self.db.list_indexes()))
+
     def test_indexes_are_added(self):
         """New indexes are added when a new store is created."""
         store = TodoStore(self.db)
@@ -89,6 +112,17 @@
         store.delete_task(task)
         self.assertRaises(KeyError, store.get_task, task.task_id)
 
+    def test_get_all_tasks(self):
+        store = TodoStore(self.db)
+        store.initialize_db()
+        task1 = store.new_task()
+        task2 = store.new_task()
+        task3 = store.new_task()
+        task_ids = [task.task_id for task in store.get_all_tasks()]
+        self.assertEqual(
+            sorted([task1.task_id, task2.task_id, task3.task_id]),
+            sorted(task_ids))
+
 
 class TaskTestCase(TestCase):
     """Tests for Task."""

=== modified file 'u1todo/u1todo.py'
--- u1todo/u1todo.py	2012-04-23 12:59:10 +0000
+++ u1todo/u1todo.py	2012-04-23 20:47:18 +0000
@@ -1,6 +1,25 @@
+# Copyright 2012 Canonical Ltd.
+#
+# This file is part of u1db.
+#
+# u1db is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# as published by the Free Software Foundation.
+#
+# u1db is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with u1db.  If not, see <http://www.gnu.org/licenses/>.
+
 """u1todo example application."""
 
 import json
+import os
+import xdg.BaseDirectory
+from u1db.backends.sqlite_backend import SQLitePartialExpandDatabase
 
 DONE = 'true'
 NOT_DONE = 'false'
@@ -13,6 +32,14 @@
 }
 
 
+def get_database():
+    """Get the path that the database is stored in."""
+    # TODO: Make this (at least somewhat) platform/backend independent.
+    return SQLitePartialExpandDatabase(
+        os.path.join(xdg.BaseDirectory.save_data_path("u1todo"),
+        "u1todo.u1db"))
+
+
 class TodoStore(object):
     """The todo application backend."""
 
@@ -70,6 +97,10 @@
         # database.
         self.db.put_doc(task.document)
 
+    def get_all_tasks(self):
+        return [
+            Task(doc) for doc in self.db.get_from_index("done", ["*"])]
+
 
 class Task(object):
     """A todo item."""

=== modified file 'u1todo/ui.py'
--- u1todo/ui.py	2012-04-23 12:59:10 +0000
+++ u1todo/ui.py	2012-04-23 20:47:18 +0000
@@ -1,7 +1,22 @@
+# Copyright 2012 Canonical Ltd.
+#
+# This file is part of u1db.
+#
+# u1db is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# as published by the Free Software Foundation.
+#
+# u1db is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with u1db.  If not, see <http://www.gnu.org/licenses/>.
+
 """User interface for the u1todo example application."""
 
-from u1db.backends import inmemory
-from u1todo import TodoStore
+from u1todo import TodoStore, get_database
 import os
 import sys
 from PyQt4 import QtGui, QtCore, uic
@@ -21,26 +36,33 @@
 class Main(QtGui.QMainWindow):
     """Main window of our application."""
 
-    def __init__(self):
+    def __init__(self, in_memory=False):
         super(Main, self).__init__()
         uifile = os.path.join(os.path.abspath(os.path.dirname(__file__)),
                               'u1todo.ui')
         uic.loadUi(uifile, self)
-        db = inmemory.InMemoryDatabase("u1todo")
+        db = get_database()
         self.store = TodoStore(db)
+        self.store.initialize_db()
         self.connect_events()
         self.item = None
         self.delete_button.setEnabled(False)
+        for task in self.store.get_all_tasks():
+            self.add_task(task)
 
     def connect_events(self):
         """Hook up all the signal handlers."""
-        self.connect(
-            self.edit_button, QtCore.SIGNAL("clicked()"), self.update)
-        self.connect(
-            self.delete_button, QtCore.SIGNAL("clicked()"), self.delete)
-        self.connect(
-            self.list_widget, QtCore.SIGNAL("currentRowChanged(int)"),
-            self.row_changed)
+        self.edit_button.clicked.connect(self.update)
+        self.delete_button.clicked.connect(self.delete)
+        self.list_widget.currentRowChanged.connect(self.row_changed)
+        self.list_widget.itemChanged.connect(self.item_changed)
+
+    def item_changed(self, item):
+        if item.checkState() == QtCore.Qt.Checked:
+            item.task.done = True
+        else:
+            item.task.done = False
+        self.store.save_task(item.task)
 
     def update(self):
         """Either add a new task or update an existing one."""
@@ -48,9 +70,10 @@
         if not text:
             return
         if self.item is None:
-            self.add_item(text)
+            task = self.store.new_task(text)
+            self.add_task(task)
         else:
-            self.update_item(text)
+            self.update_task_text(text)
         self.line_edit.clear()
         self.item = None
 
@@ -61,17 +84,20 @@
         if self.list_widget.count() == 0:
             self.delete_button.setEnabled(False)
 
-    def add_item(self, text):
+    def add_task(self, task):
         """Add a new todo item."""
-        task = self.store.new_task(text)
         item = UITask(task)
         self.list_widget.addItem(item)
         self.delete_button.setEnabled(True)
 
-    def update_item(self, text):
+    def update_task_text(self, text):
         """Edit an existing todo item."""
         self.item.task.title = text
+        # disconnect the signal temporarily while we change the title
+        self.list_widget.itemChanged.disconnect(self.item_changed)
         self.item.setText(text)
+        # reconnect the signal after we changed the title
+        self.list_widget.itemChanged.connect(self.item_changed)
         self.store.save_task(self.item.task)
 
     def row_changed(self, index):