Merge lp:~felix-velasco/do-plugins/firefox-favicons into lp:do-plugins

[Félix Velasco]

[Félix Velasco (felix-velasco)]

If there's a stored favicon in the firefox db, compose it with the current "www" icon used for it. I was not sure of the proper size as to retrieve the stock icon. With bigger sizes, the favicons need to be scaled or are way too small, and it may take a second or two to reload the Firefox Places plugin

Unmerged revisions

675. By Félix Velasco on 2009-11-30

Retrieve favicon info from firefox's sqlite database and use it composed with the current icon

=== modified file 'Firefox/Firefox.mdp'
--- Firefox/Firefox.mdp	2009-06-29 08:47:41 +0000
+++ Firefox/Firefox.mdp	2009-11-30 12:05:22 +0000
@@ -31,8 +31,9 @@
     <ProjectReference type="Gac" localcopy="True" refto="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="True" refto="Mono.Data.SqliteClient, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
     <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.9.0.0, Culture=neutral" />
     <ProjectReference type="Gac" localcopy="True" refto="Do.Platform.Linux, Version=0.9.0.0, Culture=neutral" />
     <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.9.0.0, Culture=neutral" />
   </References>
-</Project>
 \ No newline at end of file
+</Project>
 
=== modified file 'Firefox/Makefile.am'
--- Firefox/Makefile.am	2009-06-22 04:05:16 +0000
+++ Firefox/Makefile.am	2009-11-30 12:05:22 +0000
@@ -17,5 +17,6 @@
 	System.Core \
 	System.Data \
 	Mono.Data.SqliteClient \
+	$(GTK_SHARP_20_LIBS) \
 	$(DO_PLATFORM_LIBS) \
 	$(DO_UNIVERSE_LIBS)
 
=== modified file 'Firefox/src/PlaceItem.cs'
--- Firefox/src/PlaceItem.cs	2009-06-22 04:05:16 +0000
+++ Firefox/src/PlaceItem.cs	2009-11-30 12:05:22 +0000
@@ -30,19 +30,21 @@
 	
 	public class PlaceItem : Item, IBookmarkItem
 	{
-		string title, url;
+		string title, url, icon;
 		
-		public PlaceItem (string title, string url)
+		public PlaceItem (string title, string url, string icon)
 		{
 			this.url = url;
 			this.title = title;
+			this.icon = icon;
 		}
 		
-		public PlaceItem (string title, string url, int parentId)
+		public PlaceItem (string title, string url, string icon, int parentId)
 		{
 			this.url = url;
 			this.title = title;
 			ParentId = parentId;
+			this.icon = icon;
 		}
 
 		public override string Name { 
@@ -54,7 +56,7 @@
 		}
 		
 		public override string Icon {
-			get { return "www"; } 
+			get { return icon; } 
 		}
 		
 		public string Url { 
 
=== modified file 'Firefox/src/PlacesItemSource.cs'
--- Firefox/src/PlacesItemSource.cs	2009-09-05 02:06:59 +0000
+++ Firefox/src/PlacesItemSource.cs	2009-11-30 12:05:22 +0000
@@ -28,6 +28,7 @@
 using Do.Universe;
 using Do.Universe.Common;
 
+using Gdk;
 using Mono.Addins;
 using Mono.Data.SqliteClient;
 	
@@ -44,6 +45,7 @@
 		IEnumerable<FolderItem> folders;
 		
 		string stored_temp_db_path;
+		string tmp_favicon_folder;
 		
 		public PlacesItemSource ()
 		{
@@ -52,6 +54,8 @@
 			folders = Enumerable.Empty<FolderItem> ();
 
 			ProfilePath = FindProfilePath ();
+			tmp_favicon_folder = Path.Combine (Path.GetTempPath(), "do-firefox-favicons");
+			Directory.CreateDirectory (tmp_favicon_folder);
 		}
 
 		~PlacesItemSource ()
@@ -63,6 +67,13 @@
 				Log<PlacesItemSource>.Error ("Could not delete stored db file: {0}", e.Message);
 				Log<PlacesItemSource>.Debug (e.StackTrace);
 			}
+			try {
+				if (Directory.Exists (tmp_favicon_folder))
+					Directory.Delete (tmp_favicon_folder, true);
+			} catch (IOException e) {
+				Log<PlacesItemSource>.Error ("Could not delete temporary favicons folder: {0}", e.Message);
+				Log<PlacesItemSource>.Debug (e.StackTrace);
+			}
 		}
 
 		public override string Name {
@@ -275,9 +286,14 @@
 				dbcon.Open ();
 				
 				using (IDbCommand dbcmd = dbcon.CreateCommand ()) {
-					dbcmd.CommandText =  "SELECT moz_places.title, moz_places.url, moz_bookmarks.parent, moz_bookmarks.title "
+					dbcmd.CommandText =  "SELECT moz_places.title, moz_places.url, "
+						+ "moz_bookmarks.parent, moz_bookmarks.title, "
+						+ "moz_favicons.data, moz_favicons.id "
 						+ "FROM moz_places LEFT OUTER JOIN moz_bookmarks "
 						+ "ON moz_places.id=moz_bookmarks.fk "
+						+ "LEFT OUTER JOIN moz_favicons "
+						+ "ON moz_places.favicon_id=moz_favicons.id "
+
 						+ "ORDER BY moz_places.frecency DESC "
 						+ "LIMIT 500";
 						
@@ -285,20 +301,36 @@
 						while (reader.Read () ) {				
 							string title = reader.GetString (0);
 							string url = reader.GetString (1);
-							
+							string icon = "www";
+
 							// Firefox stores some interesting non-url places. Ignore them.
 							if (url [0] != 'p') {
+								// Check if the place has a stored favicon
+								if (!reader.IsDBNull(5) && !reader.IsDBNull(4)) {
+									string id = reader.GetString (5);
+									icon = Path.Combine (tmp_favicon_folder, id + ".png");
+
+									// Firefox reuses favicons, and so do we
+									if (!File.Exists(icon)) {
+										byte[] data = (byte[]) reader["data"];
+										Pixbuf pix = new Pixbuf (data);
+										Pixbuf dest = Gtk.IconTheme.Default.LoadIcon ("www", 80, 0);
+										pix.Composite (dest, 0, 0, pix.Width, pix.Height, 0, 0, 1, 1, InterpType.Bilinear , 200);
+										dest.Save (icon, "png");
+									}
+								}
+
 								// If the place is a bookmark, use the title stored in Bookmarks.
 								if (!reader.IsDBNull (2)) {
 									int parent = reader.GetInt32 (2);
 									string bookmarkTitle = reader.GetString (3);
 									
-									yield return new PlaceItem (bookmarkTitle, url, parent);
+									yield return new PlaceItem (bookmarkTitle, url, icon, parent);
 								} else if (string.IsNullOrEmpty (title)) {
 									// If the place has no title, use the url as a title so it's searchable.
-									yield return new PlaceItem (url, url);
+									yield return new PlaceItem (url, url, icon);
 								} else {
-									yield return new PlaceItem (title, url);
+									yield return new PlaceItem (title, url, icon);
 								}
 							}
 						}
@@ -309,4 +341,4 @@
 			}
 		}
 	}
-}
 \ No newline at end of file
+}