Merge lp:~ahayzen/music-app/fix-1369050-content-hub-fix-translations into lp:music-app/trusty

[Andrew Hayzen]

* Fix missing translations
* Change path to ~/Music/Imported/yyyy/MM/dd/hhmmss
* Remove unused dialogue code
* Update .pot

* Fix missing translations
* Change path to ~/Music/Imported/yyyy/MM/dd/hhmmss
* Remove unused dialogue code
* Update .pot

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

PASSED: Continuous integration, rev:627
http://91.189.93.70:8080/job/music-app-ci/1126/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/321
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/321/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/350

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

1) Aren't we expecting "Music" to always be the name of the music directory regardless of what the locale is? If not, shouldn't we use a system call to determine the name of the folder? I do not think it should be left up to the translator to determine what the name of this folder is.

2) Why are we putting imported files into a deeper folder layout? Personally, I liked having all the imported files in one place. But I can see how this might be overwhelming if we import multiple files at a time.

review: Needs Fixing

[Alan Pope 🍺🐧🐱 🦄 (popey)]

For 2) the folder does get pretty unwieldy with a lot of downloaded music. It's hard to find full albums amongst a big file list in something like nautilus over MTP, for copying them off - for example.

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

PASSED: Continuous integration, rev:628
http://91.189.93.70:8080/job/music-app-ci/1128/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/366
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/366/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/352

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:629
http://91.189.93.70:8080/job/music-app-ci/1129/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/367
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/367/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/353

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

