Changeset 94700 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 25, 2022 7:53:34 AM (3 years ago)

Author:

vboxsync

Message:

Main/Update check: Also expose IUpdateAgent::isCheckNeeded() in base class (as a convenience function). ​​bugref:7983

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (2 diffs)
• include/UpdateAgentImpl.h (modified) (1 diff)
• src-server/UpdateAgentImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -11345 +11345 @@
   <interface
     name="IUpdateAgent" extends="$unknown"
-    uuid="ca37acc8-420f-4c17-8131-04f07e5834c5"
+    uuid="d6c683f2-489e-4701-aa6a-d490f7bc0d7e"
     wsmap="managed"
     reservedMethods="2" reservedAttributes="4"
@@ -11528 +11528 @@
       </desc>
     </attribute>
+
+    <attribute name="isCheckNeeded" type="boolean" readonly="yes">
+      <desc>
+        Returns @c TRUE if an update check is needed, or @c FALSE if not.
+
+        <note>Compares the system's current date with the last
+          update check date and currently set check frequency.</note>
+      </desc>
+    </attribute>
+
   </interface>
 

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

@@ -165 +165 @@
     HRESULT setProxyURL(const com::Utf8Str &aAddress);
     HRESULT getLastCheckDate(com::Utf8Str &aData);
+    HRESULT getIsCheckNeeded(BOOL *aCheckNeeded);
     /** @} */
 };

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

@@ -370 +370 @@
 
     aDate = m->strLastCheckDate;
+
+    return S_OK;
+}
+
+HRESULT UpdateAgent::getIsCheckNeeded(BOOL *aCheckNeeded)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    /*
+     * Is update checking enabled at all?
+     */
+    if (!m->fEnabled)
+    {
+        *aCheckNeeded = FALSE;
+        return S_OK;
+    }
+
+    /*
+     * When was the last update?
+     */
+    if (m->strLastCheckDate.isEmpty()) /* No prior update check performed -- do so now. */
+    {
+        *aCheckNeeded = TRUE;
+        return S_OK;
+    }
+
+    RTTIMESPEC LastCheckTime;
+    if (!RTTimeSpecFromString(&LastCheckTime, Utf8Str(m->strLastCheckDate).c_str()))
+    {
+        *aCheckNeeded = TRUE; /* Invalid date set or error? Perform check. */
+        return S_OK;
+    }
+
+    /*
+     * Compare last update with how often we are supposed to check for updates.
+     */
+    if (   !m->uCheckFreqSeconds                /* Paranoia */
+        ||  m->uCheckFreqSeconds < RT_SEC_1DAY) /* This is the minimum we currently allow. */
+    {
+        /* Consider config (enable, 0 day interval) as checking once but never again.
+           We've already check since we've got a date. */
+        *aCheckNeeded = FALSE;
+        return S_OK;
+    }
+
+    uint64_t const cCheckFreqDays = m->uCheckFreqSeconds / RT_SEC_1DAY_64;
+
+    RTTIMESPEC TimeDiff;
+    RTTimeSpecSub(RTTimeNow(&TimeDiff), &LastCheckTime);
+
+    int64_t const diffLastCheckSecs = RTTimeSpecGetSeconds(&TimeDiff);
+    int64_t const diffLastCheckDays = diffLastCheckSecs / RT_SEC_1DAY_64;
+
+    /* Be as accurate as possible. */
+    *aCheckNeeded = diffLastCheckSecs >= (int64_t)m->uCheckFreqSeconds ? TRUE : FALSE;
+
+    LogRel2(("Update agent (%s): Last update %RU64 days (%RU64 seconds) ago, check frequency is every %RU64 days (%RU64 seconds) -> Check %s\n",
+             mData.m_strName.c_str(), diffLastCheckDays, diffLastCheckSecs, cCheckFreqDays, m->uCheckFreqSeconds,
+             *aCheckNeeded ? "needed" : "not needed"));
 
     return S_OK;
@@ -613 +672 @@
 }
 
-#if 0
-HRESULT UpdateAgent::getUpdateCheckNeeded(BOOL *aUpdateCheckNeeded)
-{
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    HRESULT rc;
-    ComPtr<ISystemProperties> pSystemProperties;
-    rc = m_VirtualBox->COMGETTER(SystemProperties)(pSystemProperties.asOutParam());
-    if (FAILED(rc))
-        return rc;
-
-    /*
-     * Is update checking enabled?
-     */
-    BOOL fVBoxUpdateEnabled;
-    rc = pSystemProperties->COMGETTER(VBoxUpdateEnabled)(&fVBoxUpdateEnabled);
-    if (FAILED(rc))
-        return rc;
-
-    if (!fVBoxUpdateEnabled)
-    {
-        *aUpdateCheckNeeded = false;
-        return S_OK;
-    }
-
-    /*
-     * When was the last update?
-     */
-    Bstr strVBoxUpdateLastCheckDate;
-    rc = pSystemProperties->COMGETTER(VBoxUpdateLastCheckDate)(strVBoxUpdateLastCheckDate.asOutParam());
-    if (FAILED(rc))
-        return rc;
-
-    // No prior update check performed so do so now
-    if (strVBoxUpdateLastCheckDate.isEmpty())
-    {
-        *aUpdateCheckNeeded = true;
-        return S_OK;
-    }
-
-    // convert stored timestamp to time spec
-    RTTIMESPEC LastCheckTime;
-    if (!RTTimeSpecFromString(&LastCheckTime, Utf8Str(strVBoxUpdateLastCheckDate).c_str()))
-    {
-        *aUpdateCheckNeeded = true;
-        return S_OK;
-    }
-
-    /*
-     * Compare last update with how often we are supposed to check for updates.
-     */
-    ULONG uVBoxUpdateFrequency = 0;  // value in days
-    rc = pSystemProperties->COMGETTER(VBoxUpdateFrequency)(&uVBoxUpdateFrequency);
-    if (FAILED(rc))
-        return rc;
-
-    if (!uVBoxUpdateFrequency)
-    {
-        /* Consider config (enable, 0 day interval) as checking once but never again.
-           We've already check since we've got a date. */
-        *aUpdateCheckNeeded = false;
-        return S_OK;
-    }
-    uint64_t const cSecsInXDays = uVBoxUpdateFrequency * RT_SEC_1DAY_64;
-
-    RTTIMESPEC TimeDiff;
-    RTTimeSpecSub(RTTimeNow(&TimeDiff), &LastCheckTime);
-
-    LogRelFunc(("Checking if seconds since last check (%lld) >= Number of seconds in %lu day%s (%lld)\n",
-                RTTimeSpecGetSeconds(&TimeDiff), uVBoxUpdateFrequency, uVBoxUpdateFrequency > 1 ? "s" : "", cSecsInXDays));
-
-    if (RTTimeSpecGetSeconds(&TimeDiff) >= (int64_t)cSecsInXDays)
-        *aUpdateCheckNeeded = true;
-
-    return S_OK;
-}
-#endif
-
 
 /*********************************************************************************************************************************