mirror of
https://github.com/nathom/streamrip.git
synced 2024-09-19 11:18:45 -04:00
Merge branch 'dev'
This commit is contained in:
commit
b10f58bdbe
4 changed files with 5 additions and 6 deletions
|
@ -1,6 +1,6 @@
|
||||||
[tool.poetry]
|
[tool.poetry]
|
||||||
name = "streamrip"
|
name = "streamrip"
|
||||||
version = "2.0.4"
|
version = "2.0.5"
|
||||||
description = "A fast, all-in-one music ripper for Qobuz, Deezer, Tidal, and SoundCloud"
|
description = "A fast, all-in-one music ripper for Qobuz, Deezer, Tidal, and SoundCloud"
|
||||||
authors = ["nathom <nathanthomas707@gmail.com>"]
|
authors = ["nathom <nathanthomas707@gmail.com>"]
|
||||||
license = "GPL-3.0-only"
|
license = "GPL-3.0-only"
|
||||||
|
@ -23,7 +23,6 @@ rip = "streamrip.rip:rip"
|
||||||
[tool.poetry.dependencies]
|
[tool.poetry.dependencies]
|
||||||
python = ">=3.10 <4.0"
|
python = ">=3.10 <4.0"
|
||||||
mutagen = "^1.45.1"
|
mutagen = "^1.45.1"
|
||||||
tqdm = "^4.61.1"
|
|
||||||
tomlkit = "^0.7.2"
|
tomlkit = "^0.7.2"
|
||||||
pathvalidate = "^2.4.1"
|
pathvalidate = "^2.4.1"
|
||||||
simple-term-menu = {version = "^1.2.1", platform = 'darwin|linux'}
|
simple-term-menu = {version = "^1.2.1", platform = 'darwin|linux'}
|
||||||
|
@ -32,7 +31,6 @@ windows-curses = {version = "^2.2.0", platform = 'win32|cygwin'}
|
||||||
Pillow = ">=9,<11"
|
Pillow = ">=9,<11"
|
||||||
deezer-py = "1.3.6"
|
deezer-py = "1.3.6"
|
||||||
pycryptodomex = "^3.10.1"
|
pycryptodomex = "^3.10.1"
|
||||||
cleo = "^2.0"
|
|
||||||
appdirs = "^1.4.4"
|
appdirs = "^1.4.4"
|
||||||
m3u8 = "^0.9.0"
|
m3u8 = "^0.9.0"
|
||||||
aiofiles = "^0.7"
|
aiofiles = "^0.7"
|
||||||
|
|
|
@ -2,4 +2,4 @@ from . import converter, db, exceptions, media, metadata
|
||||||
from .config import Config
|
from .config import Config
|
||||||
|
|
||||||
__all__ = ["Config", "media", "metadata", "converter", "db", "exceptions"]
|
__all__ = ["Config", "media", "metadata", "converter", "db", "exceptions"]
|
||||||
__version__ = "2.0.4"
|
__version__ = "2.0.5"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
from string import printable
|
from string import printable
|
||||||
|
|
||||||
from pathvalidate import sanitize_filename # type: ignore
|
from pathvalidate import sanitize_filename, sanitize_filepath # type: ignore
|
||||||
|
|
||||||
ALLOWED_CHARS = set(printable)
|
ALLOWED_CHARS = set(printable)
|
||||||
|
|
||||||
|
@ -12,6 +12,7 @@ def clean_filename(fn: str, restrict: bool = False) -> str:
|
||||||
|
|
||||||
return path
|
return path
|
||||||
|
|
||||||
|
|
||||||
def clean_filepath(fn: str, restrict: bool = False) -> str:
|
def clean_filepath(fn: str, restrict: bool = False) -> str:
|
||||||
path = str(sanitize_filepath(fn))
|
path = str(sanitize_filepath(fn))
|
||||||
if restrict:
|
if restrict:
|
||||||
|
|
|
@ -131,7 +131,7 @@ def downscale_image(input_image_path: str, max_dimension: int):
|
||||||
# Get the original width and height
|
# Get the original width and height
|
||||||
width, height = image.size
|
width, height = image.size
|
||||||
|
|
||||||
if max_dimension <= max(width, height):
|
if max_dimension >= max(width, height):
|
||||||
return
|
return
|
||||||
|
|
||||||
# Calculate the new dimensions while maintaining the aspect ratio
|
# Calculate the new dimensions while maintaining the aspect ratio
|
||||||
|
|
Loading…
Reference in a new issue