From 9ddd9ad474ee9dabd3abc402a83a4f642f40b682 Mon Sep 17 00:00:00 2001 From: rlaphoenix Date: Sun, 14 Apr 2024 02:32:34 +0100 Subject: [PATCH] refactor(Video): Do not print "?"/"Unknown" values in str() --- devine/core/tracks/video.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/devine/core/tracks/video.py b/devine/core/tracks/video.py index 0ce6e50..6958712 100644 --- a/devine/core/tracks/video.py +++ b/devine/core/tracks/video.py @@ -165,12 +165,20 @@ def __init__(self, *args: Any, codec: Video.Codec, range_: Video.Range, bitrate: self.fps = FPS.parse(str(fps)) if fps else None def __str__(self) -> str: - fps = f"{self.fps:.3f}" if self.fps else "Unknown" return " | ".join(filter(bool, [ "VID", - f"[{self.codec.value}, {self.range.name}]", + "[" + (", ".join(filter(bool, [ + self.codec.value if self.codec else None, + self.range.name + ]))) + "]", str(self.language), - f"{self.width}x{self.height} @ {self.bitrate // 1000 if self.bitrate else '?'} kb/s, {fps} FPS", + ", ".join(filter(bool, [ + " @ ".join(filter(bool, [ + f"{self.width}x{self.height}" if self.width and self.height else None, + f"{self.bitrate // 1000} kb/s" if self.bitrate else None + ])), + f"{self.fps:.3f} FPS" if self.fps else None + ])), self.edition ]))