Skip to content

Commit 4944950

Browse files
authored
Version 5.8.2 (#618)
* Fixing #610 Do not try to divide by zero if HDR metadata has bad values (thanks to Noelle Leigh) * Fixing #616 replace correct cmd line option for IDC level (thanks to pkleinejaeger) * Fixing too long of log file names could crash (thanks to ProFile) * Removing code signing as cert has expired
1 parent bcabdd8 commit 4944950

File tree

10 files changed

+36
-50
lines changed

10 files changed

+36
-50
lines changed

.github/workflows/build.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -124,31 +124,31 @@ jobs:
124124
shell: cmd
125125
run: pyinstaller FastFlix_Windows_Installer.spec
126126

127-
- uses: skymatic/code-sign-action@v1
128-
with:
129-
certificate: '${{ secrets.CODE_CERT_B64 }}'
130-
password: '${{ secrets.CODE_CERT_PASS }}'
131-
certificatesha1: '${{ secrets.CODE_CERT_THUMB }}'
132-
description: 'FastFlix'
133-
timestampUrl: 'http://timestamp.sectigo.com'
134-
folder: 'dist\FastFlix'
135-
recursive: false
127+
# - uses: skymatic/code-sign-action@v1
128+
# with:
129+
# certificate: '${{ secrets.CODE_CERT_B64 }}'
130+
# password: '${{ secrets.CODE_CERT_PASS }}'
131+
# certificatesha1: '${{ secrets.CODE_CERT_THUMB }}'
132+
# description: 'FastFlix'
133+
# timestampUrl: 'http://timestamp.sectigo.com'
134+
# folder: 'dist\FastFlix'
135+
# recursive: false
136136

137137
- name: Package installer
138138
shell: cmd
139139
run: |
140140
makensis.exe /INPUTCHARSET UTF8 /DVERSION=${{ env.EXACT_VERSION }} /DPRODUCT_VERSION=${{ env.PRODUCT_VERSION }} FastFlix.nsi
141141
move FastFlix_installer.exe dist\FastFlix_${{ env.VERSION }}_installer.exe
142142
143-
- uses: skymatic/code-sign-action@v1
144-
with:
145-
certificate: '${{ secrets.CODE_CERT_B64 }}'
146-
password: '${{ secrets.CODE_CERT_PASS }}'
147-
certificatesha1: '${{ secrets.CODE_CERT_THUMB }}'
148-
description: 'FastFlix'
149-
timestampUrl: 'http://timestamp.sectigo.com'
150-
folder: 'dist'
151-
recursive: false
143+
# - uses: skymatic/code-sign-action@v1
144+
# with:
145+
# certificate: '${{ secrets.CODE_CERT_B64 }}'
146+
# password: '${{ secrets.CODE_CERT_PASS }}'
147+
# certificatesha1: '${{ secrets.CODE_CERT_THUMB }}'
148+
# description: 'FastFlix'
149+
# timestampUrl: 'http://timestamp.sectigo.com'
150+
# folder: 'dist'
151+
# recursive: false
152152

153153
- name: Test executable
154154
run: |

CHANGES

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## Version 5.8.2
4+
5+
* Fixing #610 Do not try to divide by zero if HDR metadata has bad values (thanks to Noelle Leigh)
6+
* Fixing #616 replace correct cmd line option for IDC level (thanks to pkleinejaeger)
7+
* Fixing too long of log file names could crash, limiting filename to 220 characters (thanks to ProFile)
8+
* Removing code signing as cert has expired
9+
310
## Version 5.8.1
411

512
* Fixing #598 'dict' object has no attribute 'to_yaml' (thanks to dmo marillat)

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,6 @@ FastFlix (v4.0.2+) passes through HLG color transfer information to everything e
124124

125125
FastFlix does not plan to support Dolby Vision's proprietary format at this time.
126126

127-
# Support FastFlix
128-
129-
Check out the different ways you can help [support FastFlix](https://github.com/cdgriffith/FastFlix/wiki/Support-FastFlix)!
130-
131127
# Multilingual Support
132128

133129
FastFlix is machine translated using DeepL into Spanish (español), French (Français), German (Deutsch),

fastflix/conversion_worker.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def start_command():
3939
log_queue.put(f"CLEAR_WINDOW:{video_uuid}:{command_uuid}")
4040
reusables.remove_file_handlers(logger)
4141
new_file_handler = reusables.get_file_handler(
42-
log_path / sanitize_filename(f"flix_conversion_{log_name}_{file_date()}.log"),
42+
log_path / sanitize_filename(f"flix_conversion_{log_name[:64]}_{file_date()}.log"),
4343
level=logging.DEBUG,
4444
log_format="%(asctime)s - %(message)s",
4545
encoding="utf-8",

fastflix/data/languages.yaml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4953,21 +4953,6 @@ Success:
49534953
ukr: Успіх
49544954
kor: 성공
49554955
ron: Succes
4956-
Support FastFlix:
4957-
deu: Unterstützt FastFlix
4958-
eng: Support FastFlix
4959-
fra: Soutenez FastFlix
4960-
ita: Supporto FastFlix
4961-
spa: Soporta FastFlix
4962-
chs: 支持FastFlix
4963-
jpn: FastFlixを応援/寄付
4964-
rus: Поддержка FastFlix
4965-
por: Suporte FastFlix
4966-
swe: Stöd för FastFlix
4967-
pol: Obsługa FastFlix
4968-
ukr: Підтримка FastFlix
4969-
kor: FastFlix 지원
4970-
ron: Sprijină FastFlix
49714956
Supported Image Files:
49724957
deu: Unterstützte Bilddateien
49734958
eng: Supported Image Files
@@ -8730,7 +8715,7 @@ Drag and Drop to reorder:
87308715
eng: Drag and Drop to reorder
87318716
deu: Ziehen und Ablegen zum Neuordnen
87328717
fra: Glisser et déposer pour réorganiser
8733-
ita: Per riordinare trascina e rilascia
8718+
ita: Per riordinare trascina e rilascia
87348719
spa: Arrastrar y soltar para reordenar
87358720
chs: 拖放重新排序
87368721
jpn: ドラッグ&ドロップで並び替え

fastflix/encoders/vvc/command_builder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def build(fastflix: FastFlix):
8787
beginning += f"-tier:v {settings.tier} "
8888

8989
if settings.levelidc:
90-
beginning += f"-levelidc {settings.levelidc} "
90+
beginning += f"-level {settings.levelidc} "
9191

9292
vvc_params = settings.vvc_params.copy() or []
9393

fastflix/flix.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,12 @@ def convert_mastering_display(data: Box) -> Tuple[Box, str]:
486486
cll = None
487487

488488
def s(a, v, base=50_000):
489-
upper, lower = [int(x) for x in a.get(v, "0/0").split("/")]
489+
try:
490+
upper, lower = [int(x) for x in a.get(v, "0/0").split("/")]
491+
except ValueError:
492+
raise FlixError(f"Could not parse HDR value {a} from {v}")
493+
if lower <= 0: # avoid division by zero
494+
raise FlixError(f"HDR value outside expected range, {v} was {a}")
490495
if lower != base:
491496
upper *= base / lower
492497
value = int(upper)

fastflix/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/usr/bin/env python
22
# -*- coding: utf-8 -*-
3-
__version__ = "5.8.1"
3+
__version__ = "5.8.2"
44
__author__ = "Chris Griffith"

fastflix/widgets/about.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,6 @@ def __init__(self, app):
3535
label.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
3636
layout.addWidget(label)
3737

38-
support_label = QtWidgets.QLabel(
39-
f'{link("https://github.com/cdgriffith/FastFlix/wiki/Support-FastFlix", t("Support FastFlix"), app.fastflix.config.theme)}<br><br>'
40-
)
41-
support_label.setOpenExternalLinks(True)
42-
support_label.setFont(QtGui.QFont(self.app.font().family(), 12))
43-
support_label.setAlignment((QtCore.Qt.AlignCenter | QtCore.Qt.AlignTop))
44-
layout.addWidget(support_label)
45-
4638
bundle_label = QtWidgets.QLabel(
4739
f"{t('Conversion suites')}: {link('https://www.ffmpeg.org/download.html', 'FFmpeg', app.fastflix.config.theme)} ({t('Various')}), "
4840
f"{link('https://github.com/rigaya/NVEnc', 'NVEncC', app.fastflix.config.theme)} (MIT) "

fastflix/widgets/main.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ def __init__(self, parent, app: FastFlixApp):
226226
self.output_video_path_widget.setFixedHeight(20)
227227
self.output_video_path_widget.setFont(QtGui.QFont(self.app.font().family(), 9))
228228
self.output_video_path_widget.setStyleSheet("padding: 0 0 -1px 5px")
229+
self.output_video_path_widget.setMaxLength(220)
229230

230231
# self.output_video_path_widget.textChanged.connect(lambda x: self.page_update(build_thumbnail=False))
231232
self.video_path_widget.setEnabled(False)

0 commit comments

Comments
 (0)