Merge remote-tracking branch 'origin/release/4.0.10' into release/4.0.10

src/quadpype/hosts/aftereffects/addon.py

@@ -12,7 +12,7 @@ def add_implementation_envs(self, env, _app):
         """Modify environments to contain all required for implementation."""
         defaults = {
             "QUADPYPE_LOG_NO_COLORS": "True",
-            "WEBSOCKET_URL": "ws://localhost:8097/ws/"
+            "QUADPYPE_WEBSOCKET_URL": "ws://localhost:8017/ws/"
         }
         for key, value in defaults.items():
             if not env.get(key):

src/quadpype/hosts/aftereffects/api/README.md

@@ -59,7 +59,7 @@ Expected deployed extension location on default Windows:
 For easier debugging of Javascript:
 https://community.adobe.com/t5/download-install/adobe-extension-debuger-problem/td-p/10911704?page=1
 Add (optional) --enable-blink-features=ShadowDOMV0,CustomElementsV0 when starting Chrome
-then localhost:8092
+then localhost:8017
 
 Or use Visual Studio Code https://medium.com/adobetech/extendscript-debugger-for-visual-studio-code-public-release-a2ff6161fa01
 ## Resources

src/quadpype/hosts/aftereffects/api/checksums

@@ -1,17 +1,17 @@
-19D4C7C6C4BEA8D552873219030B5CB71D8A8DC2526B7F3909043725E36838EA:.debug
+C07F1436D9ED900B3E94605183DB29E82301191D9DC3D55917CF9A68842E6F92:.debug
 48F60C67335C984141456712CE8E6F9D82B8C0DF52353571C8D4FCFAB9724A94:index.html
 D6CCD9DD044B02E4F2ED1B49E9C083D823D6E3940F9825DD932D07C8B0229C78:css\boilerplate.css
 0D183A454C941E5C937DCFDABFFE257F4FBB49BD418DF200AB6C01A39836BA27:css\styles.css
 1CE5197F378AD02BCE717B29CB25E7423AFA2E6D22996BABB7297E025D192B4F:css\topcoat-desktop-dark.min.css
-4AC922CCE8FC86C9404831E609F3A718A3C0910690E528E413D52FC89810B0A3:CSXS\manifest.xml
+F7B0CEE06DDED97BDD89D21B246F80285AC2CFAD205966F39A39F4C644D4D5B6:CSXS\manifest.xml
 9F51E857F342D27FF05A97A09E96401EE7EB901C978A31F560F0A49C3A6592FB:icons\ayon_logo.png
 A1B1F026B3BB43F4801DB4FAB5CDAE7C1DDCABA064FEDB0A227F633F32EB4F61:icons\iconDarkNormal.png
 6C04A66B67CCDA76D4689BF5F80DFB46377E8B3A652CFC5B3D268E9E27DC9853:icons\iconDarkRollover.png
 6C04A66B67CCDA76D4689BF5F80DFB46377E8B3A652CFC5B3D268E9E27DC9853:icons\iconDisabled.png
 2BEECE898BE17D6843AD22D78139E306DEE28030FC79712B32D99F8487328AB9:icons\iconNormal.png
 DD24CF1239E1FFA18B7EE76084E75CE74178CD60A1CF388784934D3DF2F9EED6:icons\iconQuadPype.png
 F77A105590E0231818FBAFE766C7A672DC5C6A432E3416594C76D2249D2E978B:icons\iconRollover.png
-96F6BD26A8E430D1DE26E2D516DB9DA63328F15936D1F758969524924F9FA5AD:js\main.js
+76F230D6FA0F205C83F3FBBC8999D6DBE6A752D5BA7868FE463A1710A20C2C02:js\main.js
 423DF7EC0AE7C32886E06C000AE90E3FDAA919DAC563DD9DDEBB787E9E1B6025:js\themeManager.js
 5F8F8EBCFFC668009CF48DF1301F8C962A6D54F6EA12F0B0469C42C9DE48F742:js\libs\CSInterface.js
 4D9586A075F082A04FD40178499C472012B351DB4C1A4D210907A0891F7D8AD9:js\libs\jquery-2.0.2.min.js

src/quadpype/hosts/aftereffects/api/extension/.debug

@@ -6,25 +6,25 @@
             <!-- Comment Host tags according to the apps you want your panel to support -->
 
             <!-- Photoshop -->
-            <Host Name="PHXS" Port="8088"/>
+            <Host Name="PHXS" Port="8017"/>
+
+            <!-- AfterEffects -->
+            <Host Name="AEFT" Port="8018" />
 
             <!-- Illustrator -->
