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

[Mark Tully]

Parse bookmarks for all Firefox profiles

Iterate through all Firefox profiles when looking for bookmarks.

[James Henstridge (jamesh)]

Is there any reason you've removed your name from the copyright header?

And while you haven't introduced it in this change, the bare except is bad practice since it can hide mistakes (e.g. if you mistyped a method name, it would swallow the AttributeError). It looks like it would be sufficient to catch sqlite3.DatabaseError here.

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

19. By Mark Tully on 2013-03-19

Readded copyright name
Specified sqlite.DatabaseError exception in get_bookmarks_from_firefox()

[Mark Tully (markjtully)]

I removed the name by mistake. It's readded now. I've also specified the exception type as suggested.

[David Callé (davidc3)]

+1

[James Henstridge (jamesh)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/unity_firefoxbookmarks_daemon.py'
--- src/unity_firefoxbookmarks_daemon.py	2013-03-14 12:27:56 +0000
+++ src/unity_firefoxbookmarks_daemon.py	2013-03-19 13:43:23 +0000
@@ -53,33 +53,39 @@
 
 def get_bookmarks_from_firefox(path):
     '''
-     Gets a list of bookmarks from the user's firefox profile
+     Gets a list of bookmarks from the user's firefox profiles
     '''
-    # Build Firefox's profile path
-    firefox_dbfile = ""
+    # Build Firefox's profile paths
+    firefox_dbfiles = []
     bookmarks = []
     for folder in os.listdir(path):
-        if folder.endswith(".default"):
-            firefox_dbfile = path + folder + "/places.sqlite"
-
-    if os.path.exists(firefox_dbfile):
-        try:
-            sqlite_query = '''SELECT moz_bookmarks.title, moz_places.url, moz_favicons.url
-                           FROM moz_bookmarks, moz_places, moz_favicons
-                           WHERE moz_places.id = moz_bookmarks.fk
-                               AND moz_places.favicon_id = moz_favicons.id
-                               AND moz_bookmarks.title is not null
-                               AND moz_places.favicon_id is not null
-                               AND moz_bookmarks.type = 1
-                           ORDER BY moz_bookmarks.lastModified;'''
-
-            conn = sqlite3.connect(firefox_dbfile)
-            connection = conn.cursor()
-            connection.execute(sqlite_query)
-            bookmarks = connection.fetchall()
-            connection.close()
-        except:
-            pass
+        if '.' in folder:
+            firefox_dbfiles.append(path + folder + "/places.sqlite")
+
+    for dbfile in firefox_dbfiles:
+        if os.path.exists(dbfile):
+            try:
+                filename = dbfile.replace('/places.sqlite', '')
+                file_name, profile_name = os.path.splitext(filename)
+                profile_name = profile_name[1:]
+                sqlite_query = '''SELECT moz_bookmarks.title, moz_places.url, moz_favicons.url, '%s'
+                               FROM moz_bookmarks, moz_places, moz_favicons
+                               WHERE moz_places.id = moz_bookmarks.fk
+                                   AND moz_places.favicon_id = moz_favicons.id
+                                   AND moz_bookmarks.title is not null
+                                   AND moz_places.favicon_id is not null
+                                   AND moz_bookmarks.type = 1
+                               ORDER BY moz_bookmarks.lastModified;''' % profile_name
+    
+                conn = sqlite3.connect(dbfile)
+                connection = conn.cursor()
+                connection.execute(sqlite_query)
+                profile_bookmarks = connection.fetchall()
+                for bookmark in profile_bookmarks:
+                    bookmarks.append(bookmark)
+                connection.close()
+            except sqlite3.DatabaseError:
+                pass
     return bookmarks
 
 
@@ -106,7 +112,8 @@
                             'icon': icon,
                             'category': 0,
                             'title': bookmark[0],
-                            'comment': bookmark[1]})
+                            'comment': bookmark[1],
+                            'user':GLib.Variant('s', bookmark[3])})
             continue
 
         # Search bookmark urls for matches
@@ -115,7 +122,8 @@
                             'icon': icon,
                             'category': 0,
                             'title': bookmark[0],
-                            'comment': bookmark[1]})
+                            'comment': bookmark[1],
+                            'user':GLib.Variant('s', bookmark[3])})
     return results