Merge branch 'develop' into bugfix/editorial-hierarchy-context-fix

openpype/hosts/aftereffects/api/README.md

@@ -1,6 +1,6 @@
 # AfterEffects Integration
 
-Requirements: This extension requires use of Javascript engine, which is 
+Requirements: This extension requires use of Javascript engine, which is
 available since CC 16.0.
 Please check your File>Project Settings>Expressions>Expressions Engine
 
@@ -13,26 +13,28 @@ The After Effects integration requires two components to work; `extension` and `
 To install the extension download [Extension Manager Command Line tool (ExManCmd)](https://github.com/Adobe-CEP/Getting-Started-guides/tree/master/Package%20Distribute%20Install#option-2---exmancmd).
 
 ```
-ExManCmd /install {path to avalon-core}\avalon\photoshop\extension.zxp
+ExManCmd /install {path to addon}/api/extension.zxp
 ```
 OR
 download [Anastasiy’s Extension Manager](https://install.anastasiy.com/)
 
+`{path to addon}` will be most likely in your AppData (on Windows, in your user data folder in Linux and MacOS.)
+
 ### Server
 
 The easiest way to get the server and After Effects launch is with:
 
 ```
-python -c ^"import avalon.photoshop;avalon.aftereffects.launch(""c:\Program Files\Adobe\Adobe After Effects 2020\Support Files\AfterFX.exe"")^"
+python -c ^"import openpype.hosts.photoshop;openpype.hosts..aftereffects.launch(""c:\Program Files\Adobe\Adobe After Effects 2020\Support Files\AfterFX.exe"")^"
 ```
 
 `avalon.aftereffects.launch` launches the application and server, and also closes the server when After Effects exists.
 
 ## Usage
 
-The After Effects extension can be found under `Window > Extensions > OpenPype`. Once launched you should be presented with a panel like this:
+The After Effects extension can be found under `Window > Extensions > AYON`. Once launched you should be presented with a panel like this:
 
-![Avalon Panel](panel.PNG "Avalon Panel")
+![Ayon Panel](panel.png "Ayon Panel")
 
 
 ## Developing
@@ -43,8 +45,8 @@ When developing the extension you can load it [unsigned](https://github.com/Adob
 When signing the extension you can use this [guide](https://github.com/Adobe-CEP/Getting-Started-guides/tree/master/Package%20Distribute%20Install#package-distribute-install-guide).
 
 ```
