Merge lp:~ahayzen/music-app/refactor-split-content-hub-url-handler-metrics into lp:music-app

[Andrew Hayzen]

* Split content-hub, uri-handler and metrics into Helpers

* Split content-hub, uri-handler and metrics into Helpers

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:841
http://91.189.93.70:8080/job/music-app-refactor-ci/40/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1082
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1082/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-refactor-vivid-amd64-ci/40

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-refactor-ci/40/rebuild

review: Approve (continuous-integration)

[lp:~ahayzen/music-app/refactor-split-content-hub-url-handler-metrics]

842. By Andrew Hayzen on 2015-03-08

* Merge of lp:music-app/refactor

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:842
http://91.189.93.70:8080/job/music-app-refactor-ci/47/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2312
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2312/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-refactor-utopic-amd64-ci/5
    SUCCESS: http://91.189.93.70:8080/job/music-app-refactor-vivid-amd64-ci/47

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-refactor-ci/47/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

This looks good and I haven't found any issues. I think it might be best to rename MetricHelper as UserMetricsHelper. Even though the component is called "Metric" I think naming the helper so it matches the library being used makes things more clear. The other helpers have names that describe their content quite clearly.

review: Needs Information

[lp:~ahayzen/music-app/refactor-split-content-hub-url-handler-metrics]

843. By Andrew Hayzen on 2015-03-09

* Rename MetricHelper.qml to UserMetricsHelper.qml

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:843
http://91.189.93.70:8080/job/music-app-refactor-ci/48/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2313
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2313/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-refactor-utopic-amd64-ci/6
    SUCCESS: http://91.189.93.70:8080/job/music-app-refactor-vivid-amd64-ci/48

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-refactor-ci/48/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

lgtm! Thanks! :)

review: Approve

=== modified file 'app/components/CMakeLists.txt'
--- app/components/CMakeLists.txt	2015-02-16 20:27:40 +0000
+++ app/components/CMakeLists.txt	2015-03-09 00:13:54 +0000
@@ -1,6 +1,7 @@
 add_subdirectory(Delegates)
 add_subdirectory(Dialog)
 add_subdirectory(HeadState)
+add_subdirectory(Helpers)
 add_subdirectory(Flickables)
 add_subdirectory(ListItemActions)
 add_subdirectory(ViewButton)

=== added directory 'app/components/Helpers'
=== added file 'app/components/Helpers/CMakeLists.txt'
--- app/components/Helpers/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ app/components/Helpers/CMakeLists.txt	2015-03-09 00:13:54 +0000
@@ -0,0 +1,4 @@
+# make the qml files visible on qtcreator
+file(GLOB HELPERS_QML_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.qml)
+
+add_custom_target(com_ubuntu_music_HELPERS_QMLFiles ALL SOURCES ${HELPERS_QML_FILES})

