mirror of
https://github.com/ynput/ayon-core.git
synced 2025-12-24 21:04:40 +01:00
OP-4760 - extracted parsing methods into separate file
Same functions used for background family.
This commit is contained in:
Petr Kalis
parent
3e74a27efa
commit
93eb865065
2 changed files with 105 additions and 72 deletions
100
openpype/hosts/traypublisher/batch_parsing.py
Normal file
100
openpype/hosts/traypublisher/batch_parsing.py
Normal file
|
|
@ -0,0 +1,100 @@
|
|||
"""Functions to parse asset names, versions from file names"""
|
||||
import os
|
||||
import re
|
||||
|
||||
from openpype.lib import Logger
|
||||
from openpype.client import get_assets, get_asset_by_name
|
||||
|
||||
from openpype.pipeline import (
|
||||
CreatorError
|
||||
)
|
||||
|
||||
|
||||
def get_asset_doc_from_file_name(source_filename, project_name,
|
||||
version_regex, all_selected_asset_ids=None):
|
||||
"""Try to parse out asset name from file name provided.
|
||||
|
||||
Artists might provide various file name formats.
|
||||
Currently handled:
|
||||
- chair.mov
|
||||
- chair_v001.mov
|
||||
- my_chair_to_upload.mov
|
||||
"""
|
||||
version = None
|
||||
asset_name = os.path.splitext(source_filename)[0]
|
||||
# Always first check if source filename is directly asset (eg. 'chair.mov')
|
||||
matching_asset_doc = get_asset_by_name_case_not_sensitive(
|
||||
project_name, asset_name, all_selected_asset_ids)
|
||||
|
||||
if matching_asset_doc is None:
|
||||
# name contains also a version
|
||||
matching_asset_doc, version = (
|
||||
parse_with_version(project_name, asset_name, version_regex,
|
||||
all_selected_asset_ids))
|
||||
|
||||
if matching_asset_doc is None:
|
||||
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
|
||||
|
||||
|
||||
def parse_with_version(project_name, asset_name, version_regex,
|
||||
all_selected_asset_ids=None, log=None):
|
||||
"""Try to parse asset name from a file name containing version too
|
||||
|
||||
Eg. 'chair_v001.mov' >> 'chair', 1
|
||||
"""
|
||||
log = _handle_log(log)
|
||||
log.debug(
|
||||
("Asset doc by \"{}\" was not found, trying version regex.".
|
||||
format(asset_name)))
|
||||
|
||||
matching_asset_doc = version_number = None
|
||||
|
||||
regex_result = version_regex.findall(asset_name)
|
||||
if regex_result:
|
||||
_asset_name, _version_number = regex_result[0]
|
||||
matching_asset_doc = get_asset_by_name_case_not_sensitive(
|
||||
project_name, _asset_name,
|
||||
all_selected_asset_ids=all_selected_asset_ids)
|
||||
if matching_asset_doc:
|
||||
version_number = int(_version_number)
|
||||
|
||||
return matching_asset_doc, version_number
|
||||
|
||||
|
||||
def parse_containing(project_name, asset_name, all_selected_asset_ids=None):
|
||||
"""Look if file name contains any existing asset name"""
|
||||
for asset_doc in get_assets(project_name, asset_ids=all_selected_asset_ids,
|
||||
fields=["name"]):
|
||||
if asset_doc["name"].lower() in asset_name.lower():
|
||||
return get_asset_by_name(project_name, asset_doc["name"])
|
||||
|
||||
|
||||
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"""
|
||||
asset_name = re.compile(asset_name, re.IGNORECASE)
|
||||
|
||||
assets = list(get_assets(project_name, asset_ids=all_selected_asset_ids,
|
||||
asset_names=[asset_name]))
|
||||
if assets:
|
||||
if len(assets) > 1:
|
||||
log.warning("Too many records found for {}".format(
|
||||
asset_name))
|
||||
return
|
||||
|
||||
return assets.pop()
|
||||
|
||||
|
||||
def _handle_log(log):
|
||||
if not log:
|
||||
log = Logger.get_logger(__name__)
|
||||
|
||||
return log
|
||||
|
|
@ -2,14 +2,12 @@ import copy
|
|||
import os
|
||||
import re
|
||||
|
||||
from openpype.client import get_assets, get_asset_by_name
|
||||
from openpype.lib import (
|
||||
FileDef,
|
||||
BoolDef,
|
||||
)
|
||||
from openpype.pipeline import (
|
||||
CreatedInstance,
|
||||
CreatorError
|
||||
)
|
||||
from openpype.pipeline.create import (
|
||||
get_subset_name,
|
||||
|
|
@ -17,6 +15,9 @@ from openpype.pipeline.create import (
|
|||
)
|
||||
|
||||
from openpype.hosts.traypublisher.api.plugin import TrayPublishCreator
|
||||
from openpype.hosts.traypublisher.batch_parsing import (
|
||||
get_asset_doc_from_file_name
|
||||
)
|
||||
|
||||
|
||||
class BatchMovieCreator(TrayPublishCreator):
|
||||
|
|
@ -57,7 +58,7 @@ class BatchMovieCreator(TrayPublishCreator):
|
|||
filepath = os.path.join(file_info["directory"], file_name)
|
||||
instance_data["creator_attributes"] = {"filepath": filepath}
|
||||
|
||||
asset_doc, version = self.get_asset_doc_from_file_name(
|
||||
asset_doc, version = get_asset_doc_from_file_name(
|
||||
file_name, self.project_name)
|
||||
|
||||
subset_name, task_name = self._get_subset_and_task(
|
||||
|
|
@ -71,63 +72,7 @@ class BatchMovieCreator(TrayPublishCreator):
|
|||
instance_data, self)
|
||||
self._store_new_instance(new_instance)
|
||||
|
||||
def get_asset_doc_from_file_name(self, source_filename, project_name):
|
||||
"""Try to parse out asset name from file name provided.
|
||||
|
||||
Artists might provide various file name formats.
|
||||
Currently handled:
|
||||
- chair.mov
|
||||
- chair_v001.mov
|
||||
- my_chair_to_upload.mov
|
||||
"""
|
||||
version = None
|
||||
asset_name = os.path.splitext(source_filename)[0]
|
||||
# Always first check if source filename is in assets
|
||||
matching_asset_doc = self._get_asset_by_name_case_not_sensitive(
|
||||
project_name, asset_name)
|
||||
|
||||
if matching_asset_doc is None:
|
||||
matching_asset_doc, version = (
|
||||
self._parse_with_version(project_name, asset_name))
|
||||
|
||||
if matching_asset_doc is None:
|
||||
matching_asset_doc = self._parse_containing(project_name,
|
||||
asset_name)
|
||||
|
||||
if matching_asset_doc is None:
|
||||
raise CreatorError(
|
||||
"Cannot guess asset name from {}".format(source_filename))
|
||||
|
||||
return matching_asset_doc, version
|
||||
|
||||
def _parse_with_version(self, project_name, asset_name):
|
||||
"""Try to parse asset name from a file name containing version too
|
||||
|
||||
Eg. 'chair_v001.mov' >> 'chair', 1
|
||||
"""
|
||||
self.log.debug((
|
||||
"Asset doc by \"{}\" was not found, trying version regex."
|
||||
).format(asset_name))
|
||||
|
||||
matching_asset_doc = version_number = None
|
||||
|
||||
regex_result = self.version_regex.findall(asset_name)
|
||||
if regex_result:
|
||||
_asset_name, _version_number = regex_result[0]
|
||||
matching_asset_doc = self._get_asset_by_name_case_not_sensitive(
|
||||
project_name, _asset_name)
|
||||
if matching_asset_doc:
|
||||
version_number = int(_version_number)
|
||||
|
||||
return matching_asset_doc, version_number
|
||||
|
||||
def _parse_containing(self, project_name, asset_name):
|
||||
"""Look if file name contains any existing asset name"""
|
||||
for asset_doc in get_assets(project_name, fields=["name"]):
|
||||
if asset_doc["name"].lower() in asset_name.lower():
|
||||
return get_asset_by_name(project_name, asset_doc["name"])
|
||||
|
||||
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)
|
||||
|
||||
|
|
@ -205,15 +150,3 @@ class BatchMovieCreator(TrayPublishCreator):
|
|||
(eg. 'chair.mov', 'chair_v001.mov', not really safe `my_chair_v001.mov`
|
||||
"""
|
||||
|
||||
def _get_asset_by_name_case_not_sensitive(self, project_name, asset_name):
|
||||
"""Handle more cases in file names"""
|
||||
asset_name = re.compile(asset_name, re.IGNORECASE)
|
||||
|
||||
assets = list(get_assets(project_name, asset_names=[asset_name]))
|
||||
if assets:
|
||||
if len(assets) > 1:
|
||||
self.log.warning("Too many records found for {}".format(
|
||||
asset_name))
|
||||
return
|
||||
|
||||
return assets.pop()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue