Changeset 71412 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 20, 2018 4:27:18 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699 Recursively compute file object statistics for directories (for host)

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl

Files:

• UIGuestControlFileTable.cpp (modified) (1 diff)
• UIGuestControlFileTable.h (modified) (1 diff)
• UIGuestFileTable.cpp (modified) (3 diffs)
• UIHostFileTable.cpp (modified) (2 diffs)
• UIHostFileTable.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlFileTable.cpp

@@ -1333 +1333 @@
 }
 
+QString UIGuestControlFileTable::humanReadableSize(ULONG64 size)
+{
+    int i = 0;
+    double dSize = size;
+    const char* units[] = {" B", " kB", " MB", " GB", " TB", " PB", " EB", " ZB", " YB"};
+    while (size > 1024) {
+        size /= 1024;
+        dSize /= (double)1024;
+        i++;
+    }
+    if (i > 8)
+        return QString();
+
+    QString strResult(QString::number(dSize, 'f', 2));
+    strResult += units[i];
+    return strResult;
+}
+
+
 #include "UIGuestControlFileTable.moc"

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlFileTable.h

@@ -182 +182 @@
     void keyPressEvent(QKeyEvent * pEvent);
     CGuestFsObjInfo guestFsObjectInfo(const QString& path, CGuestSession &comGuestSession) const;
-
+    static QString humanReadableSize(ULONG64 size);
 
     UIFileTableItem         *m_pRootItem;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestFileTable.cpp

@@ -148 +148 @@
         return;
 
-    QString userHome = UIPathOperations::sanitize(m_comGuestSession.GetUserHome());
+    QString userHome = UIPathOperations::sanitize(m_comGuestSession.GetUserHome()).remove(0,1);
+
     QList<QString> pathTrail = userHome.split(UIPathOperations::delimiter);
 
@@ -306 +307 @@
         propertyString += "<br/>";
         /* Size: */
-        propertyString += "<b>Size:</b> " + QString::number(fileInfo.GetObjectSize()) + QString(" bytes");
+        LONG64 size = fileInfo.GetObjectSize();
+        propertyString += "<b>Size:</b> " + QString::number(size) + QString(" bytes");
+        if (size >= 1024)
+            propertyString += " (" + humanReadableSize(size) + ")";
         propertyString += "<br/>";
         /* Type: */
@@ -312 +316 @@
         propertyString += "<br/>";
         /* Creation Date: */
-        //     LONG64 GetChangeTime() const;
         propertyString += "<b>Created:</b> " + QDateTime::fromMSecsSinceEpoch(fileInfo.GetChangeTime()/1000000).toString();
         propertyString += "<br/>";

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIHostFileTable.cpp

@@ -194 +194 @@
         /* Size: */
         propertyString += "<b>Size:</b> " + QString::number(fileInfo.size()) + QString(" bytes");
+        if (fileInfo.size() >= 1024)
+            propertyString += " (" + humanReadableSize(fileInfo.size()) + ")";
         propertyString += "<br/>";
         /* Type: */
@@ -207 +209 @@
         propertyString += "<b>Owner:</b> " + fileInfo.owner();
 
-
+        if (fileInfo.isDir())
+            directoryStatisticsRecursive(fileInfo.absoluteFilePath());
         return propertyString;
     }
     return QString();
 }
+
+void UIHostFileTable::directoryStatisticsRecursive(const QString &path)
+{
+    QDir dir(path);
+    if (!dir.exists())
+        return;
+
+    QFileInfoList entryList = dir.entryInfoList();
+    for (int i = 0; i < entryList.size(); ++i)
+    {
+
+        const QFileInfo &entryInfo = entryList.at(i);
+        if (entryInfo.baseName().isEmpty() || entryInfo.baseName() == "." || entryInfo.baseName() == "..")
+            continue;
+
+        if (entryInfo.isSymLink())
+            continue;
+        if (entryInfo.isDir())
+        {
+            directoryStatisticsRecursive(entryInfo.absoluteFilePath());
+        }
+    }
+}

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIHostFileTable.h

@@ -43 +43 @@
     virtual QString fsObjectPropertyString() /* override */;
 
+private:
+
+    /** Read the directory with the path @p path recursively and collect #of objects and
+        total size */
+    void directoryStatisticsRecursive(const QString &path);
+
 };