Merge lp:~renatofilho/indicator-transfer/resume-only-paused-downloads into lp:indicator-transfer/15.10

[Renato Araujo Oliveira Filho]

Only allow resume paused downloads.

Download manager does not support resume canceled downloads.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:43
http://jenkins.qa.ubuntu.com/job/indicator-transfer-ci/44/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-amd64-ci/26/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-armhf-ci/26/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-transfer-ci/44/rebuild

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/indicator-transfer/resume-only-paused-downloads]

44. By Renato Araujo Oliveira Filho on 2015-11-05

Fix compilation.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:44
http://jenkins.qa.ubuntu.com/job/indicator-transfer-ci/45/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-armhf-ci/27/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-transfer-ci/45/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/indicator-transfer/resume-only-paused-downloads]

45. By Renato Araujo Oliveira Filho on 2015-11-09

Remove transfer from indicator if canceled.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:45
http://jenkins.qa.ubuntu.com/job/indicator-transfer-ci/46/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-armhf-ci/28/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-transfer-ci/46/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/indicator-transfer/resume-only-paused-downloads]

46. By Renato Araujo Oliveira Filho on 2015-11-09

Make the menu invisible if the download list is empty.
Remove from the list canceled downloads.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:46
http://jenkins.qa.ubuntu.com/job/indicator-transfer-ci/47/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-armhf-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-armhf-ci/29/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-transfer-ci/47/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/indicator-transfer/resume-only-paused-downloads]

47. By Renato Araujo Oliveira Filho on 2015-11-30

Parent merged.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:47
http://jenkins.qa.ubuntu.com/job/indicator-transfer-ci/48/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-armhf-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-armhf-ci/30/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-transfer-ci/48/rebuild

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Looks good, and works well

review: Approve

[Charles Kerr (charlesk)]

Patch LGTM.

review: Approve

=== modified file 'src/dm-plugin/dm-source.cpp'
--- src/dm-plugin/dm-source.cpp	2015-11-30 12:56:34 +0000
+++ src/dm-plugin/dm-source.cpp	2015-11-30 12:56:34 +0000
@@ -206,6 +206,12 @@
       }
   }
 
+  bool can_resume() const override
+  {
+    return state==PAUSED;
+  }
+
+
 private:
 
   void emit_changed_soon()
@@ -548,7 +554,7 @@
     const auto object_path = m_ccad_path.c_str();
     const auto interface_name = DM_DOWNLOAD_IFACE_NAME;
 
-    g_debug("%s transfer %s calling '%s'", G_STRLOC, id.c_str(), method_name);
+    g_debug("%s transfer %s calling '%s' with '%s'", G_STRLOC, id.c_str(), method_name, object_path);
 
     g_dbus_connection_call(m_bus, bus_name, object_path, interface_name,
                            method_name, nullptr, nullptr,
@@ -733,6 +739,10 @@
     auto transfer = find_transfer_by_id(id);
     g_return_if_fail(transfer);
     transfer->cancel();
+
+    // remove transfer from the list if canceled
+    m_removed_ccad.insert(transfer->ccad_path());
+    m_model->remove(id);
   }
 
   void clear(const Transfer::Id& id)

=== modified file 'src/view-gmenu.cpp'
--- src/view-gmenu.cpp	2015-09-08 18:10:37 +0000
+++ src/view-gmenu.cpp	2015-11-30 12:56:34 +0000
@@ -291,8 +291,13 @@
 
   virtual ~Menu()
   {
-    if (m_update_header_tag)
-      g_source_remove(m_update_header_tag);
+    if (m_update_header_tag > 0)
+      {
+        g_source_remove(m_update_header_tag);
+        // commit any pending change on header
+        update_header();
+      }
+
     g_clear_object(&m_menu);
   }
 
@@ -377,8 +382,9 @@
     int n_failed = 0;
     int n_paused = 0;
 
-    for (const auto& transfer : m_model->get_all())
+    for (auto it=m_visible_transfers.cbegin(); it!=m_visible_transfers.cend(); ++it)
       {
+        auto transfer = m_model->get((*it).first);
         switch (transfer->state)
           {
             case Transfer::RUNNING:
@@ -423,10 +429,12 @@
      currently incomplete because they're either ongoing or paused. */
   bool header_should_be_visible() const
   {
-    for (const auto& transfer : m_model->get_all())
-      if (transfer->state != Transfer::FINISHED)
-        return true;
-
+    for (auto it=m_visible_transfers.cbegin(); it!=m_visible_transfers.cend(); ++it)
+      {
+        auto transfer = m_model->get((*it).first);
+        if (transfer->state != Transfer::FINISHED)
+          return true;
+      }
     return false;
   }
 
@@ -692,6 +700,19 @@
   void update(const Transfer::Id& id)
   {
     const auto t = m_model->get(id);
+
+    // For now we do not want to keep canceled or error downloads on the list
+    // the app will handle it internally
+    switch (t->state)
+      {
+        case Transfer::CANCELED:
+        case Transfer::ERROR:
+          remove(id);
+          return;
+        default:
+          break;
+      }
+
     g_return_if_fail(t);
 
     // if the transfer already has a menu item, find it