Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tk framework adobe Code Review #1

Merged
merged 34 commits into from
Mar 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
9d4e479
initial commit
Jan 15, 2019
3b77ee2
adding after effects debug uri
Jan 17, 2019
6939874
changes to make the rpc layer work inside after effects as well
Jan 17, 2019
dd9122b
signed extension
Jan 18, 2019
26abdb6
gitignore: allowing a folder for the extracted pkgs.zip
Jan 18, 2019
a6a546c
fixing the rpc_new method
martinminsel Jan 25, 2019
ff2ed02
fix bug in rpc_new
martinminsel Feb 7, 2019
4706648
signing extension, cleaning up whitespaces and add some common files …
martinminsel Feb 8, 2019
183f4ff
adding makefiles and contributing description in Readme
martinminsel Feb 8, 2019
6614ed3
latest signed extension
martinminsel Feb 8, 2019
85e16f6
fix imports to make them work while cep installation
martinminsel Feb 8, 2019
753a580
make tk-core-folder configurable in the development environment
martinminsel Feb 15, 2019
a095336
remove comment and bump up copyright year to 2019
martinminsel Feb 15, 2019
1bda88f
rename the framework plugin from basic.framework.adobe to basic.adobe
martinminsel Feb 15, 2019
782e836
exchange external logger with framework-logger, raise Exception with …
martinminsel Feb 15, 2019
9d7f32f
update the readme
martinminsel Feb 15, 2019
9d1a3c5
remove dependency tk-framework-shotgunutils and migrate it into the e…
martinminsel Feb 15, 2019
8138c5d
editing Readme and changing adobe to Adobe in comments
martinminsel Feb 15, 2019
7768e2e
avoid installing the CEP panel on framework start migrating this call…
martinminsel Feb 15, 2019
0310cd1
readme changes from the code review
martinminsel Feb 21, 2019
2f7fc09
migrating the CEP extension install logic into a dedicated file.
martinminsel Feb 21, 2019
ab2ff64
rename tk_adobe_basic to tk_framework_adobe
martinminsel Feb 22, 2019
c6a38d9
move utility modules inside tk_framework_adobe_utils module
martinminsel Feb 22, 2019
b0df95d
linting changes
martinminsel Feb 22, 2019
b2c5aa4
change aftereffects engine name to aftereffects
martinminsel Mar 1, 2019
5ddacfb
remove single quotes
martinminsel Mar 1, 2019
af553f9
rename extension to the old name to streamline the upgrade path
martinminsel Mar 7, 2019
7ec5899
change the log file names
martinminsel Mar 7, 2019
864a163
adjust flake8 setting after extension rename
martinminsel Mar 7, 2019
9f00686
Added icon
manneohrstrom Mar 8, 2019
da9e8f4
add bring_to_front to win_32_api
martinminsel Mar 11, 2019
ce11c44
Merge branch 'tk-framework-adobe' of https://[email protected]/…
martinminsel Mar 11, 2019
9a524fa
allow after effects 2017
martinminsel Mar 12, 2019
a5219d1
reverting back the internal panel name
martinminsel Mar 13, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
66 changes: 66 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
# Copyright (c) 2017 Shotgun Software Inc.
#
# CONFIDENTIAL AND PROPRIETARY
#
# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit
# Source Code License included in this distribution package. See LICENSE.
# By accessing, using, copying or modifying this work you indicate your
# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights
# not expressly granted therein are reserved by Shotgun Software Inc.

# Flake 8 PEP and lint configuration - https://gitlab.com/pycqa/flake8
#
# This defines the official lint and PEP8 rules for this repository
#
# You can run this locally by doing pep install flake8 and then
# >flake8 /path/to/core
#
# This is also used by the hound CI - see the .hound.yml config file.
#
#
[flake8]

