Merge lp:~michael-sheldon/content-hub/debian-peers into lp:content-hub

[Michael Sheldon]

Add Debian friendly locations to content-hub-peer-hooks search locations

Adds Debian friendly locations to content-hub-peer-hooks search locations.

[Renato Araujo Oliveira Filho (renatofilho)]

Whats happen if it finds the same app more than once.

IMO the priority should be: (first has more priority)

~/.local/usr/share/content-hub/peers/
/usr/local/share/content-hub/peers/
/usr/share/content-hub/peers/

[Michael Sheldon (michael-sheldon)]

Currently the order doesn't make a difference since it ends up being purely additive; so if there's a definition for the same app in multiple locations it ends up with one entry that's a union of all the defined capabilities. That should probably be changed to ignore secondary files (and so also implement the order you suggest).

[Tiago Salem Herrmann (tiagosh)]

Just tested and it works fine with messaging-app.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:115
http://jenkins.qa.ubuntu.com/job/content-hub-ci/167/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/24/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-i386-ci/24

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

works, think it's ok as is for now and we can extend it further later

review: Approve

=== modified file 'src/com/ubuntu/content/service/hook.cpp'
--- src/com/ubuntu/content/service/hook.cpp	2014-06-04 16:50:21 +0000
+++ src/com/ubuntu/content/service/hook.cpp	2014-06-26 14:36:31 +0000
@@ -23,6 +23,7 @@
 #include <QDir>
 #include <QStandardPaths>
 #include <QTimer>
+#include <QVector>
 #include <com/ubuntu/content/peer.h>
 
 #include "debug.h"
@@ -66,13 +67,15 @@
      * no JSON file installed in this path.
      */
 
-    QDir contentDir(
+    QVector<QDir> contentDirs;
+
+    contentDirs.append(QDir(
         QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)
         + QString("/")
-        + QString("content-hub"));
-
-    if (not contentDir.exists())
-        return_error();
+        + QString("content-hub")));
+    
+    contentDirs.append(QDir("/usr/share/content-hub/peers/"));
+    contentDirs.append(QDir("/usr/share/local/content-hub/peers/"));
 
     QStringList all_peers;
     registry->enumerate_known_peers([&all_peers](const com::ubuntu::content::Peer& peer)
@@ -83,13 +86,36 @@
     Q_FOREACH(QString p, all_peers)
     {
         TRACE() << Q_FUNC_INFO << "Looking for" << p;
-        QStringList pp = contentDir.entryList(QStringList("*"+ p));
-        if (pp.isEmpty())
+        bool foundPeer = false;
+        Q_FOREACH(QDir contentDir, contentDirs)
+        {
+            QStringList pp = contentDir.entryList(QStringList("*"+ p));
+            if (!pp.isEmpty()) {
+                foundPeer = true;
+            }
+        }
+        if(!foundPeer) {
             registry->remove_peer(com::ubuntu::content::Peer{p});
-    }
-
-    Q_FOREACH(QFileInfo f, contentDir.entryInfoList(QDir::Files))
-        add_peer(f);
+        }
+    }
+
+    bool peerDirsExist = false;
+
+    Q_FOREACH(QDir contentDir, contentDirs)
+    {
+
+        if (contentDir.exists()) 
+        {
+            peerDirsExist = true;
+
+            Q_FOREACH(QFileInfo f, contentDir.entryInfoList(QDir::Files))
+                add_peer(f);
+        }
+
+    }
+
+    if(!peerDirsExist)
+        return_error("No peer setting directories exist.");
 
     deleteLater();
     QCoreApplication::instance()->quit();