adding files in single instance in case of url

CURA-11596

cura/CuraApplication.py

@@ -356,7 +356,7 @@ class CuraApplication(QtApplication):
         self._machine_action_manager.initialize()
 
     def __sendCommandToSingleInstance(self):
-        self._single_instance = SingleInstance(self, self._files_to_open)
+        self._single_instance = SingleInstance(self, self._files_to_open, self._open_url_queue)
 
         # If we use single instance, try to connect to the single instance server, send commands, and then exit.
         # If we cannot find an existing single instance server, this is the only instance, so just keep going.

cura/SingleInstance.py

@@ -12,9 +12,10 @@ from UM.Logger import Logger
 
 
 class SingleInstance:
-    def __init__(self, application: QtApplication, files_to_open: Optional[List[str]]) -> None:
+    def __init__(self, application: QtApplication, files_to_open: Optional[List[str]], url_to_open: Optional[List[str]]) -> None:
         self._application = application
         self._files_to_open = files_to_open
+        self._url_to_open = url_to_open
 
         self._single_instance_server = None
 
@@ -33,7 +34,7 @@ class SingleInstance:
             return False
 
         # We only send the files that need to be opened.
-        if not self._files_to_open:
+        if not self._files_to_open or not self._url_to_open:
             Logger.log("i", "No file need to be opened, do nothing.")
             return True
 
@@ -52,10 +53,13 @@ class SingleInstance:
             single_instance_socket.write(bytes(json.dumps(payload) + "\n", encoding="ascii"))
 
             for filename in self._files_to_open:
-                Logger.log("i",f"Filename isxxx {os.path(filename)}")
                 payload = {"command": "open", "filePath": os.path.abspath(filename)}
                 single_instance_socket.write(bytes(json.dumps(payload) + "\n", encoding="ascii"))
 
+            for filename in self._url_to_open:
+                payload = {"command": "open", "urlPath": os.path.abspath(filename)}
+                single_instance_socket.write(bytes(json.dumps(payload) + "\n", encoding="ascii"))
+
             payload = {"command": "close-connection"}
             single_instance_socket.write(bytes(json.dumps(payload) + "\n", encoding="ascii"))
 
@@ -82,7 +86,6 @@ class SingleInstance:
 
     def __readCommands(self, connection: QLocalSocket) -> None:
         line = connection.readLine()
-        Logger.log("i", f"line read is {line}")
         while len(line) != 0:  # There is also a .canReadLine()
             try:
                 payload = json.loads(str(line, encoding="ascii").strip())
@@ -96,8 +99,8 @@ class SingleInstance:
                 elif command == "open":
                     if payload["filePath"].file():
                         self._application.callLater(lambda f = payload["filePath"]: self._application._openFile(f))
-                    if payload["filePath"].url():
+                    if payload["urlPath"].url():
-                        self._application.callLater(lambda f= payload["filepath"]: self._application._openUrl(f))
+                        self._application.callLater(lambda f = payload["urlPath"]: self._application._openUrl(f))
 
 
                 # Command: Activate the window and bring it to the top.

packaging/NSIS/Ultimaker-Cura.nsi.jinja

@@ -156,7 +156,7 @@ WriteRegStr HKCR "slicer" "" "URL:slicer"
 WriteRegStr HKCR "slicer" "URL Protocol" ""
 WriteRegStr HKCR "slicer\DefaultIcon" "" "$INSTDIR\${MAIN_APP_EXE},1"
 WriteRegStr HKCR "slicer\shell" "" "open"
-WriteRegStr HKCR "slicer\shell\open\command" "" '"$INSTDIR\${MAIN_APP_EXE}" --single-instance "%1"'
+WriteRegStr HKCR "slicer\shell\open\command" "" '"$INSTDIR\${MAIN_APP_EXE}" "%1"'
 
 SectionEnd
 ######################################################################

packaging/msi/UltiMaker-Cura.wxs.jinja

@@ -165,9 +165,7 @@
                 <RegistryValue Type="string" Value="URL:Cura Protocol"/>
                 <RegistryValue Type="string" Name="URL Protocol" Value=""/>
                 <RegistryValue Type="string" Key="DefaultIcon" Value="[APPLICATIONFOLDER]\{{ main_app }},1"/>
-                <RegistryValue Type="string" Key="shell\open\command" Value="&quot;[APPLICATIONFOLDER]\{{ main_app }}&quot; --single-instance &quot;%1&quot;"/>
+                <RegistryValue Type="string" Key="shell\open\command" Value="&quot;[APPLICATIONFOLDER]\{{ main_app }}&quot; &quot;%1&quot;"/>
-                <Verb Id="open_url" Command="Open" Argument='"%1"' />
-                <MIME Advertise="yes" ContentType="application/url" Default="yes" />
             </RegistryKey>
         </Component>