Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-06 08:39:17 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into 7z_support

Browse source
This commit is contained in:
Adrian Sampson 2021-05-08 09:47:51 -07:00 committed by GitHub
commit a4352ff845
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
beets/autotag/mb.py
View file

@ -97,7 +97,11 @@ def configure():
from the beets configuration. This should be called at startup. from the beets configuration. This should be called at startup.
""" """
hostname = config['musicbrainz']['host'].as_str() hostname = config['musicbrainz']['host'].as_str()
musicbrainzngs.set_hostname(hostname) https = config['musicbrainz']['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( musicbrainzngs.set_rate_limit(
config['musicbrainz']['ratelimit_interval'].as_number(), config['musicbrainz']['ratelimit_interval'].as_number(),
config['musicbrainz']['ratelimit'].get(int), config['musicbrainz']['ratelimit'].get(int),

1
beets/config_default.yaml
View file

@ -102,6 +102,7 @@ statefile: state.pickle
musicbrainz: musicbrainz:
host: musicbrainz.org host: musicbrainz.org
https: no
ratelimit: 1 ratelimit: 1
ratelimit_interval: 1.0 ratelimit_interval: 1.0
searchlimit: 5 searchlimit: 5

3
docs/changelog.rst
View file

@ -46,6 +46,8 @@ Major new features:
Other new things: Other new things:
* Enable HTTPS for MusicBrainz by default and add configuration option
`https` for custom servers.
* :doc:`/plugins/mpdstats`: Add a new `strip_path` option to help build the * :doc:`/plugins/mpdstats`: Add a new `strip_path` option to help build the
right local path from MPD information. right local path from MPD information.
* :doc:`/plugins/convert`: Conversion can now parallelize conversion jobs on * :doc:`/plugins/convert`: Conversion can now parallelize conversion jobs on
@ -361,6 +363,7 @@ Fixes:
:bug:`2984` :bug:`2984`
* :doc:`/plugins/lyrics`: Fix crashes for Tekstowo false positives * :doc:`/plugins/lyrics`: Fix crashes for Tekstowo false positives
:bug:`3904` :bug:`3904`
* :doc`/reference/cli`: Remove reference to rarfile version in link
For plugin developers: For plugin developers:

2
docs/reference/cli.rst
View file

@ -151,7 +151,7 @@ Optional command flags:
beet import --set genre="Alternative Rock" --set mood="emotional" beet import --set genre="Alternative Rock" --set mood="emotional"
.. _rarfile: https://pypi.python.org/pypi/rarfile/2.2 .. _rarfile: https://pypi.python.org/pypi/rarfile/
.. _py7zr: https://pypi.org/project/py7zr/ .. _py7zr: https://pypi.org/project/py7zr/
.. only:: html .. only:: html

7
docs/reference/config.rst
View file

@ -691,15 +691,18 @@ MusicBrainz Options
------------------- -------------------
You can instruct beets to use `your own MusicBrainz database`_ instead of You can instruct beets to use `your own MusicBrainz database`_ instead of
the `main server`_. Use the ``host`` and ``ratelimit`` options under a the `main server`_. Use the ``host``, ``https`` and ``ratelimit`` options
``musicbrainz:`` header, like so:: under a ``musicbrainz:`` header, like so::
musicbrainz: musicbrainz:
host: localhost:5000 host: localhost:5000
https: no
ratelimit: 100 ratelimit: 100
The ``host`` key, of course, controls the Web server hostname (and port, The ``host`` key, of course, controls the Web server hostname (and port,
optionally) that will be contacted by beets (default: musicbrainz.org). optionally) that will be contacted by beets (default: musicbrainz.org).
The ``https`` key makes the client use HTTPS instead of HTTP. This setting applies
only to custom servers. The official MusicBrainz server always uses HTTPS. (Default: no.)
The server must have search indices enabled (see `Building search indexes`_). The server must have search indices enabled (see `Building search indexes`_).
The ``ratelimit`` option, an integer, controls the number of Web service requests The ``ratelimit`` option, an integer, controls the number of Web service requests