Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-02-06 07:22:18 +01:00
Code Issues Projects Releases Wiki Activity

Remove dependency existence checks

Browse source 
I think we can make our life easier by removing these checks assuming
that users follow the instructions in the docs.
This commit is contained in:
Šarūnas Nejus 2024-10-26 01:17:12 +01:00
parent b2402b1634
commit 04054cac5c
No known key found for this signature in database
GPG key ID: DD28F6704DBE3435
1 changed files with 3 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
beetsplug/lyrics.py
View file

@ -30,7 +30,9 @@ from http import HTTPStatus
from typing import TYPE_CHECKING, ClassVar, Iterable, Iterator, NamedTuple
from urllib.parse import quote, urlencode, urlparse
import langdetect
import requests
from bs4 import BeautifulSoup
from unidecode import unidecode
import beets
@ -43,20 +45,6 @@ if TYPE_CHECKING:
from ._typing import GeniusAPI, GoogleCustomSearchAPI, JSONDict, LRCLibAPI
try:
from bs4 import BeautifulSoup
HAS_BEAUTIFUL_SOUP = True
except ImportError:
HAS_BEAUTIFUL_SOUP = False
try:
import langdetect
HAS_LANGDETECT = True
except ImportError:
HAS_LANGDETECT = False
USER_AGENT = f"beets/{beets.__version__}"
INSTRUMENTAL_LYRICS = "[Instrumental]"
@ -265,8 +253,6 @@ class RequestHandler:
class Backend(RequestHandler):
REQUIRES_BS = False
def __init__(self, config, log):
self._log = log
self.config = config
@ -510,8 +496,6 @@ class SearchResult(NamedTuple):
class SearchBackend(SoupMixin, Backend):
REQUIRES_BS = True
@cached_property
def dist_thresh(self) -> float:
return self.config["dist_thresh"].get(float)
@ -605,7 +589,6 @@ class Genius(SearchBackend):
class Tekstowo(SoupMixin, DirectBackend):
"""Fetch lyrics from Tekstowo.pl."""
REQUIRES_BS = True
URL_TEMPLATE = "https://www.tekstowo.pl/piosenka,{},{}.html"
non_alpha_to_underscore = partial(re.compile(r"\W").sub, "_")
@ -816,9 +799,6 @@ class LyricsPlugin(RequestHandler, plugins.BeetsPlugin):
self.config["sources"].as_str_seq(), available_sources
)
if not HAS_BEAUTIFUL_SOUP:
sources = self.sanitize_bs_sources(sources)
if "google" in sources:
if not self.config["google_API_key"].get():
# We log a *debug* message here because the default
@ -832,31 +812,11 @@ class LyricsPlugin(RequestHandler, plugins.BeetsPlugin):
x.lower() for x in self.config["bing_lang_from"].as_str_seq()
]
if not HAS_LANGDETECT and self.config["bing_client_secret"].get():
self.warn(
"To use bing translations, you need to install the langdetect "
"module. See the documentation for further details."
)
self.backends = [
self.SOURCE_BACKENDS[s](self.config, self._log.getChild(s))
for s in sources
]
def sanitize_bs_sources(self, sources):
enabled_sources = []
for source in sources:
if self.SOURCE_BACKENDS[source].REQUIRES_BS:
self._log.debug(
"To use the %s lyrics source, you must "
"install the beautifulsoup4 module. See "
"the documentation for further details." % source
)
else:
enabled_sources.append(source)
return enabled_sources
@cached_property
def bing_access_token(self) -> str | None:
params = {
@ -1032,7 +992,7 @@ class LyricsPlugin(RequestHandler, plugins.BeetsPlugin):
if lyrics:
self.info("🟢 Found lyrics: {0}", item)
if HAS_LANGDETECT and self.config["bing_client_secret"].get():
if self.config["bing_client_secret"].get():
lang_from = langdetect.detect(lyrics)
if self.config["bing_lang_to"].get() != lang_from and (
not self.config["bing_lang_from"]