mirrors/streamrip
1
0
Fork 0
mirror of https://github.com/nathom/streamrip.git synced 2025-05-13 14:44:49 -04:00
Code Issues Projects Releases Packages Wiki Activity

Improve NonStreamable message for Deezer

Browse source
This commit is contained in:
nathom 2021-07-24 11:00:51 -07:00
parent 482f398e44
commit 19edeb68b5
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
streamrip/utils.py
View file

@ -5,10 +5,10 @@ from __future__ import annotations
import base64 import base64
import logging import logging
import os import os
import re
from string import Formatter from string import Formatter
from typing import Dict, Hashable, Optional, Tuple, Union from typing import Dict, Hashable, Optional, Tuple, Union
from collections import OrderedDict from collections import OrderedDict
from json import JSONDecodeError
import click import click
import requests import requests
@ -16,7 +16,7 @@ from pathvalidate import sanitize_filename
from requests.packages import urllib3 from requests.packages import urllib3
from tqdm import tqdm from tqdm import tqdm
from .constants import AGENT, TIDAL_COVER_URL, COVER_SIZES from .constants import TIDAL_COVER_URL, COVER_SIZES
from .exceptions import InvalidQuality, InvalidSourceError, NonStreamable from .exceptions import InvalidQuality, InvalidSourceError, NonStreamable
urllib3.disable_warnings() urllib3.disable_warnings()
@ -146,8 +146,12 @@ def tqdm_download(url: str, filepath: str, params: dict = None, desc: str = None
session = gen_threadsafe_session() session = gen_threadsafe_session()
r = session.get(url, allow_redirects=True, stream=True, params=params) r = session.get(url, allow_redirects=True, stream=True, params=params)
total = int(r.headers.get("content-length", 0)) total = int(r.headers.get("content-length", 0))
logger.debug(f"File size = {total}") logger.debug("File size = %s", total)
if total < 1000 and not url.endswith("jpg") and not url.endswith("png"): if total < 1000 and not url.endswith("jpg") and not url.endswith("png"):
logger.debug("Response text: %s", r.text)
try:
raise NonStreamable(r.json()["error"])
except JSONDecodeError:
raise NonStreamable("Resource not found.") raise NonStreamable("Resource not found.")
try: try: