Merge lp:~ajalkane/ubuntu-filemanager-app/sdcard-support into lp:ubuntu-filemanager-app

[Arto Jalkanen]

SDCard support: Places plugin watches /etc/mtab for any mounts that are done under /media/$USER directory. Whenever a directory is mounted or unmounted there, it's added or removed to the Places model so that it can be seen in the UI.

C++ backend has been reworked to allow arbitrary allowed directories, instead of hard-coded MTP directories. Allowed directories are initialized now in QML side, which gives flexibility for future changes.

Support for showing mounted SDCards.

Basically this branch assumes that SDCards are mounted as sub-directories under /media/$USER. If anything appears there, it will be shown in the Places model.

Regarding security this merge proposal is conservative: mounted SDCards contents are not viewable in phone/tablet unless full access is unlocked first with PIN/password.

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

PASSED: Continuous integration, rev:357
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/442/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/538
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/538/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/64

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

review: Approve (continuous-integration)

[Carlos Jose Mazieri (carlos-mazieri)]

Hi Arto,

That looks nice, however if you read /etc/mtab in PlacesModel::rescanUserMountDirectories() you can have all the mounts including /media/$USER, I remember someone talking about having all the mounts in the places. This would be a complete solution for local places, only missing network places. You can use either use your timer or use the External File System Watcher directly in /etc/mtab.

You can take a look on QTrashDir::mountedPoints() (it can be turned static) in
 src/plugin/folderlistmodel/trash/qtrashdir.cpp, it gets all the mount points because any mount point can have its own trash can.

Let me know what you think about it.

review: Needs Information

[Arto Jalkanen (ajalkane)]

Thanks Carlos,

using mtab seems like the more proper way to do it, although it will require a bit more work as mtab file must be parsed.

I will work more on it.

[Carlos Jose Mazieri (carlos-mazieri)]

Thanks Arto,

Maybe you do not need to parse /etc/mtab, you can use QTrashDir::mountedPoints() or similar and only work with the mount points, if you want/need the file system type to set icons for example then you will need to parse it. Remember that there would be some mount points not accessible to the current $USER.

[Arto Jalkanen (ajalkane)]

Thank you Carlos, something like this is exactly what I need. There's some potential trouble though, I'll e-mail you.

[lp:~ajalkane/ubuntu-filemanager-app/sdcard-support]

358. By Arto Jalkanen on 2015-01-03

Rewrote user mount detection to use /etc/mtab.

[Arto Jalkanen (ajalkane)]

Carlos, please take a look at the latest commit. I rewrote the detection to use /etc/mtab. Let me know if you see more room for improvement.

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

PASSED: Continuous integration, rev:358
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/443/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/539
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/539/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/65

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

review: Approve (continuous-integration)

[Carlos Jose Mazieri (carlos-mazieri)]

Hello Arto,

I did a little test on it and got the following output:

Location: "/home/devubuntu"
Location: "/home/devubuntu/Documents"
Location: "/home/devubuntu/Downloads"
Location: "/home/devubuntu/"
Location: "/home/devubuntu/"
Location: "/home/devubuntu/Videos"
void PlacesModel::initNewUserMountsWatcher() Start watching mtab file for new mounts "/etc/mtab"
void PlacesModel::rescanMtab() rescanning mtab "/etc/mtab"
void PlacesModel::rescanMtab() Considering "/"
void PlacesModel::rescanMtab() Considering "/proc"
void PlacesModel::rescanMtab() Considering "/sys"
void PlacesModel::rescanMtab() Considering "/sys/fs/cgroup"
void PlacesModel::rescanMtab() Considering "/sys/fs/fuse/connections"
void PlacesModel::rescanMtab() Considering "/sys/kernel/debug"
void PlacesModel::rescanMtab() Considering "/sys/kernel/security"
void PlacesModel::rescanMtab() Considering "/dev"
void PlacesModel::rescanMtab() Considering "/dev/pts"
void PlacesModel::rescanMtab() Considering "/run"
void PlacesModel::rescanMtab() Considering "/run/lock"
void PlacesModel::rescanMtab() Considering "/run/shm"
void PlacesModel::rescanMtab() Considering "/run/user"
void PlacesModel::rescanMtab() Considering "/sys/fs/pstore"
void PlacesModel::rescanMtab() Considering "/mnt/backup"
void PlacesModel::rescanMtab() Considering "/mnt/storage"
void PlacesModel::rescanMtab() Considering "/sys/fs/cgroup/systemd"
void PlacesModel::rescanMtab() Considering "/run/vmblock-fuse"

