no need to request update again: if there is no update - skip

musescore · Feb 18, 2025 · f3d36dd · f3d36dd
1 parent 289c418
commit f3d36dd
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 17 deletions.
diff --git a/src/framework/stubs/update/musesoundscheckupdatescenariostub.cpp b/src/framework/stubs/update/musesoundscheckupdatescenariostub.cpp
@@ -23,6 +23,11 @@
 
 using namespace muse::update;
 
-void MuseSoundsCheckUpdateScenarioStub::checkForUpdate()
+bool MuseSoundsCheckUpdateScenarioStub::hasUpdate() const
+{
+    return false;
+}
+
+void MuseSoundsCheckUpdateScenarioStub::showUpdate()
 {
 }
diff --git a/src/framework/stubs/update/musesoundscheckupdatescenariostub.h b/src/framework/stubs/update/musesoundscheckupdatescenariostub.h
@@ -28,7 +28,8 @@ namespace muse::update {
 class MuseSoundsCheckUpdateScenarioStub : public IMuseSoundsCheckUpdateScenario
 {
 public:
-    void checkForUpdate() override;
+    bool hasUpdate() const override;
+    void showUpdate() override;
 };
 }
 

diff --git a/src/framework/update/imusesoundscheckupdatescenario.h b/src/framework/update/imusesoundscheckupdatescenario.h
@@ -32,7 +32,8 @@ class IMuseSoundsCheckUpdateScenario : MODULE_EXPORT_INTERFACE
 public:
     virtual ~IMuseSoundsCheckUpdateScenario() = default;
 
-    virtual void checkForUpdate() = 0;
+    virtual bool hasUpdate() const = 0;
+    virtual void showUpdate() = 0;
 };
 }
 

diff --git a/src/framework/update/internal/musesoundscheckupdatescenario.cpp b/src/framework/update/internal/musesoundscheckupdatescenario.cpp
@@ -48,29 +48,33 @@ void MuseSoundsCheckUpdateScenario::delayedInit()
     }
 }
 
-void MuseSoundsCheckUpdateScenario::checkForUpdate()
+bool MuseSoundsCheckUpdateScenario::hasUpdate() const
 {
     if (isCheckStarted() || !service()->needCheckForUpdate()) {
-        return;
+        return false;
     }
 
     RetVal<ReleaseInfo> lastCheckResult = service()->lastCheckResult();
-    if (lastCheckResult.ret) {
-        //! NOTE: recheck if we already shown the info
-        if (shouldIgnoreUpdate(lastCheckResult.val)) {
-            return;
-        }
-
-        showReleaseInfo(lastCheckResult.val);
-        return;
+    if (!lastCheckResult.ret) {
+        return false;
     }
 
     bool noUpdate = lastCheckResult.ret.code() == static_cast<int>(Err::NoUpdate);
     if (noUpdate) {
+        return false;
+    }
+
+    return !shouldIgnoreUpdate(lastCheckResult.val);
+}
+
+void MuseSoundsCheckUpdateScenario::showUpdate()
+{
+    RetVal<ReleaseInfo> lastCheckResult = service()->lastCheckResult();
+    if (!lastCheckResult.ret) {
         return;
     }
 
-    doCheckForUpdate(true);
+    showReleaseInfo(lastCheckResult.val);
 }
 
 bool MuseSoundsCheckUpdateScenario::isCheckStarted() const

diff --git a/src/framework/update/internal/musesoundscheckupdatescenario.h b/src/framework/update/internal/musesoundscheckupdatescenario.h
@@ -32,7 +32,6 @@
 #include "../iupdateconfiguration.h"
 #include "../imusesoundscheckupdateservice.h"
 
-#include "../iappupdateservice.h"
 #include "../imusesoundscheckupdatescenario.h"
 
 namespace muse::update {
@@ -51,7 +50,8 @@ class MuseSoundsCheckUpdateScenario : public IMuseSoundsCheckUpdateScenario, pub
 
     void delayedInit();
 
-    void checkForUpdate() override;
+    bool hasUpdate() const override;
+    void showUpdate() override;
 
 private:
     bool isCheckStarted() const;

diff --git a/src/project/internal/projectactionscontroller.cpp b/src/project/internal/projectactionscontroller.cpp
@@ -393,7 +393,10 @@ Ret ProjectActionsController::doFinishOpenProject()
     //! Show Tours & Muse Sounds update if need
     auto showToursAndMuseSoundsUpdate = [=](){
         QTimer::singleShot(1000, [this]() {
-            museSoundsCheckUpdateScenario()->checkForUpdate();
+            if (museSoundsCheckUpdateScenario()->hasUpdate()) {
+                museSoundsCheckUpdateScenario()->showUpdate();
+            }
+
             toursService()->onEvent(u"project_opened");
         });
     };