# things we don't want to lint
exclude =
.tox,
.git,
.flake8,
.gitignore,
.travis.yml,
.cache,
.eggs,
*.rst,
*.yml,
*.pyc,
*.pyo,
*.egg-info,
__pycache__,
# Those are our third parties, do not lint them!
python/tank_vendor,
com.sg.basic.ps/*,
cep/node_modules/*,
# Otherwise you'll have a lot of 'xxx' imported but unused
python/tank/__init__.py,
python/tank/*/__init__.py,
# Skip the auto-generated ui file.
python/tank/authentication/ui/login_dialog.py,
python/tank/authentication/ui/resources_rc.py,
python/tank/authentication/sso_saml2/*,
tests/python

# toolkit exceptions
#
# E501 line too long (112 > 79 characters)
# W291 trailing whitespace
# W293 blank line contains whitespace
# W391 blank line at end of file
# E221 multiple spaces before operator
# E261 two whitespaces before end of line comment.
# E402 module level import not top of file
# N802 Variables should be lower case. (clashes with Qt naming conventions)
# N806 Variables should be lower case. (clashes with Qt naming conventions)
# E999 SyntaxError: invalid syntax (hack for hound CI which runs python 3.x)

ignore = E501, W291, W293, W391, E221, E261, E402, N802, N806, E999


11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
*.py[co]

.DS_Store
*.swp
*.lock
profile
Thumbs.db

*.rnd
*.swp
pkgs/*
68 changes: 67 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,71 @@
# tk-framework-adobe

A framework for adobe engines

A framework for Adobe engines


# Contributing

## Setup development environment

To setup the development environment for this project, you will need to obtain the _**ZXPSignCmd**_ tool provided by Adobe, which can be found [here](https://labs.adobe.com/downloads/extensionbuilder3.html). Once you have logged in using your existing Adobe user account, download the _**CC Extensions Signing Toolkit**_, which will provide you with the necessary executable.

If you are developing on a ***Mac*** please set all necessary variables in `dev/env.mk`.

On ***Windows*** please fill all necessary variables in `dev\env.cmd`

From now on you may test and sign with the following targets:

---
***Note***
Be sure to run all of the following commands from the top-level directory of this project.
---


### To install the CEP extension for testing without signing:
```
cd dev
make test
```

### To sign the CEP extension
```
cd dev
make sign
```


### To create a certificate for use when signing the CEP extension
```
cd dev
make create_certificate
```

---
***Note***
In the case where the configured CERTIFICATE_FILE does not exist, the create_certificate command will be automatically run as part of the _sign_ target.
---


### To remove the latest signed zxp file
```
cd dev
make clean
```

### Notes on editing the env files (env.mk/env.cmd)

Changes to the env files (env.mk and env.cmd) will typically not be tracked in git. The information contained in these files is specific to a particular development environment, so tracking changes to that data in git is undesirable.

If you need to make changes to these files, you can use the following commands:

```
git update-index --no-skip-worktree dev/env.mk dev/env.cmd
git add dev\env.*
git commit -m "your message"
git update-index --skip-worktree dev/env.mk dev/env.cmd
```

Please be aware that these files contain potentially-sensitive information, such as a certificate password. When making changes to these files and pushing them to a git repository, be sure that you've removed any data that might be considered confidential.


17 changes: 17 additions & 0 deletions cep/.debug
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<ExtensionList>
<Extension Id="com.sg.basic.adobe.panel">
<HostList>
<Host Name="PHSP" Port="45216"/>
<Host Name="PHXS" Port="45217"/>
<Host Name="AEFT" Port="45218"/>
</HostList>
</Extension>
<Extension Id="com.sg.basic.adobe.manager">
<HostList>
<Host Name="PHSP" Port="45226"/>
<Host Name="PHXS" Port="45227"/>
<Host Name="AEFT" Port="45228"/>
</HostList>
</Extension>
</ExtensionList>
84 changes: 84 additions & 0 deletions cep/CSXS/manifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<ExtensionManifest xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ExtensionBundleId="com.sg.basic.adobe" ExtensionBundleName="Shotgun Engine for Adobe CC" ExtensionBundleVersion="1.0" Version="6.0">
<ExtensionList>
<Extension Id="com.sg.basic.adobe.manager" Version="1.0"/>
<Extension Id="com.sg.basic.adobe.panel" Version="1.0"/>
</ExtensionList>
<ExecutionEnvironment>
<HostList>
<!-- Photoshop - CC 2014+ -->
<Host Name="PHSP" Version="15.0"/>
<Host Name="PHXS" Version="15.0"/>
<!-- After Effects - CC 2017+ -->
<Host Name="AEFT" Version="14.0"/>
<!-- Supporting more engines than Photoshop and After Effects can be done in this line -->
</HostList>
<LocaleList>
<Locale Code="All"/>
</LocaleList>
<RequiredRuntimeList>
<RequiredRuntime Name="CSXS" Version="6.0"/>
</RequiredRuntimeList>
</ExecutionEnvironment>
<DispatchInfoList>
<Extension Id="com.sg.basic.adobe.manager">
<DispatchInfo>
<Resources>
<MainPath>./html/manager.html</MainPath>
<CEFCommandLine>
<Parameter>--enable-nodejs</Parameter>
</CEFCommandLine>
</Resources>
<Lifecycle>
<!-- don't show. keep it secret. keep it safe. -->
<AutoVisible>false</AutoVisible>
<StartOn>
<!-- Adobe CEP startup event -->
<Event>com.adobe.csxs.events.AppOnline</Event>
<!-- Adobe CEP startup event -->
<Event>com.adobe.csxs.events.ApplicationActivate</Event>
</StartOn>
</Lifecycle>
<UI>
<!-- Custom keeps it hidden. -->
<Type>Custom</Type>
<Geometry>
<Size>
<Height>100</Height>
<Width>100</Width>
</Size>
</Geometry>
</UI>
</DispatchInfo>
</Extension>
<Extension Id="com.sg.basic.adobe.panel">
<DispatchInfo>
<Resources>
<MainPath>./html/panel.html</MainPath>
<CEFCommandLine>
<Parameter>--enable-nodejs</Parameter>
</CEFCommandLine>
</Resources>
<Lifecycle>
<AutoVisible>true</AutoVisible>
</Lifecycle>
<UI>
<Type>Panel</Type>
<Menu>Shotgun Adobe Panel</Menu>
<Geometry>
<Size>
<Height>350</Height>
<Width>400</Width>
</Size>
</Geometry>
<Icons>
<Icon Type="Normal">./images/IconLight.png</Icon>
<Icon Type="RollOver">./images/IconLightRollOver.png</Icon>
<Icon Type="DarkNormal">./images/IconDark.png</Icon>
<Icon Type="DarkRollOver">./images/IconDarkRollOver.png</Icon>
</Icons>
</UI>
</DispatchInfo>
</Extension>
</DispatchInfoList>
</ExtensionManifest>
Loading