Merge lp:~laney/ubuntu-system-settings/fix-storage-page into lp:ubuntu-system-settings

[Iain Lane]

Reintroduce the functionality dropped in the Qt 5.4 transition - expose the functions we need from QStorageInfo to QML, and copy over a heuristic function to tell if a drive is "internal" or not.

Someone please test this on bq.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1314
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1978/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1414
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/248
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1251
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1412
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1412/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18150

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1978/rebuild

review: Needs Fixing (continuous-integration)

[lp:~laney/ubuntu-system-settings/fix-storage-page]

1315. By Iain Lane on 2015-02-18

Remove stray warning

[Sebastien Bacher (seb128)]

Seems fine to me, works fine on my desktop. My bq runs rtm but Ken has it on vivid and said he would test, letting him deal with the status change

review: Approve

[Ken VanDine (ken-vandine)]

Works fine on my krillin. I also ran the autopilot tests on krillin, 100% pass :-D

review: Approve

=== modified file 'debian/copyright'
--- debian/copyright	2013-06-20 09:30:32 +0000
+++ debian/copyright	2015-02-18 15:35:19 +0000
@@ -9,6 +9,12 @@
  On Debian systems, the complete text of the GNU General
  Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
 
+Files: plugins/about/storageabout.cpp
+Copyright: 2013 Canonical Ltd, 2012 Digia Plc and/or its subsidiary(-ies).
+License: GPL-3
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
+
 Files: plugins/background/aeg.jpg
 Copyright: 2012 Tauno Erik
 License: CC-BY-SA-3.0

=== modified file 'plugins/about/PageComponent.qml'
--- plugins/about/PageComponent.qml	2015-02-17 10:38:26 +0000
+++ plugins/about/PageComponent.qml	2015-02-18 15:35:19 +0000
@@ -171,7 +171,7 @@
                 /* TRANSLATORS: that's the free disk space, indicated in the most appropriate storage unit */
                 value: i18n.tr("%1 free").arg(Utilities.formatSize(backendInfos.getFreeSpace("/home")))
                 progression: true
