Changeset 94685 in vbox

Timestamp:

Apr 22, 2022 10:16:24 AM (3 years ago)

Author:

vboxsync

Message:

Main/Update check: Settings fixes, added @todos. ​​bugref:7983

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageUpdateCheck.cpp (modified) (4 diffs)
• Main/include/UpdateAgentImpl.h (modified) (1 diff)
• Main/src-server/HostImpl.cpp (modified) (1 diff)
• Main/src-server/UpdateAgentImpl.cpp (modified) (9 diffs)
• Main/xml/Settings.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageUpdateCheck.cpp

@@ -184 +184 @@
                 else if (!RTStrICmp(ValueUnion.psz, "withbetas"))
                     enmChannel = UpdateChannel_WithBetas;
+                /** @todo UpdateChannel_WithTesting once supported. */
                 else if (!RTStrICmp(ValueUnion.psz, "all"))
                     enmChannel = UpdateChannel_All;
@@ -196 +197 @@
                 break;
 
+            /** @todo Add more options like proxy + repo handling etc. */
+
             default:
                 return errorGetOpt(c, &ValueUnion);
@@ -201 +204 @@
     }
 
-    if (   fEnabled == -1
-        && enmChannel != enmChannelNil
+    if (   fEnabled       == -1
+        && enmChannel     == enmChannelNil
         && cFrequencyDays == 0)
         return errorSyntax(UpdateCheck::tr("No change requested"));
@@ -221 +224 @@
         CHECK_ERROR2I_RET(pUpdateAgent, COMSETTER(CheckFrequency)(cFrequencyDays * RT_SEC_1DAY), RTEXITCODE_FAILURE);
     }
-
     return RTEXITCODE_SUCCESS;
 }

trunk/src/VBox/Main/include/UpdateAgentImpl.h

@@ -128 +128 @@
 
 protected:
-    /** @name Wrapped IUpdateAgent attributes and methods
+
+    /** @name Internal helper methods.
+     * @{ */
+    HRESULT i_commitSettings(AutoWriteLock &aLock);
+    /** @}  */
+
+protected:
+    /** @name Wrapped IUpdateAgent attributes and methods.
      * @{ */
     HRESULT checkFor(ComPtr<IProgress> &aProgress);

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -2085 +2085 @@
     RT_NOREF(data);
 #endif /* VBOX_WITH_USB */
+
+#ifdef VBOX_WITH_UPDATE_AGENT
+    rc = m->pUpdateHost->i_loadSettings(data.updateHost);
+    ComAssertComRCRet(rc, rc);
+    /** @todo Add handling for ExtPack and Guest Additions updates here later. See @bugref{7983}. */
+#endif
+
     return rc;
 }

trunk/src/VBox/Main/src-server/UpdateAgentImpl.cpp

@@ -238 +238 @@
     m->fEnabled = aEnabled;
 
-    return S_OK;
+    return i_commitSettings(alock);
 }
 
@@ -278 +278 @@
     m->uCheckFreqSeconds = aFreqSeconds;
 
-    return S_OK;
+    return i_commitSettings(alock);
 }
 
@@ -296 +296 @@
     m->enmChannel = aChannel;
 
-    return S_OK;
+    return i_commitSettings(alock);
 }
 
@@ -326 +326 @@
     m->strRepoUrl = aRepo;
 
-    return S_OK;
+        return i_commitSettings(alock);
 }
 
@@ -344 +344 @@
     m->enmProxyMode = aMode;
 
-    return S_OK;
+    return i_commitSettings(alock);
 }
 
@@ -362 +362 @@
     m->strProxyUrl = aAddress;
 
-    return S_OK;
+    return i_commitSettings(alock);
 }
 
@@ -579 +579 @@
     m->uCheckCount = aCount;
 
-    return S_OK;
+    return i_commitSettings(alock);
 }
 
@@ -591 +591 @@
     m->strLastCheckDate = aDate;
 
-    return S_OK;
+    return i_commitSettings(alock);
+}
+
+
+/*********************************************************************************************************************************
+*   Internal helper methods                                                                                                      *
+*********************************************************************************************************************************/
+
+/**
+ * Internal helper function to commit modified settings.
+ *
+ * @returns HRESULT
+ * @param   aLock               Write lock to release before committing settings.
+ */
+HRESULT UpdateAgent::i_commitSettings(AutoWriteLock &aLock)
+{
+    aLock.release();
+
+    AutoWriteLock vboxLock(m_VirtualBox COMMA_LOCKVAL_SRC_POS);
+        return m_VirtualBox->i_saveSettings();
 }
 
@@ -799 +818 @@
     m->uCheckCount++;
 
+    rc = i_commitSettings(alock);
+    AssertComRCReturn(rc, rc);
+
     strUrl.appendPrintf("&count=%RU32", m->uCheckCount);
-
-    alock.release();
 
     // Update the query URL (if necessary) with the 'channel' information.

trunk/src/VBox/Main/xml/Settings.cpp

@@ -2356 +2356 @@
                                 pelmLevel4Child->getAttributeValue("enabled", updateHost.fEnabled);
                                 pelmLevel4Child->getAttributeValue("channel", (uint32_t&)updateHost.enmChannel);
-                                pelmLevel4Child->getAttributeValue("checkFrequency", updateHost.uCheckFreqSeconds);
+                                pelmLevel4Child->getAttributeValue("checkFreqSec", updateHost.uCheckFreqSeconds);
                                 pelmLevel4Child->getAttributeValue("repoUrl", updateHost.strRepoUrl);
                                 pelmLevel4Child->getAttributeValue("proxyMode", (uint32_t&)updateHost.enmProxyMode);
@@ -2603 +2603 @@
     pelmUpdateHost->setAttribute("enabled", updateHost.fEnabled);
     pelmUpdateHost->setAttribute("channel", (int32_t)updateHost.enmChannel);
-    pelmUpdateHost->setAttribute("checkFrequency", updateHost.uCheckFreqSeconds);
+    pelmUpdateHost->setAttribute("checkFreqSec", updateHost.uCheckFreqSeconds);
     if (updateHost.strRepoUrl.length())
         pelmUpdateHost->setAttribute("repoUrl", updateHost.strRepoUrl);