It has been decided that the path will be fixed to ~/Music/Imported/* for now as this then allows for confinement as stated in bug 1315386.

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

PASSED: Continuous integration, rev:631
http://91.189.93.70:8080/job/music-app-ci/1131/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/453
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/453/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/355

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

See inline comments.

review: Needs Fixing

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

PASSED: Continuous integration, rev:633
http://91.189.93.70:8080/job/music-app-ci/1132/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/487
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/487/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/356

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

This looks good, but I'm still confused as to what our intent is for the future. Are we honestly considering having the Music and import directories be the name specified in translations? I don't understand how this would be a good idea. The directory itself needs to be seen by MTP. If we imported into "~/Musica" would that automatically be shown via MTP? I just want to make sure we're not planning to do anything silly.

review: Needs Information

[Andrew Hayzen (ahayzen)]

I thought we were fixing them so they are not being translated? As in the code didn't I remove any tr() around Music and Imported?

[Victor Thompson (vthompson)]

You did, but you left a comment that suggests the only reason you did so is because the app can not be confined if it were to do so...

[Andrew Hayzen (ahayzen)]

"Imported" we could translate if we could figure out how to do the apparmor profiles, as you said Music could be more tricky. IIRC dpm said it is fine to fix them for now due to the concerns you said but when we start using a converged desktop "Music" may have to be translated as well, but that is a larger problem to solve another time.

Basically for the short-medium term we won't be translating Music/Imported.

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

FAILED: Continuous integration, rev:634
http://91.189.93.70:8080/job/music-app-ci/1133/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/494
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/494/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/357

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

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

Ok perfect. I still don't think it will ever be a good idea to rely on the in-app translation of "Music" to get the user's music folder. Instead, we should use Xdg (XDG_MUSIC_DIR) to detect the user's chosen Music directory based on localization.

review: Approve

[Andrew Hayzen (ahayzen)]

Same, but we would need a way in QML to be able to access XDG_.

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

review: Approve (continuous-integration)

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

FAILED: Autolanding.
Unapproved changes made after approval.
http://91.189.93.70:8080/job/music-app-autolanding/609/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/495
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/495/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-autolanding/150

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

review: Approve

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

PASSED: Continuous integration, rev:635
http://91.189.93.70:8080/job/music-app-ci/1134/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/496
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/496/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/358

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

review: Approve (continuous-integration)

=== modified file 'music-app.qml'
--- music-app.qml	2014-09-23 02:15:55 +0000
+++ music-app.qml	2014-09-23 16:28:17 +0000
@@ -303,7 +303,8 @@
                     url = importItems[i].url.toString()
                     console.debug("Triggered content-hub import for item", url)
 
-                    path = "~/Music/Imported/" + Qt.formatDateTime(new Date(), "yyyyMMddhhmmss") + "-" + url.split("/").pop()
+                    // 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) {
@@ -330,9 +331,11 @@
         function importFile(contentItem, path) {
             var contentUrl = contentItem.url.toString()
 
-            if (path.indexOf("~/Music/") !== 0) {
-                console.debug("Invalid dest (not in ~/Music/)")
-                return i18n.tr("Filepath must start with ~/Music/")
+            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
@@ -356,10 +359,14 @@
 
                 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 {
@@ -489,55 +496,6 @@
         }
     }
 
-    Component {
-        id: contentHubImport
-        Dialog {
-            id: dialogContentHubImport
-            title: i18n.tr("Import")
-            text: i18n.tr("Target destination")
-
-            property var contentItem
-
-            TextField {
-                id: pathField
-                text: "~/Music/Imported/" + Date("YYYYMMDDHHMMSS") + "-" + contentItem.url.split("/").pop()
-            }
-
-            Label {
-                id: contentHubOutput
-                color: styleMusic.common.black
-                visible: false // should only be visible when an error is made.
-            }
-
-            Button {
-                text: i18n.tr("Import")
-                onClicked: {
-                    contentHubOutput.visible = false
-
-                    var out = contentHub.importFile(contentItem, pathField.text.toString())
-
-                    if (out === true) {
-                        PopupUtils.close(dialogContentHubImport)
-
-                        contentHubWaitForFile.dialog = PopupUtils.open(contentHubWait, mainView)
-                        contentHubWaitForFile.searchPaths = contentHub.searchPaths;
-                        contentHubWaitForFile.start();
-                    }
-                    else {
-                        contentHubOutput.visible = true
-                        contentHubOutput.text = out
-                    }
-                }
-            }
-
-            Button {
-                text: i18n.tr("Cancel")
-                color: styleMusic.dialog.buttonColor
-                onClicked: PopupUtils.close(dialogContentHubImport)
-            }
-        }
-    }
-
     // UserMetrics to show Music stuff on welcome screen
     Metric {
         id: songsMetric

=== modified file 'po/com.ubuntu.music.pot'
--- po/com.ubuntu.music.pot	2014-09-18 16:00:27 +0000
+++ po/com.ubuntu.music.pot	2014-09-23 16:28:17 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: music-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-18 16:58+0100\n"
+"POT-Creation-Date: 2014-09-23 13:43+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -54,11 +54,11 @@
 msgid "You forgot to set your username and/or password"
 msgstr ""
 
-#: ../MusicAlbums.qml:35 ../MusicStart.qml:388
+#: ../MusicAlbums.qml:35 ../MusicStart.qml:392
 msgid "Albums"
 msgstr ""
 
-#: ../MusicAlbums.qml:152 ../MusicStart.qml:200 ../MusicStart.qml:450
+#: ../MusicAlbums.qml:152 ../MusicStart.qml:200 ../MusicStart.qml:454
 #: ../common/AlbumsPage.qml:264
 msgid "Album"
 msgstr ""
@@ -67,14 +67,14 @@
 msgid "Artists"
 msgstr ""
 
-#: ../MusicArtists.qml:108 ../common/AlbumsPage.qml:112
+#: ../MusicArtists.qml:107 ../common/AlbumsPage.qml:112
 #, qt-format
 msgid "%1 album"
 msgid_plural "%1 albums"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../MusicArtists.qml:114 ../MusicPlaylists.qml:180 ../MusicStart.qml:369
+#: ../MusicArtists.qml:113 ../MusicPlaylists.qml:180 ../MusicStart.qml:371
 #: ../MusicaddtoPlaylist.qml:106 ../common/AlbumsPage.qml:331
 #: ../common/SongsPage.qml:123 ../common/SongsPage.qml:124
 #, qt-format
@@ -83,7 +83,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../MusicArtists.qml:124
+#: ../MusicArtists.qml:123
 msgid "Artist"
 msgstr ""
 
@@ -114,16 +114,15 @@
 msgid "Change"
 msgstr ""
 
-#: ../MusicPlaylists.qml:96 ../music-app.qml:998
+#: ../MusicPlaylists.qml:96 ../music-app.qml:956
 msgid "Playlist already exists"
 msgstr ""
 
-#: ../MusicPlaylists.qml:100 ../music-app.qml:1003
+#: ../MusicPlaylists.qml:100 ../music-app.qml:961
 msgid "Please type in a name."
 msgstr ""
 
-#: ../MusicPlaylists.qml:105 ../music-app.qml:486 ../music-app.qml:534
-#: ../music-app.qml:1009
+#: ../MusicPlaylists.qml:105 ../music-app.qml:493 ../music-app.qml:967
 msgid "Cancel"
 msgstr ""
 
@@ -225,7 +224,7 @@
 msgid "Clean everything!"
 msgstr ""
 
-#: ../MusicStart.qml:35 ../music-app.qml:631 ../music-app.qml:1192
+#: ../MusicStart.qml:35 ../music-app.qml:589 ../music-app.qml:1150
 #: com.ubuntu.music_music.desktop.in.in.h:1
 msgid "Music"
 msgstr ""
@@ -238,11 +237,11 @@
 msgid "Clear History"
 msgstr ""
 
-#: ../MusicStart.qml:225
+#: ../MusicStart.qml:227
 msgid "Genres"
 msgstr ""
 
-#: ../MusicStart.qml:314 ../MusicStart.qml:316 ../common/SongsPage.qml:123
+#: ../MusicStart.qml:316 ../MusicStart.qml:318 ../common/SongsPage.qml:123
 #: ../common/SongsPage.qml:162 ../common/SongsPage.qml:240
 msgid "Genre"
 msgstr ""
@@ -265,11 +264,11 @@
 msgstr ""
 
 #: ../common/AlbumsPage.qml:211 ../common/AlbumsPage.qml:400
-#: ../common/SongsPage.qml:200 ../music-app.qml:930
+#: ../common/SongsPage.qml:200 ../music-app.qml:888
 msgid "Add to queue"
 msgstr ""
 
-#: ../common/ListItemActions/AddToPlaylist.qml:25 ../music-app.qml:944
+#: ../common/ListItemActions/AddToPlaylist.qml:25 ../music-app.qml:902
 msgid "Add to playlist"
 msgstr ""
 
@@ -363,76 +362,71 @@
 msgid "Music Settings"
 msgstr ""
 
-#: ../music-app.qml:335
-msgid "Filepath must start with ~/Music/"
+#. TRANSLATORS: This string represents that the target destination filepath does not start with ~/Music/Imported/
+#: ../music-app.qml:338
+msgid "Filepath must start with"
 msgstr ""
 
-#: ../music-app.qml:359
+#. TRANSLATORS: This string represents that a blank filepath destination has been used
+#: ../music-app.qml:364
 msgid "Filepath must be a file"
 msgstr ""
 
-#: ../music-app.qml:363
+#. TRANSLATORS: This string represents that there was failure moving the file to the target destination
+#: ../music-app.qml:370
 msgid "Failed to move file"
 msgstr ""
 
-#: ../music-app.qml:440
+#: ../music-app.qml:447
 msgid "Waiting for file(s)..."
 msgstr ""
 
-#: ../music-app.qml:459
+#: ../music-app.qml:466
 msgid "OK"
 msgstr ""
 
-#: ../music-app.qml:472
+#: ../music-app.qml:479
 msgid "Imported file not found"
 msgstr ""
 
-#: ../music-app.qml:476
+#: ../music-app.qml:483
 msgid "Wait"
 msgstr ""
 
-#: ../music-app.qml:496 ../music-app.qml:513
-msgid "Import"
-msgstr ""
-
-#: ../music-app.qml:497
-msgid "Target destination"
-msgstr ""
-
 #. 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)
-#: ../music-app.qml:546
+#: ../music-app.qml:504
 msgid "songs played today"
 msgstr ""
 
-#: ../music-app.qml:547
+#: ../music-app.qml:505
 msgid "No songs played today"
 msgstr ""
 
-#: ../music-app.qml:655
+#: ../music-app.qml:613
 msgid "Debug: "
 msgstr ""
 
-#: ../music-app.qml:967
+#: ../music-app.qml:925
 msgid "New Playlist"
 msgstr ""
 
-#: ../music-app.qml:968
+#: ../music-app.qml:926
 msgid "Name your playlist."
 msgstr ""
 
-#: ../music-app.qml:972
+#: ../music-app.qml:930
 msgid "Name"
 msgstr ""
 
-#: ../music-app.qml:982
+#: ../music-app.qml:940
 msgid "Create"
 msgstr ""
 
-#: ../music-app.qml:1218
+#: ../music-app.qml:1176
 msgid "No music found"
 msgstr ""
 
-#: ../music-app.qml:1225
+#: ../music-app.qml:1183
 msgid "Please import music"
 msgstr ""