I expected that "/" , "/mnt/backup" and "/mnt/storage" would be added into places.

I think that QMtabParser::parseEntries() should have a filter to discard virtual file systems and PlacesModel::rescanMtab() should consider any mounted file system not only mount points as /media/???.

I modified the code a little bit and got:

void PlacesModel::initNewUserMountsWatcher() Start watching mtab file for new mounts "/etc/mtab"
void PlacesModel::rescanMtab() rescanning mtab "/etc/mtab"
void PlacesModel::rescanMtab() Considering fsName: "/dev/sda1" dir: "/" type: "ext4"
void PlacesModel::rescanMtab() Adding as userMount directory dir "/"
void PlacesModel::rescanMtab() Considering fsName: "/dev/sda6" dir: "/mnt/backup" type: "ext3"
void PlacesModel::rescanMtab() Adding as userMount directory dir "/mnt/backup"
void PlacesModel::rescanMtab() Considering fsName: "/dev/sda7" dir: "/mnt/storage" type: "ext4"
void PlacesModel::rescanMtab() Adding as userMount directory dir "/mnt/storage"
void PlacesModel::rescanMtab() user mount added: "/mnt/backup"
void PlacesModel::rescanMtab() user mount added: "/mnt/storage"
void PlacesModel::rescanMtab() user mount added: "/"

Please take a look on my suggestion, it still needs some improvements, we should maybe discard "/" and get it from QStandardPaths or QDir:
https://code.launchpad.net/~carlos-mazieri/ubuntu-filemanager-app/sdcard-support

Thanks.

[Arto Jalkanen (ajalkane)]

Thank you Carlos for detailed testing and the improvements!

Well, this branch was meant to add SDCard support and that's why I was content to limiting it to just that - because I did not think I have good enough knowledge to include support for other mounts without more research.

But with your changes we can add more comprehensive support for other usecases at the same time. To me your changes look just great.

So how about you propose a merge of your changes to my branch, and so we get with sdcard support a whole lot more?

Regarding "/", I think it's very good that it'd come from the code you added. Right now it's hard-coded addition in QML side, after this code we can get rid of that too.

Thanks.

[Carlos Jose Mazieri (carlos-mazieri)]

MP done: https://code.launchpad.net/~carlos-mazieri/ubuntu-filemanager-app/sdcard-support/+merge/245500

Thanks.

[lp:~ajalkane/ubuntu-filemanager-app/sdcard-support]

359. By Arto Jalkanen on 2015-01-03

Improvements from Carloz Mazieri: adding also other user mounts (such as network mounts) besides SDCard and other mounts residing under /media/sdcard

360. By Arto Jalkanen on 2015-01-03

Removed "userMountPath" as it's not needed anymore with more generalized solution. Also removed from QML the special-case of path "/" as new solution handles that also.

361. By Arto Jalkanen on 2015-01-03

Trying to revert pot file.

362. By Arto Jalkanen on 2015-01-03

Added Carlos to authors.

[Arto Jalkanen (ajalkane)]

Merged Carlos' improvements and did other changes needed due to that. Ready for review.

[Carlos Jose Mazieri (carlos-mazieri)]

OK, we have all the interesting mounts to the user.

review: Approve

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

PASSED: Continuous integration, rev:361
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/444/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/543
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/543/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/66

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:362
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/445/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/544
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/544/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/67

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:362
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/446/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/545
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/545/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/68

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

