Merge lp:~ajalkane/ubuntu-filemanager-app/sdcard-less-is-more into lp:ubuntu-filemanager-app

[Arto Jalkanen]

Reduce number of mounts shown in Places bar.

Reduce number of mounts shown in Places bar.

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

FAILED: Continuous integration, rev:374
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/451/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/964
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/964/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/73

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/451/rebuild

review: Needs Fixing (continuous-integration)

[Carla Sella (carla-sella)]

If you look at the video:http://91.189.93.70:8080/job/generic-mediumtests-vivid/964/artifact/filemanager.tests.test_places.PlacesTestCase.test_go_to_root_must_open_the_root_directory.ogv you can see that the folders are missing labels (or name) so the test fails as there is no Object name 'Standard' and properties {'objectName': 'placeDevice'}.

[Carla Sella (carla-sella)]

The same happens launching the test on my desktop.

[Arto Jalkanen (ajalkane)]

Thanks Carla,

I remember seeing this with tests. This hasn't broken anything previously in tests. I don't quite see how this change would suddenly break it, but I will look into it.

[Carla Sella (carla-sella)]

Arto, I think the problem is in "def patch_home(self):" in file __init__.py line 175 but I do not know how exactly how fixtures works, so I am not sure I can be of much help :(.

[Carlos Jose Mazieri (carlos-mazieri)]

The code looks OK, later other mounts can be added.

review: Approve

[lp:~ajalkane/ubuntu-filemanager-app/sdcard-less-is-more]

375. By Arto Jalkanen on 2015-02-11

Trying to fix autopilot test.

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

PASSED: Continuous integration, rev:375
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/455/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1049
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1049/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/77

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/455/rebuild

review: Approve (continuous-integration)

=== modified file 'src/plugin/placesmodel/placesmodel.cpp'
--- src/plugin/placesmodel/placesmodel.cpp	2015-01-03 17:12:34 +0000
+++ src/plugin/placesmodel/placesmodel.cpp	2015-02-11 19:22:32 +0000
@@ -28,6 +28,10 @@
 PlacesModel::PlacesModel(QObject *parent) :
     QAbstractListModel(parent)
 {
+    m_userMountLocation = "/media/" + qgetenv("USER");
+    // For example /run/user/1000
+    m_runtimeLocations = QStandardPaths::standardLocations(QStandardPaths::RuntimeLocation);
+
     QStringList defaultLocations;
     // Set the storage location to a path that works well
     // with app isolation
@@ -44,6 +48,8 @@
     defaultLocations.append(locationMusic());
     defaultLocations.append(locationPictures());
     defaultLocations.append(locationVideos());
+    // Add root also
+    defaultLocations.append("/");
 
     if (!m_settings->contains("storedLocations")) {
         m_locations.append(defaultLocations);
@@ -94,9 +100,7 @@
 
     foreach (QMtabEntry e, entries) {
         qDebug() << Q_FUNC_INFO << "Considering" << "fsName:" <<  e.fsName << "dir:" << e.dir << "type:" << e.type;
-        QFileInfo dir(e.dir);
-        if (dir.isReadable() && dir.isExecutable())
-        {
+        if (isMtabEntryUserMount(e)) {
             qDebug() << Q_FUNC_INFO << "Adding as userMount directory dir" << e.dir;
             userMounts << e.dir;
         }
@@ -123,6 +127,35 @@
     }
 }
 
+bool PlacesModel::isMtabEntryUserMount(const QMtabEntry &e) const {
+    if (e.fsName == "none") {
+        qDebug() << Q_FUNC_INFO << "Ignoring mounts with filesystem name 'none'";
+        return false;
+    }
+    if (isSubDirectory(m_userMountLocation, e.dir)) {
+        qDebug() << Q_FUNC_INFO << "Is user mount location";
+        return true;
+    }
+    foreach (const QString &runtimeLocation, m_runtimeLocations) {
+        if (isSubDirectory(runtimeLocation, e.dir)) {
+            qDebug() << Q_FUNC_INFO << "Is user mount location";
+            return true;
+        }
+    }
+
+    return false;
+}
+
+bool PlacesModel::isSubDirectory(const QString &dir, const QString &path) const {
+    QFileInfo dirFi = QFileInfo(dir);
+    QFileInfo pathFi = QFileInfo(path);
+
+    QString absDir = dirFi.absolutePath();
+    QString absPath = pathFi.absolutePath();
+
+    return absPath.startsWith(QString(absDir + "/"));
+}
+
 QString PlacesModel::standardLocation(QStandardPaths::StandardLocation location) const
 {
     QStringList locations = QStandardPaths::standardLocations(location);

=== modified file 'src/plugin/placesmodel/placesmodel.h'
--- src/plugin/placesmodel/placesmodel.h	2015-01-03 17:12:34 +0000
+++ src/plugin/placesmodel/placesmodel.h	2015-02-11 19:22:32 +0000
@@ -77,6 +77,10 @@
     void removeItemWithoutStoring(int itemToRemove);
 
     QMtabParser m_mtabParser;
+    QStringList m_runtimeLocations;
+    QString m_userMountLocation;
+    bool isMtabEntryUserMount(const QMtabEntry &entry) const;
+    bool isSubDirectory(const QString &dir, const QString &path) const;
     QString standardLocation(QStandardPaths::StandardLocation location) const;
     QStringList m_locations;
     QSettings *m_settings;

=== modified file 'src/plugin/placesmodel/qmtabparser.cpp'
--- src/plugin/placesmodel/qmtabparser.cpp	2015-01-03 17:18:04 +0000
+++ src/plugin/placesmodel/qmtabparser.cpp	2015-02-11 19:22:32 +0000
@@ -64,44 +64,8 @@
         entry.opts = ent->mnt_opts;
         entry.freq = ent->mnt_freq;
         entry.passno = ent->mnt_passno;
-        if (fsHasUserContent(entry)) {
-            entries << entry;
-        }
+        entries << entry;
     }
 
     return entries;
 }
-
-
-bool QMtabParser::fsHasUserContent(const QMtabEntry &fs)
-{
-   //check for disk file systems like /dev/sda?
-   bool ret = QFileInfo(fs.fsName).exists();
-   if (!ret)
-   {
-      /*!
-       * \link http://en.wikipedia.org/wiki/List_of_file_systems#Distributed_file_systems
-       */
-        static QStringList netFs =  QStringList()
-                   << "v9fs"
-                   << "afs"
-                   << "nfs"
-                   << "smb"
-                   << "afp"
-                   << "dce"
-                   << "dfs"
-                   << "fal"
-                   << "sfs"
-                   << "ncp"
-                   << "dfs"
-                   << "cfs"
-                   << "coda"
-                   << "MooseFS"
-                   << "ssh"
-                   << "sftp"
-                   << "sshfs"
-                   ;
-       ret =  netFs.contains(fs.type, Qt::CaseSensitive);
-   }
-   return ret;
-}

=== modified file 'src/plugin/placesmodel/qmtabparser.h'
--- src/plugin/placesmodel/qmtabparser.h	2015-01-03 17:18:04 +0000
+++ src/plugin/placesmodel/qmtabparser.h	2015-02-11 19:22:32 +0000
@@ -43,16 +43,6 @@
     QList<QMtabEntry> parseEntries();
 
     inline const QString& path() { return m_path; }
-
-private:
-    /*!
-     * \brief fsHasUserContent() consider Disk and Network file systems as valid
-     * \param fs
-     * \return TRUE if the filesystem is considered as having normal user files, FALSE when it is supposed to be system FS
-     *
-     * \sa \link http://en.wikipedia.org/wiki/List_of_file_systems
-     */
-    bool  fsHasUserContent(const struct QMtabEntry& fs);
 };
 
 #endif // QMTABPARSER_H