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

[Ken VanDine]

Added support for registering a source or destination as handlers for Type::all

Added support for registering a source or destination as handlers for Type::all

Note: This is not exposed to the QML bindings and aren't related to the ContentType::All in the QML bindings. This Type::all only exists for peer registration and ensure the peers registered for Type::all always appear in the peer model.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[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/all_content_type]

216. By Ken VanDine on 2015-06-10

Fixed typo

217. By Ken VanDine on 2015-06-10

Moved Type::Known::all to Type::all, it's not a well known type

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[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

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

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

218. By Ken VanDine on 2015-06-15

Include ContentType::Unknown in the ContentPeerModel

219. By Ken VanDine on 2015-06-15

Don't ignore unknown types for source and destinations

220. By Ken VanDine on 2015-06-15

Added != operator for cuc::Type and ensure we don't check gsettings for unknown

221. By Ken VanDine on 2015-06-15

Don't look for default sources for unknown types

=== modified file 'import/Ubuntu/Content/contentpeermodel.cpp'
--- import/Ubuntu/Content/contentpeermodel.cpp	2014-12-01 13:09:16 +0000
+++ import/Ubuntu/Content/contentpeermodel.cpp	2015-06-15 18:20:43 +0000
@@ -103,6 +103,8 @@
         appendPeersForContentType(ContentType::Videos);
         appendPeersForContentType(ContentType::Links);
         appendPeersForContentType(ContentType::EBooks);
+        appendPeersForContentType(ContentType::Text);
+        appendPeersForContentType(ContentType::Unknown);
     } else {
         appendPeersForContentType(m_contentType);
     }

=== modified file 'import/Ubuntu/Content/contenttype.cpp'
--- import/Ubuntu/Content/contenttype.cpp	2015-03-10 19:00:08 +0000
+++ import/Ubuntu/Content/contenttype.cpp	2015-06-15 18:20:43 +0000
@@ -31,7 +31,7 @@
      \li Type
      \li Description
    \row
-     \li ContentType.Uknown
+     \li ContentType.Unknown
      \li Unknown type
    \row
      \li ContentType.Documents

=== modified file 'include/com/ubuntu/content/type.h'
--- include/com/ubuntu/content/type.h	2015-03-10 19:00:08 +0000
+++ include/com/ubuntu/content/type.h	2015-06-15 18:20:43 +0000
@@ -39,6 +39,7 @@
   public:
     
     static const Type& unknown();
