Make the statusbar space info use the new KIO::fileSystemFreeSpace job.

REVIEW: 120137
BUG: 245226

diff --git a/src/statusbar/mountpointobserver.cpp b/src/statusbar/mountpointobserver.cpp
index 4a23be6b621320f086464c1e7cee04854a78392f..df2a4898fdfa515955b3357ac19687733c28f21c 100644 (file)
--- a/src/statusbar/mountpointobserver.cpp
+++ b/src/statusbar/mountpointobserver.cpp
@@ -17,20 +17,21 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 

+#include <KIO/FileSystemFreeSpaceJob>
+

 #include "mountpointobserver.h"
 #include "mountpointobservercache.h"
 
 #include "mountpointobserver.h"
 #include "mountpointobservercache.h"
 

-MountPointObserver::MountPointObserver(const QString& mountPoint, QObject* parent) :
+MountPointObserver::MountPointObserver(const QUrl& url, QObject* parent) :

     QObject(parent),
     QObject(parent),

-    m_mountPoint(mountPoint),
-    m_referenceCount(0),
-    m_spaceInfo(KDiskFreeSpaceInfo::freeSpaceInfo(mountPoint))
+    m_url(url),
+    m_referenceCount(0)

 {
 }
 
 {
 }
 

-MountPointObserver* MountPointObserver::observerForPath(const QString& path)
+MountPointObserver* MountPointObserver::observerForUrl(const QUrl& url)

 {
 {

-    MountPointObserver* observer = MountPointObserverCache::instance()->observerForPath(path);
+    MountPointObserver* observer = MountPointObserverCache::instance()->observerForUrl(url);

     return observer;
 }
 
     return observer;
 }
 


@@ -39,10 +40,16 @@ void MountPointObserver::update()
     if (m_referenceCount == 0) {
         delete this;
     } else {
     if (m_referenceCount == 0) {
         delete this;
     } else {

-        const KDiskFreeSpaceInfo spaceInfo = KDiskFreeSpaceInfo::freeSpaceInfo(m_mountPoint);
-        if (spaceInfo.size() != m_spaceInfo.size() || spaceInfo.available() != m_spaceInfo.available()) {
-            m_spaceInfo = spaceInfo;
-            emit spaceInfoChanged();
-        }
+        KIO::FileSystemFreeSpaceJob* job = KIO::fileSystemFreeSpace(m_url);
+        connect(job, &KIO::FileSystemFreeSpaceJob::result, this, &MountPointObserver::freeSpaceResult);
+    }
+}
+
+void MountPointObserver::freeSpaceResult(KIO::Job* job, KIO::filesize_t size, KIO::filesize_t available)
+{
+    if (!job->error()) {
+        emit spaceInfoChanged(size, available);
+    } else {
+        emit spaceInfoChanged(0, 0);

     }
 }
     }
 }

diff --git a/src/statusbar/mountpointobserver.h b/src/statusbar/mountpointobserver.h
index ac5f8ecc37391ff589d2f26e459e8ab625084b6a..c3d2aa67753836c33bc74f28d2ec941d6629dc6f 100644 (file)
--- a/src/statusbar/mountpointobserver.h
+++ b/src/statusbar/mountpointobserver.h
@@ -20,9 +20,10 @@
 #ifndef MOUNTPOINTOBSERVER_H
 #define MOUNTPOINTOBSERVER_H
 
 #ifndef MOUNTPOINTOBSERVER_H
 #define MOUNTPOINTOBSERVER_H
 

-#include <KDiskFreeSpaceInfo>
+#include <KIO/Job>

 
 #include <QObject>
 
 #include <QObject>

+#include <QUrl>

 
 /**
  * A MountPointObserver can be used to determine the free space on a mount
 
 /**
  * A MountPointObserver can be used to determine the free space on a mount


@@ -52,15 +53,10 @@ class MountPointObserver : public QObject
 {
     Q_OBJECT
 
 {
     Q_OBJECT
 

-    explicit MountPointObserver(const QString& mountPoint, QObject* parent = 0);
+    explicit MountPointObserver(const QUrl& url, QObject* parent = 0);

     virtual ~MountPointObserver() {}
 
 public:
     virtual ~MountPointObserver() {}
 
 public:

-    /**
-     * Obtains information about the available space on the observed mount point.
-     */
-    KDiskFreeSpaceInfo spaceInfo() const { return m_spaceInfo; }
-

     /**
      * Call this function to indicate that the caller intends to continue using this object. An
      * internal reference count is increased then. When the observer is not needed any more,
     /**
      * Call this function to indicate that the caller intends to continue using this object. An
      * internal reference count is increased then. When the observer is not needed any more,


@@ -80,28 +76,30 @@ public:
     }
 
     /**
     }
 
     /**

-     * Returns a MountPointObserver for the given \a path. If the caller intends to continue using
+     * Returns a MountPointObserver for the given \a url. If the caller intends to continue using

      * the returned object, it must call its ref() method.
      */
      * the returned object, it must call its ref() method.
      */

-    static MountPointObserver* observerForPath(const QString& path);
+    static MountPointObserver* observerForUrl(const QUrl& url);

 
 signals:
     /**
 
 signals:
     /**

-     * This signal is emitted if the information that spaceInfo() will return has changed.
+     * This signal is emitted when the size has been retrieved.

      */
      */

-    void spaceInfoChanged();
+    void spaceInfoChanged(quint64 size, quint64 available);

 
 public slots:
     /**
 
 public slots:
     /**

-     * If this slot is invoked, MountPointObserver checks if the available space on the observed
-     * mount point has changed, and emits spaceInfoChanged() if that is the case.
+     * If this slot is invoked, MountPointObserver starts a new driveSize job
+     * to get the drive's size.

      */
     void update();
 
      */
     void update();
 

+private slots:
+    void freeSpaceResult(KIO::Job* job, KIO::filesize_t size, KIO::filesize_t available);
+

 private:
 private:

-    const QString m_mountPoint;
+    const QUrl m_url;

     int m_referenceCount;
     int m_referenceCount;

-    KDiskFreeSpaceInfo m_spaceInfo;

 
     friend class MountPointObserverCache;
 };
 
     friend class MountPointObserverCache;
 };

diff --git a/src/statusbar/mountpointobservercache.cpp b/src/statusbar/mountpointobservercache.cpp
index aff0c8e2f051737ab9e8544107e3f12eb3c7a665..5be2a9f9553c6b45d2b0e297d703090f31e23585 100644 (file)
--- a/src/statusbar/mountpointobservercache.cpp
+++ b/src/statusbar/mountpointobservercache.cpp
@@ -51,33 +51,38 @@ MountPointObserverCache* MountPointObserverCache::instance()
     return &s_MountPointObserverCache->instance;
 }
 
     return &s_MountPointObserverCache->instance;
 }
 

