Changeset 94643 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 20, 2022 9:08:37 AM (3 years ago)

Author:

vboxsync

Message:

Main/Update check: Big overhaul of the API and functionality.

• Now uses VBOX_WITH_UPDATE_AGENT to entirely disable the feature (enabled by default).
• Main: Uses new (more abstract) API as proposed in the latest UML docs.
• Main: Added support for several events.
• Main: Added support for update severities, order and dependencies (all optional).
• Settings/XML: Now has own "Updates" branch to also cover other updatable components (later); not part of the system properties anymore.
• Prepared for GuestAdditions and ExtPack updates.
• FE/Qt: Adapted to new API.
• FE/VBoxManage: Adapted to new API; uses more uniform (common) synopsis "modify" and "list" for modifying and listing (showing) update settings.
• Docs: Fixed various typos, extended documentation.

Work in progress. bugref:7983

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/notificationcenter/UINotificationObjects.cpp (modified) (3 diffs)
• src/notificationcenter/UINotificationObjects.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -255 +255 @@
         $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE) \
         $(if $(VBOX_WITH_QHELP_VIEWER),VBOX_WITH_QHELP_VIEWER) \
-        $(if $(VBOX_WITH_SDS),VBOX_WITH_SDS,)
+        $(if $(VBOX_WITH_SDS),VBOX_WITH_SDS,) \
+        $(if $(VBOX_WITH_UPDATE_AGENT),VBOX_WITH_UPDATE_AGENT)
 ifdef VBOX_WITH_DEBUGGER_GUI
  UICommon_DEFS        += VBOX_WITH_DEBUGGER_GUI

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.cpp

@@ -4316 +4316 @@
     connect(this, &UINotificationProgress::sigProgressFinished,
             this, &UINotificationProgressNewVersionChecker::sltHandleProgressFinished);
-    CHost comHost = uiCommon().virtualBox().GetHost();
+
+#ifdef VBOX_WITH_UPDATE_AGENT
+    CHost comHost = uiCommon().host();
     if (!comHost.isNull())
-        m_comUpdateChecker = comHost.GetUpdate();
+        m_comUpdateHost = comHost.GetUpdateHost();
+#endif /* VBOX_WITH_UPDATE_AGENT */
 }
 
 QString UINotificationProgressNewVersionChecker::name() const
 {
-    return UINotificationProgress::tr("Check for New Version ...");
+#ifdef VBOX_WITH_UPDATE_AGENT
+    if (m_comUpdateHost.isOk())
+        return UINotificationProgress::tr("Checking for new version of %s ...", m_comUpdateHost.GetName().toLocal8Bit().data());
+#endif /* VBOX_WITH_UPDATE_AGENT */
+    return UINotificationProgress::tr("Checking for new version ...");
 }
 
@@ -4333 +4340 @@
 CProgress UINotificationProgressNewVersionChecker::createProgress(COMResult &comResult)
 {
-    if (!m_comUpdateChecker.isOk())
+#ifdef VBOX_WITH_UPDATE_AGENT
+    if (!m_comUpdateHost.isOk())
         return CProgress();
 
-    CProgress comProgress = m_comUpdateChecker.UpdateCheck(KUpdateCheckType_VirtualBox);
-    comResult = m_comUpdateChecker;
-
-    return comProgress;
+    CProgress comProgress = m_comUpdateHost.Check();
+    comResult = m_comUpdateHost;
+
+    return comProgress;
+#else
+    return CProgress();
+#endif /* VBOX_WITH_UPDATE_AGENT */
 }
 
 void UINotificationProgressNewVersionChecker::sltHandleProgressFinished()
 {
-    if (m_comUpdateChecker.isNull() && !m_comUpdateChecker.isOk())
+#ifdef VBOX_WITH_UPDATE_AGENT
+    if (m_comUpdateHost.isNull() && !m_comUpdateHost.isOk())
         return;
 
-    bool fUpdateAvailable = m_comUpdateChecker.GetUpdateResponse();
-    if (!m_comUpdateChecker.isOk())
+    bool const fUpdateAvailable = m_comUpdateHost.GetState() == UpdateState_Available; /** @todo Handle other states. */
+    if (!m_comUpdateHost.isOk())
         return;
 
     if (fUpdateAvailable)
     {
-        QString strVersion = m_comUpdateChecker.GetUpdateVersion();
-        if (!m_comUpdateChecker.isOk())
+        QString strVersion = m_comUpdateHost.GetVersion();
+        if (!m_comUpdateHost.isOk())
             return;
 
-        QString strURL = m_comUpdateChecker.GetUpdateURL();
-        if (!m_comUpdateChecker.isOk())
+        QString strURL = m_comUpdateHost.GetDownloadUrl();
+        if (!m_comUpdateHost.isOk())
             return;
 
@@ -4368 +4380 @@
             UINotificationMessage::showUpdateNotFound();
     }
+#endif /* VBOX_WITH_UPDATE_AGENT */
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.h

@@ -42 +42 @@
 #include "CGuest.h"
 #include "CHost.h"
-#include "CHostUpdate.h"
 #include "CHostNetworkInterface.h"
 #include "CMachine.h"
@@ -49 +48 @@
 #include "CSnapshot.h"
 #include "CStringArray.h"
+#ifdef VBOX_WITH_UPDATE_AGENT
+# include "CUpdateAgent.h"
+#endif
 #include "CVFSExplorer.h"
 #include "CVirtualSystemDescription.h"
@@ -2709 +2711 @@
 private:
 
-    CHostUpdate m_comUpdateChecker;
+#ifdef VBOX_WITH_UPDATE_AGENT
+    CUpdateAgent m_comUpdateHost;
+#endif
     /** Holds whether this customer has forced privelegies. */
-    bool        m_fForcedCall;
+    bool         m_fForcedCall;
 };