-ZXPSignCmd -selfSignedCert NA NA Avalon Avalon-After-Effects avalon extension.p12
-ZXPSignCmd -sign {path to avalon-core}\avalon\aftereffects\extension {path to avalon-core}\avalon\aftereffects\extension.zxp extension.p12 avalon
+ZXPSignCmd -selfSignedCert NA NA Ayon Avalon-After-Effects Ayon extension.p12
+ZXPSignCmd -sign {path to addon}/api/extension {path to addon}/api/extension.zxp extension.p12 Ayon
 ```
 
 ### Plugin Examples
@@ -52,14 +54,14 @@ ZXPSignCmd -sign {path to avalon-core}\avalon\aftereffects\extension {path to av
 These plugins were made with the [polly config](https://github.com/mindbender-studio/config). To fully integrate and load, you will have to use this config and add `image` to the [integration plugin](https://github.com/mindbender-studio/config/blob/master/polly/plugins/publish/integrate_asset.py).
 
 Expected deployed extension location on default Windows:
-`c:\Program Files (x86)\Common Files\Adobe\CEP\extensions\com.openpype.AE.panel`
+`c:\Program Files (x86)\Common Files\Adobe\CEP\extensions\io.ynput.AE.panel`
 
 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
 
-Or use Visual Studio Code https://medium.com/adobetech/extendscript-debugger-for-visual-studio-code-public-release-a2ff6161fa01 
+Or use Visual Studio Code https://medium.com/adobetech/extendscript-debugger-for-visual-studio-code-public-release-a2ff6161fa01
 ## Resources
   - https://javascript-tools-guide.readthedocs.io/introduction/index.html
   - https://github.com/Adobe-CEP/Getting-Started-guides

openpype/hosts/aftereffects/api/extension/.debug

@@ -1,32 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?> 
+<?xml version="1.0" encoding="UTF-8"?>
 <ExtensionList>
-    <Extension Id="com.openpype.AE.panel">
+    <Extension Id="io.ynput.AE.panel">
         <HostList>
-           
+
             <!-- Comment Host tags according to the apps you want your panel to support -->
-            
+
             <!-- Photoshop -->
             <Host Name="PHXS" Port="8088"/>
-            
+
             <!-- Illustrator -->
             <Host Name="ILST" Port="8089"/>
 
             <!-- InDesign -->
             <Host Name="IDSN" Port="8090" />
-            
+
             <!-- Premiere -->
             <Host Name="PPRO" Port="8091" />
-            
+
             <!-- AfterEffects -->
             <Host Name="AEFT" Port="8092" />
-            
+
             <!-- PRELUDE -->
             <Host Name="PRLD" Port="8093" />
-            
+
             <!-- FLASH Pro -->
             <Host Name="FLPR" Port="8094" />
-                        
+
         </HostList>
     </Extension>
 </ExtensionList>
- 

openpype/hosts/aftereffects/api/extension/CSXS/manifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ExtensionManifest Version="8.0" ExtensionBundleId="com.openpype.AE.panel" ExtensionBundleVersion="1.0.27"
-		ExtensionBundleName="com.openpype.AE.panel" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<ExtensionManifest Version="8.0" ExtensionBundleId="io.ynput.AE.panel" ExtensionBundleVersion="1.1.0"
+		ExtensionBundleName="io.ynput.AE.panel" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<ExtensionList>
-		<Extension Id="com.openpype.AE.panel" Version="1.0" />
+		<Extension Id="io.ynput.AE.panel" Version="1.0" />
 	</ExtensionList>
 	<ExecutionEnvironment>
 		<HostList>
@@ -38,7 +38,7 @@
 		</RequiredRuntimeList>
 	</ExecutionEnvironment>
 	<DispatchInfoList>
-		<Extension Id="com.openpype.AE.panel">
+		<Extension Id="io.ynput.AE.panel">
 			<DispatchInfo >
 				<Resources>
 				<MainPath>./index.html</MainPath>
@@ -49,7 +49,7 @@
 				</Lifecycle>
 				<UI>
 					<Type>Panel</Type>
-					<Menu>OpenPype</Menu>
+					<Menu>AYON</Menu>
 					<Geometry>
 						<Size>
 							<Height>200</Height>
@@ -66,7 +66,7 @@
 
 					</Geometry>
 					<Icons>
-						<Icon Type="Normal">./icons/iconNormal.png</Icon>
+						<Icon Type="Normal">./icons/ayon_logo.png</Icon>
 						<Icon Type="RollOver">./icons/iconRollover.png</Icon>
 						<Icon Type="Disabled">./icons/iconDisabled.png</Icon>
 						<Icon Type="DarkNormal">./icons/iconDarkNormal.png</Icon>

openpype/hosts/photoshop/api/README.md

@@ -9,7 +9,7 @@ The Photoshop integration requires two components to work; `extension` and `serv
 To install the extension download [Extension Manager Command Line tool (ExManCmd)](https://github.com/Adobe-CEP/Getting-Started-guides/tree/master/Package%20Distribute%20Install#option-2---exmancmd).
 
 ```
-ExManCmd /install {path to avalon-core}\avalon\photoshop\extension.zxp
+ExManCmd /install {path to addon}/api/extension.zxp
 ```
 
 ### Server
@@ -17,16 +17,16 @@ ExManCmd /install {path to avalon-core}\avalon\photoshop\extension.zxp
 The easiest way to get the server and Photoshop launch is with:
 
 ```
-python -c ^"import avalon.photoshop;avalon.photoshop.launch(""C:\Program Files\Adobe\Adobe Photoshop 2020\Photoshop.exe"")^"
+python -c ^"import openpype.hosts.photoshop;openpype.hosts.photoshop.launch(""C:\Program Files\Adobe\Adobe Photoshop 2020\Photoshop.exe"")^"
 ```
 
 `avalon.photoshop.launch` launches the application and server, and also closes the server when Photoshop exists.
 
 ## Usage
 
-The Photoshop extension can be found under `Window > Extensions > Avalon`. Once launched you should be presented with a panel like this:
+The Photoshop extension can be found under `Window > Extensions > Ayon`. Once launched you should be presented with a panel like this:
 
-![Avalon Panel](panel.PNG "Avalon Panel")
+![Ayon Panel](panel.png "AYON Panel")
 
 
 ## Developing
@@ -37,7 +37,7 @@ When developing the extension you can load it [unsigned](https://github.com/Adob
 When signing the extension you can use this [guide](https://github.com/Adobe-CEP/Getting-Started-guides/tree/master/Package%20Distribute%20Install#package-distribute-install-guide).
 
 ```
-ZXPSignCmd -selfSignedCert NA NA Avalon Avalon-Photoshop avalon extension.p12
+ZXPSignCmd -selfSignedCert NA NA Ayon Ayon-Photoshop Ayon extension.p12
 ZXPSignCmd -sign {path to avalon-core}\avalon\photoshop\extension {path to avalon-core}\avalon\photoshop\extension.zxp extension.p12 avalon
 ```
 

openpype/hosts/photoshop/api/extension/.debug

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ExtensionList>
-    <Extension Id="com.openpype.PS.panel">
+    <Extension Id="io.ynput.PS.panel">
         <HostList>
             <Host Name="PHXS" Port="8078"/>
             <Host Name="FLPR" Port="8078"/>
         </HostList>
     </Extension>
-</ExtensionList>
+</ExtensionList>

openpype/hosts/photoshop/api/extension/CSXS/manifest.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<ExtensionManifest ExtensionBundleId="com.openpype.PS.panel" ExtensionBundleVersion="1.0.12" Version="7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<ExtensionManifest ExtensionBundleId="io.ynput.PS.panel" ExtensionBundleVersion="1.1.0" Version="7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <ExtensionList>
-    <Extension Id="com.openpype.PS.panel" Version="1.0.1" />
+    <Extension Id="io.ynput.PS.panel" Version="1.0.1" />
   </ExtensionList>
   <ExecutionEnvironment>
     <HostList>
@@ -16,7 +16,7 @@
     </RequiredRuntimeList>
   </ExecutionEnvironment>
   <DispatchInfoList>
-    <Extension Id="com.openpype.PS.panel">
+    <Extension Id="io.ynput.PS.panel">
       <DispatchInfo>
         <Resources>
           <MainPath>./index.html</MainPath>
@@ -32,7 +32,7 @@
 		</Lifecycle>
         <UI>
           <Type>Panel</Type>
-          <Menu>OpenPype</Menu>
+          <Menu>AYON</Menu>
           <Geometry>
             <Size>
               <Width>300</Width>
@@ -44,7 +44,7 @@
             </MaxSize>
           </Geometry>
           <Icons>
-            <Icon Type="Normal">./icons/avalon-logo-48.png</Icon>
+            <Icon Type="Normal">./icons/ayon_logo.png</Icon>
           </Icons>
         </UI>
       </DispatchInfo>

start.py

@@ -366,8 +366,8 @@ def run_disk_mapping_commands(settings):
             destination = destination.replace("/", "\\").rstrip("\\")
             source = source.replace("/", "\\").rstrip("\\")
             # Add slash after ':' ('G:' -> 'G:\')
-            if destination.endswith(":"):
-                destination += "\\"
+            if source.endswith(":"):
+                source += "\\"
         else:
             destination = destination.rstrip("/")
             source = source.rstrip("/")