Merge lp:~kalikiana/midori/historydial into lp:~kalikiana/midori/historydb

[Cris Dywan]

This branch uses the new HistoryDatabase API for filling up empty slots in the speed dial with recently visited pages.

[Danielle Foré (danrabbit)]

Tried it out and it's pretty cool! I only have 1 small complaint: It creates duplicate dials with the things that I've manually added. If that were fixed, I think it'd be super cool :)

review: Needs Fixing

Unmerged revisions

6278. By Cris Dywan on 2013-07-23

Fill up speed dial with recently visited websites

=== modified file 'midori/midori-frontend.c'
--- midori/midori-frontend.c	2013-06-30 14:58:59 +0000
+++ midori/midori-frontend.c	2013-07-24 17:50:33 +0000
@@ -534,7 +534,7 @@
     }
 
     katze_assign (config_file, midori_paths_get_config_filename_for_reading ("speeddial"));
-    MidoriSpeedDial* dial = midori_speed_dial_new (config_file, NULL);
+    MidoriSpeedDial* dial = midori_speed_dial_new (config_file, NULL, G_OBJECT (app));
 
     if (error_messages->len)
     {

=== modified file 'midori/midori-historydatabase.vala'
--- midori/midori-historydatabase.vala	2013-07-22 23:05:26 +0000
+++ midori/midori-historydatabase.vala	2013-07-24 17:50:33 +0000
@@ -46,7 +46,7 @@
             return_val_if_fail (db != null, null);
         }
 
-        public async List<HistoryItem>? query (string sqlcmd, string? filter, int day, int max_items, Cancellable cancellable) {
+        public async List<HistoryItem>? query (string sqlcmd, string? filter, int day, uint max_items, Cancellable cancellable) {
             return_val_if_fail (db != null, null);
 
             Sqlite.Statement stmt;
@@ -108,7 +108,7 @@
             return items;
         }
 
-        public async List<HistoryItem>? list_by_count_with_bookmarks (string? filter, int max_items, Cancellable cancellable) {
+        public async List<HistoryItem>? list_by_count_with_bookmarks (string? filter, uint max_items, Cancellable cancellable) {
             unowned string sqlcmd = """
                 SELECT type, date, uri, title FROM (
                 SELECT 1 AS type, date, uri, title, count() AS ct FROM history
@@ -124,5 +124,14 @@
                 """;
             return yield query (sqlcmd, filter, 0, max_items, cancellable);
         }
+
+        public async List<HistoryItem>? list_by_count (string? filter, uint max_items, Cancellable cancellable) {
+            unowned string sqlcmd = """
+                SELECT 1 AS type, date, uri, title, count() AS ct FROM history
+                WHERE uri LIKE :filter OR title LIKE :filter
+                GROUP BY uri ORDER BY ct DESC LIMIT :limit
+                """;
+            return yield query (sqlcmd, filter, 0, max_items, cancellable);
+        }
    }
 }

=== modified file 'midori/midori-speeddial.vala'
--- midori/midori-speeddial.vala	2013-06-25 22:32:12 +0000
+++ midori/midori-speeddial.vala	2013-07-24 17:50:33 +0000
@@ -36,21 +36,25 @@
         Spec? spec = null;
 
         public GLib.KeyFile keyfile;
