Skip to content

Commit 1bbdd4e

Browse files
committed
* Fixing logs were showing red for info commands
1 parent 44ac399 commit 1bbdd4e

File tree

9 files changed

+21
-15
lines changed

9 files changed

+21
-15
lines changed

CHANGES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* Fixing #654 Failed to import attachment due to bad mime type gathering (thanks to larsk2)
66
* Fixing missing unittests for common encoder options
77
* Fixing some extra spaces in commands
8+
* Fixing logs were showing red for info commands
89

910
## Version 5.12.0
1011

fastflix/application.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,13 @@ def init_logging(app: FastFlixApp):
5252
logger.setLevel(logging.DEBUG)
5353
logger.addHandler(stream_handler)
5454
logger.addHandler(file_handler)
55-
coloredlogs.install(level="DEBUG", logger=logger)
55+
level_styles = {
56+
"debug": {"color": "blue"},
57+
"info": {"color": "green"},
58+
"warning": {"color": "yellow", "bold": True},
59+
"error": {"color": "red", "bold": True},
60+
}
61+
coloredlogs.install(level="DEBUG", logger=logger, level_styles=level_styles)
5662

5763

5864
def init_encoders(app: FastFlixApp, **_):

fastflix/command_runner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ def clean(self):
174174
def kill(self, log=True):
175175
if self.process and self.process.poll() is None:
176176
if log:
177-
logger.info(f"Killing worker process {self.process.pid}")
177+
logger.warning(f"Stopping encoder worker process {self.process.pid}")
178178
try:
179179
# if reusables.win_based:
180180
# os.kill(self.process.pid, signal.CTRL_C_EVENT)

fastflix/encoders/svt_av1/settings_panel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ def init_svtav1_params(self):
160160
layout = QtWidgets.QHBoxLayout()
161161
self.labels.svtav1_params = QtWidgets.QLabel(t("Additional svt av1 params"))
162162
self.labels.svtav1_params.setFixedWidth(200)
163-
tool_tip = f"{t('Extra svt av1 params in opt=1:opt2=0 format')},\n" f"{t('cannot modify generated settings')}"
163+
tool_tip = f"{t('Extra svt av1 params in opt=1:opt2=0 format')},\n{t('cannot modify generated settings')}"
164164
self.labels.svtav1_params.setToolTip(tool_tip)
165165
layout.addWidget(self.labels.svtav1_params)
166166
self.widgets.svtav1_params = QtWidgets.QLineEdit()

fastflix/encoders/svt_av1_avif/settings_panel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ def init_svtav1_params(self):
124124
layout = QtWidgets.QHBoxLayout()
125125
self.labels.svtav1_params = QtWidgets.QLabel(t("Additional svt av1 params"))
126126
self.labels.svtav1_params.setFixedWidth(200)
127-
tool_tip = f"{t('Extra svt av1 params in opt=1:opt2=0 format')},\n" f"{t('cannot modify generated settings')}"
127+
tool_tip = f"{t('Extra svt av1 params in opt=1:opt2=0 format')},\n{t('cannot modify generated settings')}"
128128
self.labels.svtav1_params.setToolTip(tool_tip)
129129
layout.addWidget(self.labels.svtav1_params)
130130
self.widgets.svtav1_params = QtWidgets.QLineEdit()

fastflix/entry.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,13 @@ def main(portable_mode=False):
8888
logger = logging.getLogger("fastflix-core")
8989
logger.addHandler(reusables.get_stream_handler(level=logging.DEBUG))
9090
logger.setLevel(logging.DEBUG)
91-
coloredlogs.install(level="DEBUG", logger=logger)
91+
level_styles = {
92+
"debug": {"color": "blue"},
93+
"info": {"color": "green"},
94+
"warning": {"color": "yellow", "bold": True},
95+
"error": {"color": "red", "bold": True},
96+
}
97+
coloredlogs.install(level="DEBUG", logger=logger, level_styles=level_styles)
9298
logger.info(f"Starting FastFlix {__version__}")
9399

94100
worker_queue = Queue()

fastflix/flix.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,6 @@ def generate_thumbnail_command(
327327
filters: str,
328328
start_time: float = 0,
329329
input_track: int = 0,
330-
enable_opencl: bool = False,
331330
) -> list[str]:
332331
command = [str(config.ffmpeg)]
333332

@@ -339,10 +338,6 @@ def generate_thumbnail_command(
339338
# Video file input
340339
command += ["-loglevel", "warning", "-i", clean_file_string(source)]
341340

342-
# Hardware acceleration with OpenCL
343-
if enable_opencl:
344-
command += ["-init_hw_device", "opencl:0.0=ocl", "-filter_hw_device", "ocl"]
345-
346341
command += shlex.split(filters)
347342

348343
# Apply video track selection

fastflix/widgets/main.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1669,7 +1669,7 @@ def generate_thumbnail(self):
16691669
filters = helpers.generate_filters(
16701670
start_filters="select=eq(pict_type\\,I)" if self.widgets.thumb_key.isChecked() else None,
16711671
custom_filters=custom_filters,
1672-
enable_opencl=self.app.fastflix.opencl_support,
1672+
enable_opencl=False,
16731673
**settings,
16741674
)
16751675

@@ -1678,7 +1678,6 @@ def generate_thumbnail(self):
16781678
source=self.source_material,
16791679
output=self.thumb_file,
16801680
filters=filters,
1681-
enable_opencl=self.app.fastflix.opencl_support,
16821681
start_time=self.preview_place if not self.app.fastflix.current_video.concat else None,
16831682
input_track=self.app.fastflix.current_video.video_settings.selected_track,
16841683
)
@@ -1906,7 +1905,7 @@ def encode_video(self):
19061905
sure = yes_no_message(t("Are you sure you want to stop the current encode?"), title="Confirm Stop Encode")
19071906
if not sure:
19081907
return
1909-
logger.debug(t("Canceling current encode"))
1908+
logger.info(t("Canceling current encode"))
19101909
self.app.fastflix.worker_queue.put(["cancel"])
19111910
self.video_options.queue.reset_pause_encode()
19121911
return

fastflix/widgets/windows/large_preview.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def generate_image(self):
6868
settings["remove_hdr"] = True
6969

7070
filters = helpers.generate_filters(
71-
enable_opencl=self.main.app.fastflix.opencl_support,
71+
enable_opencl=False,
7272
start_filters="select=eq(pict_type\\,I)" if self.main.widgets.thumb_key.isChecked() else None,
7373
scale=self.main.app.fastflix.current_video.scale,
7474
**settings,
@@ -82,7 +82,6 @@ def generate_image(self):
8282
output=output,
8383
filters=filters,
8484
start_time=self.main.preview_place,
85-
enable_opencl=self.main.app.fastflix.opencl_support,
8685
input_track=self.main.app.fastflix.current_video.video_settings.selected_track,
8786
)
8887
if thumb_command == self.last_command:

0 commit comments

Comments
 (0)