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

[Ken VanDine]

If the transfer isn't persistent, attempt to hardlink instead of copying. If
the link fails, fallback to a copy.

If the transfer isn't persistent, attempt to hardlink instead of copying. If
the link fails, fallback to a copy. This should requires an apparmor policy
for content_exchange to deny write access to HubIncoming.

deny @{HOME}/.cache/@{APP_PKGNAME}/HubIncoming/** w,

This policy was added in apparmor-easyprof-ubuntu 1.1.9

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/123/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/hardlink_and_fallback_to_copy]

140. By Ken VanDine on 2014-03-19

merged trunk

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/125/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)

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

141. By Ken VanDine on 2014-03-20

merged

=== modified file 'src/com/ubuntu/content/utils.cpp'
--- src/com/ubuntu/content/utils.cpp	2014-03-20 23:46:04 +0000
+++ src/com/ubuntu/content/utils.cpp	2014-03-20 23:46:04 +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;