review: Approve (continuous-integration)

=== modified file 'src/app/qml/components/PlacesSidebar.qml'
--- src/app/qml/components/PlacesSidebar.qml	2014-10-20 15:52:41 +0000
+++ src/app/qml/components/PlacesSidebar.qml	2015-01-03 17:18:33 +0000
@@ -20,7 +20,6 @@
 import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0
 import Ubuntu.Components.Popups 1.0
-import com.ubuntu.PlacesModel 0.1
 
 Sidebar {
     id: root
@@ -54,16 +53,6 @@
             text: i18n.tr("Places")
         }
 
-        PlacesModel {
-            id: userplaces
-
-            // By default, the model only contains the
-            // user directories. Add the file system location too
-            Component.onCompleted: {
-                addLocation("/");
-            }
-        }
-
         Repeater {
             id: placesList
             objectName: "placesList"

=== modified file 'src/app/qml/ui/FolderListPage.qml'
--- src/app/qml/ui/FolderListPage.qml	2014-12-28 06:18:40 +0000
+++ src/app/qml/ui/FolderListPage.qml	2015-01-03 17:18:33 +0000
@@ -21,7 +21,6 @@
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0
 import org.nemomobile.folderlistmodel 1.0
-import com.ubuntu.PlacesModel 0.1
 import com.ubuntu.Archives 0.1
 import "../components"
 import "../upstream"
@@ -117,7 +116,7 @@
             id: unlockButton
             iconName: "lock"
             text: i18n.tr("Unlock full access")
-            visible: pageModel.onlyMTPPaths
+            visible: pageModel.onlyAllowedPaths
             onTriggered: {
                 console.log("Full access clicked")
                 var authDialog = PopupUtils.open(Qt.resolvedUrl("AuthenticationDialog.qml"),
@@ -126,7 +125,7 @@
                 authDialog.passwordEntered.connect(function(password) {
                     if (pamAuthentication.validatePasswordToken(password)) {
                         console.log("Authenticated for full access")
-                        pageModel.onlyMTPPaths = false
+                        pageModel.onlyAllowedPaths = false
                     } else {
                         PopupUtils.open(Qt.resolvedUrl("NotifyDialog.qml"), folderListPage,
                                         {
@@ -191,13 +190,11 @@
         }
     }
 
-    PlacesModel { id: userplaces }
-
     FolderListModel {
         id: pageModel
         path: folderListPage.folder
         enableExternalFSWatcher: true
-        onlyMTPPaths: !noAuthentication && pamAuthentication.requireAuthentication()
+        onlyAllowedPaths: !noAuthentication && pamAuthentication.requireAuthentication()
 
         // Properties to emulate a model entry for use by FileDetailsPopover
         property bool isDir: true
@@ -205,6 +202,15 @@
         property string fileSize: i18n.tr("%1 file", "%1 files", folderListView.count).arg(folderListView.count)
         property bool isReadable: true
         property bool isExecutable: true
+
+        Component.onCompleted: {
+            // Add default allowed paths
+            addAllowedDirectory(userplaces.locationDocuments)
+            addAllowedDirectory(userplaces.locationDownloads)
+            addAllowedDirectory(userplaces.locationMusic)
+            addAllowedDirectory(userplaces.locationPictures)
+            addAllowedDirectory(userplaces.locationVideos)
+        }
     }
 
     FolderListModel {
@@ -312,7 +318,7 @@
         width: parent.width - sidebar.width
 
         spacing: units.gu(2)
-        visible: fileSelectorMode || pageModel.onlyMTPPaths
+        visible: fileSelectorMode || pageModel.onlyAllowedPaths
 
         Button {
             text: i18n.tr("Select")
@@ -788,6 +794,9 @@
             iconPath = "/usr/share/icons/Humanity/places/48/folder-videos.svg"
         } else if (file === "/") {
             iconPath = "/usr/share/icons/Humanity/devices/48/drive-harddisk.svg"
+        } else if (userplaces.isUserMountDirectory(file)) {
+            // In context of Ubuntu Touch this means SDCard currently.
+            iconPath = "/usr/share/icons/Humanity/devices/48/drive-removable-media.svg"
         }
 
         return Qt.resolvedUrl(iconPath)

=== modified file 'src/app/qml/ui/PlacesPage.qml'
--- src/app/qml/ui/PlacesPage.qml	2014-11-30 10:26:19 +0000
+++ src/app/qml/ui/PlacesPage.qml	2015-01-03 17:18:33 +0000
@@ -20,7 +20,6 @@
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0
 import org.nemomobile.folderlistmodel 1.0
-import com.ubuntu.PlacesModel 0.1
 
 Page {
     id: root
@@ -88,8 +87,7 @@
             Repeater {
                 id: placesList
                 objectName: "placesList"
-
-                model: PlacesModel {}
+                model: userplaces
 
                 delegate: Standard {
                     objectName: "place" + folderDisplayName(path).replace(/ /g,'')

=== modified file 'src/app/qml/ui/PlacesPopover.qml'
--- src/app/qml/ui/PlacesPopover.qml	2014-10-20 21:19:26 +0000
+++ src/app/qml/ui/PlacesPopover.qml	2015-01-03 17:18:33 +0000
@@ -19,7 +19,6 @@
 import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0
-import com.ubuntu.PlacesModel 0.1
 
 Popover {
     id: root
@@ -118,7 +117,7 @@
             id: placesList
             objectName: "placesList"
             visible: true
-            model: PlacesModel {}
+            model: userplaces
 
             delegate: Standard {
                 visible: placesList.visible

=== modified file 'src/plugin/folderlistmodel/dirmodel.cpp'
--- src/plugin/folderlistmodel/dirmodel.cpp	2014-10-23 04:24:38 +0000
+++ src/plugin/folderlistmodel/dirmodel.cpp	2015-01-03 17:18:33 +0000
@@ -79,31 +79,8 @@
 
 namespace {
     QHash<QByteArray, int> roleMapping;
-    QList<QString> mtpDirectories;
-
-    QList<QStandardPaths::StandardLocation> mtpStandardLocations =
-                  QList<QStandardPaths::StandardLocation>()
-                         << QStandardPaths::DocumentsLocation
-                         << QStandardPaths::DownloadLocation
-                         << QStandardPaths::MusicLocation
-                         << QStandardPaths::PicturesLocation
-                         << QStandardPaths::MoviesLocation;
-
-
-    void buildMTPDirectories() {
-        mtpDirectories.clear();
-        foreach (const QStandardPaths::StandardLocation &standardLocation, mtpStandardLocations) {
-            QStringList locations = QStandardPaths::standardLocations(standardLocation);
-
-            foreach (const QString &location, locations) {
-                mtpDirectories << location;
-            }
-        }
-    }
 }
 
-
-
 /*!
  *  Sort was originally done in \ref onItemsAdded() and that code is now in \ref addItem(),
  *  the reason to keep doing sort and do not let QDir does it is that when adding new items
@@ -126,7 +103,7 @@
     , mIsRecursive(false)
     , mReadsMediaMetadata(false)
     , mShowHiddenFiles(false)
-    , mOnlyMTPPaths(false)
+    , mOnlyAllowedPaths(false)
     , mSortBy(SortByName)
     , mSortOrder(SortAscending)
     , mCompareFunction(0)  
@@ -496,7 +473,7 @@
 }
 
 
-bool DirModel::isMTPPath(const QString &absolutePath) const {
+bool DirModel::isAllowedPath(const QString &absolutePath) const {
     // A simple fail check to try protect against most obvious accidental usages.
     // This is a private function and should always get an absolute FilePath from caller,
     // but just in case check if there's relational path in there.
@@ -506,13 +483,10 @@
         return false;
     }
 
-    if (mtpDirectories.isEmpty()) {
-        buildMTPDirectories();
-    }
-    foreach (const QString &mtpDirectory, mtpDirectories) {
-        if (absolutePath == mtpDirectory) return true;
-        // Returns true for any file/folder inside MTP directory
-        if (absolutePath.startsWith(mtpDirectory + "/")) return true;
+    foreach (const QString &allowedDirectory, m_allowedDirs) {
+        if (absolutePath == allowedDirectory) return true;
+        // Returns true for any file/folder inside allowed directory
+        if (absolutePath.startsWith(allowedDirectory + "/")) return true;
     }
 
     return false;
@@ -523,7 +497,7 @@
 }
 
 bool DirModel::allowAccess(const QString &absoluteFilePath) const {
-    return !mOnlyMTPPaths || isMTPPath(absoluteFilePath);
+    return !mOnlyAllowedPaths || isAllowedPath(absoluteFilePath);
 }
 
 void DirModel::onItemsAdded(const DirItemInfoList &newFiles)
@@ -1107,19 +1081,19 @@
     }
 }
 
-bool DirModel::getOnlyMTPPaths() const
+bool DirModel::getOnlyAllowedPaths() const
 {
-    return mOnlyMTPPaths;
+    return mOnlyAllowedPaths;
 }
 
 
-void DirModel::setOnlyMTPPaths(bool onlyMTPPaths)
+void DirModel::setOnlyAllowedPaths(bool onlyAllowedPaths)
 {
-    if (onlyMTPPaths != mOnlyMTPPaths)
+    if (onlyAllowedPaths != mOnlyAllowedPaths)
     {
-        mOnlyMTPPaths = onlyMTPPaths;
+        mOnlyAllowedPaths = onlyAllowedPaths;
         refresh();
-        emit onlyMTPPathsChanged();
+        emit onlyAllowedPathsChanged();
     }
 }
 

=== modified file 'src/plugin/folderlistmodel/dirmodel.h'
--- src/plugin/folderlistmodel/dirmodel.h	2014-10-23 04:24:38 +0000
+++ src/plugin/folderlistmodel/dirmodel.h	2015-01-03 17:18:33 +0000
@@ -35,6 +35,7 @@
 
 #include <QStringList>
 #include <QDir>
+#include <QSet>
 
 #include "iorequest.h"
 #include "filecompare.h"
@@ -179,8 +180,8 @@
     Q_PROPERTY(bool showHiddenFiles READ getShowHiddenFiles WRITE setShowHiddenFiles NOTIFY showHiddenFilesChanged)
     bool getShowHiddenFiles() const;
 
-    Q_PROPERTY(bool onlyMTPPaths READ getOnlyMTPPaths WRITE setOnlyMTPPaths NOTIFY onlyMTPPathsChanged)
-    bool getOnlyMTPPaths() const;
+    Q_PROPERTY(bool onlyAllowedPaths READ getOnlyAllowedPaths WRITE setOnlyAllowedPaths NOTIFY onlyAllowedPathsChanged)
+    bool getOnlyAllowedPaths() const;
 
     Q_ENUMS(SortBy)
     enum SortBy
@@ -389,9 +390,9 @@
     void setShowDirectories(bool showDirectories);
     void setShowHiddenFiles(bool show);
     /*!
-     * \brief if set to true then only MTP paths are shown or be modified
+     * \brief if set to true then only Allowed paths are shown or be modified
      */
-    void setOnlyMTPPaths(bool onlyMTPPaths);
+    void setOnlyAllowedPaths(bool onlyAllowedPaths);
     void setSortBy(SortBy field);
     void setSortOrder(SortOrder order);
     void setEnabledExternalFSWatcher(bool enable);
@@ -402,6 +403,17 @@
     void toggleSortOrder();
     void toggleSortBy();
 
+    /*!
+     * \brief Adds a directory to the set of directories that are accessible when "onlyAllowedPaths" property is set.
+     */
+    inline void addAllowedDirectory(const QString &allowedDirAbsolutePath) {
+        m_allowedDirs << allowedDirAbsolutePath;
+    }
+
+    inline void removeAllowedDirectory(const QString &allowedDirAbsolutePath) {
+        m_allowedDirs.remove(allowedDirAbsolutePath);
+    }
+
 signals:
     /*!
      * \brief insertedItem()
@@ -423,7 +435,7 @@
     void     progress(int curItem, int totalItems, int percent);
 
     void     showHiddenFilesChanged();
-    void     onlyMTPPathsChanged();
+    void     onlyAllowedPathsChanged();
     void     sortByChanged();
     void     sortOrderChanged();
     void     clipboardChanged();
@@ -464,7 +476,7 @@
 
 private:
     bool                mShowHiddenFiles;
-    bool                mOnlyMTPPaths;
+    bool                mOnlyAllowedPaths;
     SortBy              mSortBy;
     SortOrder           mSortOrder;
     CompareFunction     mCompareFunction;
@@ -481,6 +493,8 @@
 #ifndef DO_NOT_USE_TAG_LIB
     QVariant getAudioMetaData(const QFileInfo& fi, int role) const;
 #endif
+    QSet<QString> m_allowedDirs;
+
 //[0]
 
 #if defined(REGRESSION_TEST_FOLDERLISTMODEL)    
@@ -492,7 +506,7 @@
 
     bool allowAccess(const DirItemInfo &fi) const;
     bool allowAccess(const QString &path) const;
-    bool isMTPPath(const QString &absolutePath) const;
+    bool isAllowedPath(const QString &absolutePath) const;
 };
 
 

=== modified file 'src/plugin/placesmodel/CMakeLists.txt'
--- src/plugin/placesmodel/CMakeLists.txt	2014-06-21 21:59:52 +0000
+++ src/plugin/placesmodel/CMakeLists.txt	2015-01-03 17:18:33 +0000
@@ -9,6 +9,8 @@
     placesmodel.h
     placesmodel_plugin.cpp
     placesmodel_plugin.h
+    qmtabparser.h
+    qmtabparser.cpp
 )
 
 add_library(PlacesModel MODULE

=== modified file 'src/plugin/placesmodel/placesmodel.cpp'
--- src/plugin/placesmodel/placesmodel.cpp	2014-06-21 21:59:52 +0000
+++ src/plugin/placesmodel/placesmodel.cpp	2015-01-03 17:18:33 +0000
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Author : David Planella <[e-mail]>
+ *          Arto Jalkanen <[e-mail]>
  */
 
 #include "placesmodel.h"
@@ -24,10 +25,9 @@
 #include <QStandardPaths>
 #include <QDebug>
 
-PlacesModel::PlacesModel(QAbstractListModel *parent) :
+PlacesModel::PlacesModel(QObject *parent) :
     QAbstractListModel(parent)
 {
-
     QStringList defaultLocations;
     // Set the storage location to a path that works well
     // with app isolation
@@ -55,12 +55,74 @@
         qDebug() << "Location: " << location;
     }
 
+    initNewUserMountsWatcher();
+    rescanMtab();
 }
 
 PlacesModel::~PlacesModel() {
 
 }
 
+void
+PlacesModel::initNewUserMountsWatcher() {
+    m_newUserMountsWatcher = new QFileSystemWatcher(this);
+
+    qDebug() << Q_FUNC_INFO << "Start watching mtab file for new mounts" << m_mtabParser.path();
+
+    m_newUserMountsWatcher->addPath(m_mtabParser.path());
+
+    connect(m_newUserMountsWatcher, &QFileSystemWatcher::fileChanged, this, &PlacesModel::mtabChanged);
+}
+
+void
+PlacesModel::mtabChanged(const QString &path) {
+    qDebug() << Q_FUNC_INFO << "file changed in " << path;
+    rescanMtab();
+    // Since old mtab file is replaced with new contents, must readd filesystem watcher
+    m_newUserMountsWatcher->removePath(path);
+    m_newUserMountsWatcher->addPath(path);
+}
+
+void
+PlacesModel::rescanMtab() {
+    const QString& path = m_mtabParser.path();
+    qDebug() << Q_FUNC_INFO << "rescanning mtab" << path;
+
+    QList<QMtabEntry> entries = m_mtabParser.parseEntries();
+
+    QSet<QString> userMounts;
+
+    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())
+        {
+            qDebug() << Q_FUNC_INFO << "Adding as userMount directory dir" << e.dir;
+            userMounts << e.dir;
+        }
+    }
+
+    QSet<QString> addedMounts = QSet<QString>(userMounts).subtract(m_userMounts);
+    QSet<QString> removedMounts = QSet<QString>(m_userMounts).subtract(userMounts);
+
+    m_userMounts = userMounts;
+
+    foreach (QString addedMount, addedMounts) {
+        qDebug() << Q_FUNC_INFO << "user mount added: " << addedMount;
+        addLocationWithoutStoring(addedMount);
+        emit userMountAdded(addedMount);
+    }
+
+    foreach (QString removedMount, removedMounts) {
+        qDebug() << Q_FUNC_INFO << "user mount removed: " << removedMount;
+        int index = m_locations.indexOf(removedMount);
+        if (index > -1) {
+            removeItemWithoutStoring(index);
+        }
+        emit userMountRemoved(removedMount);
+    }
+}
+
 QString PlacesModel::standardLocation(QStandardPaths::StandardLocation location) const
 {
     QStringList locations = QStandardPaths::standardLocations(location);
@@ -132,6 +194,14 @@
 
 void PlacesModel::removeItem(int indexToRemove)
 {
+    removeItemWithoutStoring(indexToRemove);
+
+    // Remove the location permanently
+    m_settings->setValue("storedLocations", m_locations);
+}
+
+void PlacesModel::removeItemWithoutStoring(int indexToRemove)
+{
 
     // Tell Qt that we're going to be changing the model
     // There's no tree-parent, first new item will be at
@@ -145,13 +215,18 @@
     // it can update the UI and everything else to reflect
     // the new state
     endRemoveRows();
-
-    // Remove the location permanently
-    m_settings->setValue("storedLocations", m_locations);
 }
 
 void PlacesModel::addLocation(const QString &location)
 {
+    if (addLocationWithoutStoring(location)) {
+        // Store the location permanently
+        m_settings->setValue("storedLocations", m_locations);
+    }
+}
+
+bool PlacesModel::addLocationWithoutStoring(const QString &location)
+{
     // Do not allow for duplicates
     if (!m_locations.contains(location)) {
         // Tell Qt that we're going to be changing the model
@@ -167,8 +242,7 @@
         // it can update the UI and everything else to reflect
         // the new state
         endInsertRows();
-
-        // Store the location permanently
-        m_settings->setValue("storedLocations", m_locations);
+        return true;
     }
+    return false;
 }

=== modified file 'src/plugin/placesmodel/placesmodel.h'
--- src/plugin/placesmodel/placesmodel.h	2014-06-21 21:59:52 +0000
+++ src/plugin/placesmodel/placesmodel.h	2015-01-03 17:18:33 +0000
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Author : David Planella <[e-mail]>
+ *          Arto Jalkanen <[e-mail]>
  */
 
 #ifndef PLACESMODEL_H
@@ -23,6 +24,11 @@
 #include <QAbstractListModel>
 #include <QStandardPaths>
 #include <QSettings>
+#include <QFileSystemWatcher>
+#include <QTimer>
+#include <QSet>
+
+#include "qmtabparser.h"
 
 class PlacesModel : public QAbstractListModel
 {
@@ -36,7 +42,7 @@
     Q_PROPERTY(QString locationVideos READ locationVideos CONSTANT)
 
 public:
-    explicit PlacesModel(QAbstractListModel *parent = 0);
+    explicit PlacesModel(QObject *parent = 0);
     ~PlacesModel();
     QString locationHome() const;
     QString locationDocuments() const;
@@ -48,14 +54,34 @@
     QVariant data(const QModelIndex &index, int role) const override;
     QHash<int, QByteArray> roleNames() const override;
 
+signals:
+    void userMountAdded(const QString &path);
+    void userMountRemoved(const QString &paht);
+
 public slots:
     void addLocation(const QString &location);
     void removeItem(int indexToRemove);
+    inline bool isUserMountDirectory(const QString location) {
+        return m_userMounts.contains(location);
+    }
+
+private slots:
+    void mtabChanged(const QString &path);
+    void rescanMtab();
 
 private:
+    void initNewUserMountsWatcher();
+    // Returns true if location was not known before, and false if it was known
+    bool addLocationWithoutStoring(const QString &location);
+    // Returns true if location was not known before, and false if it was known
+    void removeItemWithoutStoring(int itemToRemove);
+
+    QMtabParser m_mtabParser;
     QString standardLocation(QStandardPaths::StandardLocation location) const;
     QStringList m_locations;
     QSettings *m_settings;
+    QFileSystemWatcher *m_newUserMountsWatcher;
+    QSet<QString> m_userMounts;
 };
 
 #endif // PLACESMODEL_H

=== added file 'src/plugin/placesmodel/qmtabparser.cpp'
--- src/plugin/placesmodel/qmtabparser.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/placesmodel/qmtabparser.cpp	2015-01-03 17:18:33 +0000
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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/>.
+ *
+ * Author : Arto Jalkanen <[e-mail]>
+ *          Carlos J Mazieri <[e-mail]>
+ */
+
+#include <qmtabparser.h>
+
+#include <mntent.h>
+
+#include <QFileInfo>
+#include <QStringList>
+
+class MtabFileGuard {
+    FILE *mtabFile;
+
+public:
+    MtabFileGuard(FILE *f) {
+        mtabFile = f;
+    }
+    ~MtabFileGuard() {
+        endmntent(mtabFile);
+    }
+};
+
+QMtabParser::QMtabParser(const QString& path, QObject *parent)
+    : QObject(parent) {
+    m_path = path.isEmpty() ? _PATH_MOUNTED : path;
+}
+
+QMtabParser::~QMtabParser() {}
+
+QList<QMtabEntry>
+QMtabParser::parseEntries() {
+    QList<QMtabEntry> entries;
+
+    FILE *f = setmntent(m_path.toLocal8Bit().data(), "r");
+    if (f == 0) {
+        return entries;
+    }
+
+    MtabFileGuard guard(f);
+
+    struct mntent entStorage;
+    char buffer[1024];
+    while (mntent *ent = getmntent_r(f, &entStorage, buffer, 1024)) {
+        QMtabEntry entry;
+        entry.fsName = ent->mnt_fsname;
+        entry.dir = ent->mnt_dir;
+        entry.type = ent->mnt_type;
+        entry.opts = ent->mnt_opts;
+        entry.freq = ent->mnt_freq;
+        entry.passno = ent->mnt_passno;
+        if (fsHasUserContent(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;
+}

=== added file 'src/plugin/placesmodel/qmtabparser.h'
--- src/plugin/placesmodel/qmtabparser.h	1970-01-01 00:00:00 +0000
+++ src/plugin/placesmodel/qmtabparser.h	2015-01-03 17:18:33 +0000
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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/>.
+ *
+ * Author : Arto Jalkanen <[e-mail]>
+ *          Carlos J Mazieri <[e-mail]>
+ */
+
+#ifndef QMTABPARSER_H
+#define QMTABPARSER_H
+
+#include <QObject>
+
+struct QMtabEntry {
+    QString fsName;
+    QString dir;
+    QString type;
+    QString opts;
+    int freq;
+    int passno;
+};
+
+class QMtabParser : public QObject
+{
+    Q_OBJECT
+    QString m_path;
+
+public:
+    explicit QMtabParser(const QString& path = QString(), QObject *parent = 0);
+    ~QMtabParser();
+
+    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
+
+
+