=== added file 'app/components/Helpers/ContentHubHelper.qml'
--- app/components/Helpers/ContentHubHelper.qml	1970-01-01 00:00:00 +0000
+++ app/components/Helpers/ContentHubHelper.qml	2015-03-09 00:13:54 +0000
@@ -0,0 +1,208 @@
+/*
+ * Copyright (C) 2014, 2015
+ *      Andrew Hayzen <[e-mail]>
+ *      Daniel Holm <[e-mail]>
+ *      Victor Thompson <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Popups 1.0
+import Ubuntu.Content 0.1
+
+
+Item {
+    property var activeTransfer
+    property int importId: 0
+    property list<ContentItem> importItems
+    property bool processing: contentHubWaitForFile !== -1
+
+    ContentTransferHint {
+        anchors {
+            fill: parent
+        }
+        activeTransfer: parent.activeTransfer
+    }
+
+    Connections {
+        id: contentHub
+        target: ContentHub
+
+        property var searchPaths: []
+
+        onImportRequested: {
+            activeTransfer = transfer;
+
+            if (activeTransfer.state === ContentTransfer.Charged) {
+                importItems = activeTransfer.items;
+
+                var processId = importId++;
+
+                console.debug("Triggering content-hub import ID", processId);
+
+                searchPaths = [];
+
+                var err = [];
+                var path;
+                var res;
+                var success = true;
+                var url;
+
+                for (var i=0; i < importItems.length; i++) {
+                    url = importItems[i].url.toString()
+                    console.debug("Triggered content-hub import for item", url)
+
+                    // fixed path allows for apparmor protection
+                    path = "~/Music/Imported/" + Qt.formatDateTime(new Date(), "yyyy/MM/dd/hhmmss") + "-" + url.split("/").pop()
+                    res = contentHub.importFile(importItems[i], path)
+
+                    if (res !== true) {
+                        success = false;
+                        err.push(url.split("/").pop() + " " + res)
+                    }
+                }
+
+
+                if (success === true) {
+                    if (contentHubWaitForFile.processId === -1) {
+                        contentHubWaitForFile.dialog = PopupUtils.open(Qt.resolvedUrl("../Dialog/ContentHubWaitDialog.qml"), mainView)
+                        contentHubWaitForFile.searchPaths = contentHub.searchPaths;
+                        contentHubWaitForFile.processId = processId;
+                        contentHubWaitForFile.start();
+
+                        // Stop queue loading in bg
+                        queueLoaderWorker.canLoad = false
+                    } else {
+                        contentHubWaitForFile.searchPaths.push.apply(contentHubWaitForFile.searchPaths, contentHub.searchPaths);
+                        contentHubWaitForFile.count = 0;
+                        contentHubWaitForFile.restart();
+                    }
+                }
+                else {
+                    var errordialog = PopupUtils.open(Qt.resolvedUrl("../Dialog/ContentHubErrorDialog.qml"), mainView)
+                    errordialog.errorText = err.join("\n")
+                }
+            }
+        }
+
+        function importFile(contentItem, path) {
+            var contentUrl = contentItem.url.toString()
+
+            if (path.indexOf("~/Music/Imported/") !== 0) {
+                console.debug("Invalid dest (not in ~/Music/Imported/)")
+
+                // TRANSLATORS: This string represents that the target destination filepath does not start with ~/Music/Imported/
+                return i18n.tr("Filepath must start with") + " ~/Music/Imported/"
+            }
+            else {
+                // extract /home/$USER (or $HOME) from contentitem url
+                var homepath = contentUrl.substring(7).split("/");
+
+                if (homepath[1] === "home") {
+                    homepath.splice(3, homepath.length - 3)
+                    homepath = homepath.join("/")
+                }
+                else {
+                    console.debug("/home/$USER not detecting in contentItem assuming /home/phablet/")
+                    homepath = "/home/phablet"
+                }
+
+                console.debug("Move:", contentUrl, "to", path)
+
+                // Extract filename from path and replace ~ with $HOME
+                var dir = path.split("/")
+                var filename = dir.pop()
+                dir = dir.join("/").replace("~/", homepath + "/")
+
+                if (filename === "") {
+                    console.debug("Invalid dest (filename blank)")
+
+                    // TRANSLATORS: This string represents that a blank filepath destination has been used
+                    return i18n.tr("Filepath must be a file")
+                }
+                else if (!contentItem.move(dir, filename)) {
+                    console.debug("Move failed! DIR:", dir, "FILE:", filename)
+
+                    // TRANSLATORS: This string represents that there was failure moving the file to the target destination
+                    return i18n.tr("Failed to move file")
+                }
+                else {
+                    contentHub.searchPaths.push(dir + "/" + filename)
+                    return true
+                }
+            }
+        }
+    }
+
+    Timer {
+        id: contentHubWaitForFile
+        interval: 1000
+        triggeredOnStart: false
+        repeat: true
+
+        property var dialog: null
+        property var searchPaths
+        property int count: 0
+        property int processId: -1
+
+        function stopTimer() {
+            processId = -1;
+            count = 0;
+            stop();
+
+            PopupUtils.close(dialog)
+        }
+
+        onTriggered: {
+            var found = true
+            var i;
+            var model;
+
+            for (i=0; i < searchPaths.length; i++) {
+                model = musicStore.lookup(searchPaths[i])
+
+                console.debug("MusicStore model from lookup", JSON.stringify(model))
+
+                if (!model) {
+                    found = false
+                }
+            }
+
+            if (!found) {
+                count++;
+
+                if (count >= 10) {  // wait for 10s
+                    stopTimer();
+
+                    console.debug("File(s) were not found", JSON.stringify(searchPaths))
+                    PopupUtils.open(Qt.resolvedUrl("../Dialog/ContentHubNotFoundDialog.qml"), mainView)
+                }
+            }
+            else {
+                stopTimer();
+
+                trackQueue.clear();
+
+                for (i=0; i < searchPaths.length; i++) {
+                    model = musicStore.lookup(searchPaths[i])
+
+                    trackQueue.append(makeDict(model));
+                }
+
+                trackQueueClick(0);
+            }
+        }
+    }
+}

=== added file 'app/components/Helpers/UriHandlerHelper.qml'
--- app/components/Helpers/UriHandlerHelper.qml	1970-01-01 00:00:00 +0000
+++ app/components/Helpers/UriHandlerHelper.qml	2015-03-09 00:13:54 +0000
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2013, 2014, 2015
+ *      Andrew Hayzen <[e-mail]>
+ *      Daniel Holm <[e-mail]>
+ *      Victor Thompson <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+import "../"
+
+
+Item {
+    id: uriHandler
+
+    Connections {
+        target: UriHandler
+
+        onOpened: {
+            for (var i=0; i < uris.length; i++) {
+                console.debug("URI=" + uris[i])
+                uriHandler.process(uris[i], i === 0);
+            }
+        }
+    }
+
+    function processAlbum(uri) {
+        selectedAlbum = true;
+        var split = uri.split("/");
+
+        if (split.length < 2) {
+            console.debug("Unknown artist-album " + uri + ", skipping")
+            return;
+        }
+
+        // Filter by artist and album
+        songsAlbumArtistModel.albumArtist = decodeURIComponent(split[0]);
+        songsAlbumArtistModel.album = decodeURIComponent(split[1]);
+    }
+
+    function processFile(uri, play) {
+        // Stop queue loading in the background
+        queueLoaderWorker.canLoad = false
+
+        if (queueLoaderWorker.processing > 0) {
+            waitForWorker.workerStop(queueLoaderWorker, processFile, [uri, play])
+            return;
+        }
+
+        uri = decodeURIComponent(uri);
+
+        // Lookup track in songs model
+        var track = musicStore.lookup(decodeURIComponent(uri));
+
+        if (!track) {
+            console.debug("Unknown file " + uri + ", skipping")
+            return;
+        }
+
+        if (play) {
+            // clear play queue
+            trackQueue.clear()
+        }
+
+        // enqueue
+        trackQueue.append(makeDict(track));
+
+        // play first URI
+        if (play) {
+            trackQueueClick(trackQueue.model.count - 1);
+        }
+    }
+
+    function process(uri, play) {
+        if (uri.indexOf("album:///") === 0) {
+            processAlbum(uri.substring(9));
+        } else if (uri.indexOf("file://") === 0) {
+            processFile(uri.substring(7), play);
+        } else if (uri.indexOf("music://") === 0) {
+            processFile(uri.substring(8), play);
+        } else {
+            console.debug("Unsupported URI " + uri + ", skipping")
+        }
+    }
+}

=== added file 'app/components/Helpers/UserMetricsHelper.qml'
--- app/components/Helpers/UserMetricsHelper.qml	1970-01-01 00:00:00 +0000
+++ app/components/Helpers/UserMetricsHelper.qml	2015-03-09 00:13:54 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2013, 2014, 2015
+ *      Andrew Hayzen <[e-mail]>
+ *      Daniel Holm <[e-mail]>
+ *      Victor Thompson <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+import UserMetrics 0.1
+
+
+Item {
+    // UserMetrics to show Music stuff on welcome screen
+    Metric {
+        id: songsMetric
+        name: "music-metrics"
+        // TRANSLATORS: this refers to a number of songs greater than one. The actual number will be prepended to the string automatically (plural forms are not yet fully supported in usermetrics, the library that displays that string)
+        format: "<b>%1</b> " + i18n.tr("songs played today")
+        emptyFormat: i18n.tr("No songs played today")
+        domain: "com.ubuntu.music"
+    }
+
+    // Connections for usermetrics
+    Connections {
+        id: userMetricPlayerConnection
+        target: player
+        property bool songCounted: false
+
+        onSourceChanged: {
+            songCounted = false
+        }
+
+        onPositionChanged: {
+            // Increment song count on Welcome screen if song has been
+            // playing for over 10 seconds.
+            if (player.position > 10000 && !songCounted) {
+                songCounted = true
+                songsMetric.increment()
+                console.debug("Increment UserMetrics")
+            }
+        }
+    }
+}

=== added file 'app/components/WorkerWaiter.qml'
--- app/components/WorkerWaiter.qml	1970-01-01 00:00:00 +0000
+++ app/components/WorkerWaiter.qml	2015-03-09 00:13:54 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2014, 2015
+ *      Andrew Hayzen <[e-mail]>
+ *      Daniel Holm <[e-mail]>
+ *      Victor Thompson <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+
+
+Timer {  // A timer to wait for a worker to stop
+    id: waitForWorker
+    interval: 16
+    repeat: true
+
+    property var func
+    property var params  // don't use args/arguments as they are already defined/internal
+    property WorkerScript worker
+
+    onTriggered: {
+        if (worker.processing === 0) {
+            stop()
+            func.apply(this, params)
+        }
+    }
+
+    // Waits until the worker has stopped and then calls the func(*params)
+    function workerStop(worker, func, params)
+    {
+        waitForWorker.func = func
+        waitForWorker.params = params
+        waitForWorker.worker = worker
+        start()
+    }
+}

=== modified file 'app/music-app.qml'
--- app/music-app.qml	2015-03-06 02:27:26 +0000
+++ app/music-app.qml	2015-03-09 00:13:54 +0000
@@ -19,18 +19,15 @@
 
 import QtQuick 2.3
 import Ubuntu.Components 1.1
-import Ubuntu.Components.Popups 1.0
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import Ubuntu.Content 0.1
 import Ubuntu.MediaScanner 0.1
 import Qt.labs.settings 1.0
 import QtMultimedia 5.0
 import QtQuick.LocalStorage 2.0
 import QtGraphicalEffects 1.0
-import UserMetrics 0.1
 import "logic/meta-database.js" as Library
 import "logic/playlists.js" as Playlists
 import "components"
+import "components/Helpers"
 import "ui"
 
 MainView {
@@ -180,291 +177,16 @@
 
     actions: [nextAction, playsAction, prevAction, stopAction, backAction]
 
-    // signal to open new URIs
-    Connections {
+    UriHandlerHelper {
         id: uriHandler
-        target: UriHandler
-
-        function processAlbum(uri) {
-            selectedAlbum = true;
-            var split = uri.split("/");
-
-            if (split.length < 2) {
-                console.debug("Unknown artist-album " + uri + ", skipping")
-                return;
-            }
-
-            // Filter by artist and album
-            songsAlbumArtistModel.albumArtist = decodeURIComponent(split[0]);
-            songsAlbumArtistModel.album = decodeURIComponent(split[1]);
-        }
-
-        function processFile(uri, play) {
-            // Stop queue loading in the background
-            queueLoaderWorker.canLoad = false
-
-            if (queueLoaderWorker.processing > 0) {
-                waitForWorker.workerStop(queueLoaderWorker, processFile, [uri, play])
-                return;
-            }
-
-            uri = decodeURIComponent(uri);
-
-            // Lookup track in songs model
-            var track = musicStore.lookup(decodeURIComponent(uri));
-
-            if (!track) {
-                console.debug("Unknown file " + uri + ", skipping")
-                return;
-            }
-
-            if (play) {
-                // clear play queue
-                trackQueue.clear()
-            }
-
-            // enqueue
-            trackQueue.append(makeDict(track));
-
-            // play first URI
-            if (play) {
-                trackQueueClick(trackQueue.model.count - 1);
-            }
-        }
-
-        function process(uri, play) {
-            if (uri.indexOf("album:///") === 0) {
-                uriHandler.processAlbum(uri.substring(9));
-            }
-            else if (uri.indexOf("file://") === 0) {
-                uriHandler.processFile(uri.substring(7), play);
-            }
-            else if (uri.indexOf("music://") === 0) {
-                uriHandler.processFile(uri.substring(8), play);
-            }
-            else {
-                console.debug("Unsupported URI " + uri + ", skipping")
-            }
-        }
-
-        onOpened: {
-            for (var i=0; i < uris.length; i++) {
-                console.debug("URI=" + uris[i])
-
-                uriHandler.process(uris[i], i === 0);
-            }
-        }
-    }
-
-    // Content hub support
-    property list<ContentItem> importItems
-    property var activeTransfer
-    property int importId: 0
-
-    ContentTransferHint {
-        anchors {
-            fill: parent
-        }
-        activeTransfer: parent.activeTransfer
-    }
-
-    Connections {
+    }
+
+    ContentHubHelper {
         id: contentHub
-        target: ContentHub
-        onImportRequested: {
-            activeTransfer = transfer;
-            if (activeTransfer.state === ContentTransfer.Charged) {
-                importItems = activeTransfer.items;
-
-                var processId = importId++;
-
-                console.debug("Triggering content-hub import ID", processId);
-
-                searchPaths = [];
-
-                var err = [];
-                var path;
-                var res;
-                var success = true;
-                var url;
-
-                for (var i=0; i < importItems.length; i++) {
-                    url = importItems[i].url.toString()
-                    console.debug("Triggered content-hub import for item", url)
-
-                    // fixed path allows for apparmor protection
-                    path = "~/Music/Imported/" + Qt.formatDateTime(new Date(), "yyyy/MM/dd/hhmmss") + "-" + url.split("/").pop()
-                    res = contentHub.importFile(importItems[i], path)
-
-                    if (res !== true) {
-                        success = false;
-                        err.push(url.split("/").pop() + " " + res)
-                    }
-                }
-
-
-                if (success === true) {
-                    if (contentHubWaitForFile.processId === -1) {
-                        contentHubWaitForFile.dialog = PopupUtils.open(Qt.resolvedUrl("components/Dialog/ContentHubWaitDialog.qml"), mainView)
-                        contentHubWaitForFile.searchPaths = contentHub.searchPaths;
-                        contentHubWaitForFile.processId = processId;
-                        contentHubWaitForFile.start();
-
-                        // Stop queue loading in bg
-                        queueLoaderWorker.canLoad = false
-                    } else {
-                        contentHubWaitForFile.searchPaths.push.apply(contentHubWaitForFile.searchPaths, contentHub.searchPaths);
-                        contentHubWaitForFile.count = 0;
-                        contentHubWaitForFile.restart();
-                    }
-                }
-                else {
-                    var errordialog = PopupUtils.open(Qt.resolvedUrl("components/Dialog/ContentHubErrorDialog.qml"), mainView)
-                    errordialog.errorText = err.join("\n")
-                }
-            }
-        }
-
-        property var searchPaths: []
-
-        function importFile(contentItem, path) {
-            var contentUrl = contentItem.url.toString()
-
-            if (path.indexOf("~/Music/Imported/") !== 0) {
-                console.debug("Invalid dest (not in ~/Music/Imported/)")
-
-                // TRANSLATORS: This string represents that the target destination filepath does not start with ~/Music/Imported/
-                return i18n.tr("Filepath must start with") + " ~/Music/Imported/"
-            }
-            else {
-                // extract /home/$USER (or $HOME) from contentitem url
-                var homepath = contentUrl.substring(7).split("/");
-
-                if (homepath[1] === "home") {
-                    homepath.splice(3, homepath.length - 3)
-                    homepath = homepath.join("/")
-                }
-                else {
-                    console.debug("/home/$USER not detecting in contentItem assuming /home/phablet/")
-                    homepath = "/home/phablet"
-                }
-
-                console.debug("Move:", contentUrl, "to", path)
-
-                // Extract filename from path and replace ~ with $HOME
-                var dir = path.split("/")
-                var filename = dir.pop()
-                dir = dir.join("/").replace("~/", homepath + "/")
-
-                if (filename === "") {
-                    console.debug("Invalid dest (filename blank)")
-
-                    // TRANSLATORS: This string represents that a blank filepath destination has been used
-                    return i18n.tr("Filepath must be a file")
-                }
-                else if (!contentItem.move(dir, filename)) {
-                    console.debug("Move failed! DIR:", dir, "FILE:", filename)
-
-                    // TRANSLATORS: This string represents that there was failure moving the file to the target destination
-                    return i18n.tr("Failed to move file")
-                }
-                else {
-                    contentHub.searchPaths.push(dir + "/" + filename)
-                    return true
-                }
-            }
-        }
-    }
-
-    Timer {
-        id: contentHubWaitForFile
-        interval: 1000
-        triggeredOnStart: false
-        repeat: true
-
-        property var dialog: null
-        property var searchPaths
-        property int count: 0
-        property int processId: -1
-
-        function stopTimer() {
-            processId = -1;
-            count = 0;
-            stop();
-
-            PopupUtils.close(dialog)
-        }
-
-        onTriggered: {
-            var found = true
-            var i;
-            var model;
-
-            for (i=0; i < searchPaths.length; i++) {
-                model = musicStore.lookup(searchPaths[i])
-
-                console.debug("MusicStore model from lookup", JSON.stringify(model))
-
-                if (!model) {
-                    found = false
-                }
-            }
-
-            if (!found) {
-                count++;
-
-                if (count >= 10) {  // wait for 10s
-                    stopTimer();
-
-                    console.debug("File(s) were not found", JSON.stringify(searchPaths))
-                    PopupUtils.open(Qt.resolvedUrl("components/Dialog/ContentHubNotFoundDialog.qml"), mainView)
-                }
-            }
-            else {
-                stopTimer();
-
-                trackQueue.clear();
-
-                for (i=0; i < searchPaths.length; i++) {
-                    model = musicStore.lookup(searchPaths[i])
-
-                    trackQueue.append(makeDict(model));
-                }
-
-                trackQueueClick(0);
-            }
-        }
-    }
-
-    // UserMetrics to show Music stuff on welcome screen
-    Metric {
-        id: songsMetric
-        name: "music-metrics"
-        // TRANSLATORS: this refers to a number of songs greater than one. The actual number will be prepended to the string automatically (plural forms are not yet fully supported in usermetrics, the library that displays that string)
-        format: "<b>%1</b> " + i18n.tr("songs played today")
-        emptyFormat: i18n.tr("No songs played today")
-        domain: "com.ubuntu.music"
-    }
-
-    // Connections for usermetrics
-    Connections {
-        id: userMetricPlayerConnection
-        target: player
-        property bool songCounted: false
-
-        onSourceChanged: {
-            songCounted = false
-        }
-
-        onPositionChanged: {
-            // Increment song count on Welcome screen if song has been
-            // playing for over 10 seconds.
-            if (player.position > 10000 && !songCounted) {
-                songCounted = true
-                songsMetric.increment()
-                console.debug("Increment UserMetrics")
-            }
-        }
+    }
+
+    UserMetricsHelper {
+        id: userMetrics
     }
 
     // Design stuff
@@ -486,31 +208,8 @@
         }
     }
 
-    // A timer to wait for a worker to stop
-    Timer {
+    WorkerWaiter {
         id: waitForWorker
-        interval: 16
-        repeat: true
-
-        property var func
-        property var params  // don't use args/arguments as they are already defined/internal
-        property WorkerScript worker
-
-        onTriggered: {
-            if (worker.processing === 0) {
-                stop()
-                func.apply(this, params)
-            }
-        }
-
-        // Waits until the worker has stopped and then calls the func(*params)
-        function workerStop(worker, func, params)
-        {
-            waitForWorker.func = func
-            waitForWorker.params = params
-            waitForWorker.worker = worker
-            start()
-        }
     }
 
     // Run on startup
@@ -1252,7 +951,7 @@
         id: emptyPageLoader
         // Do not be active if content-hub is importing due to the models resetting
         // this then causes the empty page loader to partially run then showing a blank header
-        active: noMusic && !firstRun && contentHubWaitForFile.processId === -1
+        active: noMusic && !firstRun && !contentHub.processing
         anchors {
             fill: parent
         }