settings: Auto-remove repositories from the "Select Repository" dialog

Adjust the settings reader so that it skips over entries that no longer
exist.  This is done for both bookmarks and the recent repositories
list.

Closes git-cola#145

Signed-off-by: David Aguilar <davvid@gmail.com>

Author: davvid

cola/settings.py

@@ -10,6 +10,7 @@
 except ImportError:
     import json
 
+from cola import core
 from cola import xdg
 
 
@@ -38,6 +39,32 @@ def __init__(self):
                 'recent': [],
         }
         self.load()
+        self.remove_missing()
+
+
+    def remove_missing(self):
+        missing_bookmarks = []
+        missing_recent = []
+
+        for bookmark in self.bookmarks:
+            if not os.path.exists(core.encode(bookmark)):
+                missing_bookmarks.append(bookmark)
+
+        for bookmark in missing_bookmarks:
+            try:
+                self.bookmarks.remove(bookmark)
+            except:
+                pass
+
+        for recent in self.recent:
+            if not os.path.exists(core.encode(recent)):
+                missing_recent.append(recent)
+
+        for recent in missing_recent:
+            try:
+                self.recent.remove(recent)
+            except:
+                pass
 
     # properties
     def _get_bookmarks(self):

share/doc/git-cola/relnotes.rst

@@ -1,3 +1,12 @@
+git-cola v1.8.2 (DRAFT)
+=======================
+Usability, bells and whistles
+-----------------------------
+* We now automatically remove missing repositories from the
+  "Select Repository" dialog.
+
+  http://github.com/git-cola/git-cola/issues/145
+
 git-cola v1.8.1
 ===============
 Usability, bells and whistles

test/test_cola_settings.py

@@ -30,19 +30,46 @@ def test_gui_save_restore(self):
 
     def test_bookmarks_save_restore(self):
         """Test the bookmark save/restore feature"""
+
+        # We automatically purge missing entries so we mock-out
+        # os.path.exists so that this bookmark is kept.
+
+        bookmark = '/tmp/python/thinks/this/exists'
+        os_path_exists = os.path.exists
+
+        def mock_exists(path):
+            return path == bookmark or os_path_exists(path)
+
+        os.path.exists = mock_exists
+
         model = self.model()
-        model.add_bookmark('test-bookmark')
+        model.add_bookmark(bookmark)
         model.save()
 
         model = self.model()
+        os.path.exists = os_path_exists # undo mock
+
         bookmarks = model.bookmarks
         self.assertEqual(len(model.bookmarks), 1)
-        self.assertTrue('test-bookmark' in bookmarks)
+        self.assertTrue(bookmark in bookmarks)
 
-        model.remove_bookmark('test-bookmark')
+        model.remove_bookmark(bookmark)
         bookmarks = model.bookmarks
         self.assertEqual(len(bookmarks), 0)
-        self.assertFalse('test-bookmark' in bookmarks)
+        self.assertFalse(bookmark in bookmarks)
+
+    def test_bookmarks_removes_missing_entries(self):
+        """Test that missing entries are removed after a reload"""
+        bookmark = '/tmp/this/does/not/exist'
+        model = self.model()
+        model.add_bookmark(bookmark)
+        model.save()
+
+        model = self.model()
+        bookmarks = model.bookmarks
+        self.assertEqual(len(model.bookmarks), 0)
+        self.assertFalse(bookmark in bookmarks)
+
 
 
 if __name__ == '__main__':