From f00ee2784ac9efde98d962f23b3063d184420213 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 20 Jan 2023 16:59:47 +0100 Subject: [PATCH] OP-4760 - fixes after review Removed unnecessary function, fixed missed arguments. --- openpype/hosts/traypublisher/batch_parsing.py | 16 ++++------------ .../plugins/create/create_movie_batch.py | 4 ++-- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/openpype/hosts/traypublisher/batch_parsing.py b/openpype/hosts/traypublisher/batch_parsing.py index 65b64ea02d..31b7c1439d 100644 --- a/openpype/hosts/traypublisher/batch_parsing.py +++ b/openpype/hosts/traypublisher/batch_parsing.py @@ -36,10 +36,6 @@ def get_asset_doc_from_file_name(source_filename, project_name, matching_asset_doc = parse_containing(project_name, asset_name, all_selected_asset_ids) - if matching_asset_doc is None: - raise CreatorError( - "Cannot guess asset name from {}".format(source_filename)) - return matching_asset_doc, version @@ -49,7 +45,8 @@ def parse_with_version(project_name, asset_name, version_regex, Eg. 'chair_v001.mov' >> 'chair', 1 """ - log = _handle_log(log) + if not log: + log = Logger.get_logger(__name__) log.debug( ("Asset doc by \"{}\" was not found, trying version regex.". format(asset_name))) @@ -80,6 +77,8 @@ def get_asset_by_name_case_not_sensitive(project_name, asset_name, all_selected_asset_ids=None, log=None): """Handle more cases in file names""" + if not log: + log = Logger.get_logger(__name__) asset_name = re.compile(asset_name, re.IGNORECASE) assets = list(get_assets(project_name, asset_ids=all_selected_asset_ids, @@ -91,10 +90,3 @@ def get_asset_by_name_case_not_sensitive(project_name, asset_name, return return assets.pop() - - -def _handle_log(log): - if not log: - log = Logger.get_logger(__name__) - - return log diff --git a/openpype/hosts/traypublisher/plugins/create/create_movie_batch.py b/openpype/hosts/traypublisher/plugins/create/create_movie_batch.py index 04aee70e5b..1dc4bad9b3 100644 --- a/openpype/hosts/traypublisher/plugins/create/create_movie_batch.py +++ b/openpype/hosts/traypublisher/plugins/create/create_movie_batch.py @@ -59,7 +59,7 @@ class BatchMovieCreator(TrayPublishCreator): instance_data["creator_attributes"] = {"filepath": filepath} asset_doc, version = get_asset_doc_from_file_name( - file_name, self.project_name) + file_name, self.project_name, self.version_regex) subset_name, task_name = self._get_subset_and_task( asset_doc, data["variant"], self.project_name) @@ -72,7 +72,7 @@ class BatchMovieCreator(TrayPublishCreator): instance_data, self) self._store_new_instance(new_instance) - def get_subset_and_task(self, asset_doc, variant, project_name): + def _get_subset_and_task(self, asset_doc, variant, project_name): """Create subset name according to standard template process""" task_name = self._get_task_name(asset_doc)