Replace Uri with UriQuery: Uri doesn't support params

RomanPudashkin · RomanPudashkin · commit a74ebc84cb05 · 2025-08-26T12:10:22.000+03:00
diff --git a/src/framework/autobot/internal/autobotinteractive.cpp b/src/framework/autobot/internal/autobotinteractive.cpp
@@ -223,12 +223,12 @@ Ret AutobotInteractive::isAppExists(const std::string& appIdentifier) const
     return m_real->isAppExists(appIdentifier);
 }
 
-Ret AutobotInteractive::canOpenApp(const Uri& uri) const
+Ret AutobotInteractive::canOpenApp(const UriQuery& uri) const
 {
     return m_real->canOpenApp(uri);
 }
 
-async::Promise<Ret> AutobotInteractive::openApp(const Uri& uri) const
+async::Promise<Ret> AutobotInteractive::openApp(const UriQuery& uri) const
 {
     return m_real->openApp(uri);
 }
diff --git a/src/framework/autobot/internal/autobotinteractive.h b/src/framework/autobot/internal/autobotinteractive.h
@@ -107,8 +107,8 @@ class AutobotInteractive : public IInteractive
     Ret openUrl(const QUrl& url) const override;
 
     Ret isAppExists(const std::string& appIdentifier) const override;
-    Ret canOpenApp(const Uri& uri) const override;
-    async::Promise<Ret> openApp(const Uri& uri) const override;
+    Ret canOpenApp(const UriQuery& uri) const override;
+    async::Promise<Ret> openApp(const UriQuery& uri) const override;
 
     Ret revealInFileBrowser(const io::path_t& filePath) const override;
 
diff --git a/src/framework/global/iinteractive.h b/src/framework/global/iinteractive.h
@@ -250,8 +250,8 @@ class IInteractive : MODULE_EXPORT_INTERFACE
     virtual Ret openUrl(const QUrl& url) const = 0;
 
     virtual Ret isAppExists(const std::string& appIdentifier) const = 0;
-    virtual Ret canOpenApp(const Uri& uri) const = 0;
-    virtual async::Promise<Ret> openApp(const Uri& uri) const = 0;
+    virtual Ret canOpenApp(const UriQuery& uri) const = 0;
+    virtual async::Promise<Ret> openApp(const UriQuery& uri) const = 0;
 
     /// Opens a file browser at the parent directory of filePath,
     /// and selects the file at filePath on OSs that support it
diff --git a/src/framework/global/internal/interactive.cpp b/src/framework/global/internal/interactive.cpp
@@ -504,7 +504,7 @@ Ret Interactive::isAppExists(const std::string& appIdentifier) const
 #endif
 }
 
-Ret Interactive::canOpenApp(const Uri& uri) const
+Ret Interactive::canOpenApp(const UriQuery& uri) const
 {
 #ifdef Q_OS_MACOS
     return MacOSInteractiveHelper::canOpenApp(uri);
@@ -515,7 +515,7 @@ Ret Interactive::canOpenApp(const Uri& uri) const
 #endif
 }
 
-async::Promise<Ret> Interactive::openApp(const Uri& uri) const
+async::Promise<Ret> Interactive::openApp(const UriQuery& uri) const
 {
 #ifdef Q_OS_MACOS
     return MacOSInteractiveHelper::openApp(uri);
diff --git a/src/framework/global/internal/interactive.h b/src/framework/global/internal/interactive.h
@@ -114,8 +114,8 @@ class Interactive : public IInteractive, public Injectable, public async::Asynca
     Ret openUrl(const QUrl& url) const override;
 
     Ret isAppExists(const std::string& appIdentifier) const override;
-    Ret canOpenApp(const Uri& uri) const override;
-    async::Promise<Ret> openApp(const Uri& uri) const override;
+    Ret canOpenApp(const UriQuery& uri) const override;
+    async::Promise<Ret> openApp(const UriQuery& uri) const override;
 
     Ret revealInFileBrowser(const io::path_t& filePath) const override;
 
diff --git a/src/framework/global/internal/platform/macos/macosinteractivehelper.h b/src/framework/global/internal/platform/macos/macosinteractivehelper.h
@@ -5,7 +5,7 @@
  * MuseScore
  * Music Composition & Notation
  *
- * Copyright (C) 2022 MuseScore BVBA and others
+ * Copyright (C) 2025 MuseScore BVBA and others
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -19,26 +19,24 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef MU_FRAMEWORK_MACOSINTERACTIVEHELPER_H
-#define MU_FRAMEWORK_MACOSINTERACTIVEHELPER_H
+
+#pragma once
 
 #include "io/path.h"
 #include "types/ret.h"
-#include "types/uri.h"
 
-#include "async/asyncable.h"
 #include "async/promise.h"
 
 namespace muse {
-class MacOSInteractiveHelper : public async::Asyncable
+class UriQuery;
+
+class MacOSInteractiveHelper
 {
 public:
     static bool revealInFinder(const io::path_t& filePath);
 
     static Ret isAppExists(const std::string& appIdentifier);
-    static Ret canOpenApp(const Uri& uri);
-    static async::Promise<Ret> openApp(const Uri& uri);
+    static Ret canOpenApp(const UriQuery& uri);
+    static async::Promise<Ret> openApp(const UriQuery& uri);
 };
 }
-
-#endif // MU_FRAMEWORK_MACOSINTERACTIVEHELPER_H
diff --git a/src/framework/global/internal/platform/macos/macosinteractivehelper.mm b/src/framework/global/internal/platform/macos/macosinteractivehelper.mm
@@ -26,6 +26,8 @@
 
 #include <Cocoa/Cocoa.h>
 
+#include "types/uri.h"
+
 #include "log.h"
 
 using namespace muse;
@@ -47,7 +49,7 @@
     return appURL != nil;
 }
 
-Ret MacOSInteractiveHelper::canOpenApp(const Uri& uri)
+Ret MacOSInteractiveHelper::canOpenApp(const UriQuery& uri)
 {
     if (__builtin_available(macOS 10.15, *)) {
         NSString* nsUrlString = [NSString stringWithUTF8String:uri.toString().c_str()];
@@ -67,9 +69,9 @@
     }
 }
 
