diff --git a/openpype/modules/ftrack/event_handlers_server/action_push_frame_values_to_task.py b/openpype/modules/ftrack/event_handlers_server/action_push_frame_values_to_task.py index 79947cbc71..bc6a58624a 100644 --- a/openpype/modules/ftrack/event_handlers_server/action_push_frame_values_to_task.py +++ b/openpype/modules/ftrack/event_handlers_server/action_push_frame_values_to_task.py @@ -38,7 +38,7 @@ class PushHierValuesToNonHier(ServerAction): """ identifier = "admin.push_hier_values_to_non_hier" - label = "Pype Admin" + label = "OpenPype Admin" variant = "- Push Hierarchical values To Non-Hierarchical" hierarchy_entities_query = ( diff --git a/openpype/modules/ftrack/event_handlers_server/action_sync_to_avalon.py b/openpype/modules/ftrack/event_handlers_server/action_sync_to_avalon.py index d19d89fe36..8f78f998ac 100644 --- a/openpype/modules/ftrack/event_handlers_server/action_sync_to_avalon.py +++ b/openpype/modules/ftrack/event_handlers_server/action_sync_to_avalon.py @@ -32,7 +32,7 @@ class SyncToAvalonServer(ServerAction): #: Action identifier. identifier = "sync.to.avalon.server" #: Action label. - label = "Pype Admin" + label = "OpenPype Admin" variant = "- Sync To Avalon (Server)" #: Action description. description = "Send data from Ftrack to Avalon" diff --git a/openpype/modules/ftrack/event_handlers_server/event_user_assigment.py b/openpype/modules/ftrack/event_handlers_server/event_user_assigment.py index 22e897c668..a0734e14a1 100644 --- a/openpype/modules/ftrack/event_handlers_server/event_user_assigment.py +++ b/openpype/modules/ftrack/event_handlers_server/event_user_assigment.py @@ -148,7 +148,7 @@ class UserAssigmentEvent(BaseEvent): """ Get data to fill template from task - .. seealso:: :mod:`pype.api.Anatomy` + .. seealso:: :mod:`openpype.api.Anatomy` :param task: Task entity :type task: dict diff --git a/openpype/modules/ftrack/event_handlers_user/action_clean_hierarchical_attributes.py b/openpype/modules/ftrack/event_handlers_user/action_clean_hierarchical_attributes.py index 599d00f7cc..4b1c1328df 100644 --- a/openpype/modules/ftrack/event_handlers_user/action_clean_hierarchical_attributes.py +++ b/openpype/modules/ftrack/event_handlers_user/action_clean_hierarchical_attributes.py @@ -6,7 +6,7 @@ from openpype.modules.ftrack.lib.avalon_sync import get_pype_attr class CleanHierarchicalAttrsAction(BaseAction): identifier = "clean.hierarchical.attr" - label = "Pype Admin" + label = "OpenPype Admin" variant = "- Clean hierarchical custom attributes" description = "Unset empty hierarchical attribute values." icon = statics_icon("ftrack", "action_icons", "PypeAdmin.svg") diff --git a/openpype/modules/ftrack/event_handlers_user/action_create_cust_attrs.py b/openpype/modules/ftrack/event_handlers_user/action_create_cust_attrs.py index 2d46b6f75a..899ee71f13 100644 --- a/openpype/modules/ftrack/event_handlers_user/action_create_cust_attrs.py +++ b/openpype/modules/ftrack/event_handlers_user/action_create_cust_attrs.py @@ -17,7 +17,7 @@ This action creates/updates custom attributes. - `tools` based on tools usages ## Second part is based on json file in ftrack module. -File location: `~/pype/pype/modules/ftrack/ftrack_custom_attributes.json` +File location: `~/OpenPype/pype/modules/ftrack/ftrack_custom_attributes.json` Data in json file is nested dictionary. Keys in first dictionary level represents Ftrack entity type (task, show, assetversion, user, list, asset) @@ -33,7 +33,7 @@ dictionary level, task's attributes are nested more. group (string) - name of group - - based on attribute `pype.modules.ftrack.lib.CUST_ATTR_GROUP` + - based on attribute `openpype.modules.ftrack.lib.CUST_ATTR_GROUP` - "pype" by default *** Required *************************************************************** diff --git a/openpype/modules/ftrack/event_handlers_user/action_job_killer.py b/openpype/modules/ftrack/event_handlers_user/action_job_killer.py index 368e39cf3c..4c9fa645a2 100644 --- a/openpype/modules/ftrack/event_handlers_user/action_job_killer.py +++ b/openpype/modules/ftrack/event_handlers_user/action_job_killer.py @@ -8,7 +8,7 @@ class JobKiller(BaseAction): #: Action identifier. identifier = 'job.killer' #: Action label. - label = "Pype Admin" + label = "OpenPype Admin" variant = '- Job Killer' #: Action description. description = 'Killing selected running jobs' diff --git a/openpype/modules/ftrack/event_handlers_user/action_store_thumbnails_to_avalon.py b/openpype/modules/ftrack/event_handlers_user/action_store_thumbnails_to_avalon.py index 85fc1ac4c8..390ac6b730 100644 --- a/openpype/modules/ftrack/event_handlers_user/action_store_thumbnails_to_avalon.py +++ b/openpype/modules/ftrack/event_handlers_user/action_store_thumbnails_to_avalon.py @@ -15,7 +15,7 @@ class StoreThumbnailsToAvalon(BaseAction): # Action identifier identifier = "store.thubmnail.to.avalon" # Action label - label = "Pype Admin" + label = "OpenPype Admin" # Action variant variant = "- Store Thumbnails to avalon" # Action description diff --git a/openpype/modules/ftrack/event_handlers_user/action_sync_to_avalon.py b/openpype/modules/ftrack/event_handlers_user/action_sync_to_avalon.py index 2fa13455de..923bce099a 100644 --- a/openpype/modules/ftrack/event_handlers_user/action_sync_to_avalon.py +++ b/openpype/modules/ftrack/event_handlers_user/action_sync_to_avalon.py @@ -33,7 +33,7 @@ class SyncToAvalonLocal(BaseAction): #: Action identifier. identifier = "sync.to.avalon.local" #: Action label. - label = "Pype Admin" + label = "OpenPype Admin" #: Action variant variant = "- Sync To Avalon (Local)" #: Action description. diff --git a/openpype/modules/ftrack/event_handlers_user/action_where_run_ask.py b/openpype/modules/ftrack/event_handlers_user/action_where_run_ask.py index 4fc0fcf87e..6950d45ecd 100644 --- a/openpype/modules/ftrack/event_handlers_user/action_where_run_ask.py +++ b/openpype/modules/ftrack/event_handlers_user/action_where_run_ask.py @@ -8,7 +8,7 @@ class ActionAskWhereIRun(BaseAction): ignore_me = True identifier = 'ask.where.i.run' label = 'Ask where I run' - description = 'Triggers PC info where user have running Pype' + description = 'Triggers PC info where user have running OpenPype' icon = statics_icon("ftrack", "action_icons", "ActionAskWhereIRun.svg") def discover(self, session, entities, event): diff --git a/openpype/modules/ftrack/event_handlers_user/action_where_run_show.py b/openpype/modules/ftrack/event_handlers_user/action_where_run_show.py index 22bdfa6cda..4ce1a439a3 100644 --- a/openpype/modules/ftrack/event_handlers_user/action_where_run_show.py +++ b/openpype/modules/ftrack/event_handlers_user/action_where_run_show.py @@ -15,7 +15,7 @@ class ActionShowWhereIRun(BaseAction): #: Action label. label = 'Show where I run' #: Action description. - description = 'Shows PC info where user have running Pype' + description = 'Shows PC info where user have running OpenPype' def discover(self, session, entities, event): """ Hide by default - Should be enabled only if you want to run. diff --git a/openpype/modules/ftrack/ftrack_server/lib.py b/openpype/modules/ftrack/ftrack_server/lib.py index 6d3bca305d..91f3712136 100644 --- a/openpype/modules/ftrack/ftrack_server/lib.py +++ b/openpype/modules/ftrack/ftrack_server/lib.py @@ -27,8 +27,8 @@ from openpype.modules.ftrack.lib import get_ftrack_event_mongo_info from openpype.lib import OpenPypeMongoConnection from openpype.api import Logger -TOPIC_STATUS_SERVER = "pype.event.server.status" -TOPIC_STATUS_SERVER_RESULT = "pype.event.server.status.result" +TOPIC_STATUS_SERVER = "openpype.event.server.status" +TOPIC_STATUS_SERVER_RESULT = "openpype.event.server.status.result" def check_ftrack_url(url, log_errors=True): @@ -92,7 +92,7 @@ class StatusEventHub(SocketBaseEventHub): code_name = self._code_name_mapping[code] if code_name == "connect": event = ftrack_api.event.base.Event( - topic="pype.status.started", + topic="openpype.status.started", data={}, source={ "id": self.id, @@ -115,7 +115,7 @@ class StorerEventHub(SocketBaseEventHub): code_name = self._code_name_mapping[code] if code_name == "connect": event = ftrack_api.event.base.Event( - topic="pype.storer.started", + topic="openpype.storer.started", data={}, source={ "id": self.id, diff --git a/openpype/modules/ftrack/ftrack_server/socket_thread.py b/openpype/modules/ftrack/ftrack_server/socket_thread.py index 179ba1ae97..fd407bb9f5 100644 --- a/openpype/modules/ftrack/ftrack_server/socket_thread.py +++ b/openpype/modules/ftrack/ftrack_server/socket_thread.py @@ -58,7 +58,7 @@ class SocketThread(threading.Thread): env = os.environ.copy() env["OPENPYPE_PROCESS_MONGO_ID"] = str(Logger.mongo_process_id) - # Pype executable (with path to start script if not build) + # OpenPype executable (with path to start script if not build) args = get_pype_execute_args( # Add `run` command "run", diff --git a/openpype/modules/ftrack/launch_hooks/pre_python2_vendor.py b/openpype/modules/ftrack/launch_hooks/pre_python2_vendor.py index 86ced990fd..7826d833ac 100644 --- a/openpype/modules/ftrack/launch_hooks/pre_python2_vendor.py +++ b/openpype/modules/ftrack/launch_hooks/pre_python2_vendor.py @@ -3,7 +3,7 @@ from openpype.lib import PreLaunchHook from openpype.modules.ftrack import FTRACK_MODULE_DIR -class PrePyhton2Support(PreLaunchHook): +class PrePython2Support(PreLaunchHook): """Add python ftrack api module for Python 2 to PYTHONPATH. Path to vendor modules is added to the beggining of PYTHONPATH. @@ -23,7 +23,7 @@ class PrePyhton2Support(PreLaunchHook): os.path.join(python_2_vendor, "arrow"), # `builtins` from `python-future` # - `python-future` is strict Python 2 module that cause crashes - # of Python 3 scripts executed through pype (burnin script etc.) + # of Python 3 scripts executed through OpenPype (burnin script etc.) os.path.join(python_2_vendor, "builtins"), # `backports.functools_lru_cache` os.path.join( diff --git a/openpype/modules/ftrack/lib/ftrack_base_handler.py b/openpype/modules/ftrack/lib/ftrack_base_handler.py index 73f916a7f7..817841df4a 100644 --- a/openpype/modules/ftrack/lib/ftrack_base_handler.py +++ b/openpype/modules/ftrack/lib/ftrack_base_handler.py @@ -557,7 +557,7 @@ class BaseHandler(object): ).one() def get_project_settings_from_event(self, event, project_name): - """Load or fill pype's project settings from event data. + """Load or fill OpenPype's project settings from event data. Project data are stored by ftrack id because in most cases it is easier to access project id than project name. diff --git a/openpype/modules/ftrack/scripts/sub_event_processor.py b/openpype/modules/ftrack/scripts/sub_event_processor.py index 29c285c47f..0d94fa7264 100644 --- a/openpype/modules/ftrack/scripts/sub_event_processor.py +++ b/openpype/modules/ftrack/scripts/sub_event_processor.py @@ -46,7 +46,7 @@ def send_status(event): } new_event = ftrack_api.event.base.Event( - topic="pype.event.server.status.result", + topic="openpype.event.server.status.result", data=new_event_data ) diff --git a/openpype/modules/ftrack/scripts/sub_event_status.py b/openpype/modules/ftrack/scripts/sub_event_status.py index 783cf11290..24b9bfb789 100644 --- a/openpype/modules/ftrack/scripts/sub_event_status.py +++ b/openpype/modules/ftrack/scripts/sub_event_status.py @@ -22,7 +22,7 @@ action_identifier = ( ) host_ip = socket.gethostbyname(socket.gethostname()) action_data = { - "label": "Pype Admin", + "label": "OpenPype Admin", "variant": "- Event server Status ({})".format(host_ip), "description": "Get Infromation about event server", "actionIdentifier": action_identifier @@ -322,7 +322,7 @@ def register(session): "topic=ftrack.action.discover", server_activity_discover ) - session.event_hub.subscribe("topic=pype.status.started", on_start) + session.event_hub.subscribe("topic=openpype.status.started", on_start) status_launch_subscription = ( "topic=ftrack.action.launch and data.actionIdentifier={}" diff --git a/openpype/modules/ftrack/scripts/sub_event_storer.py b/openpype/modules/ftrack/scripts/sub_event_storer.py index 6ee61f5a08..6e2990ef0b 100644 --- a/openpype/modules/ftrack/scripts/sub_event_storer.py +++ b/openpype/modules/ftrack/scripts/sub_event_storer.py @@ -170,7 +170,7 @@ def register(session): '''Registers the event, subscribing the discover and launch topics.''' install_db() session.event_hub.subscribe("topic=*", launch) - session.event_hub.subscribe("topic=pype.storer.started", trigger_sync) + session.event_hub.subscribe("topic=openpype.storer.started", trigger_sync) session.event_hub.subscribe( "topic={}".format(TOPIC_STATUS_SERVER), send_status )