Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extract Review: Fix typos + remove unused variable #312

Merged
merged 5 commits into from
Apr 2, 2024
Merged

Extract Review: Fix typos + remove unused variable #312

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0a300c5
Fix typos
BigRoy Mar 28, 2024
23a8df8
Remove unused variables
BigRoy Mar 28, 2024
5a546c3
Fix typo
BigRoy Mar 28, 2024
413f304
Fix some more typos
BigRoy Apr 2, 2024
9992b00
Merge branch 'develop' into chore/extract_review_typos
BigRoy Apr 2, 2024
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
30 changes: 10 additions & 20 deletions client/ayon_core/plugins/publish/extract_review.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@ def _ffmpeg_arguments(
# Prepare input and output filepaths
self.input_output_paths(new_repre, output_def, temp_data)

# Set output frames len to 1 when ouput is single image
# Set output frames len to 1 when output is single image
if (
temp_data["output_ext_is_image"]
and not temp_data["output_is_sequence"]
Expand Down Expand Up @@ -955,7 +955,7 @@ def input_output_paths(self, new_repre, output_def, temp_data):

self.log.debug("New representation ext: `{}`".format(output_ext))

# Output is image file sequence witht frames
# Output is image file sequence with frames
output_ext_is_image = bool(output_ext in self.image_exts)
output_is_sequence = bool(
output_ext_is_image
Expand All @@ -967,7 +967,7 @@ def input_output_paths(self, new_repre, output_def, temp_data):
frame_end = temp_data["output_frame_end"]

filename_base = "{}_{}".format(filename, filename_suffix)
# Temporary tempalte for frame filling. Example output:
# Temporary template for frame filling. Example output:
# "basename.%04d.exr" when `frame_end` == 1001
repr_file = "{}.%{:0>2}d.{}".format(
filename_base, len(str(frame_end)), output_ext
Expand Down Expand Up @@ -997,7 +997,7 @@ def input_output_paths(self, new_repre, output_def, temp_data):
self.log.debug("Creating dir: {}".format(dst_staging_dir))
os.makedirs(dst_staging_dir)

# Store stagingDir to representaion
# Store stagingDir to representation
new_repre["stagingDir"] = dst_staging_dir

# Store paths to temp data
Expand Down Expand Up @@ -1228,16 +1228,6 @@ def rescaling_filters(self, temp_data, output_def, new_repre):
reformat_in_baking = bool("reformated" in new_repre["tags"])
BigRoy marked this conversation as resolved.
Show resolved Hide resolved
self.log.debug("reformat_in_baking: `{}`".format(reformat_in_baking))

# Get instance data
pixel_aspect = temp_data["pixel_aspect"]

if reformat_in_baking:
self.log.debug((
"Using resolution from input. It is already "
"reformated from upstream process"
))
pixel_aspect = 1

# NOTE Skipped using instance's resolution
full_input_path_single_file = temp_data["full_input_path_single_file"]
try:
Expand Down Expand Up @@ -1268,7 +1258,7 @@ def rescaling_filters(self, temp_data, output_def, new_repre):
if reformat_in_baking:
self.log.debug((
"Using resolution from input. It is already "
"reformated from upstream process"
"reformatted from upstream process"
))
pixel_aspect = 1
output_width = input_width
Expand Down Expand Up @@ -1374,7 +1364,7 @@ def rescaling_filters(self, temp_data, output_def, new_repre):
# Make sure output width and height is not an odd number
# When this can happen:
# - if output definition has set width and height with odd number
# - `instance.data` contain width and height with odd numbeer
# - `instance.data` contain width and height with odd number
if output_width % 2 != 0:
self.log.warning((
"Converting output width from odd to even number. {} -> {}"
Expand Down Expand Up @@ -1555,7 +1545,7 @@ def filter_outputs_by_custom_tags(self, outputs, custom_tags):
custom_tags (list): Custom Tags of processed representation.

Returns:
list: Containg all output definitions matching entered tags.
list: Containing all output definitions matching entered tags.
"""

filtered_outputs = []
Expand Down Expand Up @@ -1820,8 +1810,8 @@ def video_filters(self):
"""
# crop=width:height:x:y - explicit start x, y position
# crop=width:height - x, y are related to center by width/height
# pad=width:heigth:x:y - explicit start x, y position
# pad=width:heigth - x, y are set to 0 by default
# pad=width:height:x:y - explicit start x, y position
# pad=width:height - x, y are set to 0 by default

width = self.width()
height = self.height()
Expand Down Expand Up @@ -1869,7 +1859,7 @@ def _convert_string_to_values(self, orig_string_value):
# Replace "px" (and spaces before) with single space
string_value = re.sub(r"([ ]+)?px", " ", string_value)
string_value = re.sub(r"([ ]+)%", "%", string_value)
# Make sure +/- sign at the beggining of string is next to number
# Make sure +/- sign at the beginning of string is next to number
string_value = re.sub(r"^([\+\-])[ ]+", "\g<1>", string_value)
# Make sure +/- sign in the middle has zero spaces before number under
# which belongs
Expand Down
Loading