+    static const Type& all();
 
     struct Known
     {
@@ -57,6 +58,7 @@
     
     Type& operator=(const Type&);    
     bool operator==(const Type&) const;
+    bool operator!=(const Type&) const;
     bool operator<(const Type&) const;
 
     Q_INVOKABLE virtual const QString& id() const;

=== modified file 'src/com/ubuntu/content/service/com.ubuntu.content.hub.gschema.xml'
--- src/com/ubuntu/content/service/com.ubuntu.content.hub.gschema.xml	2015-03-10 19:00:08 +0000
+++ src/com/ubuntu/content/service/com.ubuntu.content.hub.gschema.xml	2015-06-15 18:20:43 +0000
@@ -27,6 +27,9 @@
     </key>
   </schema>
   <schema id="com.ubuntu.content.hub.source" path="/com/ubuntu/content/hub/source/">
+    <key name="all" type="as">
+      <default>[]</default>
+    </key>
     <key name="pictures" type="as">
       <default>[]</default>
     </key>
@@ -53,6 +56,9 @@
     </key>
   </schema>
   <schema id="com.ubuntu.content.hub.destination" path="/com/ubuntu/content/hub/destination/">
+    <key name="all" type="as">
+      <default>[]</default>
+    </key>
     <key name="pictures" type="as">
       <default>[]</default>
     </key>

=== modified file 'src/com/ubuntu/content/service/hook.cpp'
--- src/com/ubuntu/content/service/hook.cpp	2015-03-10 19:00:08 +0000
+++ src/com/ubuntu/content/service/hook.cpp	2015-06-15 18:20:43 +0000
@@ -126,7 +126,7 @@
     TRACE() << Q_FUNC_INFO << "Hook:" << result.filePath();
 
     QStringList knownTypes;
-    knownTypes << "pictures" << "music" << "contacts" << "documents" << "videos" << "links" << "ebooks" << "text";
+    knownTypes << "all" << "pictures" << "music" << "contacts" << "documents" << "videos" << "links" << "ebooks" << "text";
     QString app_id = result.fileName();
     auto peer = cuc::Peer(app_id);
 

=== modified file 'src/com/ubuntu/content/service/registry.cpp'
--- src/com/ubuntu/content/service/registry.cpp	2014-06-04 16:49:40 +0000
+++ src/com/ubuntu/content/service/registry.cpp	2015-06-15 18:20:43 +0000
@@ -136,14 +136,17 @@
 {
     TRACE() << Q_FUNC_INFO << type.id();
 
-    if (type == cuc::Type::unknown())
-        return;
-
-    Q_FOREACH (QString k, m_sources->get(type.id()).toStringList())
+    QStringList peers;
+    peers << m_sources->get("all").toStringList();
+    if (type != cuc::Type::unknown())
+        peers << m_sources->get(type.id()).toStringList();
+    Q_FOREACH (QString k, peers)
     {
         TRACE() << Q_FUNC_INFO << k;
         bool defaultPeer = false;
-        QVariant peer_v = m_defaultSources->get(type.id());
+        QVariant peer_v;
+        if (type != cuc::Type::unknown())
+            peer_v = m_defaultSources->get(type.id());
         if (peer_v.type() == QVariant::StringList)
         {
             QStringList as(peer_v.toStringList());
@@ -166,10 +169,11 @@
 {
     TRACE() << Q_FUNC_INFO << type.id();
 
-    if (type == cuc::Type::unknown())
-        return;
-
-    Q_FOREACH (QString k, m_dests->get(type.id()).toStringList())
+    QStringList peers;
+    peers << m_dests->get("all").toStringList();
+    if (type != cuc::Type::unknown())
+        peers << m_dests->get(type.id()).toStringList();
+    Q_FOREACH (QString k, peers)
     {
         TRACE() << Q_FUNC_INFO << k;
         for_each(cuc::Peer{k});

=== modified file 'src/com/ubuntu/content/type.cpp'
--- src/com/ubuntu/content/type.cpp	2015-03-10 19:00:08 +0000
+++ src/com/ubuntu/content/type.cpp	2015-06-15 18:20:43 +0000
@@ -53,6 +53,14 @@
     return d->id == rhs.d->id;
 }
 
+bool cuc::Type::operator!=(const cuc::Type& rhs) const
+{
+    if (d == rhs.d)
+        return false;
+
+    return d->id != rhs.d->id;
+}
+
 bool cuc::Type::operator<(const cuc::Type& rhs) const
 {
     return d->id < rhs.d->id;
@@ -69,6 +77,12 @@
     return t;
 }
 
+const cuc::Type& cuc::Type::all()
+{
+    static cuc::Type t("all", nullptr);
+    return t;
+}
+
 const cuc::Type& cuc::Type::Known::documents()
 {
     static cuc::Type t("documents", nullptr);

=== modified file 'tests/acceptance-tests/CMakeLists.txt'
--- tests/acceptance-tests/CMakeLists.txt	2014-02-25 15:35:43 +0000
+++ tests/acceptance-tests/CMakeLists.txt	2015-06-15 18:20:43 +0000
@@ -60,6 +60,7 @@
   ${CMAKE_SOURCE_DIR}/src/com/ubuntu/content/service/registry.cpp
   good.json
   bad.json
+  source_all.json
 )
 
 qt5_use_modules(app_hub_communication_default_source Core Gui DBus Test)
@@ -93,7 +94,7 @@
   AUTOMOC TRUE
 )
 
-file(COPY good.json bad.json DESTINATION .)
+file(COPY good.json bad.json source_all.json DESTINATION .)
 
 add_custom_command(
   OUTPUT transfer_files

=== added file 'tests/acceptance-tests/source_all.json'
--- tests/acceptance-tests/source_all.json	1970-01-01 00:00:00 +0000
+++ tests/acceptance-tests/source_all.json	2015-06-15 18:20:43 +0000
@@ -0,0 +1,5 @@
+{
+    "source": [
+        "all"
+    ]
+}

=== modified file 'tests/acceptance-tests/test_hook.cpp'
--- tests/acceptance-tests/test_hook.cpp	2014-02-21 02:30:11 +0000
+++ tests/acceptance-tests/test_hook.cpp	2015-06-15 18:20:43 +0000
@@ -65,7 +65,7 @@
     
     auto mock = new MockedRegistry{};
     EXPECT_CALL(*mock, install_source_for_type(_,_)).
-    Times(Exactly(2)).
+    Times(Exactly(3)).
     WillRepeatedly(Return(true));
 
     QFileInfo f("good.json");
@@ -74,5 +74,7 @@
     EXPECT_TRUE(hook->add_peer(f));
     f.setFile("bad.json");
     EXPECT_FALSE(hook->add_peer(f));
+    f.setFile("source_all.json");
+    EXPECT_TRUE(hook->add_peer(f));
     delete mock;
 }