Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

Optionally add task to subset name #1068

Merged
merged 37 commits into from
Mar 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
5d98c22
added pype specific Creator that will have different subset name method
iLLiCiTiT Feb 26, 2021
f9b881f
Pype Creator extracted to CreatorMixin which can override `get_subset…
iLLiCiTiT Feb 26, 2021
5d6c37e
implemented maya Creator plugin in pype's maya api which is used in m…
iLLiCiTiT Feb 26, 2021
112fe8f
fix maya's `on_startup` callback
iLLiCiTiT Feb 26, 2021
b290059
created harmony specific creator using pype's mixin
iLLiCiTiT Feb 26, 2021
9fcc77a
fixed aftereffects creator
iLLiCiTiT Feb 26, 2021
d3da0a6
added Creator plugin for blender creators
iLLiCiTiT Feb 26, 2021
7481df2
fixed Fusion creator plugin
iLLiCiTiT Feb 26, 2021
22a1a71
fixed hiero creator plugin inheritance
iLLiCiTiT Feb 26, 2021
c154aa5
added Creator plugin for houdini and fixed inheritance in it's creators
iLLiCiTiT Feb 26, 2021
e5d5032
nuke's creator inherit from creator mixin and all remaining creators …
iLLiCiTiT Feb 26, 2021
933d6de
fixed inheritance in photoshop creator
iLLiCiTiT Feb 26, 2021
c935958
resolve's creator also inherit from creator mixin
iLLiCiTiT Feb 26, 2021
bc2c2b4
added Creator plugin for tvpaint and it's creator are using it
iLLiCiTiT Feb 26, 2021
4d16475
modified unreal's creator plugin
iLLiCiTiT Feb 26, 2021
cef7b30
standalone publisher is using pype's creator and way how creator tool…
iLLiCiTiT Feb 26, 2021
9a3db03
cleaned code
iLLiCiTiT Feb 26, 2021
66efae6
extracted `compile_list_of_regexes` to pype.lib's init file
iLLiCiTiT Feb 26, 2021
d3e13d4
added profiles filtering function to pype.lib
iLLiCiTiT Feb 26, 2021
23b613e
modified profile_filtering to be able use different logger
iLLiCiTiT Feb 26, 2021
895017e
added subset name profiles to settings
iLLiCiTiT Mar 1, 2021
86912ee
saved default subset names templates
iLLiCiTiT Mar 1, 2021
770f62e
standalone publisher has defined host name in constants and is set on…
iLLiCiTiT Mar 1, 2021
759620d
basic logic of using settings for subset template works
iLLiCiTiT Mar 1, 2021
60cd9b8
added validation of not set value
iLLiCiTiT Mar 1, 2021
42830fc
fixed profile filtering logic
iLLiCiTiT Mar 1, 2021
ad3458c
changed keys in creator plugin for filtering and filling
iLLiCiTiT Mar 1, 2021
2fbf018
added simple check of task existence when template requires task name
iLLiCiTiT Mar 1, 2021
7fe8f85
added catch exception when task is required and not set
iLLiCiTiT Mar 1, 2021
317e3ed
standalone publisher cares about task changes
iLLiCiTiT Mar 1, 2021
f2ac90f
fix standalone publisher handling on project change
iLLiCiTiT Mar 1, 2021
afad37d
hound fixes
iLLiCiTiT Mar 1, 2021
1e3d389
changed `user_input` to `variant`
iLLiCiTiT Mar 1, 2021
ebaab6d
added multiple variants of formatting keys with different lower/upper…
iLLiCiTiT Mar 1, 2021
2430410
modified default subset name templates
iLLiCiTiT Mar 1, 2021
0289546
multiple variants should not work as expected
iLLiCiTiT Mar 1, 2021
a8aec32
removed unused import
iLLiCiTiT Mar 2, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pype/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
from . import resources

from .plugin import (
PypeCreatorMixin,
Creator,

Extractor,

ValidatePipelineOrder,
Expand Down Expand Up @@ -86,6 +89,9 @@
# Resources
"resources",

# Pype creator mixin
"PypeCreatorMixin",
"Creator",
# plugin classes
"Extractor",
# ordering
Expand Down
4 changes: 2 additions & 2 deletions pype/hosts/aftereffects/plugins/create/create_render.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from avalon import api
import pype.api
from avalon.vendor import Qt
from avalon import aftereffects

Expand All @@ -7,7 +7,7 @@
log = logging.getLogger(__name__)


class CreateRender(api.Creator):
class CreateRender(pype.api.Creator):
"""Render folder for publish."""

name = "renderDefault"
Expand Down
6 changes: 6 additions & 0 deletions pype/hosts/blender/api/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import bpy

from avalon import api
import avalon.blender
from pype.api import PypeCreatorMixin

VALID_EXTENSIONS = [".blend", ".json"]

Expand Down Expand Up @@ -100,6 +102,10 @@ def get_local_collection_with_name(name):
return None


class Creator(PypeCreatorMixin, avalon.blender.Creator):
pass


class AssetLoader(api.Loader):
"""A basic AssetLoader for Blender
Expand Down
4 changes: 2 additions & 2 deletions pype/hosts/blender/plugins/create/create_action.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
import bpy

from avalon import api
from avalon.blender import Creator, lib
import pype.hosts.blender.api.plugin
from avalon.blender import lib


class CreateAction(Creator):
class CreateAction(pype.hosts.blender.api.plugin.Creator):
"""Action output for character rigs"""

name = "actionMain"
Expand Down
2 changes: 1 addition & 1 deletion pype/hosts/blender/plugins/create/create_animation.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import pype.hosts.blender.api.plugin


class CreateAnimation(blender.Creator):
class CreateAnimation(pype.hosts.blender.api.plugin.Creator):
"""Animation output for character rigs"""

name = "animationMain"
Expand Down
4 changes: 2 additions & 2 deletions pype/hosts/blender/plugins/create/create_camera.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
import bpy

from avalon import api
from avalon.blender import Creator, lib
from avalon.blender import lib
import pype.hosts.blender.api.plugin


class CreateCamera(Creator):
class CreateCamera(pype.hosts.blender.api.plugin.Creator):
"""Polygonal static geometry"""

name = "cameraMain"
Expand Down
4 changes: 2 additions & 2 deletions pype/hosts/blender/plugins/create/create_layout.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
import bpy

from avalon import api
from avalon.blender import Creator, lib
from avalon.blender import lib
import pype.hosts.blender.api.plugin


class CreateLayout(Creator):
class CreateLayout(pype.hosts.blender.api.plugin.Creator):
"""Layout output for character rigs"""

name = "layoutMain"
Expand Down
4 changes: 2 additions & 2 deletions pype/hosts/blender/plugins/create/create_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
import bpy

from avalon import api
from avalon.blender import Creator, lib
from avalon.blender import lib
import pype.hosts.blender.api.plugin


class CreateModel(Creator):
class CreateModel(pype.hosts.blender.api.plugin.Creator):
"""Polygonal static geometry"""

name = "modelMain"
Expand Down
4 changes: 2 additions & 2 deletions pype/hosts/blender/plugins/create/create_rig.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
import bpy

from avalon import api
from avalon.blender import Creator, lib
from avalon.blender import lib
import pype.hosts.blender.api.plugin


class CreateRig(Creator):
class CreateRig(pype.hosts.blender.api.plugin.Creator):
"""Artist-friendly rig with controls to direct motion"""

name = "rigMain"
Expand Down
3 changes: 2 additions & 1 deletion pype/hosts/blender/plugins/create/create_setdress.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
from avalon import api, blender
import pype.hosts.blender.api.plugin

class CreateSetDress(blender.Creator):

class CreateSetDress(pype.hosts.blender.api.plugin.Creator):
"""A grouped package of loaded content"""

name = "setdressMain"
Expand Down
4 changes: 2 additions & 2 deletions pype/hosts/fusion/plugins/create/create_exr_saver.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import os

import avalon.api
import pype.api
from avalon import fusion


class CreateOpenEXRSaver(avalon.api.Creator):
class CreateOpenEXRSaver(pype.api.Creator):

name = "openexrDefault"
label = "Create OpenEXR Saver"
Expand Down
6 changes: 6 additions & 0 deletions pype/hosts/harmony/api/plugin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from avalon import harmony
from pype.api import PypeCreatorMixin


class Creator(PypeCreatorMixin, harmony.Creator):
pass
3 changes: 2 additions & 1 deletion pype/hosts/harmony/plugins/create/create_farm_render.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# -*- coding: utf-8 -*-
"""Create Composite node for render on farm."""
from avalon import harmony
from pype.hosts.harmony.api import plugin


class CreateFarmRender(harmony.Creator):
class CreateFarmRender(plugin.Creator):
"""Composite node for publishing renders."""

name = "renderDefault"
Expand Down
3 changes: 2 additions & 1 deletion pype/hosts/harmony/plugins/create/create_render.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# -*- coding: utf-8 -*-
"""Create render node."""
from avalon import harmony
from pype.hosts.harmony.api import plugin


class CreateRender(harmony.Creator):
class CreateRender(plugin.Creator):
"""Composite node for publishing renders."""

name = "renderDefault"
Expand Down
4 changes: 2 additions & 2 deletions pype/hosts/harmony/plugins/create/create_template.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from avalon import harmony
from pype.hosts.harmony.api import plugin


class CreateTemplate(harmony.Creator):
class CreateTemplate(plugin.Creator):
"""Composite node for publishing to templates."""

name = "templateDefault"
Expand Down
2 changes: 1 addition & 1 deletion pype/hosts/hiero/api/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ def load(self):
return track_item


class Creator(avalon.Creator):
class Creator(pype.Creator):
"""Creator class wrapper
"""
clip_color = "Purple"
Expand Down
6 changes: 6 additions & 0 deletions pype/hosts/houdini/api/plugin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from avalon import houdini
from pype.api import PypeCreatorMixin


class Creator(PypeCreatorMixin, houdini.Creator):
pass
4 changes: 2 additions & 2 deletions pype/hosts/houdini/plugins/create/create_alembic_camera.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from avalon import houdini
from pype.hosts.houdini.api import plugin


class CreateAlembicCamera(houdini.Creator):
class CreateAlembicCamera(plugin.Creator):
"""Single baked camera from Alembic ROP"""

name = "camera"
Expand Down
4 changes: 2 additions & 2 deletions pype/hosts/houdini/plugins/create/create_pointcache.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from avalon import houdini
from pype.hosts.houdini.api import plugin


class CreatePointCache(houdini.Creator):
class CreatePointCache(plugin.Creator):
"""Alembic ROP to pointcache"""

name = "pointcache"
Expand Down
4 changes: 2 additions & 2 deletions pype/hosts/houdini/plugins/create/create_vbd_cache.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from avalon import houdini
from pype.hosts.houdini.api import plugin


class CreateVDBCache(houdini.Creator):
class CreateVDBCache(plugin.Creator):
"""OpenVDB from Geometry ROP"""

name = "vbdcache"
Expand Down
4 changes: 2 additions & 2 deletions pype/hosts/maya/api/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def on_open(_):
"""On scene open let's assume the containers have changed."""

from avalon.vendor.Qt import QtWidgets
from ...widgets import popup
from pype.widgets import popup

cmds.evalDeferred(
"from pype.hosts.maya.api import lib;"
Expand Down Expand Up @@ -223,4 +223,4 @@ def on_task_changed(*args):
lib.show_message(
"Context was changed",
("Context was changed to {}".format(avalon.Session["AVALON_ASSET"])),
)
)
6 changes: 6 additions & 0 deletions pype/hosts/maya/api/plugin.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
from avalon import api
from avalon.vendor import qargparse
import avalon.maya
from pype.api import PypeCreatorMixin


def get_reference_node_parents(ref):
Expand All @@ -26,6 +28,10 @@ def get_reference_node_parents(ref):
return parents


class Creator(PypeCreatorMixin, avalon.maya.Creator):
pass


class ReferenceLoader(api.Loader):
"""A basic ReferenceLoader for Maya
Expand Down
8 changes: 5 additions & 3 deletions pype/hosts/maya/plugins/create/create_animation.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import avalon.maya
from pype.hosts.maya.api import lib
from pype.hosts.maya.api import (
lib,
plugin
)


class CreateAnimation(avalon.maya.Creator):
class CreateAnimation(plugin.Creator):
"""Animation output for character rigs"""

name = "animationDefault"
Expand Down
8 changes: 5 additions & 3 deletions pype/hosts/maya/plugins/create/create_ass.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
from collections import OrderedDict

import avalon.maya
from pype.hosts.maya.api import lib
from pype.hosts.maya.api import (
lib,
plugin
)

from maya import cmds


class CreateAss(avalon.maya.Creator):
class CreateAss(plugin.Creator):
"""Arnold Archive"""

name = "ass"
Expand Down
4 changes: 2 additions & 2 deletions pype/hosts/maya/plugins/create/create_assembly.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import avalon.maya
from pype.hosts.maya.api import plugin


class CreateAssembly(avalon.maya.Creator):
class CreateAssembly(plugin.Creator):
"""A grouped package of loaded content"""

name = "assembly"
Expand Down
10 changes: 6 additions & 4 deletions pype/hosts/maya/plugins/create/create_camera.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import avalon.maya
from pype.hosts.maya.api import lib
from pype.hosts.maya.api import (
lib,
plugin
)


class CreateCamera(avalon.maya.Creator):
class CreateCamera(plugin.Creator):
"""Single baked camera"""

name = "cameraMain"
Expand All @@ -24,7 +26,7 @@ def __init__(self, *args, **kwargs):
self.data['bakeToWorldSpace'] = True


class CreateCameraRig(avalon.maya.Creator):
class CreateCameraRig(plugin.Creator):
"""Complex hierarchy with camera."""

name = "camerarigMain"
Expand Down
4 changes: 2 additions & 2 deletions pype/hosts/maya/plugins/create/create_layout.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import avalon.maya
from pype.hosts.maya.api import plugin


class CreateLayout(avalon.maya.Creator):
class CreateLayout(plugin.Creator):
"""A grouped package of loaded content"""

name = "layoutMain"
Expand Down
8 changes: 5 additions & 3 deletions pype/hosts/maya/plugins/create/create_look.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import avalon.maya
from pype.hosts.maya.api import lib
from pype.hosts.maya.api import (
lib,
plugin
)


class CreateLook(avalon.maya.Creator):
class CreateLook(plugin.Creator):
"""Shader connections defining shape look"""

name = "look"
Expand Down
4 changes: 2 additions & 2 deletions pype/hosts/maya/plugins/create/create_mayaascii.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import avalon.maya
from pype.hosts.maya.api import plugin


class CreateMayaAscii(avalon.maya.Creator):
class CreateMayaAscii(plugin.Creator):
"""Raw Maya Ascii file export"""

name = "mayaAscii"
Expand Down
4 changes: 2 additions & 2 deletions pype/hosts/maya/plugins/create/create_model.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import avalon.maya
from pype.hosts.maya.api import plugin


class CreateModel(avalon.maya.Creator):
class CreateModel(plugin.Creator):
"""Polygonal static geometry"""

name = "modelMain"
Expand Down
Loading