Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

Webpublisher: extension is lowercased in Setting and in uploaded files #4095

Merged
merged 59 commits into from
Nov 18, 2022
Merged
Show file tree
Hide file tree
Changes from 58 commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
f6495ca
OP-4394 - extension is lowercased in Setting and in uploaded files
kalisp Nov 14, 2022
93b9dd7
OP-4394 - extension is lowercased in Setting and in uploaded files
kalisp Nov 14, 2022
f18efd2
OP-4394 - fix - lowercase extension everywhere
kalisp Nov 15, 2022
e11815b
OP-4394 - safer handling of Settings extensions
kalisp Nov 16, 2022
ed77950
[Automated] Bump version
Nov 12, 2022
f9732a8
renamed 'CollectAvalonEntities' to 'CollectContextEntities'
iLLiCiTiT Nov 10, 2022
910b7d7
get "asset" and "task" from context
iLLiCiTiT Nov 10, 2022
017720d
get "task" from context in anatomy context data
iLLiCiTiT Nov 10, 2022
db6bfcb
Bump terser from 5.10.0 to 5.14.2 in /website
dependabot[bot] Jul 20, 2022
ff76034
ignore case sensitivity of extension in files widget
iLLiCiTiT Nov 14, 2022
213c78b
Avoid name conflict where `group_name != group_node` due to maya auto…
BigRoy Sep 13, 2022
d662b34
added settings for validate frame range in tray publisher
iLLiCiTiT Nov 15, 2022
125d0bb
Feature: Auto download last published workfile as first workfile
Tilix4 Oct 31, 2022
af15b0d
Project setting
Tilix4 Nov 1, 2022
7a7c91c
docstring
Tilix4 Nov 1, 2022
e24489c
comment length
Tilix4 Nov 1, 2022
17853d0
lint
Tilix4 Nov 1, 2022
881bceb
requested cosmetic changes
Tilix4 Nov 3, 2022
9e01c5d
Change to REST API using web server
Tilix4 Nov 3, 2022
8d9542b
lint
Tilix4 Nov 3, 2022
5e02d7d
legacy compatibility
Tilix4 Nov 4, 2022
1c48c09
use 'created_dt' of representation
Tilix4 Nov 8, 2022
a614f0f
add priority to add_site
Tilix4 Nov 8, 2022
b6365d8
clean
Tilix4 Nov 8, 2022
138051f
clean
Tilix4 Nov 8, 2022
3a5ebc6
sort fields
Tilix4 Nov 8, 2022
29f0dee
clean
Tilix4 Nov 8, 2022
a600cf4
fix last version check
iLLiCiTiT Nov 9, 2022
7596610
replaced 'add_sites_to_representations' with 'reset_timer' in rest api
iLLiCiTiT Nov 9, 2022
2052afc
added ability to rese timer from add_site
iLLiCiTiT Nov 9, 2022
f7c1fa0
'reset_timer' can reset timer via rest api endpoint
iLLiCiTiT Nov 9, 2022
1d028d2
updated prelaunch hook with new abilities of sync server
iLLiCiTiT Nov 9, 2022
5db7430
check if is sync server enabled
iLLiCiTiT Nov 9, 2022
75e1295
removed 'get_representation_last_created_time_on_site' function
iLLiCiTiT Nov 9, 2022
99bebd8
fix typo
iLLiCiTiT Nov 9, 2022
44cfbf9
added method to check if representation has all files on site
kalisp Nov 9, 2022
2e6f850
small updates to docstrings
kalisp Nov 9, 2022
5838f0f
clean
Tilix4 Nov 9, 2022
c096279
logging format
Tilix4 Nov 15, 2022
460adc7
Alembic Loader as Arnold Standin
Oct 31, 2022
ecbe06b
Alembic Loader as Arnold Standin
Oct 31, 2022
2e6974b
Alembic Loader as Arnold Standin
Nov 1, 2022
ce5d4c0
Alembic Loader as Arnold Standin
Nov 1, 2022
c58ef40
Alembic Loader as Arnold Standin
Nov 8, 2022
0314657
Alembic Loader as Arnold Standin
Nov 9, 2022
6e94a81
Alembic Loader as Arnold Standin
Nov 10, 2022
6660830
Alembic Loader as Arnold Standin
Nov 10, 2022
7c3f625
Alembic Loader as Arnold Standin
Nov 10, 2022
bee7b17
Alembic Loader as Arnold Standin
Nov 10, 2022
3649ee7
Alembic Loader as Arnold Standin
Nov 10, 2022
cd27df0
Alembic Loader as Arnold Standin
Nov 10, 2022
3186acc
Alembic Loader as Arnold Standin
Nov 10, 2022
cf8bd8e
Alembic Loader as Arnold Standin
Nov 14, 2022
93bff0c
[Automated] Bump version
Nov 16, 2022
35b43f3
Bump loader-utils from 1.4.1 to 1.4.2 in /website
dependabot[bot] Nov 15, 2022
ece1e8b
OP-4394 - Hound
kalisp Nov 16, 2022
96f3a9a
Merge branch 'develop' of github.com:pypeclub/OpenPype into bugfix/OP…
kalisp Nov 16, 2022
4b95ad6
OP-4394 - use lowercased extension in ExtractReview
kalisp Nov 16, 2022
64e5af2
OP-4394 - removed explicit lower from repre ext to not shadow upper c…
kalisp Nov 18, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ def process(self, context):
first_file = task_data["files"][0]