-MountPointObserver* MountPointObserverCache::observerForPath(const QString& path)
+MountPointObserver* MountPointObserverCache::observerForUrl(const QUrl& url)

 {
 {

-    // Try to share the observer with other paths that have the same mount point.
-    QString mountPointPath;
-    KMountPoint::Ptr mountPoint = KMountPoint::currentMountPoints().findByPath(path);
-    if (mountPoint) {
-        mountPointPath = mountPoint->mountPoint();
+    QUrl cachedObserverUrl;
+    // If the url is a local path we can extract the root dir by checking the mount points.
+    if (url.isLocalFile()) {
+        // Try to share the observer with other paths that have the same mount point.
+        KMountPoint::Ptr mountPoint = KMountPoint::currentMountPoints().findByPath(url.toLocalFile());
+        if (mountPoint) {
+            cachedObserverUrl = QUrl::fromLocalFile(mountPoint->mountPoint());
+        } else {
+            // Even if determining the mount point failed, the observer might still
+            // be able to retrieve information about the url.
+            cachedObserverUrl = url.toLocalFile();
+        }

     } else {
     } else {

-        // Even if determining the mount point failed, KDiskFreeSpaceInfo might still
-        // be able to retrieve information about the path.
-        mountPointPath = path;
+        cachedObserverUrl = url.url();

     }
 
     }
 

-    MountPointObserver* observer = m_observerForMountPoint.value(mountPointPath);
+    MountPointObserver* observer = m_observerForMountPoint.value(cachedObserverUrl);

     if (!observer) {
     if (!observer) {

-        observer = new MountPointObserver(mountPointPath, this);
-        m_observerForMountPoint.insert(mountPointPath, observer);
-        m_mountPointForObserver.insert(observer, mountPointPath);
+        observer = new MountPointObserver(cachedObserverUrl, this);
+        m_observerForMountPoint.insert(cachedObserverUrl, observer);
+        m_mountPointForObserver.insert(observer, cachedObserverUrl);

         Q_ASSERT(m_observerForMountPoint.count() == m_mountPointForObserver.count());
 
         Q_ASSERT(m_observerForMountPoint.count() == m_mountPointForObserver.count());
 

-        connect(observer, SIGNAL(destroyed(QObject*)), this, SLOT(slotObserverDestroyed(QObject*)));
+        connect(observer, &MountPointObserver::destroyed, this, &MountPointObserverCache::slotObserverDestroyed);

 
         if (!m_updateTimer->isActive()) {
             m_updateTimer->start(10000);
         }
 
 
         if (!m_updateTimer->isActive()) {
             m_updateTimer->start(10000);
         }
 

-        connect(m_updateTimer, SIGNAL(timeout()), observer, SLOT(update()));
+        connect(m_updateTimer, &QTimer::timeout, observer, &MountPointObserver::update);

     }
 
     return observer;
     }
 
     return observer;


@@ -86,9 +91,9 @@ MountPointObserver* MountPointObserverCache::observerForPath(const QString& path
 void MountPointObserverCache::slotObserverDestroyed(QObject* observer)
 {
     Q_ASSERT(m_mountPointForObserver.contains(observer));
 void MountPointObserverCache::slotObserverDestroyed(QObject* observer)
 {
     Q_ASSERT(m_mountPointForObserver.contains(observer));

-    const QString& path = m_mountPointForObserver.value(observer);
-    Q_ASSERT(m_observerForMountPoint.contains(path));
-    m_observerForMountPoint.remove(path);
+    const QUrl& url = m_mountPointForObserver.value(observer);
+    Q_ASSERT(m_observerForMountPoint.contains(url));
+    m_observerForMountPoint.remove(url);

     m_mountPointForObserver.remove(observer);
 
     Q_ASSERT(m_observerForMountPoint.count() == m_mountPointForObserver.count());
     m_mountPointForObserver.remove(observer);
 
     Q_ASSERT(m_observerForMountPoint.count() == m_mountPointForObserver.count());

diff --git a/src/statusbar/mountpointobservercache.h b/src/statusbar/mountpointobservercache.h
index 425000645b7eb4b90aafca6fef8d62f3292e53a4..8a1496d8932b421d41e75924cfb9d16a5dc822b1 100644 (file)
--- a/src/statusbar/mountpointobservercache.h
+++ b/src/statusbar/mountpointobservercache.h
@@ -37,9 +37,9 @@ public:
     static MountPointObserverCache* instance();
 
     /**
     static MountPointObserverCache* instance();
 
     /**

-     * Returns a MountPointObserver for the given \a path. A new observer is created if necessary.
+     * Returns a MountPointObserver for the given \a url. A new observer is created if necessary.

      */
      */

-    MountPointObserver* observerForPath(const QString& path);
+    MountPointObserver* observerForUrl(const QUrl& url);

 
 private slots:
     /**
 
 private slots:
     /**


@@ -48,8 +48,8 @@ private slots:
     void slotObserverDestroyed(QObject* observer);
 
 private:
     void slotObserverDestroyed(QObject* observer);
 
 private:

-    QHash<QString, MountPointObserver*> m_observerForMountPoint;
-    QHash<QObject*, QString> m_mountPointForObserver;
+    QHash<QUrl, MountPointObserver*> m_observerForMountPoint;
+    QHash<QObject*, QUrl> m_mountPointForObserver;

     QTimer* m_updateTimer;
 
     friend class MountPointObserverCacheSingleton;
     QTimer* m_updateTimer;
 
     friend class MountPointObserverCacheSingleton;

diff --git a/src/statusbar/spaceinfoobserver.cpp b/src/statusbar/spaceinfoobserver.cpp
index 9125a9308a51fc8f406f12d931f7380e06e8f5e9..10efdd7fb69d53b499a890a9aee43947c26221dc 100644 (file)
--- a/src/statusbar/spaceinfoobserver.cpp
+++ b/src/statusbar/spaceinfoobserver.cpp
@@ -25,13 +25,14 @@
 
 SpaceInfoObserver::SpaceInfoObserver(const KUrl& url, QObject* parent) :
     QObject(parent),
 
 SpaceInfoObserver::SpaceInfoObserver(const KUrl& url, QObject* parent) :
     QObject(parent),

-    m_mountPointObserver(0)
+    m_mountPointObserver(0),
+    m_dataSize(0),
+    m_dataAvailable(0)

 {
 {

-    if (url.isLocalFile()) {
-        m_mountPointObserver = MountPointObserver::observerForPath(url.toLocalFile());
-        m_mountPointObserver->ref();
-        connect(m_mountPointObserver, SIGNAL(spaceInfoChanged()), this, SIGNAL(valuesChanged()));
-    }
+    m_mountPointObserver = MountPointObserver::observerForUrl(url);
+    m_mountPointObserver->ref();
+    connect(m_mountPointObserver, &MountPointObserver::spaceInfoChanged, this, &SpaceInfoObserver::spaceInfoChanged);
+    m_mountPointObserver->update();

 }
 
 SpaceInfoObserver::~SpaceInfoObserver()
 }
 
 SpaceInfoObserver::~SpaceInfoObserver()


@@ -44,46 +45,41 @@ SpaceInfoObserver::~SpaceInfoObserver()
 
 quint64 SpaceInfoObserver::size() const
 {
 
 quint64 SpaceInfoObserver::size() const
 {

-    if (m_mountPointObserver && m_mountPointObserver->spaceInfo().isValid()) {
-        return m_mountPointObserver->spaceInfo().size();
-    } else {
-        return 0;
-    }
+    return m_dataSize;

 }
 
 quint64 SpaceInfoObserver::available() const
 {
 }
 
 quint64 SpaceInfoObserver::available() const
 {

-    if (m_mountPointObserver && m_mountPointObserver->spaceInfo().isValid()) {
-        return m_mountPointObserver->spaceInfo().available();
-    } else {
-        return 0;
-    }
+    return m_dataAvailable;

 }
 
 void SpaceInfoObserver::setUrl(const KUrl& url)
 {
 }
 
 void SpaceInfoObserver::setUrl(const KUrl& url)
 {

-    if (url.isLocalFile()) {
-        MountPointObserver* newObserver = MountPointObserver::observerForPath(url.toLocalFile());
-        if (newObserver != m_mountPointObserver) {
-            if (m_mountPointObserver) {
-                disconnect(m_mountPointObserver, SIGNAL(spaceInfoChanged()), this, SIGNAL(valuesChanged()));
-                m_mountPointObserver->deref();
-                m_mountPointObserver = 0;
-            }
-
-            m_mountPointObserver = newObserver;
-            m_mountPointObserver->ref();
-            connect(m_mountPointObserver, SIGNAL(spaceInfoChanged()), this, SIGNAL(valuesChanged()));
-
-            emit valuesChanged();
-        }
-    } else {
+    MountPointObserver* newObserver = MountPointObserver::observerForUrl(url);
+    if (newObserver != m_mountPointObserver) {

         if (m_mountPointObserver) {
         if (m_mountPointObserver) {

-            disconnect(m_mountPointObserver, SIGNAL(spaceInfoChanged()), this, SIGNAL(valuesChanged()));
+            disconnect(m_mountPointObserver, &MountPointObserver::spaceInfoChanged, this, &SpaceInfoObserver::spaceInfoChanged);

             m_mountPointObserver->deref();
             m_mountPointObserver = 0;
             m_mountPointObserver->deref();
             m_mountPointObserver = 0;

-
-            emit valuesChanged();

         }
         }

+
+        m_mountPointObserver = newObserver;
+        m_mountPointObserver->ref();
+        connect(m_mountPointObserver, &MountPointObserver::spaceInfoChanged, this, &SpaceInfoObserver::spaceInfoChanged);
+
+        // If newObserver is cached it won't call update until the next timer update, 
+        // so update the observer now.
+        m_mountPointObserver->update();
+    }
+}
+
+void SpaceInfoObserver::spaceInfoChanged(quint64 size, quint64 available)
+{
+    // Make sure that the size has actually changed
+    if (m_dataSize != size || m_dataAvailable != available) {
+        m_dataSize = size;
+        m_dataAvailable = available;
+
+        emit valuesChanged();

     }
 }
     }
 }

diff --git a/src/statusbar/spaceinfoobserver.h b/src/statusbar/spaceinfoobserver.h
index d2fb6ebf31ad88ae7b233ebffb00c1ef48db4359..68c559ec9ecff91c1cb949d5cb5014f52a0bc95b 100644 (file)
--- a/src/statusbar/spaceinfoobserver.h
+++ b/src/statusbar/spaceinfoobserver.h
@@ -22,6 +22,8 @@
 
 #include <QObject>
 
 
 #include <QObject>
 

+#include <KIO/Job>
+

 class KUrl;
 class MountPointObserver;
 
 class KUrl;
 class MountPointObserver;
 


@@ -40,12 +42,18 @@ public:
 
 signals:
     /**
 
 signals:
     /**

-     * This signal is emitted if the information that size() and/or available() will  return has changed.
+     * This signal is emitted when the size or available space changes.

      */
     void valuesChanged();
 
      */
     void valuesChanged();
 

+private slots:
+    void spaceInfoChanged(quint64 size, quint64 available);
+

 private:
     MountPointObserver* m_mountPointObserver;
 private:
     MountPointObserver* m_mountPointObserver;

+
+    quint64 m_dataSize;
+    quint64 m_dataAvailable;

 };
 
 #endif
 };
 
 #endif

diff --git a/src/statusbar/statusbarspaceinfo.cpp b/src/statusbar/statusbarspaceinfo.cpp
index ea8b4704c02f6a9ed9e14d15882081fadbefffe4..43d9f342d704d8c83d2e2e8499a86df2b3fbaa92 100644 (file)
--- a/src/statusbar/statusbarspaceinfo.cpp
+++ b/src/statusbar/statusbarspaceinfo.cpp
@@ -57,7 +57,7 @@ void StatusBarSpaceInfo::showEvent(QShowEvent* event)
     KCapacityBar::showEvent(event);
     m_observer.reset(new SpaceInfoObserver(m_url, this));
     slotValuesChanged();
     KCapacityBar::showEvent(event);
     m_observer.reset(new SpaceInfoObserver(m_url, this));
     slotValuesChanged();

-    connect(m_observer.data(), SIGNAL(valuesChanged()), this, SLOT(slotValuesChanged()));
+    connect(m_observer.data(), &SpaceInfoObserver::valuesChanged, this, &StatusBarSpaceInfo::slotValuesChanged);

 }
 
 void StatusBarSpaceInfo::hideEvent(QHideEvent* event)
 }
 
 void StatusBarSpaceInfo::hideEvent(QHideEvent* event)