-async::Promise<Ret> MacOSInteractiveHelper::openApp(const Uri& uri)
+async::Promise<Ret> MacOSInteractiveHelper::openApp(const UriQuery& uri)
 {
-    return Promise<Ret>([&uri](auto resolve, auto reject) {
+    return Promise<Ret>([uri](auto resolve, auto reject) {
         if (__builtin_available(macOS 10.15, *)) {
             NSString* nsUrlString = [NSString stringWithUTF8String:uri.toString().c_str()];
             if (nsUrlString == nil) {
diff --git a/src/framework/global/internal/platform/win/wininteractivehelper.cpp b/src/framework/global/internal/platform/win/wininteractivehelper.cpp
@@ -5,7 +5,7 @@
  * MuseScore
  * Music Composition & Notation
  *
- * Copyright (C) 2024 MuseScore BVBA and others
+ * Copyright (C) 2025 MuseScore BVBA and others
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -33,7 +33,7 @@ using namespace muse::async;
 using namespace winrt;
 using namespace Windows::System;
 
-async::Promise<Ret> WinInteractiveHelper::openApp(const Uri& uri)
+async::Promise<Ret> WinInteractiveHelper::openApp(const UriQuery& uri)
 {
     const Windows::Foundation::Uri wUri(winrt::to_hstring(uri.toString()));
 
diff --git a/src/framework/global/internal/platform/win/wininteractivehelper.h b/src/framework/global/internal/platform/win/wininteractivehelper.h
@@ -5,7 +5,7 @@
  * MuseScore
  * Music Composition & Notation
  *
- * Copyright (C) 2024 MuseScore BVBA and others
+ * Copyright (C) 2025 MuseScore BVBA and others
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -23,15 +23,14 @@
 
 #include "types/ret.h"
 
-#include "async/asyncable.h"
 #include "async/promise.h"
 
 namespace muse {
-class Uri;
+class UriQuery;
 
-class WinInteractiveHelper : public async::Asyncable
+class WinInteractiveHelper
 {
 public:
-    static async::Promise<Ret> openApp(const Uri& uri);
+    static async::Promise<Ret> openApp(const UriQuery& uri);
 };
 }
diff --git a/src/framework/global/tests/mocks/interactivemock.h b/src/framework/global/tests/mocks/interactivemock.h
@@ -87,8 +87,8 @@ class InteractiveMock : public IInteractive
     MOCK_METHOD(Ret, openUrl, (const QUrl&), (const, override));
 
     MOCK_METHOD(Ret, isAppExists, (const std::string&), (const, override));
-    MOCK_METHOD(Ret, canOpenApp, (const Uri&), (const, override));
-    MOCK_METHOD(async::Promise<Ret>, openApp, (const Uri&), (const, override));
+    MOCK_METHOD(Ret, canOpenApp, (const UriQuery&), (const, override));
+    MOCK_METHOD(async::Promise<Ret>, openApp, (const UriQuery&), (const, override));
 
     MOCK_METHOD(Ret, revealInFileBrowser, (const io::path_t&), (const, override));
 };
diff --git a/src/framework/ui/view/qmllauncher.cpp b/src/framework/ui/view/qmllauncher.cpp
@@ -41,7 +41,7 @@ bool QmlLauncher::openSync(const QString& uri)
 
 bool QmlLauncher::openApp(const QString& uri)
 {
-    interactive()->openApp(Uri(uri));
+    interactive()->openApp(UriQuery(uri.toStdString()));
     return true;
 }
 
diff --git a/src/musesounds/internal/musesamplercheckupdatescenario.cpp b/src/musesounds/internal/musesamplercheckupdatescenario.cpp
@@ -133,7 +133,7 @@ void MuseSamplerCheckUpdateScenario::openMuseHubAndQuit()
         openMuseHubWebsiteAndQuit();
     }
 #else
-    static const muse::Uri MUSEHUB_URI("musehub://requestUpdateCheck?from=musescore-studio");
+    const muse::UriQuery MUSEHUB_URI("musehub://requestUpdateCheck?from=musescore-studio");
 
 #ifdef Q_OS_MACOS
     if (!interactive()->canOpenApp(MUSEHUB_URI)) {
diff --git a/src/musesounds/internal/musesoundscheckupdatescenario.cpp b/src/musesounds/internal/musesoundscheckupdatescenario.cpp
@@ -219,7 +219,7 @@ void MuseSoundsCheckUpdateScenario::tryOpenMuseHub(ValList actions) const
         return;
     }
 
-    interactive()->openApp(muse::Uri(action)).onReject(this, [this, actions](int, const std::string&) {
+    interactive()->openApp(muse::UriQuery(action)).onReject(this, [this, actions](int, const std::string&) {
         tryOpenMuseHub(actions);
     });
 }
diff --git a/src/musesounds/internal/musesoundscheckupdateservice.cpp b/src/musesounds/internal/musesoundscheckupdateservice.cpp
@@ -33,8 +33,8 @@
 
 #include "log.h"
 
-static const muse::Uri MUSEHUB_APP_URI("musehub://?from=musescore");
-static const muse::Uri MUSEHUB_APP_V1_URI("muse-hub://?from=musescore");
+static const muse::UriQuery MUSEHUB_APP_URI("musehub://?from=musescore");
+static const muse::UriQuery MUSEHUB_APP_V1_URI("muse-hub://?from=musescore");
 
 using namespace mu::musesounds;
 using namespace muse;

Original file line number	Diff line number	Diff line change
`@@ -223,12 +223,12 @@ Ret AutobotInteractive::isAppExists(const std::string& appIdentifier) const`
`223`	`223`	`return m_real->isAppExists(appIdentifier);`
`224`	`224`	`}`
`225`	`225`
`226`		`-Ret AutobotInteractive::canOpenApp(const Uri& uri) const`
	`226`	`+Ret AutobotInteractive::canOpenApp(const UriQuery& uri) const`
`227`	`227`	`{`
`228`	`228`	`return m_real->canOpenApp(uri);`
`229`	`229`	`}`
`230`	`230`
`231`		`-async::Promise<Ret> AutobotInteractive::openApp(const Uri& uri) const`
	`231`	`+async::Promise<Ret> AutobotInteractive::openApp(const UriQuery& uri) const`
`232`	`232`	`{`
`233`	`233`	`return m_real->openApp(uri);`
`234`	`234`	`}`
Original file line number	Diff line number	Diff line change
`@@ -504,7 +504,7 @@ Ret Interactive::isAppExists(const std::string& appIdentifier) const`
`504`	`504`	`#endif`
`505`	`505`	`}`
`506`	`506`
`507`		`-Ret Interactive::canOpenApp(const Uri& uri) const`
	`507`	`+Ret Interactive::canOpenApp(const UriQuery& uri) const`
`508`	`508`	`{`
`509`	`509`	`#ifdef Q_OS_MACOS`
`510`	`510`	`return MacOSInteractiveHelper::canOpenApp(uri);`
`@@ -515,7 +515,7 @@ Ret Interactive::canOpenApp(const Uri& uri) const`
`515`	`515`	`#endif`
`516`	`516`	`}`
`517`	`517`
`518`		`-async::Promise<Ret> Interactive::openApp(const Uri& uri) const`
	`518`	`+async::Promise<Ret> Interactive::openApp(const UriQuery& uri) const`
`519`	`519`	`{`
`520`	`520`	`#ifdef Q_OS_MACOS`
`521`	`521`	`return MacOSInteractiveHelper::openApp(uri);`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@`
`26`	`26`
`27`	`27`	`#include <Cocoa/Cocoa.h>`
`28`	`28`
	`29`	`+#include "types/uri.h"`
	`30`	`+`
`29`	`31`	`#include "log.h"`
`30`	`32`
`31`	`33`	`using namespace muse;`
`@@ -47,7 +49,7 @@`
`47`	`49`	`return appURL != nil;`
`48`	`50`	`}`
`49`	`51`
`50`		`-Ret MacOSInteractiveHelper::canOpenApp(const Uri& uri)`
	`52`	`+Ret MacOSInteractiveHelper::canOpenApp(const UriQuery& uri)`
`51`	`53`	`{`
`52`	`54`	`if (__builtin_available(macOS 10.15, *)) {`
`53`	`55`	`NSString* nsUrlString = [NSString stringWithUTF8String:uri.toString().c_str()];`
`@@ -67,9 +69,9 @@`
`67`	`69`	`}`
`68`	`70`	`}`
`69`	`71`
`70`		`-async::Promise<Ret> MacOSInteractiveHelper::openApp(const Uri& uri)`
	`72`	`+async::Promise<Ret> MacOSInteractiveHelper::openApp(const UriQuery& uri)`
`71`	`73`	`{`
`72`		`- return Promise<Ret>([&uri](auto resolve, auto reject) {`
	`74`	`+ return Promise<Ret>([uri](auto resolve, auto reject) {`
`73`	`75`	`if (__builtin_available(macOS 10.15, *)) {`
`74`	`76`	`NSString* nsUrlString = [NSString stringWithUTF8String:uri.toString().c_str()];`
`75`	`77`	`if (nsUrlString == nil) {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`* MuseScore`
`6`	`6`	`* Music Composition & Notation`
`7`	`7`	`*`
`8`		`- * Copyright (C) 2024 MuseScore BVBA and others`
	`8`	`+ * Copyright (C) 2025 MuseScore BVBA and others`
`9`	`9`	`*`
`10`	`10`	`* This program is free software: you can redistribute it and/or modify`
`11`	`11`	`* it under the terms of the GNU General Public License version 3 as`
`@@ -33,7 +33,7 @@ using namespace muse::async;`
`33`	`33`	`using namespace winrt;`
`34`	`34`	`using namespace Windows::System;`
`35`	`35`
`36`		`-async::Promise<Ret> WinInteractiveHelper::openApp(const Uri& uri)`
	`36`	`+async::Promise<Ret> WinInteractiveHelper::openApp(const UriQuery& uri)`
`37`	`37`	`{`
`38`	`38`	`const Windows::Foundation::Uri wUri(winrt::to_hstring(uri.toString()));`
`39`	`39`