mirror of https://github.com/devine-dl/devine.git
fix(Video): Allow specifying width/height as str, cast to int
We simply check the type near the top of the constructor, and later in the code it casts to int and handles failures there too (e.g., if the str is not a number, it will be handled).
This commit is contained in:
parent
09e80feee5
commit
4335806ca2
|
@ -194,9 +194,9 @@ class Video(Track):
|
||||||
raise TypeError(f"Expected range_ to be a {Video.Range}, not {range_!r}")
|
raise TypeError(f"Expected range_ to be a {Video.Range}, not {range_!r}")
|
||||||
if not isinstance(bitrate, (str, int, float, type(None))):
|
if not isinstance(bitrate, (str, int, float, type(None))):
|
||||||
raise TypeError(f"Expected bitrate to be a {str}, {int}, or {float}, not {bitrate!r}")
|
raise TypeError(f"Expected bitrate to be a {str}, {int}, or {float}, not {bitrate!r}")
|
||||||
if not isinstance(width, (int, type(None))):
|
if not isinstance(width, (int, str, type(None))):
|
||||||
raise TypeError(f"Expected width to be a {int}, not {width!r}")
|
raise TypeError(f"Expected width to be a {int}, not {width!r}")
|
||||||
if not isinstance(height, (int, type(None))):
|
if not isinstance(height, (int, str, type(None))):
|
||||||
raise TypeError(f"Expected height to be a {int}, not {height!r}")
|
raise TypeError(f"Expected height to be a {int}, not {height!r}")
|
||||||
if not isinstance(fps, (str, int, float, type(None))):
|
if not isinstance(fps, (str, int, float, type(None))):
|
||||||
raise TypeError(f"Expected fps to be a {str}, {int}, or {float}, not {fps!r}")
|
raise TypeError(f"Expected fps to be a {str}, {int}, or {float}, not {fps!r}")
|
||||||
|
@ -212,12 +212,12 @@ class Video(Track):
|
||||||
try:
|
try:
|
||||||
self.width = int(width or 0) or None
|
self.width = int(width or 0) or None
|
||||||
except ValueError as e:
|
except ValueError as e:
|
||||||
raise ValueError(f"Expected width to be a number, {e}")
|
raise ValueError(f"Expected width to be a number, not {width!r}, {e}")
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self.height = int(height or 0) or None
|
self.height = int(height or 0) or None
|
||||||
except ValueError as e:
|
except ValueError as e:
|
||||||
raise ValueError(f"Expected height to be a number, {e}")
|
raise ValueError(f"Expected height to be a number, not {height!r}, {e}")
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self.fps = (FPS.parse(str(fps)) or None) if fps else None
|
self.fps = (FPS.parse(str(fps)) or None) if fps else None
|
||||||
|
|
Loading…
Reference in New Issue