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

[Ken VanDine]

If the default source is set to anything other than a click appId triplet,
fallback to the legacy APP_ID.

Changed default source for contacts to the legacy APP_ID for address-book-app

If the default source is set to anything other than a click appId triplet,
fallback to the legacy APP_ID.

Changed default source for contacts to the legacy APP_ID for address-book-app

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:145
http://jenkins.qa.ubuntu.com/job/content-hub-ci/122/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-armhf-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-i386-ci/25

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

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Are there any related MPs required for this MP to build/function as expected?
 * No (besides the prerequisite branch included)
Is your branch in sync with latest trunk
 * 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 UI changes
If you changed the packaging (debian), did you subscribe a core-dev to this MP?
 * No packaging changes

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

146. By Ken VanDine on 2014-03-18

merged fix_pending_check branch

147. By Ken VanDine on 2014-03-19

merged trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:147
http://jenkins.qa.ubuntu.com/job/content-hub-ci/124/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-armhf-ci/27/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-i386-ci/27

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/124/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, based on https://wiki.ubuntu.com/Process/Merges/TestPlan/content-hub (with updated gallery-app, address-book-app and ubuntu-system-settings branches for new API compatibility, with address-book-app installed as a debian package)

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/fallback_to_legacy_apps]

148. By Ken VanDine on 2014-03-20

merged

=== modified file 'src/com/ubuntu/content/detail/service.cpp'
--- src/com/ubuntu/content/detail/service.cpp	2014-03-20 23:45:32 +0000
+++ src/com/ubuntu/content/detail/service.cpp	2014-03-20 23:45:33 +0000
@@ -304,19 +304,23 @@
             {
                 if (t->Id() != transfer->Id())
                 {
-                    if ((t->source() == transfer->source()) || (t->destination() == transfer->destination()))
+                    if ((t->source() == transfer->source()) && (t->State() == cuc::Transfer::in_progress))
                     {
-                        TRACE() << Q_FUNC_INFO << "Peer has pending transfers:" << t->Id();
+                        TRACE() << Q_FUNC_INFO << "Source has pending transfers:" << t->Id();
                         shouldStop = false;
                     }
+                    if (t->destination() == transfer->destination())
+                    {
+                        qDebug() << Q_FUNC_INFO << "Destination has pending transfers:" << t->Id();
+                        if (should_cancel(t->State()))
+                            shouldStop = false;
+                    }
                 }
             }
             if (shouldStop)
-            {
-                d->app_manager->stop_application(transfer->source().toStdString());
-                d->app_manager->invoke_application(transfer->destination().toStdString());
-            }
+                d->app_manager->stop_application(transfer->source().toStdString());            
         }
+        d->app_manager->invoke_application(transfer->destination().toStdString());
     }
 }
 
@@ -377,19 +381,23 @@
             {
                 if (t->Id() != transfer->Id())
                 {
-                    if ((t->source() == transfer->source()) || (t->destination() == transfer->destination()))
+                    if ((t->source() == transfer->source()) && (t->State() == cuc::Transfer::in_progress))
                     {
-                        TRACE() << Q_FUNC_INFO << "Peer has pending transfers:" << t->Id();
+                        TRACE() << Q_FUNC_INFO << "Source has pending transfers:" << t->Id();
                         shouldStop = false;
                     }
+                    if (t->destination() == transfer->destination())
+                    {
+                        qDebug() << Q_FUNC_INFO << "Destination has pending transfers:" << t->Id();
+                        if (should_cancel(t->State()))
+                            shouldStop = false;
+                    }
                 }
             }
             if (shouldStop)
-            {
                 d->app_manager->stop_application(transfer->destination().toStdString());
-                d->app_manager->invoke_application(transfer->source().toStdString());
-            }
         }
+        d->app_manager->invoke_application(transfer->source().toStdString());
     }
 }
 

=== modified file 'src/com/ubuntu/content/service/com.ubuntu.content.hub.gschema.xml'
--- src/com/ubuntu/content/service/com.ubuntu.content.hub.gschema.xml	2014-03-20 23:45:32 +0000
+++ src/com/ubuntu/content/service/com.ubuntu.content.hub.gschema.xml	2014-03-20 23:45:33 +0000
@@ -11,7 +11,7 @@
       <default>[]</default>
     </key>
     <key name="contacts" type="as">
-      <default>["com.ubuntu.address-book", "address-book", "current-user-version"]</default>
+      <default>["address-book-app", "", ""]</default>
     </key>
   </schema>
   <schema id="com.ubuntu.content.hub.source" path="/com/ubuntu/content/hub/source/">

