From 40d426ed00abdc558797f193e5b2ae66b9b67a1b Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 19 Apr 2022 15:22:29 +0200
Subject: [PATCH] OP-3103 - fixes hosts, update variant location

---
 .../webpublisher/plugins/publish/collect_batch_data.py | 10 ++++++++--
 .../plugins/publish/collect_published_files.py         |  5 +++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/openpype/hosts/webpublisher/plugins/publish/collect_batch_data.py b/openpype/hosts/webpublisher/plugins/publish/collect_batch_data.py
index ca14538d7d..c9ba903007 100644
--- a/openpype/hosts/webpublisher/plugins/publish/collect_batch_data.py
+++ b/openpype/hosts/webpublisher/plugins/publish/collect_batch_data.py
@@ -1,7 +1,12 @@
-"""Loads batch context from json and continues in publish process.
+"""Parses batch context from json and continues in publish process.
 
 Provides:
     context -> Loaded batch file.
+        - asset
+        - task  (task name)
+        - taskType
+        - project_name
+        - variant
 """
 
 import os
@@ -24,7 +29,7 @@ class CollectBatchData(pyblish.api.ContextPlugin):
     # must be really early, context values are only in json file
     order = pyblish.api.CollectorOrder - 0.495
     label = "Collect batch data"
-    host = ["webpublisher"]
+    hosts = ["webpublisher"]
 
     def process(self, context):
         batch_dir = os.environ.get("OPENPYPE_PUBLISH_DATA")
@@ -60,6 +65,7 @@ class CollectBatchData(pyblish.api.ContextPlugin):
         context.data["task"] = task_name
         context.data["taskType"] = task_type
         context.data["project_name"] = project_name
+        context.data["variant"] = batch_data["variant"]
 
         self._set_ctx_path(batch_data)
 
diff --git a/openpype/hosts/webpublisher/plugins/publish/collect_published_files.py b/openpype/hosts/webpublisher/plugins/publish/collect_published_files.py
index 8edaf4f67b..65db9d7e2e 100644
--- a/openpype/hosts/webpublisher/plugins/publish/collect_published_files.py
+++ b/openpype/hosts/webpublisher/plugins/publish/collect_published_files.py
@@ -40,7 +40,7 @@ class CollectPublishedFiles(pyblish.api.ContextPlugin):
     # must be really early, context values are only in json file
     order = pyblish.api.CollectorOrder - 0.490
     label = "Collect rendered frames"
-    host = ["webpublisher"]
+    hosts = ["webpublisher"]
     targets = ["filespublish"]
 
     # from Settings
@@ -61,6 +61,7 @@ class CollectPublishedFiles(pyblish.api.ContextPlugin):
         task_name = context.data["task"]
         task_type = context.data["taskType"]
         project_name = context.data["project_name"]
+        variant = context.data["variant"]
         for task_dir in task_subfolders:
             task_data = parse_json(os.path.join(task_dir,
                                                 "manifest.json"))
@@ -76,7 +77,7 @@ class CollectPublishedFiles(pyblish.api.ContextPlugin):
                 extension.replace(".", ''))
 
             subset_name = get_subset_name_with_asset_doc(
-                family, task_data["variant"], task_name, asset_doc,
+                family, variant, task_name, asset_doc,
                 project_name=project_name, host_name="webpublisher"
             )
             version = self._get_last_version(asset_name, subset_name) + 1