show size of files scanned so far in progress box

src/localLister.cpp

@@ -189,13 +189,15 @@ LocalLister::scan(const QByteArray &path, const QByteArray &dirname)
             continue;
         }
 
-        if (S_ISREG(statbuf.st_mode)) //file
+        if (S_ISREG(statbuf.st_mode)) { //file
 #ifndef Q_OS_WIN
-            cwd->append(ent->d_name, (statbuf.st_blocks * S_BLKSIZE));
+            const size_t size = (statbuf.st_blocks * S_BLKSIZE);
 #else
-            cwd->append(ent->d_name, statbuf.st_size);
+            const size_t size = statbuf.st_size;
 #endif
-
+            cwd->append(ent->d_name, size);
+            m_parent->m_totalSize += size;
+        }
         else if (S_ISDIR(statbuf.st_mode)) //folder
         {
             Folder *d = nullptr;

src/progressBox.cpp

@@ -25,6 +25,7 @@
 #include "mainWindow.h"
 
 #include <KColorScheme>
+#include <KFormat>
 #include <KIO/Job>
 #include <KLocalizedString>
 
@@ -45,7 +46,7 @@ ProgressBox::ProgressBox(QWidget *parent, Filelight::MainWindow *mainWindow, Fil
 
     setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
 
-    setText(999999);
+    setText(999999, 0);
     setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
     setMinimumSize(300, 300);
 
@@ -66,7 +67,7 @@ ProgressBox::start() //slot
 void
 ProgressBox::report() //slot
 {
-    setText(m_manager->files());
+    setText(m_manager->files(), m_manager->totalSize());
     update(); //repaint();
 }
 
@@ -85,9 +86,9 @@ ProgressBox::halt()
 }
 
 void
-ProgressBox::setText(int files)
+ProgressBox::setText(int files, size_t totalSize)
 {
-    m_text = i18np("%1 File", "%1 Files", files);
+    m_text = i18ncp("Scanned number of files and size so far", "%1 File, %2", "%1 Files, %2", files, KFormat().formatByteSize(totalSize));
     m_textWidth = fontMetrics().boundingRect(m_text).width();
     m_textHeight = fontMetrics().height();
 }

src/progressBox.h

@@ -38,7 +38,7 @@ class ProgressBox : public QWidget
 public:
     ProgressBox(QWidget *parent, Filelight::MainWindow *mainWindow, Filelight::ScanManager *scanManager);
 
-    void setText(int);
+    void setText(int files, size_t totalSize);
 
 public Q_SLOTS:
     void start();

src/remoteLister.cpp

@@ -112,10 +112,12 @@ void RemoteLister::onCompleted()
     const KFileItemList items = KDirLister::items();
     for (KFileItemList::ConstIterator it = items.begin(), end = items.end(); it != end; ++it)
     {
-        if (it->isDir())
+        if (it->isDir()) {
             m_store->stores += new Store(it->url(), it->name(), m_store);
-        else
+        } else {
             m_store->folder->append(it->name().toUtf8().constData(), it->size());
+            m_manager->m_totalSize += it->size();
+        }
 
         m_manager->m_files++;
     }

src/scan.h

@@ -47,8 +47,11 @@ public:
     bool start(const QUrl& path);
     bool running() const;
 
-    uint files() const {
-        return m_files;
+    int files() const {
+        return m_files.loadRelaxed();
+    }
+    size_t totalSize() const {
+        return m_totalSize.loadRelaxed();
     }
 
     void invalidateCacheFor(const QUrl &url);
@@ -66,7 +69,8 @@ Q_SIGNALS:
 
 private:
     bool m_abort;
-    uint m_files;
+    QAtomicInt m_files;
+    QAtomicInteger<size_t> m_totalSize;
 
     QMutex m_mutex;
     LocalLister *m_thread;