-            <Host Name="ILST" Port="8089"/>
+            <Host Name="ILST" Port="8019"/>
 
             <!-- InDesign -->
-            <Host Name="IDSN" Port="8090" />
+            <Host Name="IDSN" Port="8020" />
 
             <!-- Premiere -->
-            <Host Name="PPRO" Port="8091" />
-
-            <!-- AfterEffects -->
-            <Host Name="AEFT" Port="8092" />
+            <Host Name="PPRO" Port="8021" />
 
             <!-- PRELUDE -->
-            <Host Name="PRLD" Port="8093" />
+            <Host Name="PRLD" Port="8022" />
 
             <!-- FLASH Pro -->
-            <Host Name="FLPR" Port="8094" />
+            <Host Name="FLPR" Port="8023" />
 
         </HostList>
     </Extension>

src/quadpype/hosts/aftereffects/api/extension/CSXS/manifest.xml

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ExtensionManifest Version="8.0" ExtensionBundleId="io.quad.AE.panel" ExtensionBundleVersion="1.0.0"
-		ExtensionBundleName="io.quad.AE.panel" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version='1.0' encoding='UTF-8'?>
+<ExtensionManifest Version="8.0" ExtensionBundleId="io.quad.AE.panel" ExtensionBundleVersion="1.0.1" ExtensionBundleName="io.quad.AE.panel">
 	<ExtensionList>
 		<Extension Id="io.quad.AE.panel" Version="1.0" />
 	</ExtensionList>
@@ -39,7 +38,7 @@
 	</ExecutionEnvironment>
 	<DispatchInfoList>
 		<Extension Id="io.quad.AE.panel">
-			<DispatchInfo >
+			<DispatchInfo>
 				<Resources>
 				<MainPath>./index.html</MainPath>
 				<ScriptPath>./jsx/hostscript.jsx</ScriptPath>

src/quadpype/hosts/aftereffects/api/extension/js/main.js

