Merge lp:~severinh/gnome-zeitgeist/firefox_profiles_fix into lp:gnome-zeitgeist

[Severin H]

[Severin H (severinh)]

This branch features a fix for bug #374918 as well as a minor cleanup in zeitgeist_firefox.py.

[Severin H (severinh)]

I guess I don't need to tell you that it would be wise to give the branch a try before merging it into main. ;-)

[lp:~severinh/gnome-zeitgeist/firefox_profiles_fix]

565. By Severin H on 2009-05-11

zeitgeist_firefox.py:

Typo in get_profile_dirs fixed.

Don't crash if no Firefox profile can be found.

[Seif Lotfy (seif)]

Ok i tested it and it looks good

review: Approve

=== modified file 'src/zeitgeist_engine/zeitgeist_firefox.py'
--- src/zeitgeist_engine/zeitgeist_firefox.py	2009-05-10 18:55:04 +0000
+++ src/zeitgeist_engine/zeitgeist_firefox.py	2009-05-11 15:54:30 +0000
@@ -1,38 +1,49 @@
 # -.- encoding: utf-8 -.-
 
-import os
-import glob
 import shutil
 import sqlite3 as db
 import gettext
 
+from os.path import join, expanduser, isfile
+from ConfigParser import ConfigParser, NoOptionError
+
 from zeitgeist_engine.zeitgeist_util import FileMonitor
 from zeitgeist_engine.zeitgeist_base import DataProvider
 
-
 class FirefoxSource(DataProvider):
+    FIREFOX_DIR = expanduser("~/.mozilla/firefox")
+    PROFILE_FILE = join(FIREFOX_DIR, "profiles.ini")
+    LOCATION = expanduser("~/.zeitgeist/firefox.sqlite")
     
-    def __init__(self, name="Firefox History", icon="gnome-globe", uri="gzg/firefox"):
-        
-        DataProvider.__init__(self, name=name, icon=icon, uri = uri)
-        self.name = "Firefox History"
-        self.icon="gnome-globe"
-        self.type = self.name
-        self.comment = "websites visited with Firefox"
-        
-        self.historydb = glob.glob(os.path.expanduser("~/.mozilla/firefox/*/places.sqlite"))
-        
-        # TODO: Be more sensible about: a) old profiles being present
-        # (look at profiles.ini to find the correct one), and b) more
-        # than one Firefox version being used (eg., current and alpha).
+    def __init__(self):
+        DataProvider.__init__(self,
+            name=_(u"Firefox History"),
+            icon="gnome-globe",
+            uri="gzg/firefox",
+            comment=_(u"Websites visited with Firefox"))
+        
+        self.type = "Firefox History"
+        
+        # Holds a list of all places.sqlite files. The file that belongs to the
+        # default profile will be the at the top of the list.
+        self.history_dbs = []
+        
+        for profile_dir in self.get_profile_dirs():
+            db_file = join(profile_dir, "places.sqlite")
+            
+            # Make sure that this particular places.sqlite file exists.
+            if isfile(db_file):
+                self.history_dbs.append(db_file)
+        
+        # TODO: Handle more than one Firefox profile.
         try:
-            self.note_path_monitor = FileMonitor(self.historydb[0])
+            self.note_path_monitor = FileMonitor(self.history_dbs[0])
             self.note_path_monitor.connect("event", self.reload_proxy)
             self.note_path_monitor.open()
         except Exception:
             print "Are you using Firefox?"
         else:
-            print 'Reading from', self.historydb[0]
+            print 'Reading from', self.history_dbs[0]
         
         if not hasattr(self, "cursor"):
             self.cursor = None
@@ -41,10 +52,49 @@
         else:
             self.last_timestamp = 0.0
         
-        self.loc = os.path.expanduser("~/.zeitgeist/firefox.sqlite")
-        
         self.__copy_sqlite()
     
+    @classmethod
+    def get_profile_dirs(cls):
+        """
+        Returns a list of all Firefox profile directories.
+        
+        The default profile is located at the top of the list.
+        """
+        
+        profiles = []
+        
+        # Parse the profiles.ini file to get the location of all Firefox
+        # profiles.
+        profile_parser = ConfigParser()
+        
+        # Doesn't raise an exception if the file doesn't exist.
+        profile_parser.read(cls.PROFILE_FILE)
+        
+        for section in profile_parser.sections():
+            try:
+                is_relative = profile_parser.getboolean(section, "isRelative")
+                path = profile_parser.get(section, "Path")
+            except NoOptionError:
+                # This section does not represent a profile (for example the
+                # `General` section).
+                pass
+            else:
+                try:
+                    is_default = profile_parser.getboolean(section, "Default")
+                except (NoOptionError, ValueError):
+                    is_default = False
+                
+                if is_relative:
+                    path = join(cls.FIREFOX_DIR, path)
+                
+                if is_default:
+                    profiles.insert(0, path)
+                else:
+                    profile.append(path)
+        
+        return profiles
+    
     def get_latest_timestamp(self): 
         
         contents = "visit_date"
@@ -98,6 +148,6 @@
         '''
         if self.cursor:
             self.cursor.close()
-        shutil.copy2(self.historydb[0],  self.loc)
-        self.connection = db.connect(self.loc, True)
+        shutil.copy2(self.history_dbs[0],  self.LOCATION)
+        self.connection = db.connect(self.LOCATION, True)
         self.cursor = self.connection.cursor()