Changeset 71135 in vbox

Timestamp:

Feb 27, 2018 12:56:00 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt bugref:6699 Adding 'stat' command to guet control CLI

Location:

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

Files:

• UIGuestControlConsole.cpp (modified) (1 diff)
• UIGuestControlInterface.cpp (modified) (9 diffs)
• UIGuestControlInterface.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIGuestControlConsole.cpp

@@ -106 +106 @@
         case Qt::Key_Right:
         {
-            if (textCursor().positionInBlock() > m_strPrompt.length())
+            if (textCursor().positionInBlock() > m_strPrompt.length()-1)
                 QPlainTextEdit::keyPressEvent(pEvent);
             break;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIGuestControlInterface.cpp

@@ -28 +28 @@
 # include "CGuestProcess.h"
 # include "CGuestSession.h"
-
-#include <iprt/getopt.h>
+# include "CGuestFsObjInfo.h"
+
+/* Misc. includes: */
+# include <iprt/getopt.h>
+
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
@@ -44 +47 @@
     m_strStatus.append(strError);  \
     return false;                  \
+    }
+
+#define RETURN_MESSAGE(strMessage)   \
+    {                                \
+    m_strStatus.append(strMessage);  \
+    return true;                     \
     }
 
@@ -108 +117 @@
     QString m_strExePath;
     QString m_strSessionName;
-    QString m_strDirectoryPath;
+    QString m_strPath;
     ULONG   m_uSessionId;
     QString m_strDomain;
@@ -134 +143 @@
                 "                                   [-P|--parents] [<guest directory>\n"
                 "                                   [--sessionid <id> |  [sessionname <name>]]\n"
+                "stat                            [common-options]\n"
+                "                                   [--sessionid <id> |  [sessionname <name>]]\n"
                 )
 {
@@ -176 +187 @@
                 if (!pathFound)
                 {
-                    commandData.m_strDirectoryPath = ValueUnion.psz;
+                    commandData.m_strPath = ValueUnion.psz;
                     pathFound = true;
                 }
@@ -188 +199 @@
         }
     }
-    if (commandData.m_strDirectoryPath.isEmpty())
+    if (commandData.m_strPath.isEmpty())
         RETURN_ERROR(QString(m_strHelp).append("Syntax error! No path is given\n"));
 
@@ -203 +214 @@
         creationFlags.push_back(KDirectoryCreateFlag_Parents);
 
-    guestSession.DirectoryCreate(commandData.m_strDirectoryPath, 0 /*ULONG aMode*/, creationFlags);
+    guestSession.DirectoryCreate(commandData.m_strPath, 0 /*ULONG aMode*/, creationFlags);
 
     //startProcess(commandData, guestSession);
     return true;
+}
+
+bool UIGuestControlInterface::handleStat(int argc, char** argv)
+{
+
+    CommandData commandData;
+
+    static const RTGETOPTDEF s_aOptions[] =
+    {
+        GCTLCMD_COMMON_OPTION_DEFS()
+        { "--sessionname",                  GCTLCMD_COMMON_OPT_SESSION_NAME,          RTGETOPT_REQ_STRING  },
+        { "--sessionid",                    GCTLCMD_COMMON_OPT_SESSION_ID,            RTGETOPT_REQ_UINT32  }
+    };
+
+    int ch;
+    bool pathFound = false;
+    RTGETOPTUNION ValueUnion;
+    RTGETOPTSTATE GetState;
+    RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 1 /* ignore 0th element (command) */, 0);
+    while ((ch = RTGetOpt(&GetState, &ValueUnion)))
+    {
+        switch (ch)
+        {
+            HANDLE_COMMON_OPTION_DEFS()
+            case GCTLCMD_COMMON_OPT_SESSION_NAME:
+                commandData.m_bSessionNameGiven = true;
+                commandData.m_strSessionName  = ValueUnion.psz;
+                break;
+            case GCTLCMD_COMMON_OPT_SESSION_ID:
+                commandData.m_bSessionIdGiven = true;
+                commandData.m_uSessionId  = ValueUnion.i32;
+                break;
+            case 'P':
+                commandData.m_bCreateParentDirectories  = true;
+                break;
+            case VINF_GETOPT_NOT_OPTION:
+                if (!pathFound)
+                {
+                    commandData.m_strPath = ValueUnion.psz;
+                    pathFound = true;
+                }
+                /* Allow only a single NOT_OPTION */
+                else
+                    RETURN_ERROR(generateErrorString(ch, ValueUnion))
+
+                break;
+            default:
+                RETURN_ERROR(generateErrorString(ch, ValueUnion))
+        }
+    }
+    if (commandData.m_strPath.isEmpty())
+        RETURN_ERROR(QString(m_strHelp).append("Syntax error! No path is given\n"));
+
+    CGuestSession guestSession;
+    if (!findOrCreateSession(commandData, guestSession) || !guestSession.isOk())
+        return false;
+
+    bool isADirectory =
+        guestSession.DirectoryExists(commandData.m_strPath, false /*BOOL aFollowSymlinks*/);
+
+    bool isAFile = false;
+    if (!isADirectory)
+        isAFile = guestSession.FileExists(commandData.m_strPath, false /*BOOL aFollowSymlinks*/);
+
+    if (!isADirectory && !isAFile)
+        RETURN_ERROR("Specified object does not exist")
+
+    CGuestFsObjInfo fsObjectInfo = guestSession.FsObjQueryInfo(commandData.m_strPath, false /*BOOL aFollowSymlinks*/);
+    if (!fsObjectInfo.isOk())
+        RETURN_ERROR("Cannot get object info");
+
+    QString strObjectInfo = getFsObjInfoString(fsObjectInfo);
+
+    RETURN_MESSAGE(strObjectInfo);
 }
 
@@ -376 +461 @@
     m_subCommandHandlers.insert("help" , &UIGuestControlInterface::handleHelp);
     m_subCommandHandlers.insert("mkdir" , &UIGuestControlInterface::handleMkdir);
+    m_subCommandHandlers.insert("stat" , &UIGuestControlInterface::handleStat);
 }
 
@@ -483 +569 @@
     return true;
 }
+
+QString UIGuestControlInterface::getFsObjInfoString(const CGuestFsObjInfo &fsObjectInfo) const
+{
+    QString strInfo;
+    if (!fsObjectInfo.isOk())
+        return strInfo;
+    strInfo.append(QString("Name %1 \n").arg(fsObjectInfo.GetName()));
+    strInfo.append(QString("Size %1 \n").arg(fsObjectInfo.GetObjectSize()));
+    strInfo.append(QString("User %1 \n").arg(fsObjectInfo.GetUserName()));
+    strInfo.append(QString("BirthTime %1 \n").arg(fsObjectInfo.GetBirthTime()));
+    strInfo.append(QString("ChangeTime %1 ").arg(fsObjectInfo.GetChangeTime()));
+
+    return strInfo;
+}

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIGuestControlInterface.h

@@ -75 +75 @@
     /* Handles the 'mkdir' session command to create guest directories */
     bool handleMkdir(int, char**);
+    bool handleStat(int, char**);
+
+    QString getFsObjInfoString(const CGuestFsObjInfo &fsObjectInfo) const;
 
     CGuest        m_comGuest;