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

musicbrainz: access the custom server directly, if configured

Browse source
This commit is contained in:
Šarūnas Nejus 2025-09-29 00:20:47 +01:00
parent 82a77f0f9c
commit 87a074ee99
No known key found for this signature in database
2 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
beetsplug/musicbrainz.py
View file

@ -19,6 +19,7 @@ from __future__ import annotations
import traceback
from collections import Counter
from contextlib import suppress
from dataclasses import dataclass
from functools import cached_property
from itertools import product
from typing import TYPE_CHECKING, Any, Iterable, Sequence
@ -118,16 +119,18 @@ BROWSE_CHUNKSIZE = 100
BROWSE_MAXTRACKS = 500
@dataclass
class MusicBrainzAPI:
api_url = "https://musicbrainz.org/ws/2"
api_host: str
rate_limit: float
@cached_property
def session(self) -> LimiterTimeoutSession:
return LimiterTimeoutSession(per_second=1)
return LimiterTimeoutSession(per_second=self.rate_limit)
def _get(self, entity: str, **kwargs) -> JSONDict:
return self.session.get(
f"{self.api_url}/{entity}", params={**kwargs, "fmt": "json"}
f"{self.api_host}/ws/2/{entity}", params={**kwargs, "fmt": "json"}
).json()
def get_release(self, id_: str) -> JSONDict:
@ -361,7 +364,17 @@ def _merge_pseudo_and_actual_album(
class MusicBrainzPlugin(MetadataSourcePlugin):
@cached_property
def api(self) -> MusicBrainzAPI:
return MusicBrainzAPI()
hostname = self.config["host"].as_str()
if hostname == "musicbrainz.org":
hostname, rate_limit = "https://musicbrainz.org", 1.0
else:
https = self.config["https"].get(bool)
hostname = f"http{'s' if https else ''}://{hostname}"
rate_limit = (
self.config["ratelimit"].get(int)
/ self.config["ratelimit_interval"].as_number()
)
return MusicBrainzAPI(hostname, rate_limit)
def __init__(self):
"""Set up the python-musicbrainz-ngs module according to settings
@ -394,16 +407,6 @@ class MusicBrainzPlugin(MetadataSourcePlugin):
"'musicbrainz.searchlimit' option is deprecated and will be "
"removed in 3.0.0. Use 'musicbrainz.search_limit' instead."
)
hostname = self.config["host"].as_str()
https = self.config["https"].get(bool)
# Only call set_hostname when a custom server is configured. Since
# musicbrainz-ngs connects to musicbrainz.org with HTTPS by default
if hostname != "musicbrainz.org":
musicbrainzngs.set_hostname(hostname, https)
musicbrainzngs.set_rate_limit(
self.config["ratelimit_interval"].as_number(),
self.config["ratelimit"].get(int),
)
def track_info(
self,

9
docs/plugins/musicbrainz.rst
View file

@ -68,15 +68,14 @@ Default
.. conf:: ratelimit
:default: 1
Controls the number of Web service requests per second.
**Do not change the rate limit setting** if you're using the main MusicBrainz
server---on this public server, you're limited_ to one request per second.
Controls the number of Web service requests per second. This setting applies only
to custom servers. The official MusicBrainz server enforces a rate limit of 1
request per second.
.. conf:: ratelimit_interval
:default: 1.0
The time interval (in seconds) for the rate limit.
The time interval (in seconds) for the rate limit. Only applies to custom servers.
.. conf:: enabled
:default: yes