Merge lp:~submarine/ubuntu-scopes/chromiumbookmarks-multiple-profiles into lp:~submarine/ubuntu-scopes/chromiumbookmarks

[David Callé]

Parse bookmarks for all Chromium profiles

Iterate through all Chromium profiles when looking for bookmarks.

[lp:~submarine/ubuntu-scopes/chromiumbookmarks-multiple-profiles]

21. By David Callé on 2013-03-18

Prepare for adding activation for a specific Chromium profile

[James Henstridge (jamesh)]

This seems to make the test suite dependent on the user's local bookmarks. While it is unlikely the user might have a bookmark named 'upnriitnyt', it would seem better for the test not to depend on that being the case.

[lp:~submarine/ubuntu-scopes/chromiumbookmarks-multiple-profiles]

22. By David Callé on 2013-03-19

Don't parse user profiles when running tests

[David Callé (davidc3)]

I hadn't considered the test in the context of running on a user machine, thanks.

[James Henstridge (jamesh)]

The other issue is that you are extending BOOKMARKS_PATH every time a search runs. This means each successive search will do more work.

How about something like this:

    BOOKMARKS_PATH = None

    def get_chromium_profiles():
        if BOOKMARKS_PATH is not None:
            return [BOOKMARKS_PATH]
        # Otherwise, build up and return the list of profile directories

This should give you the testing hook, and avoid the above problem.

[lp:~submarine/ubuntu-scopes/chromiumbookmarks-multiple-profiles]

23. By David Callé on 2013-03-19

Don't extend the list of bookmarks paths on each run

[David Callé (davidc3)]

Indeed. I've fixed it another way, to catch new chromium profiles while running. (Since we are not shutting daemons down atm)

[James Henstridge (jamesh)]

Looks good. It seems a bit weird to use the "About" stock icon to represent bookmarks, but that is a pre-existing issue, so I won't block the merge on that point.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/unity_chromiumbookmarks_daemon.py'
--- src/unity_chromiumbookmarks_daemon.py	2013-03-14 12:27:26 +0000
+++ src/unity_chromiumbookmarks_daemon.py	2013-03-19 08:55:25 +0000
@@ -39,9 +39,10 @@
 DEFAULT_RESULT_ICON = SVG_DIR + 'result-help.svg'
 DEFAULT_RESULT_MIMETYPE = 'text/html'
 DEFAULT_RESULT_TYPE = Unity.ResultType.DEFAULT
-BOOKMARKS_PATH = os.getenv("HOME") + "/.config/chromium/Default/Bookmarks"
+DEFAULT_BOOKMARKS = os.getenv("HOME") + "/.config/chromium/Default/Bookmarks"
+PARSE_ALL_PROFILES = True
 
-c1 = {'id': 'bookamrks',
+c1 = {'id': 'bookmarks',
       'name': _('Bookmarks'),
       'icon': SVG_DIR + 'group-installed.svg',
       'renderer': Unity.CategoryRenderer.VERTICAL_TILE}
@@ -52,6 +53,19 @@
 EXTRA_METADATA = []
 
 
+def get_chromium_profiles():
+    BOOKMARKS_PATH = [DEFAULT_BOOKMARKS]
+    if not PARSE_ALL_PROFILES:
+        return BOOKMARKS_PATH
+    try:
+        for f in os.listdir(os.getenv("HOME") + "/.config/chromium/"):
+            if f == "Default" or f.startswith('Profile '):
+                BOOKMARKS_PATH.append(os.getenv("HOME") + "/.config/chromium/"+f+"/Bookmarks")
+    except Exception as error:
+        print(error)
+    return BOOKMARKS_PATH
+
+
 def get_bookmarks_from_chromium(path):
     '''
      Gets a list of bookmarks from the user's chromium profile
@@ -113,25 +127,19 @@
     Search for help documents matching the search string
     '''
     results = []
-    bookmarks = get_bookmarks_from_chromium(BOOKMARKS_PATH)
-    icon = Gio.ThemedIcon.new("gtk-about").to_string()
-    for bookmark in bookmarks:
-        # Search bookmark names for matches
-        if not bookmark[0].lower().find(search.lower()) == -1:
-            results.append({'uri': bookmark[1],
-                            'icon': icon,
-                            'category': 0,
-                            'title': bookmark[0],
-                            'comment': bookmark[1]})
-            continue
-
-        # Search bookmark urls for matches
-        if not bookmark[1].lower().find(search.lower()) == -1:
-            results.append({'uri': bookmark[1],
-                            'icon': icon,
-                            'category': 0,
-                            'title': bookmark[0],
-                            'comment': bookmark[1]})
+    for path in get_chromium_profiles():
+        user = path.split('/')[-2]
+        bookmarks = get_bookmarks_from_chromium(path)
+        icon = Gio.ThemedIcon.new("gtk-about").to_string()
+        for bookmark in bookmarks:
+            # Search bookmark names for matches
+            if not bookmark[0].lower().find(search.lower()) == -1 or not bookmark[1].lower().find(search.lower()) == -1:
+                results.append({'uri': bookmark[1],
+                                'icon': icon,
+                                'category': 0,
+                                'title': bookmark[0],
+                                'comment': bookmark[1],
+                                'user':GLib.Variant('s',user)})
     return results
 
 

=== modified file 'tests/test_chromiumbookmarks.py'
--- tests/test_chromiumbookmarks.py	2013-02-18 01:37:22 +0000
+++ tests/test_chromiumbookmarks.py	2013-03-19 08:55:25 +0000
@@ -39,7 +39,8 @@
         self.scope_module = None
 
     def test_questions_search(self):
-        self.scope_module.BOOKMARKS_PATH = 'tests/data/mock_chromiumbookmarks_pass'
+        self.scope_module.DEFAULT_BOOKMARKS = 'tests/data/mock_chromiumbookmarks_pass'
+        self.scope_module.PARSE_ALL_PROFILES = False
         expected_results = ["http://www.ubuntu.com/",
                             "Test Bookmark"]
         results = []
@@ -51,8 +52,9 @@
 
 
     def test_questions_failing_search(self):        
-        self.scope_module.BOOKMARKS_PATH = 'tests/data/mock_chromiumbookmarks_fail'
-        for s in ['upnriitnyt']:
+        self.scope_module.DEFAULT_BOOKMARKS = 'tests/data/mock_chromiumbookmarks_fail'
+        self.scope_module.PARSE_ALL_PROFILES = False
+        for s in ['ubuntu']:
             result_set = self.perform_query(s)
             self.assertEqual(len(result_set.results), 0)