@@ -57,7 +57,7 @@ function get_extension_version(){
 
 function main(websocket_url){
     // creates connection to 'websocket_url', registers routes
-    var default_url = 'ws://localhost:8099/ws/';
+    var default_url = 'ws://localhost:8017/ws/';
 
     if  (websocket_url == ''){
          websocket_url = default_url;
@@ -386,7 +386,7 @@ function main(websocket_url){
 }
 
 /** main entry point **/
-startUp("WEBSOCKET_URL");
+startUp("QUADPYPE_WEBSOCKET_URL");
 
 (function () {
     'use strict';

src/quadpype/hosts/photoshop/addon.py

@@ -15,7 +15,7 @@ def add_implementation_envs(self, env, _app):
         """Modify environments to contain all required for implementation."""
         defaults = {
             "QUADPYPE_LOG_NO_COLORS": "True",
-            "WEBSOCKET_URL": "ws://localhost:8099/ws/"
+            "QUADPYPE_WEBSOCKET_URL": "ws://localhost:8018/ws/"
         }
         for key, value in defaults.items():
             if not env.get(key):

src/quadpype/hosts/photoshop/api/checksums

@@ -1,11 +1,11 @@
 8716BC5C7DBF3338B8F104CFDEED84B1F88E2D4CC2A1AA2E5AAE577EDD396DB8:.debug
 28997C43711E01361728A5FA0F67E7EEBDD616FB083B0210934C18FDA3D5E92B:index.html
-7046A70229FD9B8833C76A46E067734945E2C465C607965D9945E06EC4AD80BB:client\client.js
+E971793EC8E773D2D9FAAC01A35C94DEA2864BAD426460CA025285B5B78C943B:client\client.js
 5F8F8EBCFFC668009CF48DF1301F8C962A6D54F6EA12F0B0469C42C9DE48F742:client\CSInterface.js
 FD0E8BED2FA88E12F5D49646944793C134428F80311BC03F3BCB1196CE3AF0AD:client\loglevel.min.js
 61E9E273ADF6E290D9E6911500D44F2AB02DAEFCD902888106017735590E26C1:client\wsrpc.js
 78E2A27896C24A4AF1D232AAC321E09B8995CC9A86C9ABB19C8A97A861946F41:client\wsrpc.min.js
-5009853F7DDD19A2CB8F1A2920CF8D1008E61274766023A85114EF04D56039B4:CSXS\manifest.xml
+1630FED4CC9468A7C9DC3B1F8E5CE3159E3583579C1FE7CB35D4DD877C1A3856:CSXS\manifest.xml
 52437DE708F4A7153DB0A0A5DB66658C2A12F3A8673054E87C7B84895D4CE584:host\index.jsx
 CC7DDC2DA053A7B922BC0DA7023F734BB80D6E00B87926715206D530664BC415:host\json.js
 D6F0B54C43673F18785AE31D4659289CCB08D9C79C1BBEF588ACBA8C9DBD96F4:host\JSX.js

src/quadpype/hosts/photoshop/api/extension/CSXS/manifest.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<ExtensionManifest ExtensionBundleId="io.quad.PS.panel" ExtensionBundleVersion="1.0.0" Version="7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<ExtensionManifest ExtensionBundleId="io.quad.PS.panel" ExtensionBundleVersion="1.0.1" Version="7.0">
   <ExtensionList>
     <Extension Id="io.quad.PS.panel" Version="1.0.0" />
   </ExtensionList>

src/quadpype/hosts/photoshop/api/extension/client/client.js

@@ -28,7 +28,7 @@
     }
 
     /** main entry point **/
-    startUp("WEBSOCKET_URL");
+    startUp("QUADPYPE_WEBSOCKET_URL");
 
     // get websocket server url from environment value
     async function startUp(url){
@@ -67,7 +67,7 @@
     function main(websocket_url){
       // creates connection to 'websocket_url', registers routes
       log.warn("websocket_url", websocket_url);
-      var default_url = 'ws://localhost:8099/ws/';
+      var default_url = 'ws://localhost:8018/ws/';
 
       if  (websocket_url == ''){
            websocket_url = default_url;

src/quadpype/hosts/tvpaint/api/communication_server.py

@@ -717,12 +717,12 @@ def launch(self, launch_args):
 
         self._create_routes()
 
-        os.environ["WEBSOCKET_URL"] = "ws://localhost:{}".format(
+        os.environ["QUADPYPE_WEBSOCKET_URL"] = "ws://localhost:{}".format(
             self.websocket_server.port
         )
 
         log.info("Added request handler for url: {}".format(
-            os.environ["WEBSOCKET_URL"]
+            os.environ["QUADPYPE_WEBSOCKET_URL"]
         ))
 
         self._start_webserver()

src/quadpype/hosts/tvpaint/tvpaint_plugin/plugin_code/README.md

@@ -7,7 +7,7 @@ This implementation is using TVPaint plugin (C/C++) which can communicate with p
 
 Current implementation is based on websocket protocol, using json-rpc communication (specification 2.0). Project is in beta stage, tested only on Windows.
 
-To be able to load plugin, environment variable `WEBSOCKET_URL` must be set otherwise plugin won't load at all. Plugin should not affect TVPaint if python server crash, but buttons won't work.
+To be able to load plugin, environment variable `QUADPYPE_WEBSOCKET_URL` must be set otherwise plugin won't load at all. Plugin should not affect TVPaint if python server crash, but buttons won't work.
 
 ## Requirements - Python server
 - python >= 3.6

src/quadpype/hosts/tvpaint/tvpaint_plugin/plugin_code/library.cpp

@@ -543,7 +543,7 @@ int FAR PASCAL PI_Open( PIFilter* iFilter )
     {
         PI_Parameters( iFilter, NULL ); // NULL as iArg means "open the requester"
     }
-    char *env_value = std::getenv("WEBSOCKET_URL");
+    char *env_value = std::getenv("QUADPYPE_WEBSOCKET_URL");
     if (env_value != NULL) {
         communication = new Communicator(env_value);
         communication->connect();

src/quadpype/tools/adobe_webserver/app.py

@@ -39,13 +39,13 @@ def __init__(self):
 
         port = None
         host_name = "localhost"
-        websocket_url = os.getenv("WEBSOCKET_URL")
+        websocket_url = os.getenv("QUADPYPE_WEBSOCKET_URL")
         if websocket_url:
             parsed = urllib.parse.urlparse(websocket_url)
             port = parsed.port
             host_name = parsed.netloc.split(":")[0]
         if not port:
-            port = 8098  # fallback
+            port = 8016  # fallback
 
         self.port = port
         self.host_name = host_name
@@ -76,7 +76,7 @@ async def send_context_change(self, host):
             but one already running, without
             this publish would point to old context.
         """
-        client = WSRPCClient(os.getenv("WEBSOCKET_URL"),
+        client = WSRPCClient(os.getenv("QUADPYPE_WEBSOCKET_URL"),
                              loop=asyncio.get_event_loop())
         await client.connect()
 

src/tools/_lib/run/pre_run.py

@@ -43,10 +43,6 @@ def main():
         repo_root = repo_root.parent
     repo_root.resolve()
 
-    print("#######################")
-    print(args_string)
-    print("#######################")
-
     if low_platform == "windows":
         pre_run_script_path = repo_root.joinpath("tools", "pre_run.ps1")
         p = subprocess.Popen(