-                /*onClicked: pageStack.push(Qt.resolvedUrl("Storage.qml"))*/
+                onClicked: pageStack.push(Qt.resolvedUrl("Storage.qml"))
             }
 
             SettingsItemTitle {

=== modified file 'plugins/about/Storage.qml'
--- plugins/about/Storage.qml	2014-10-24 20:04:30 +0000
+++ plugins/about/Storage.qml	2015-02-18 15:35:19 +0000
@@ -36,15 +36,14 @@
     property var allDrives: {
         var drives = ["/"] // Always consider /
         var paths = [backendInfo.getDevicePath("/")]
-        var systemDrives = storageInfo.allLogicalDrives
+        var systemDrives = backendInfo.mountedVolumes
         for (var i = 0; i < systemDrives.length; i++) {
             var drive = systemDrives[i]
-            var type = storageInfo.driveType(drive)
             var path = backendInfo.getDevicePath(drive)
             /* only deal with the device's storage for now, external mounts
                handling would require being smarter on the categories
                computation as well and is not in the current design */
-            if ((type === StorageInfo.InternalDrive) &&
+            if (backendInfo.isInternal(drive) &&
                 paths.indexOf(path) == -1 && // Haven't seen this device before
                 path.charAt(0) === "/") { // Has a real mount point
                 drives.push(drive)
@@ -56,14 +55,15 @@
     property real diskSpace: {
         var space = 0
         for (var i = 0; i < allDrives.length; i++) {
-            space += storageInfo.totalDiskSpace(allDrives[i])
+            space += backendInfo.getTotalSpace(allDrives[i])
         }
         return space
     }
     /* Limit the free space to the user available one (see bug #1374134) */
     property real freediskSpace: {
-        return storageInfo.availableDiskSpace("/home")
+        return backendInfo.getFreeSpace("/home")
     }
+
     property real usedByUbuntu: diskSpace -
                                 freediskSpace -
                                 backendInfo.homeSize -
@@ -120,10 +120,6 @@
 
     }
 
-    StorageInfo {
-        id: storageInfo
-    }
-
     Flickable {
         id: scrollWidget
         anchors.fill: parent

=== modified file 'plugins/about/storageabout.cpp'
--- plugins/about/storageabout.cpp	2015-02-17 10:38:26 +0000
+++ plugins/about/storageabout.cpp	2015-02-18 15:35:19 +0000
@@ -1,6 +1,8 @@
 /*
  * Copyright (C) 2013 Canonical Ltd
  *
+ * isInternal() is Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+ *
  * 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.
@@ -21,6 +23,9 @@
 
 #include <QDebug>
 
+#include <mntent.h>
+#include <sys/stat.h>
+
 #include <gio/gio.h>
 #include <gio/gunixmounts.h>
 #include <glib.h>
@@ -325,25 +330,141 @@
                                 m_cancellable));
 }
 
+QStringList StorageAbout::getMountedVolumes() const
+{
+    QStringList out;
+
+    Q_FOREACH (const QStorageInfo &storage, QStorageInfo::mountedVolumes())
+        if (storage.isValid() && storage.isReady())
+            out.append(storage.rootPath());
+
+    return out;
+}
+
 QString StorageAbout::getDevicePath(const QString mount_point)
 {
     QString s_mount_point;
-
     GUnixMountEntry * g_mount_point = nullptr;
 
     if (!mount_point.isNull() && !mount_point.isEmpty()) {
-         g_mount_point = g_unix_mount_at(mount_point.toLocal8Bit(), nullptr);
+        g_mount_point = g_unix_mount_at(mount_point.toLocal8Bit(), nullptr);
     }
 
     if (g_mount_point) {
         const gchar * device_path =
-                g_unix_mount_get_device_path(g_mount_point);
+            g_unix_mount_get_device_path(g_mount_point);
         s_mount_point = QString::fromLocal8Bit(device_path);
 
         g_unix_mount_free (g_mount_point);
     }
 
     return s_mount_point;
+ }
+
+/* This function was copied from QtSystems, as it was removed when the
+ * QSystemInfo class moved to Qt 5.4.
+ * 
+ * The license terms state, in part:
+ *
+ * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+ *
+ * GNU General Public License Usage
+ * Alternatively, this file may be used under the terms of the GNU
+ * General Public License version 3.0 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.  Please review the following information to
+ * ensure the GNU General Public License version 3.0 requirements will be
+ * met: http://www.gnu.org/copyleft/gpl.html.
+ *
+ */
+bool StorageAbout::isInternal(const QString &drive)
+{
+    bool ret = false;
+    FILE *fsDescription = setmntent(_PATH_MOUNTED, "r");
+    struct mntent entry;
+    char buffer[512];
+    while ((getmntent_r(fsDescription, &entry, buffer, sizeof(buffer))) != NULL) {
+        if (drive != QString::fromLatin1(entry.mnt_dir))
+            continue;
+
+        if (strcmp(entry.mnt_type, "binfmt_misc") == 0
+            || strcmp(entry.mnt_type, "debugfs") == 0
+            || strcmp(entry.mnt_type, "devpts") == 0
+            || strcmp(entry.mnt_type, "devtmpfs") == 0
+            || strcmp(entry.mnt_type, "fusectl") == 0
+            || strcmp(entry.mnt_type, "none") == 0
+            || strcmp(entry.mnt_type, "proc") == 0
+            || strcmp(entry.mnt_type, "ramfs") == 0
+            || strcmp(entry.mnt_type, "securityfs") == 0
+            || strcmp(entry.mnt_type, "sysfs") == 0
+            || strcmp(entry.mnt_type, "tmpfs") == 0
+            || strcmp(entry.mnt_type, "cifs") == 0
+            || strcmp(entry.mnt_type, "ncpfs") == 0
+            || strcmp(entry.mnt_type, "nfs") == 0
+            || strcmp(entry.mnt_type, "nfs4") == 0
+            || strcmp(entry.mnt_type, "smbfs") == 0
+            || strcmp(entry.mnt_type, "iso9660") == 0) {
+            ret = false;
+            break;
+        }
+
+        if (strcmp(entry.mnt_type, "rootfs") == 0) {
+            ret = true;
+            break;
+        }
+
+        // Now need to guess if it's InternalDrive or RemovableDrive
+        QString fsName(QString::fromLatin1(entry.mnt_fsname));
+        if (fsName.contains(QString(QStringLiteral("mapper")))) {
+            struct stat status;
+            stat(entry.mnt_fsname, &status);
+            fsName = QString(QStringLiteral("/sys/block/dm-%1/removable")).arg(status.st_rdev & 0377);
+        } else {
+            fsName = fsName.section(QString(QStringLiteral("/")), 2, 3);
+            if (!fsName.isEmpty()) {
+                if (fsName.length() > 3) {
+                    // only take the parent of the device
+                    if (fsName.at(fsName.size() -1).isDigit() && fsName.at(fsName.size() - 2) == QChar(QLatin1Char('p')))
+                        fsName.chop(2);
+                    if (fsName.startsWith(QString(QStringLiteral("mmc")))) {
+                        // "removable" attribute is set only for removable media, and we may have internal mmc cards
+                        fsName = QString(QStringLiteral("/sys/block/")) + fsName + QString(QStringLiteral("/device/uevent"));
+                        QFile file(fsName);
+                        if (file.open(QIODevice::ReadOnly)) {
+                            QByteArray buf = file.readLine();
+                            while (buf.size() > 0) {
+                                if (qstrncmp(buf.constData(), "MMC_TYPE=", 9) == 0) {
+                                    if (qstrncmp(buf.constData() + 9, "MMC", 3) == 0)
+                                        ret = true;
+                                    else if (qstrncmp(buf.constData() + 9, "SD", 2) == 0)
+                                        ret = false;
+                                    if (ret) {
+                                        endmntent(fsDescription);
+                                        return ret;
+                                    }
+                                    break;  // fall back to check the "removable" attribute
+                                }
+                                buf = file.readLine();
+                            }
+                        }
+                    }
+                }
+                fsName = QString(QStringLiteral("/sys/block/")) + fsName + QString(QStringLiteral("/removable"));
+            }
+        }
+        QFile removable(fsName);
+        char isRemovable;
+        if (!removable.open(QIODevice::ReadOnly) || 1 != removable.read(&isRemovable, 1))
+            break;
+        if (isRemovable == '0')
+            ret = true;
+        else
+            ret = false;
+        break;
+    }
+
+    endmntent(fsDescription);
+    return ret;
 }
 
 qint64 StorageAbout::getFreeSpace(const QString mount_point)
@@ -355,6 +476,15 @@
     return -1;
 }
 
+qint64 StorageAbout::getTotalSpace(const QString mount_point)
+{
+    QStorageInfo si(mount_point);
+    if (si.isValid())
+        return si.bytesTotal();
+
+    return -1;
+}
+
 StorageAbout::~StorageAbout() {
     if (m_cancellable) {
         g_cancellable_cancel(m_cancellable);

=== modified file 'plugins/about/storageabout.h'
--- plugins/about/storageabout.h	2015-02-17 10:38:26 +0000
+++ plugins/about/storageabout.h	2015-02-18 15:35:19 +0000
@@ -54,6 +54,10 @@
                READ getClickSize
                CONSTANT)
 
+    Q_PROPERTY(QStringList mountedVolumes
+               READ getMountedVolumes
+               CONSTANT)
+
     Q_PROPERTY(quint64 moviesSize
                READ getMoviesSize
                NOTIFY sizeReady)
@@ -110,8 +114,11 @@
     quint64 getPicturesSize();
     quint64 getHomeSize();
     Q_INVOKABLE void populateSizes();
+    QStringList getMountedVolumes() const;
     Q_INVOKABLE QString getDevicePath (const QString mount_point);
     Q_INVOKABLE qint64 getFreeSpace (const QString mount_point);
+    Q_INVOKABLE qint64 getTotalSpace (const QString mount_point);
+    Q_INVOKABLE bool isInternal(const QString &drive);
     bool getDeveloperMode();
     void setDeveloperMode(bool newMode);