Merge lp:~kalikiana/midori/manydowns into lp:midori

[Cris Dywan]

Collect multiple download notifications within a minute

Collect multiple download notifications within a minute

[Cris Dywan (kalikiana)]

If several files finnish in close succession they will now be merged into one notification bubble.

[André Stösel (ivaldi)]

I fixed a little bug and slightly optimized the behavior.

https://code.launchpad.net/~ivaldi/midori/manydowns/+merge/166567

[André Stösel (ivaldi)]

review: Needs Fixing

[lp:~kalikiana/midori/manydowns]

6183. By Cris Dywan on 2013-05-30

Merge lp:~ivaldi/midori/manydowns

[André Stösel (ivaldi)]

review: Approve

=== modified file 'extensions/transfers.vala'
--- extensions/transfers.vala	2013-05-15 19:52:41 +0000
+++ extensions/transfers.vala	2013-05-30 18:26:27 +0000
@@ -411,6 +411,8 @@
     private class Manager : Midori.Extension {
         internal Katze.Array array;
         internal GLib.List<Gtk.Widget> widgets;
+        internal GLib.List<string> notifications;
+        internal uint notification_timeout;
 
         void download_added (WebKit.Download download) {
             var transfer = new Transfer (download);
@@ -420,6 +422,21 @@
             array.add_item (transfer);
         }
 
+        bool notification_timeout_triggered () {
+            notification_timeout = 0;
+            if (notifications.length () > 0) {
+                string filename = notifications.nth_data(0);
+                string msg;
+                if (notifications.length () == 1)
+                    msg = _("The file '<b>%s</b>' has been downloaded.").printf (filename);
+                else
+                    msg = _("'<b>%s</b>' and %d other files have been downloaded.").printf (filename, notifications.length ());
+                get_app ().send_notification (_("Transfer completed"), msg);
+                notifications = new GLib.List<string> ();
+            }
+            return false;
+        }
+
         void transfer_changed (Transfer transfer) {
             if (transfer.succeeded) {
                 /* FIXME: The following 2 blocks ought to be done in core */
@@ -437,8 +454,11 @@
                 if (!Midori.Download.has_wrong_checksum (transfer.download))
                     Gtk.RecentManager.get_default ().add_item (uri);
 
-                string msg = _("The file '<b>%s</b>' has been downloaded.").printf (filename);
-                get_app ().send_notification (_("Transfer completed"), msg);
+                notifications.append (filename);
+                if (notification_timeout == 0) {
+                    notification_timeout_triggered ();
+                    notification_timeout = Midori.Timeout.add_seconds (60, notification_timeout_triggered);
+                }
             }
         }
 
@@ -495,6 +515,8 @@
         void activated (Midori.App app) {
             array = new Katze.Array (typeof (Transfer));
             widgets = new GLib.List<Gtk.Widget> ();
+            notifications = new GLib.List<string> ();
+            notification_timeout = 0;
             foreach (var browser in app.get_browsers ())
                 browser_added (browser);
             app.add_browser.connect (browser_added);