=== modified file 'src/com/ubuntu/content/service/registry.cpp'
--- src/com/ubuntu/content/service/registry.cpp	2014-03-20 23:45:32 +0000
+++ src/com/ubuntu/content/service/registry.cpp	2014-03-20 23:45:33 +0000
@@ -44,7 +44,11 @@
                 std::string pkg = as[0].toStdString();
                 std::string app = as[1].toStdString();
                 std::string ver = as[2].toStdString();
-                cuc::Peer peer(QString::fromLocal8Bit(upstart_app_launch_triplet_to_app_id(pkg.c_str(), app.c_str(), ver.c_str())));
+                cuc::Peer peer;
+                if (app.empty() || ver.empty())
+                    peer = QString::fromStdString(pkg);
+                else
+                    peer = QString::fromLocal8Bit(upstart_app_launch_triplet_to_app_id(pkg.c_str(), app.c_str(), ver.c_str()));
                 install_source_for_type(type, cuc::Peer{peer.id(), true});
             }
         }
@@ -64,6 +68,9 @@
             std::string pkg = as[0].toStdString();
             std::string app = as[1].toStdString();
             std::string ver = as[2].toStdString();
+            cuc::Peer peer;
+            if (app.empty() || ver.empty())
+                return cuc::Peer(QString::fromStdString(pkg));
             return cuc::Peer(QString::fromLocal8Bit(upstart_app_launch_triplet_to_app_id(pkg.c_str(), app.c_str(), ver.c_str())), true);
         }
     }
@@ -121,7 +128,10 @@
             std::string pkg = as[0].toStdString();
             std::string app = as[1].toStdString();
             std::string ver = as[2].toStdString();
-            defaultPeer = QString::fromLocal8Bit(upstart_app_launch_triplet_to_app_id(pkg.c_str(), app.c_str(), ver.c_str())) == k;
+            if (app.empty() || ver.empty())
+                defaultPeer = QString::fromStdString(pkg) == k;
+            else
+                defaultPeer = QString::fromLocal8Bit(upstart_app_launch_triplet_to_app_id(pkg.c_str(), app.c_str(), ver.c_str())) == k;
         }
         for_each(cuc::Peer{k, defaultPeer});
     }

=== modified file 'src/com/ubuntu/content/utils.cpp'
--- src/com/ubuntu/content/utils.cpp	2014-03-20 23:45:32 +0000
+++ src/com/ubuntu/content/utils.cpp	2014-03-20 23:45:33 +0000
@@ -29,6 +29,7 @@
 #include "common.h"
 #include "debug.h"
 #include "com/ubuntu/content/type.h"
+#include <unistd.h>
 
 namespace cuc = com::ubuntu::content;
 
@@ -108,6 +109,15 @@
     return aaProfile;
 }
 
+bool is_persistent(QString store)
+{
+    TRACE() << Q_FUNC_INFO << store;
+    QRegExp rx("*.cache/*/HubIncoming/*");
+    rx.setPatternSyntax(QRegExp::Wildcard);
+    rx.setCaseSensitivity(Qt::CaseSensitive);
+    return not rx.exactMatch(store);
+}
+
 QString copy_to_store(const QString& src, const QString& store)
 {
     TRACE() << Q_FUNC_INFO;
@@ -122,24 +132,25 @@
         st.mkpath(st.absolutePath());
     QString destFilePath = store + QDir::separator() + fi.fileName();
     TRACE() << Q_FUNC_INFO << destFilePath;
-    bool result = QFile::copy(fi.filePath(), destFilePath);
-    if (not result)
-    {
-        qWarning() << "Failed to copy to Store:" << store;
+    bool copy_failed = true;
+    if (not is_persistent(store))
+    {
+        if (link( fi.absoluteFilePath().toStdString().c_str(),
+            destFilePath.toStdString().c_str() ) < 0)
+        {
+            qWarning() << "Can't create hard link to Store:" << store;
+        } else
+            copy_failed = false;
+    }
+    if (copy_failed)
+    {
+        if (not QFile::copy(fi.filePath(), destFilePath))
+            qWarning() << "Failed to copy to Store:" << store;
     }
 
     return QUrl::fromLocalFile(destFilePath).toString();
 }
 
-bool is_persistent(QString store)
-{
-    TRACE() << Q_FUNC_INFO << store;
-    QRegExp rx("*.cache/*/HubIncoming/*");
-    rx.setPatternSyntax(QRegExp::Wildcard);
-    rx.setCaseSensitivity(Qt::CaseSensitive);
-    return not rx.exactMatch(store);
-}
-
 bool purge_store_cache(QString store)
 {
     TRACE() << Q_FUNC_INFO << "Store:" << store;