_, extension = os.path.splitext(first_file)
extension = extension.lower()
family, families, tags = self._get_family(
self.task_type_to_family,
task_type,
Expand Down Expand Up @@ -180,6 +181,7 @@ def _get_subset_name(self, family, subset_template, task_name, variant):

def _get_single_repre(self, task_dir, files, tags):
_, ext = os.path.splitext(files[0])
ext = ext.lower()
repre_data = {
"name": ext[1:],
"ext": ext[1:],
Expand All @@ -199,6 +201,7 @@ def _process_sequence(self, files, task_dir, tags):
frame_start = list(collections[0].indexes)[0]
frame_end = list(collections[0].indexes)[-1]
ext = collections[0].tail
ext = ext.lower()
Comment on lines 203 to +204
Copy link
Member

@iLLiCiTiT iLLiCiTiT Nov 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
ext = collections[0].tail
ext = ext.lower()
ext = collections[0].tail.lower()

repre_data = {
"frameStart": frame_start,
"frameEnd": frame_end,
Expand Down Expand Up @@ -244,8 +247,17 @@ def _get_family(self, settings, task_type, is_sequence, extension):
for config in families_config:
if is_sequence != config["is_sequence"]:
continue
if (extension in config["extensions"] or
'' in config["extensions"]): # all extensions setting
extensions = config.get("extensions") or []
lower_extensions = set()
for ext in extensions:
if ext:
ext = ext.lower()
if ext.startswith("."):
ext = ext[1:]
lower_extensions.add(ext)

# all extensions setting
if not lower_extensions or extension in lower_extensions:
found_family = config["result_family"]
break

Expand Down
8 changes: 5 additions & 3 deletions openpype/plugins/publish/extract_review.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def _get_outputs_per_representations(self, instance, profile_outputs):
if input_ext.startswith("."):
input_ext = input_ext[1:]

if input_ext not in self.supported_exts:
if input_ext.lower() not in self.supported_exts:
iLLiCiTiT marked this conversation as resolved.
Show resolved Hide resolved
self.log.info(
"Representation has unsupported extension \"{}\"".format(
input_ext
Expand All @@ -179,7 +179,7 @@ def _single_frame_filter(self, input_filepaths, output_defs):
single_frame_image = False
if len(input_filepaths) == 1:
ext = os.path.splitext(input_filepaths[0])[-1]
single_frame_image = ext in IMAGE_EXTENSIONS
single_frame_image = ext.lower() in IMAGE_EXTENSIONS

filtered_defs = []
for output_def in output_defs:
Expand Down Expand Up @@ -501,7 +501,7 @@ def prepare_temp_data(self, instance, repre, output_def):
first_sequence_frame += handle_start

ext = os.path.splitext(repre["files"][0])[1].replace(".", "")
if ext in self.alpha_exts:
if ext.lower() in self.alpha_exts:
input_allow_bg = True

return {
Expand Down Expand Up @@ -934,6 +934,8 @@ def input_output_paths(self, new_repre, output_def, temp_data):
if output_ext.startswith("."):
output_ext = output_ext[1:]

output_ext = output_ext.lower()

# Store extension to representation
new_repre["ext"] = output_ext

Expand Down