From 9d0951a93d2b638d27ca3de740d70257785216a2 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 22 Feb 2022 10:50:06 +0100 Subject: [PATCH 1/3] OP-2726 - fixed pushing ftrack username as username --- .../default_modules/ftrack/plugins/publish/collect_username.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/modules/default_modules/ftrack/plugins/publish/collect_username.py b/openpype/modules/default_modules/ftrack/plugins/publish/collect_username.py index 303490189b..88a5cb1da8 100644 --- a/openpype/modules/default_modules/ftrack/plugins/publish/collect_username.py +++ b/openpype/modules/default_modules/ftrack/plugins/publish/collect_username.py @@ -33,7 +33,6 @@ class CollectUsername(pyblish.api.ContextPlugin): def process(self, context): self.log.info("CollectUsername") - os.environ["FTRACK_API_USER"] = os.environ["FTRACK_BOT_API_USER"] os.environ["FTRACK_API_KEY"] = os.environ["FTRACK_BOT_API_KEY"] @@ -61,3 +60,4 @@ class CollectUsername(pyblish.api.ContextPlugin): username = user[0].get("username") self.log.debug("Resolved ftrack username:: {}".format(username)) os.environ["FTRACK_API_USER"] = username + os.environ["OPENPYPE_USERNAME"] = username # for burnins From 2583b390e6a8fc2aba855955675a0deecd00de11 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 22 Feb 2022 12:23:40 +0100 Subject: [PATCH 2/3] OP-2726 - introduced new env var WEBPUBLISH_OPENPYPE_USERNAME OPENPYPE_USERNAME might be used in different places (as os pats etc), so explicit env var is safer. Changed its value to first and last name of Ftrack user by request. --- .../ftrack/plugins/publish/collect_username.py | 8 +++++--- openpype/plugins/publish/extract_burnin.py | 6 ++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/openpype/modules/default_modules/ftrack/plugins/publish/collect_username.py b/openpype/modules/default_modules/ftrack/plugins/publish/collect_username.py index 88a5cb1da8..459e441afe 100644 --- a/openpype/modules/default_modules/ftrack/plugins/publish/collect_username.py +++ b/openpype/modules/default_modules/ftrack/plugins/publish/collect_username.py @@ -56,8 +56,10 @@ class CollectUsername(pyblish.api.ContextPlugin): if not user: raise ValueError( "Couldn't find user with {} email".format(user_email)) - - username = user[0].get("username") + user = user[0] + username = user.get("username") self.log.debug("Resolved ftrack username:: {}".format(username)) os.environ["FTRACK_API_USER"] = username - os.environ["OPENPYPE_USERNAME"] = username # for burnins + burnin_name = "{} {}".format(user.get("first_name"), + user.get("last_name")) + os.environ["WEBPUBLISH_OPENPYPE_USERNAME"] = burnin_name diff --git a/openpype/plugins/publish/extract_burnin.py b/openpype/plugins/publish/extract_burnin.py index 7ff1b24689..b2ca8850b6 100644 --- a/openpype/plugins/publish/extract_burnin.py +++ b/openpype/plugins/publish/extract_burnin.py @@ -478,6 +478,12 @@ class ExtractBurnin(openpype.api.Extractor): "frame_end_handle": frame_end_handle } + # use explicit username for webpublishes as rewriting + # OPENPYPE_USERNAME might have side effects + webpublish_user_name = os.environ.get("WEBPUBLISH_OPENPYPE_USERNAME") + if webpublish_user_name: + burnin_data["username"] = webpublish_user_name + self.log.debug( "Basic burnin_data: {}".format(json.dumps(burnin_data, indent=4)) ) From b688557c1ed002b1a87014dd260d5146edcc8d53 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 23 Feb 2022 14:17:30 +0100 Subject: [PATCH 3/3] OP-2726 - changed name in burnins to part before @ --- .../ftrack/plugins/publish/collect_username.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openpype/modules/default_modules/ftrack/plugins/publish/collect_username.py b/openpype/modules/default_modules/ftrack/plugins/publish/collect_username.py index 459e441afe..84d7f60a3f 100644 --- a/openpype/modules/default_modules/ftrack/plugins/publish/collect_username.py +++ b/openpype/modules/default_modules/ftrack/plugins/publish/collect_username.py @@ -60,6 +60,8 @@ class CollectUsername(pyblish.api.ContextPlugin): username = user.get("username") self.log.debug("Resolved ftrack username:: {}".format(username)) os.environ["FTRACK_API_USER"] = username - burnin_name = "{} {}".format(user.get("first_name"), - user.get("last_name")) + + burnin_name = username + if '@' in burnin_name: + burnin_name = burnin_name[:burnin_name.index('@')] os.environ["WEBPUBLISH_OPENPYPE_USERNAME"] = burnin_name