From 11fc3ee6fd1d0ce5f9352622e02ce47ba9099d80 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 9 Aug 2019 19:36:24 +0200 Subject: [PATCH] added plugins_presets to ftrack plugins init args --- pype/ftrack/actions/action_application_loader.py | 8 ++++---- pype/ftrack/actions/action_asset_delete.py | 4 ++-- pype/ftrack/actions/action_attributes_remapper.py | 4 ++-- pype/ftrack/actions/action_client_review_sort.py | 4 ++-- pype/ftrack/actions/action_component_open.py | 4 ++-- pype/ftrack/actions/action_create_cust_attrs.py | 4 ++-- pype/ftrack/actions/action_create_folders.py | 4 ++-- pype/ftrack/actions/action_create_project_folders.py | 4 ++-- pype/ftrack/actions/action_cust_attr_doctor.py | 4 ++-- pype/ftrack/actions/action_delete_asset.py | 4 ++-- pype/ftrack/actions/action_delete_asset_byname.py | 4 ++-- pype/ftrack/actions/action_delete_unpublished.py | 4 ++-- pype/ftrack/actions/action_djvview.py | 8 ++++---- pype/ftrack/actions/action_job_killer.py | 4 ++-- pype/ftrack/actions/action_multiple_notes.py | 4 ++-- pype/ftrack/actions/action_rv.py | 8 ++++---- pype/ftrack/actions/action_set_version.py | 4 ++-- pype/ftrack/actions/action_start_timer.py | 4 ++-- pype/ftrack/actions/action_sync_hier_attrs_local.py | 4 ++-- pype/ftrack/actions/action_sync_to_avalon_local.py | 4 ++-- pype/ftrack/actions/action_test.py | 4 ++-- pype/ftrack/actions/action_thumbToChildern.py | 4 ++-- pype/ftrack/actions/action_thumbToParent.py | 4 ++-- pype/ftrack/actions/action_where_run_ask.py | 4 ++-- pype/ftrack/actions/action_where_run_show.py | 4 ++-- pype/ftrack/events/action_sync_hier_attrs.py | 4 ++-- pype/ftrack/events/action_sync_to_avalon.py | 4 ++-- pype/ftrack/events/event_del_avalon_id_from_new.py | 4 ++-- pype/ftrack/events/event_next_task_update.py | 4 ++-- pype/ftrack/events/event_radio_buttons.py | 4 ++-- pype/ftrack/events/event_sync_hier_attr.py | 4 ++-- pype/ftrack/events/event_sync_to_avalon.py | 4 ++-- pype/ftrack/events/event_test.py | 4 ++-- pype/ftrack/events/event_thumbnail_updates.py | 4 ++-- pype/ftrack/events/event_user_assigment.py | 4 ++-- pype/ftrack/events/event_version_to_task_statuses.py | 4 ++-- pype/ftrack/lib/ftrack_action_handler.py | 4 ++-- pype/ftrack/lib/ftrack_app_handler.py | 6 +++--- pype/ftrack/lib/ftrack_base_handler.py | 2 +- pype/ftrack/lib/ftrack_event_handler.py | 4 ++-- 40 files changed, 86 insertions(+), 86 deletions(-) diff --git a/pype/ftrack/actions/action_application_loader.py b/pype/ftrack/actions/action_application_loader.py index 06a3f9c92e..813eee358a 100644 --- a/pype/ftrack/actions/action_application_loader.py +++ b/pype/ftrack/actions/action_application_loader.py @@ -9,7 +9,7 @@ from pype.lib import get_all_avalon_projects log = Logger().get_logger(__name__) -def registerApp(app, session): +def registerApp(app, session, plugins_presets): name = app['name'] variant = "" try: @@ -41,14 +41,14 @@ def registerApp(app, session): # register action AppAction( session, label, name, executable, variant, - icon, description, preactions + icon, description, preactions, plugins_presets ).register() if not variant: log.info('- Variant is not set') -def register(session): +def register(session, plugins_presets={}): # WARNING getting projects only helps to check connection to mongo # - without will `discover` of ftrack apps actions take ages result = get_all_avalon_projects() @@ -71,7 +71,7 @@ def register(session): app_counter = 0 for app in apps: try: - registerApp(app, session) + registerApp(app, session, plugins_presets) if app_counter%5 == 0: time.sleep(0.1) app_counter += 1 diff --git a/pype/ftrack/actions/action_asset_delete.py b/pype/ftrack/actions/action_asset_delete.py index 684b3862a8..654c78049b 100644 --- a/pype/ftrack/actions/action_asset_delete.py +++ b/pype/ftrack/actions/action_asset_delete.py @@ -78,7 +78,7 @@ class AssetDelete(BaseAction): } -def register(session, **kw): +def register(session, plugins_presets={}): '''Register action. Called when used as an event plugin.''' # Validate that session is an instance of ftrack_api.Session. If not, @@ -87,7 +87,7 @@ def register(session, **kw): if not isinstance(session, ftrack_api.session.Session): return - AssetDelete(session).register() + AssetDelete(session, plugins_presets).register() def main(arguments=None): diff --git a/pype/ftrack/actions/action_attributes_remapper.py b/pype/ftrack/actions/action_attributes_remapper.py index 696e59d949..a098225125 100644 --- a/pype/ftrack/actions/action_attributes_remapper.py +++ b/pype/ftrack/actions/action_attributes_remapper.py @@ -276,10 +276,10 @@ class AttributesRemapper(BaseAction): self.show_interface(event, items, title) -def register(session, **kw): +def register(session, plugins_presets={}): '''Register plugin. Called when used as an plugin.''' if not isinstance(session, ftrack_api.session.Session): return - AttributesRemapper(session).register() + AttributesRemapper(session, plugins_presets).register() diff --git a/pype/ftrack/actions/action_client_review_sort.py b/pype/ftrack/actions/action_client_review_sort.py index b06a928007..6a659ce5e3 100644 --- a/pype/ftrack/actions/action_client_review_sort.py +++ b/pype/ftrack/actions/action_client_review_sort.py @@ -53,12 +53,12 @@ class ClientReviewSort(BaseAction): } -def register(session, **kw): +def register(session, plugins_presets={}): '''Register action. Called when used as an event plugin.''' if not isinstance(session, ftrack_api.session.Session): return - action_handler = ClientReviewSort(session) + action_handler = ClientReviewSort(session, plugins_presets) action_handler.register() diff --git a/pype/ftrack/actions/action_component_open.py b/pype/ftrack/actions/action_component_open.py index d3213c555a..33f4d38890 100644 --- a/pype/ftrack/actions/action_component_open.py +++ b/pype/ftrack/actions/action_component_open.py @@ -65,7 +65,7 @@ class ComponentOpen(BaseAction): } -def register(session, **kw): +def register(session, plugins_presets={}): '''Register action. Called when used as an event plugin.''' # Validate that session is an instance of ftrack_api.Session. If not, @@ -74,7 +74,7 @@ def register(session, **kw): if not isinstance(session, ftrack_api.session.Session): return - ComponentOpen(session).register() + ComponentOpen(session, plugins_presets).register() def main(arguments=None): diff --git a/pype/ftrack/actions/action_create_cust_attrs.py b/pype/ftrack/actions/action_create_cust_attrs.py index 2cd06cc479..6a68eb783e 100644 --- a/pype/ftrack/actions/action_create_cust_attrs.py +++ b/pype/ftrack/actions/action_create_cust_attrs.py @@ -568,7 +568,7 @@ class CustomAttributes(BaseAction): } -def register(session, **kw): +def register(session, plugins_presets={}): '''Register plugin. Called when used as an plugin.''' # Validate that session is an instance of ftrack_api.Session. If not, @@ -577,7 +577,7 @@ def register(session, **kw): if not isinstance(session, ftrack_api.session.Session): return - CustomAttributes(session).register() + CustomAttributes(session, plugins_presets).register() def main(arguments=None): diff --git a/pype/ftrack/actions/action_create_folders.py b/pype/ftrack/actions/action_create_folders.py index 2a777911b4..dc969ada02 100644 --- a/pype/ftrack/actions/action_create_folders.py +++ b/pype/ftrack/actions/action_create_folders.py @@ -322,13 +322,13 @@ class PartialDict(dict): return '{'+key+'}' -def register(session, **kw): +def register(session, plugins_presets={}): '''Register plugin. Called when used as an plugin.''' if not isinstance(session, ftrack_api.session.Session): return - CreateFolders(session).register() + CreateFolders(session, plugins_presets).register() def main(arguments=None): diff --git a/pype/ftrack/actions/action_create_project_folders.py b/pype/ftrack/actions/action_create_project_folders.py index 3ccdb08714..ef48df7d67 100644 --- a/pype/ftrack/actions/action_create_project_folders.py +++ b/pype/ftrack/actions/action_create_project_folders.py @@ -190,13 +190,13 @@ class CreateProjectFolders(BaseAction): -def register(session, **kw): +def register(session, plugins_presets={}): '''Register plugin. Called when used as an plugin.''' if not isinstance(session, ftrack_api.session.Session): return - CreateProjectFolders(session).register() + CreateProjectFolders(session, plugins_presets).register() def main(arguments=None): diff --git a/pype/ftrack/actions/action_cust_attr_doctor.py b/pype/ftrack/actions/action_cust_attr_doctor.py index 9d0ce2071f..a6ccb237a6 100644 --- a/pype/ftrack/actions/action_cust_attr_doctor.py +++ b/pype/ftrack/actions/action_cust_attr_doctor.py @@ -286,13 +286,13 @@ class CustomAttributeDoctor(BaseAction): return all_roles -def register(session, **kw): +def register(session, plugins_presets={}): '''Register plugin. Called when used as an plugin.''' if not isinstance(session, ftrack_api.session.Session): return - CustomAttributeDoctor(session).register() + CustomAttributeDoctor(session, plugins_presets).register() def main(arguments=None): diff --git a/pype/ftrack/actions/action_delete_asset.py b/pype/ftrack/actions/action_delete_asset.py index 96087f4c8e..a408de45b2 100644 --- a/pype/ftrack/actions/action_delete_asset.py +++ b/pype/ftrack/actions/action_delete_asset.py @@ -311,7 +311,7 @@ class DeleteAsset(BaseAction): return assets -def register(session, **kw): +def register(session, plugins_presets={}): '''Register plugin. Called when used as an plugin.''' # Validate that session is an instance of ftrack_api.Session. If not, @@ -320,7 +320,7 @@ def register(session, **kw): if not isinstance(session, ftrack_api.session.Session): return - DeleteAsset(session).register() + DeleteAsset(session, plugins_presets).register() def main(arguments=None): diff --git a/pype/ftrack/actions/action_delete_asset_byname.py b/pype/ftrack/actions/action_delete_asset_byname.py index fa966096a8..1c05d7d88c 100644 --- a/pype/ftrack/actions/action_delete_asset_byname.py +++ b/pype/ftrack/actions/action_delete_asset_byname.py @@ -131,7 +131,7 @@ class AssetsRemover(BaseAction): return assets -def register(session, **kw): +def register(session, plugins_presets={}): '''Register plugin. Called when used as an plugin.''' # Validate that session is an instance of ftrack_api.Session. If not, @@ -140,7 +140,7 @@ def register(session, **kw): if not isinstance(session, ftrack_api.session.Session): return - AssetsRemover(session).register() + AssetsRemover(session, plugins_presets).register() def main(arguments=None): diff --git a/pype/ftrack/actions/action_delete_unpublished.py b/pype/ftrack/actions/action_delete_unpublished.py index 377e118ffb..5e7f783ba7 100644 --- a/pype/ftrack/actions/action_delete_unpublished.py +++ b/pype/ftrack/actions/action_delete_unpublished.py @@ -42,7 +42,7 @@ class VersionsCleanup(BaseAction): } -def register(session, **kw): +def register(session, plugins_presets={}): '''Register action. Called when used as an event plugin.''' # Validate that session is an instance of ftrack_api.Session. If not, @@ -51,7 +51,7 @@ def register(session, **kw): if not isinstance(session, ftrack_api.session.Session): return - VersionsCleanup(session).register() + VersionsCleanup(session, plugins_presets).register() def main(arguments=None): diff --git a/pype/ftrack/actions/action_djvview.py b/pype/ftrack/actions/action_djvview.py index e0c0334e5f..58914fbc1e 100644 --- a/pype/ftrack/actions/action_djvview.py +++ b/pype/ftrack/actions/action_djvview.py @@ -21,9 +21,9 @@ class DJVViewAction(BaseAction): ) type = 'Application' - def __init__(self, session): + def __init__(self, session, plugins_presets): '''Expects a ftrack_api.Session instance''' - super().__init__(session) + super().__init__(session, plugins_presets) self.djv_path = None self.config_data = config.get_presets()['djv_view']['config'] @@ -218,12 +218,12 @@ class DJVViewAction(BaseAction): return True -def register(session): +def register(session, plugins_presets={}): """Register hooks.""" if not isinstance(session, ftrack_api.session.Session): return - DJVViewAction(session).register() + DJVViewAction(session, plugins_presets).register() def main(arguments=None): diff --git a/pype/ftrack/actions/action_job_killer.py b/pype/ftrack/actions/action_job_killer.py index 44acb24d55..8ac81c4ac2 100644 --- a/pype/ftrack/actions/action_job_killer.py +++ b/pype/ftrack/actions/action_job_killer.py @@ -117,7 +117,7 @@ class JobKiller(BaseAction): } -def register(session, **kw): +def register(session, plugins_presets={}): '''Register plugin. Called when used as an plugin.''' # Validate that session is an instance of ftrack_api.Session. If not, @@ -126,7 +126,7 @@ def register(session, **kw): if not isinstance(session, ftrack_api.session.Session): return - JobKiller(session).register() + JobKiller(session, plugins_presets).register() def main(arguments=None): diff --git a/pype/ftrack/actions/action_multiple_notes.py b/pype/ftrack/actions/action_multiple_notes.py index 338083fe47..6e28b7bed6 100644 --- a/pype/ftrack/actions/action_multiple_notes.py +++ b/pype/ftrack/actions/action_multiple_notes.py @@ -112,13 +112,13 @@ class MultipleNotes(BaseAction): return True -def register(session, **kw): +def register(session, plugins_presets={}): '''Register plugin. Called when used as an plugin.''' if not isinstance(session, ftrack_api.session.Session): return - MultipleNotes(session).register() + MultipleNotes(session, plugins_presets).register() def main(arguments=None): diff --git a/pype/ftrack/actions/action_rv.py b/pype/ftrack/actions/action_rv.py index 223fd0a94b..6b6591355f 100644 --- a/pype/ftrack/actions/action_rv.py +++ b/pype/ftrack/actions/action_rv.py @@ -23,13 +23,13 @@ class RVAction(BaseAction): ) type = 'Application' - def __init__(self, session): + def __init__(self, session, plugins_presets): """ Constructor :param session: ftrack Session :type session: :class:`ftrack_api.Session` """ - super().__init__(session) + super().__init__(session, plugins_presets) self.rv_path = None self.config_data = None @@ -326,12 +326,12 @@ class RVAction(BaseAction): return paths -def register(session): +def register(session, plugins_presets={}): """Register hooks.""" if not isinstance(session, ftrack_api.session.Session): return - RVAction(session).register() + RVAction(session, plugins_presets).register() def main(arguments=None): diff --git a/pype/ftrack/actions/action_set_version.py b/pype/ftrack/actions/action_set_version.py index f6e745b3ec..5bf965e3ef 100644 --- a/pype/ftrack/actions/action_set_version.py +++ b/pype/ftrack/actions/action_set_version.py @@ -71,7 +71,7 @@ class SetVersion(BaseAction): } -def register(session, **kw): +def register(session, plugins_presets={}): '''Register action. Called when used as an event plugin.''' # Validate that session is an instance of ftrack_api.Session. If not, @@ -80,7 +80,7 @@ def register(session, **kw): if not isinstance(session, ftrack_api.session.Session): return - SetVersion(session).register() + SetVersion(session, plugins_presets).register() def main(arguments=None): diff --git a/pype/ftrack/actions/action_start_timer.py b/pype/ftrack/actions/action_start_timer.py index d27908541e..ad83edfc9e 100644 --- a/pype/ftrack/actions/action_start_timer.py +++ b/pype/ftrack/actions/action_start_timer.py @@ -70,10 +70,10 @@ class StartTimer(BaseAction): self.log.info('Starting Clockify timer for task: ' + task['name']) -def register(session, **kw): +def register(session, plugins_presets={}): '''Register plugin. Called when used as an plugin.''' if not isinstance(session, ftrack_api.session.Session): return - StartTimer(session).register() + StartTimer(session, plugins_presets).register() diff --git a/pype/ftrack/actions/action_sync_hier_attrs_local.py b/pype/ftrack/actions/action_sync_hier_attrs_local.py index 9ec07c1319..31d95f9a6f 100644 --- a/pype/ftrack/actions/action_sync_hier_attrs_local.py +++ b/pype/ftrack/actions/action_sync_hier_attrs_local.py @@ -305,13 +305,13 @@ class SyncHierarchicalAttrs(BaseAction): self.update_hierarchical_attribute(child, key, value) -def register(session, **kw): +def register(session, plugins_presets={}): '''Register plugin. Called when used as an plugin.''' if not isinstance(session, ftrack_api.session.Session): return - SyncHierarchicalAttrs(session).register() + SyncHierarchicalAttrs(session, plugins_presets).register() def main(arguments=None): diff --git a/pype/ftrack/actions/action_sync_to_avalon_local.py b/pype/ftrack/actions/action_sync_to_avalon_local.py index 34070c7e1f..6e603b33b3 100644 --- a/pype/ftrack/actions/action_sync_to_avalon_local.py +++ b/pype/ftrack/actions/action_sync_to_avalon_local.py @@ -212,7 +212,7 @@ class SyncToAvalon(BaseAction): self.add_childs_to_importable(child) -def register(session, **kw): +def register(session, plugins_presets={}): '''Register plugin. Called when used as an plugin.''' # Validate that session is an instance of ftrack_api.Session. If not, @@ -221,7 +221,7 @@ def register(session, **kw): if not isinstance(session, ftrack_api.session.Session): return - SyncToAvalon(session).register() + SyncToAvalon(session, plugins_presets).register() def main(arguments=None): diff --git a/pype/ftrack/actions/action_test.py b/pype/ftrack/actions/action_test.py index b7cfd4934a..a2bc8bf892 100644 --- a/pype/ftrack/actions/action_test.py +++ b/pype/ftrack/actions/action_test.py @@ -40,13 +40,13 @@ class TestAction(BaseAction): return True -def register(session, **kw): +def register(session, plugins_presets={}): '''Register plugin. Called when used as an plugin.''' if not isinstance(session, ftrack_api.session.Session): return - TestAction(session).register() + TestAction(session, plugins_presets).register() def main(arguments=None): diff --git a/pype/ftrack/actions/action_thumbToChildern.py b/pype/ftrack/actions/action_thumbToChildern.py index 4e7f1298f5..99ca713662 100644 --- a/pype/ftrack/actions/action_thumbToChildern.py +++ b/pype/ftrack/actions/action_thumbToChildern.py @@ -64,12 +64,12 @@ class ThumbToChildren(BaseAction): } -def register(session, **kw): +def register(session, plugins_presets={}): '''Register action. Called when used as an event plugin.''' if not isinstance(session, ftrack_api.session.Session): return - ThumbToChildren(session).register() + ThumbToChildren(session, plugins_presets).register() def main(arguments=None): diff --git a/pype/ftrack/actions/action_thumbToParent.py b/pype/ftrack/actions/action_thumbToParent.py index 632d2a50b2..9de9cd8cc4 100644 --- a/pype/ftrack/actions/action_thumbToParent.py +++ b/pype/ftrack/actions/action_thumbToParent.py @@ -86,12 +86,12 @@ class ThumbToParent(BaseAction): } -def register(session, **kw): +def register(session, plugins_presets={}): '''Register action. Called when used as an event plugin.''' if not isinstance(session, ftrack_api.session.Session): return - ThumbToParent(session).register() + ThumbToParent(session, plugins_presets).register() def main(arguments=None): diff --git a/pype/ftrack/actions/action_where_run_ask.py b/pype/ftrack/actions/action_where_run_ask.py index 2bd1ed3d22..95bbf1fdd7 100644 --- a/pype/ftrack/actions/action_where_run_ask.py +++ b/pype/ftrack/actions/action_where_run_ask.py @@ -45,10 +45,10 @@ class ActionAskWhereIRun(BaseAction): return True -def register(session, **kw): +def register(session, plugins_presets={}): '''Register plugin. Called when used as an plugin.''' if not isinstance(session, ftrack_api.session.Session): return - ActionAskWhereIRun(session).register() + ActionAskWhereIRun(session, plugins_presets).register() diff --git a/pype/ftrack/actions/action_where_run_show.py b/pype/ftrack/actions/action_where_run_show.py index 7875d2e262..7fea23e3b7 100644 --- a/pype/ftrack/actions/action_where_run_show.py +++ b/pype/ftrack/actions/action_where_run_show.py @@ -77,10 +77,10 @@ class ActionShowWhereIRun(BaseAction): return True -def register(session, **kw): +def register(session, plugins_presets={}): '''Register plugin. Called when used as an plugin.''' if not isinstance(session, ftrack_api.session.Session): return - ActionShowWhereIRun(session).register() + ActionShowWhereIRun(session, plugins_presets).register() diff --git a/pype/ftrack/events/action_sync_hier_attrs.py b/pype/ftrack/events/action_sync_hier_attrs.py index a94d43cad2..cd7446f5e4 100644 --- a/pype/ftrack/events/action_sync_hier_attrs.py +++ b/pype/ftrack/events/action_sync_hier_attrs.py @@ -333,13 +333,13 @@ class SyncHierarchicalAttrs(BaseAction): self.update_hierarchical_attribute(child, key, value) -def register(session, **kw): +def register(session, plugins_presets): '''Register plugin. Called when used as an plugin.''' if not isinstance(session, ftrack_api.session.Session): return - SyncHierarchicalAttrs(session).register() + SyncHierarchicalAttrs(session, plugins_presets).register() def main(arguments=None): diff --git a/pype/ftrack/events/action_sync_to_avalon.py b/pype/ftrack/events/action_sync_to_avalon.py index e78b209fac..fc03180bdc 100644 --- a/pype/ftrack/events/action_sync_to_avalon.py +++ b/pype/ftrack/events/action_sync_to_avalon.py @@ -242,7 +242,7 @@ class Sync_To_Avalon(BaseAction): self.add_childs_to_importable(child) -def register(session, **kw): +def register(session, plugins_presets): '''Register plugin. Called when used as an plugin.''' # Validate that session is an instance of ftrack_api.Session. If not, @@ -251,7 +251,7 @@ def register(session, **kw): if not isinstance(session, ftrack_api.session.Session): return - Sync_To_Avalon(session).register() + SyncToAvalon(session, plugins_presets).register() def main(arguments=None): diff --git a/pype/ftrack/events/event_del_avalon_id_from_new.py b/pype/ftrack/events/event_del_avalon_id_from_new.py index f27a329429..6f6320f51b 100644 --- a/pype/ftrack/events/event_del_avalon_id_from_new.py +++ b/pype/ftrack/events/event_del_avalon_id_from_new.py @@ -51,9 +51,9 @@ class DelAvalonIdFromNew(BaseEvent): continue -def register(session, **kw): +def register(session, plugins_presets): '''Register plugin. Called when used as an plugin.''' if not isinstance(session, ftrack_api.session.Session): return - DelAvalonIdFromNew(session).register() + DelAvalonIdFromNew(session, plugins_presets).register() diff --git a/pype/ftrack/events/event_next_task_update.py b/pype/ftrack/events/event_next_task_update.py index 1ae06050bc..e25514a2b4 100644 --- a/pype/ftrack/events/event_next_task_update.py +++ b/pype/ftrack/events/event_next_task_update.py @@ -86,9 +86,9 @@ class NextTaskUpdate(BaseEvent): session.rollback() -def register(session, **kw): +def register(session, plugins_presets): '''Register plugin. Called when used as an plugin.''' if not isinstance(session, ftrack_api.session.Session): return - NextTaskUpdate(session).register() + NextTaskUpdate(session, plugins_presets).register() diff --git a/pype/ftrack/events/event_radio_buttons.py b/pype/ftrack/events/event_radio_buttons.py index a185280ecc..9c6f2d490a 100644 --- a/pype/ftrack/events/event_radio_buttons.py +++ b/pype/ftrack/events/event_radio_buttons.py @@ -34,9 +34,9 @@ class Radio_buttons(BaseEvent): session.commit() -def register(session): +def register(session, plugins_presets): '''Register plugin. Called when used as an plugin.''' if not isinstance(session, ftrack_api.session.Session): return - Radio_buttons(session).register() + Radio_buttons(session, plugins_presets).register() diff --git a/pype/ftrack/events/event_sync_hier_attr.py b/pype/ftrack/events/event_sync_hier_attr.py index 867e2cde2b..7c5c4b820b 100644 --- a/pype/ftrack/events/event_sync_hier_attr.py +++ b/pype/ftrack/events/event_sync_hier_attr.py @@ -115,9 +115,9 @@ class SyncHierarchicalAttrs(BaseEvent): self.update_hierarchical_attribute(child, key, value) -def register(session, **kw): +def register(session, plugins_presets): '''Register plugin. Called when used as an plugin.''' if not isinstance(session, ftrack_api.session.Session): return - SyncHierarchicalAttrs(session).register() + SyncHierarchicalAttrs(session, plugins_presets).register() diff --git a/pype/ftrack/events/event_sync_to_avalon.py b/pype/ftrack/events/event_sync_to_avalon.py index dbd58111b3..ae7ebbbf90 100644 --- a/pype/ftrack/events/event_sync_to_avalon.py +++ b/pype/ftrack/events/event_sync_to_avalon.py @@ -118,10 +118,10 @@ class Sync_to_Avalon(BaseEvent): return -def register(session, **kw): +def register(session, plugins_presets): '''Register plugin. Called when used as an plugin.''' if not isinstance(session, ftrack_api.session.Session): return - Sync_to_Avalon(session).register() + Sync_to_Avalon(session, plugins_presets).register() diff --git a/pype/ftrack/events/event_test.py b/pype/ftrack/events/event_test.py index cc7851afb7..94d99dbf67 100644 --- a/pype/ftrack/events/event_test.py +++ b/pype/ftrack/events/event_test.py @@ -20,9 +20,9 @@ class Test_Event(BaseEvent): return True -def register(session, **kw): +def register(session, plugins_presets): '''Register plugin. Called when used as an plugin.''' if not isinstance(session, ftrack_api.session.Session): return - Test_Event(session).register() + Test_Event(session, plugins_presets).register() diff --git a/pype/ftrack/events/event_thumbnail_updates.py b/pype/ftrack/events/event_thumbnail_updates.py index 042f6cc600..7f52177161 100644 --- a/pype/ftrack/events/event_thumbnail_updates.py +++ b/pype/ftrack/events/event_thumbnail_updates.py @@ -45,9 +45,9 @@ class ThumbnailEvents(BaseEvent): pass -def register(session, **kw): +def register(session, plugins_presets): '''Register plugin. Called when used as an plugin.''' if not isinstance(session, ftrack_api.session.Session): return - ThumbnailEvents(session).register() + ThumbnailEvents(session, plugins_presets).register() diff --git a/pype/ftrack/events/event_user_assigment.py b/pype/ftrack/events/event_user_assigment.py index 0bb7f21590..3e250b988a 100644 --- a/pype/ftrack/events/event_user_assigment.py +++ b/pype/ftrack/events/event_user_assigment.py @@ -229,11 +229,11 @@ class UserAssigmentEvent(BaseEvent): return True -def register(session, **kw): +def register(session, plugins_presets): """ Register plugin. Called when used as an plugin. """ if not isinstance(session, ftrack_api.session.Session): return - UserAssigmentEvent(session).register() + UserAssigmentEvent(session, plugins_presets).register() diff --git a/pype/ftrack/events/event_version_to_task_statuses.py b/pype/ftrack/events/event_version_to_task_statuses.py index 8b14e025d3..306d594647 100644 --- a/pype/ftrack/events/event_version_to_task_statuses.py +++ b/pype/ftrack/events/event_version_to_task_statuses.py @@ -69,9 +69,9 @@ class VersionToTaskStatus(BaseEvent): path, task_status['name'])) -def register(session, **kw): +def register(session, plugins_presets): '''Register plugin. Called when used as an plugin.''' if not isinstance(session, ftrack_api.session.Session): return - VersionToTaskStatus(session).register() + VersionToTaskStatus(session, plugins_presets).register() diff --git a/pype/ftrack/lib/ftrack_action_handler.py b/pype/ftrack/lib/ftrack_action_handler.py index 7a25155718..7fd7eccfb7 100644 --- a/pype/ftrack/lib/ftrack_action_handler.py +++ b/pype/ftrack/lib/ftrack_action_handler.py @@ -21,9 +21,9 @@ class BaseAction(BaseHandler): icon = None type = 'Action' - def __init__(self, session): + def __init__(self, session, plugins_presets={}): '''Expects a ftrack_api.Session instance''' - super().__init__(session) + super().__init__(session, plugins_presets) if self.label is None: raise ValueError( diff --git a/pype/ftrack/lib/ftrack_app_handler.py b/pype/ftrack/lib/ftrack_app_handler.py index 7389d1c2c3..dbb38a3247 100644 --- a/pype/ftrack/lib/ftrack_app_handler.py +++ b/pype/ftrack/lib/ftrack_app_handler.py @@ -26,10 +26,10 @@ class AppAction(BaseHandler): preactions = ['start.timer'] def __init__( - self, session, label, name, executable, - variant=None, icon=None, description=None, preactions=[] + self, session, label, name, executable, variant=None, + icon=None, description=None, preactions=[], plugins_presets={} ): - super().__init__(session) + super().__init__(session, plugins_presets) '''Expects a ftrack_api.Session instance''' if label is None: diff --git a/pype/ftrack/lib/ftrack_base_handler.py b/pype/ftrack/lib/ftrack_base_handler.py index 3cf1a47f7b..e1a2556fcf 100644 --- a/pype/ftrack/lib/ftrack_base_handler.py +++ b/pype/ftrack/lib/ftrack_base_handler.py @@ -29,7 +29,7 @@ class BaseHandler(object): ignore_me = False preactions = [] - def __init__(self, session): + def __init__(self, session, plugins_presets={}): '''Expects a ftrack_api.Session instance''' self._session = session self.log = Logger().get_logger(self.__class__.__name__) diff --git a/pype/ftrack/lib/ftrack_event_handler.py b/pype/ftrack/lib/ftrack_event_handler.py index b2f47c3fbb..db55eef16e 100644 --- a/pype/ftrack/lib/ftrack_event_handler.py +++ b/pype/ftrack/lib/ftrack_event_handler.py @@ -15,9 +15,9 @@ class BaseEvent(BaseHandler): type = 'Event' - def __init__(self, session): + def __init__(self, session, plugins_presets={}): '''Expects a ftrack_api.Session instance''' - super().__init__(session) + super().__init__(session, plugins_presets) # Decorator def launch_log(self, func):