Merge lp:~ken-vandine/content-hub/has_pending into lp:content-hub

[Ken VanDine]

added hasPending property on ContentHub

added hasPending property on ContentHub

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:238
http://jenkins.qa.ubuntu.com/job/content-hub-ci/273/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-wily-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-wily-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-wily-armhf-ci/14/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-wily-i386-ci/14

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/273/rebuild

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

works as expected.

review: Approve

[lp:~ken-vandine/content-hub/has_pending]

239. By Ken VanDine on 2015-08-20

Added test for has_pending

[Ken VanDine (ken-vandine)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/content-hub) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

[lp:~ken-vandine/content-hub/has_pending]

240. By Ken VanDine on 2015-08-21

added docstring for hasPending

241. By Ken VanDine on 2015-08-21

mark hasPending as internal

[Michael Sheldon (michael-sheldon)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?

 * Yes, tested with modified addressbook-app and was able to see when there were pending transfers at start up

Did CI run pass? If not, please explain why.

 * Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?

 * Yes

review: Approve

=== modified file 'import/Ubuntu/Content/contenthub.cpp'
--- import/Ubuntu/Content/contenthub.cpp	2014-08-05 20:03:08 +0000
+++ import/Ubuntu/Content/contenthub.cpp	2015-08-21 14:49:49 +0000
@@ -15,6 +15,7 @@
  */
 
 #include "../../../src/com/ubuntu/content/debug.h"
+#include "../../../src/com/ubuntu/content/utils.cpp"
 #include "contenthub.h"
 #include "contentpeer.h"
 #include "contentstore.h"
@@ -122,6 +123,9 @@
     m_hub = cuc::Hub::Client::instance();
     m_handler = new QmlImportExportHandler(this);
     m_hub->register_import_export_handler(m_handler);
+    QString id = app_id();
+    if (!id.isEmpty())
+        m_hasPending = m_hub->has_pending(id);
 
     connect(m_handler, SIGNAL(importRequested(com::ubuntu::content::Transfer*)),
             this, SLOT(handleImport(com::ubuntu::content::Transfer*)));
@@ -301,6 +305,17 @@
 }
 
 /*!
+ * \qmlproperty bool ContentHub::hasPending
+ * True if there is a pending transfer for the handler
+ * \internal
+ */
+bool ContentHub::hasPending()
+{
+    TRACE() << Q_FUNC_INFO;
+    return m_hasPending;
+}
+
+/*!
  * \qmlsignal ContentHub::importRequested(ContentTransfer transfer)
  *
  * The signal is triggered when an import is requested.
 
=== modified file 'import/Ubuntu/Content/contenthub.h'
--- import/Ubuntu/Content/contenthub.h	2014-08-04 17:57:26 +0000
+++ import/Ubuntu/Content/contenthub.h	2015-08-21 14:49:49 +0000
@@ -43,6 +43,7 @@
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<ContentTransfer> finishedImports READ finishedImports NOTIFY finishedImportsChanged)
+    Q_PROPERTY(bool hasPending READ hasPending)
 
 public:
     ContentHub(const ContentHub&) = delete;
@@ -52,6 +53,7 @@
     Q_INVOKABLE void restoreImports();
 
     QQmlListProperty<ContentTransfer> finishedImports();
+    bool hasPending();
 
     Q_INVOKABLE ContentTransfer* importContent(com::ubuntu::content::Peer peer, ContentType::Type type);
     Q_INVOKABLE ContentTransfer* exportContent(com::ubuntu::content::Peer peer, ContentType::Type type);
@@ -75,6 +77,7 @@
     QHash<com::ubuntu::content::Transfer *, ContentTransfer *> m_activeImports;
     com::ubuntu::content::Hub *m_hub;
     QmlImportExportHandler *m_handler;
+    bool m_hasPending = false;
 
 protected:
     ContentHub(QObject* = nullptr);
 
=== modified file 'include/com/ubuntu/content/hub.h'
--- include/com/ubuntu/content/hub.h	2014-08-04 17:56:09 +0000
+++ include/com/ubuntu/content/hub.h	2015-08-21 14:49:49 +0000
@@ -64,6 +64,7 @@
     Q_INVOKABLE virtual Transfer* create_import_from_peer_for_type(Peer peer, Type type);
     Q_INVOKABLE virtual Transfer* create_export_to_peer_for_type(Peer peer, Type type);
     Q_INVOKABLE virtual Transfer* create_share_to_peer_for_type(Peer peer, Type type);
+    Q_INVOKABLE virtual bool has_pending(QString peer_id);
        
   protected:
     Hub(QObject* = nullptr);
 
=== modified file 'src/com/ubuntu/content/detail/com.ubuntu.content.Service.xml'
--- src/com/ubuntu/content/detail/com.ubuntu.content.Service.xml	2014-08-04 17:56:09 +0000
+++ src/com/ubuntu/content/detail/com.ubuntu.content.Service.xml	2015-08-21 14:49:49 +0000
@@ -43,5 +43,9 @@
     <method name="HandlerActive">
       <arg name="peer_id" type="s" direction="in" />
     </method>
+    <method name="HasPending">
+      <arg name="peer_id" type="s" direction="in" />
+      <arg name="pending" type="b" direction="out" />
+    </method>
  </interface>
 </node>
 
=== modified file 'src/com/ubuntu/content/detail/service.cpp'
--- src/com/ubuntu/content/detail/service.cpp	2015-05-27 15:30:31 +0000
+++ src/com/ubuntu/content/detail/service.cpp	2015-08-21 14:49:49 +0000
@@ -598,3 +598,18 @@
         }
     }
 }
+
+bool cucd::Service::HasPending(const QString& peer_id)
+{
+    TRACE() << Q_FUNC_INFO << peer_id;
+    Q_FOREACH (cucd::Transfer *t, d->active_transfers)
+    {
+        TRACE() << Q_FUNC_INFO << "SOURCE: " << t->source() << "DEST:" << t->destination() << "STATE:" << t->State();
+        if (((t->source() == peer_id) || (t->destination() == peer_id)) && (t->State() == cuc::Transfer::initiated))
+        {
+            TRACE() << Q_FUNC_INFO << "Has pending:" << peer_id;
+            return true;
+        }
+    }
+    return false;
+}
 
=== modified file 'src/com/ubuntu/content/detail/service.h'
--- src/com/ubuntu/content/detail/service.h	2015-05-27 15:30:31 +0000
+++ src/com/ubuntu/content/detail/service.h	2015-08-21 14:49:49 +0000
@@ -66,6 +66,7 @@
     void HandlerActive(const QString&);
     void Quit();
     void DownloadManagerError(QString);
+    bool HasPending(const QString&);
 
   private:
     bool should_cancel(int);
 
=== modified file 'src/com/ubuntu/content/hub.cpp'
--- src/com/ubuntu/content/hub.cpp	2014-08-04 17:56:09 +0000
+++ src/com/ubuntu/content/hub.cpp	2015-08-21 14:49:49 +0000
@@ -299,3 +299,14 @@
 {
     d->service->Quit();
 }
+
+bool cuc::Hub::has_pending(QString peer_id)
+{
+    auto reply = d->service->HasPending(peer_id);
+    reply.waitForFinished();
+
+    if (reply.isError())
+        return false;
+
+    return reply.value();
+}
 
=== modified file 'tests/acceptance-tests/app_hub_communication_transfer.cpp'
--- tests/acceptance-tests/app_hub_communication_transfer.cpp	2015-04-03 18:23:12 +0000
+++ tests/acceptance-tests/app_hub_communication_transfer.cpp	2015-08-21 14:49:49 +0000
@@ -152,11 +152,13 @@
                 hub->default_source_for_type(cuc::Type::Known::pictures()));
             ASSERT_TRUE(transfer != nullptr);
             EXPECT_EQ(cuc::Transfer::created, transfer->state());
+            ASSERT_FALSE(hub->has_pending(transfer->destination()));
             EXPECT_TRUE(transfer->setSelectionType(cuc::Transfer::SelectionType::multiple));
             ASSERT_EQ(cuc::Transfer::SelectionType::multiple, transfer->selectionType());
             transfer->setStore(new cuc::Store{store_dir.path()});
             EXPECT_TRUE(transfer->start());
             EXPECT_EQ(cuc::Transfer::initiated, transfer->state());
+            ASSERT_TRUE(hub->has_pending(transfer->destination()));
             EXPECT_TRUE(transfer->setSelectionType(cuc::Transfer::SelectionType::single));
             ASSERT_EQ(cuc::Transfer::SelectionType::multiple, transfer->selectionType());
             EXPECT_TRUE(transfer->charge(source_items));