+        GLib.Object? app;
+        List<Midori.HistoryItem> recent_items;
         public bool close_buttons_left { get; set; default = false; }
         public signal void refresh ();
 
         public class Spec {
-            public string dial_id;
+            public string? dial_id;
             public string uri;
-            public Spec (string dial_id, string uri) {
+            public Spec (string? dial_id, string uri) {
                 this.dial_id = dial_id;
                 this.uri = uri;
             }
         }
 
-        public SpeedDial (string new_filename, string? fallback = null) {
+        public SpeedDial (string new_filename, string? fallback = null, GLib.Object? app = null) {
             filename = new_filename;
             thumb_queue = new GLib.List<Spec> ();
+            recent_items = new List<Midori.HistoryItem> ();
+            this.app = app;
             keyfile = new GLib.KeyFile ();
             try {
                 keyfile.load_from_file (filename, GLib.KeyFileFlags.NONE);
@@ -153,9 +157,11 @@
             }
         }
 
-        public void add_with_id (string id, string uri, string title, Gdk.Pixbuf? img) {
-            keyfile.set_string (id, "uri", uri);
-            keyfile.set_string (id, "title", title);
+        public void add_with_id (string? id, string uri, string title, Gdk.Pixbuf? img) {
+            if (id != null) {
+                keyfile.set_string (id, "uri", uri);
+                keyfile.set_string (id, "title", title);
+            }
 
             Katze.mkdir_with_parents (Path.build_path (Path.DIR_SEPARATOR_S,
                 Paths.get_cache_dir (), "thumbnails"), 0700);
@@ -174,6 +180,24 @@
             return Path.build_filename (Paths.get_cache_dir (), "thumbnails", thumbnail);
         }
 
+        public async void queue_recent_tiles (uint max_items, Cancellable? cancellable) {
+            if (app == null)
+                return;
+            var database = new Midori.HistoryDatabase (app);
+            recent_items = yield database.list_by_count (null, max_items, cancellable);
+            foreach (var item in recent_items) {
+                var website = item as Midori.HistoryWebsite;
+                if (Posix.access (build_thumbnail_path (website.uri), Posix.F_OK) != 0)
+                    get_thumb (null, website.uri);
+            }
+
+            /* FIXME: determine if anything changed at all */
+            app = null;
+
+            html = null;
+            refresh ();
+        }
+
         public unowned string get_html () throws Error {
             bool load_missing = true;
 
@@ -195,6 +219,10 @@
                 string dial_id = get_next_free_slot (out slot_count);
                 uint next_slot = dial_id.substring (5, -1).to_int ();
 
+                /* Fill up empty dials with recently visited pages */
+                uint recent_count = slot_count < 9 ? 9 - slot_count : 0;
+                slot_count += recent_count;
+
                 /* Try to guess the best X by X grid size */
                 uint grid_index = 3;
                 while ((grid_index * grid_index) < slot_count)
@@ -260,6 +288,28 @@
                     catch (KeyFileError error) { }
                 }
 
+                if (recent_count > 0)
+                    queue_recent_tiles.begin (recent_count, null);
+                foreach (var item in recent_items) {
+                    var website = item as Midori.HistoryWebsite;
+                    string encoded;
+                    try {
+                        uint8[] thumb;
+                        FileUtils.get_data (build_thumbnail_path (website.uri), out thumb);
+                        encoded = Base64.encode (thumb);
+                    }
+                    catch (FileError error) {
+                        encoded = null;
+                    }
+                    markup.append_printf ("""
+                        <div class="shortcut" id="%u"><div class="preview">
+                        <a class="cross" href="#"></a>
+                        <a href="%s"><img src="data:image/png;base64,%s" title='%s'></a>
+                        </div><div class="title">%s</div></div>
+                        """,
+                        next_slot, website.uri, encoded ?? "", website.title, website.title);
+                }
+
                 markup.append_printf ("""
                     <div class="shortcut" id="%u"><div class="preview new">
                     <a class="add" href="#"></a>
@@ -390,7 +440,7 @@
             return false;
         }
 
-        void get_thumb (string dial_id, string uri) {
+        void get_thumb (string? dial_id, string uri) {
 #if !HAVE_WEBKIT2
             if (thumb_view == null) {
                 thumb_view = new WebKit.WebView ();
@@ -409,7 +459,7 @@
 
             /* Don't load thumbnails already queued */
             foreach (var spec_ in thumb_queue)
-                if (spec_.dial_id == dial_id)
+                if (spec_.uri == uri)
                     return;
 
             thumb_queue.append (new Spec (dial_id, uri));