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

Fix up invalid master merges

Browse source
This commit is contained in:
Andrew Rogl 2021-09-26 17:33:15 +10:00
parent ed07bb5b7e
commit ac6cc2ffa4
5 changed files with 69 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
beets/autotag/mb.py
View file

@ -18,8 +18,6 @@
import musicbrainzngs import musicbrainzngs
import re import re
import traceback import traceback
from collections import Counter
from six.moves.urllib.parse import urljoin
from beets import logging from beets import logging
from beets import plugins from beets import plugins

138
beets/library.py
View file

@ -455,47 +455,47 @@ class Item(LibModel):
'path': PathType(), 'path': PathType(),
'album_id': types.FOREIGN_ID, 'album_id': types.FOREIGN_ID,
'title': types.STRING, 'title': types.STRING,
'artist': types.STRING, 'artist': types.STRING,
'artist_sort': types.STRING, 'artist_sort': types.STRING,
'artist_credit': types.STRING, 'artist_credit': types.STRING,
'album': types.STRING, 'album': types.STRING,
'albumartist': types.STRING, 'albumartist': types.STRING,
'albumartist_sort': types.STRING, 'albumartist_sort': types.STRING,
'albumartist_credit': types.STRING, 'albumartist_credit': types.STRING,
'genre': types.STRING, 'genre': types.STRING,
'style': types.STRING, 'style': types.STRING,
'discogs_albumid': types.INTEGER, 'discogs_albumid': types.INTEGER,
'discogs_artistid': types.INTEGER, 'discogs_artistid': types.INTEGER,
'discogs_labelid': types.INTEGER, 'discogs_labelid': types.INTEGER,
'lyricist': types.STRING, 'lyricist': types.STRING,
'composer': types.STRING, 'composer': types.STRING,
'composer_sort': types.STRING, 'composer_sort': types.STRING,
'work': types.STRING, 'work': types.STRING,
'mb_workid': types.STRING, 'mb_workid': types.STRING,
'work_disambig': types.STRING, 'work_disambig': types.STRING,
'arranger': types.STRING, 'arranger': types.STRING,
'grouping': types.STRING, 'grouping': types.STRING,
'year': types.PaddedInt(4), 'year': types.PaddedInt(4),
'month': types.PaddedInt(2), 'month': types.PaddedInt(2),
'day': types.PaddedInt(2), 'day': types.PaddedInt(2),
'track': types.PaddedInt(2), 'track': types.PaddedInt(2),
'tracktotal': types.PaddedInt(2), 'tracktotal': types.PaddedInt(2),
'disc': types.PaddedInt(2), 'disc': types.PaddedInt(2),
'disctotal': types.PaddedInt(2), 'disctotal': types.PaddedInt(2),
'lyrics': types.STRING, 'lyrics': types.STRING,
'comments': types.STRING, 'comments': types.STRING,
'bpm': types.INTEGER, 'bpm': types.INTEGER,
'comp': types.BOOLEAN, 'comp': types.BOOLEAN,
'mb_trackid': types.STRING, 'mb_trackid': types.STRING,
'mb_albumid': types.STRING, 'mb_albumid': types.STRING,
'mb_artistid': types.STRING, 'mb_artistid': types.STRING,
'mb_albumartistid': types.STRING, 'mb_albumartistid': types.STRING,
'mb_releasetrackid': types.STRING, 'mb_releasetrackid': types.STRING,
'trackdisambig': types.STRING, 'trackdisambig': types.STRING,
'albumtype': types.STRING, 'albumtype': types.STRING,
'albumtypes': types.STRING, 'albumtypes': types.STRING,
'label': types.STRING, 'label': types.STRING,
'acoustid_fingerprint': types.STRING, 'acoustid_fingerprint': types.STRING,
'acoustid_id': types.STRING, 'acoustid_id': types.STRING,
'mb_releasegroupid': types.STRING, 'mb_releasegroupid': types.STRING,
@ -1024,35 +1024,35 @@ class Album(LibModel):
_fields = { _fields = {
'id': types.PRIMARY_ID, 'id': types.PRIMARY_ID,
'artpath': PathType(True), 'artpath': PathType(True),
'added': DateType(), 'added': DateType(),
'albumartist': types.STRING, 'albumartist': types.STRING,
'albumartist_sort': types.STRING, 'albumartist_sort': types.STRING,
'albumartist_credit': types.STRING, 'albumartist_credit': types.STRING,
'album': types.STRING, 'album': types.STRING,
'genre': types.STRING, 'genre': types.STRING,
'style': types.STRING, 'style': types.STRING,
'discogs_albumid': types.INTEGER, 'discogs_albumid': types.INTEGER,
'discogs_artistid': types.INTEGER, 'discogs_artistid': types.INTEGER,
'discogs_labelid': types.INTEGER, 'discogs_labelid': types.INTEGER,
'year': types.PaddedInt(4), 'year': types.PaddedInt(4),
'month': types.PaddedInt(2), 'month': types.PaddedInt(2),
'day': types.PaddedInt(2), 'day': types.PaddedInt(2),
'disctotal': types.PaddedInt(2), 'disctotal': types.PaddedInt(2),
'comp': types.BOOLEAN, 'comp': types.BOOLEAN,
'mb_albumid': types.STRING, 'mb_albumid': types.STRING,
'mb_albumartistid': types.STRING, 'mb_albumartistid': types.STRING,
'albumtype': types.STRING, 'albumtype': types.STRING,
'albumtypes': types.STRING, 'albumtypes': types.STRING,
'label': types.STRING, 'label': types.STRING,
'mb_releasegroupid': types.STRING, 'mb_releasegroupid': types.STRING,
'asin': types.STRING, 'asin': types.STRING,
'catalognum': types.STRING, 'catalognum': types.STRING,
'script': types.STRING, 'script': types.STRING,
'language': types.STRING, 'language': types.STRING,
'country': types.STRING, 'country': types.STRING,
'albumstatus': types.STRING, 'albumstatus': types.STRING,
'albumdisambig': types.STRING, 'albumdisambig': types.STRING,
'releasegroupdisambig': types.STRING, 'releasegroupdisambig': types.STRING,
'rg_album_gain': types.NULL_FLOAT, 'rg_album_gain': types.NULL_FLOAT,
'rg_album_peak': types.NULL_FLOAT, 'rg_album_peak': types.NULL_FLOAT,

3
beetsplug/albumtypes.py
View file

@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-
# This file is part of beets. # This file is part of beets.
# Copyright 2021, Edgars Supe. # Copyright 2021, Edgars Supe.
# #
@ -16,7 +14,6 @@
"""Adds an album template field for formatted album types.""" """Adds an album template field for formatted album types."""
from __future__ import division, absolute_import, print_function
from beets.autotag.mb import VARIOUS_ARTISTS_ID from beets.autotag.mb import VARIOUS_ARTISTS_ID
from beets.library import Album from beets.library import Album

7
docs/changelog.rst
View file

@ -7,13 +7,6 @@ Changelog
This release now requires Python 3.6 or later (it removes support for Python This release now requires Python 3.6 or later (it removes support for Python
2.7, 3.4, and 3.5). 2.7, 3.4, and 3.5).
* Primary and secondary release types from MusicBrainz are now stored in
``albumtypes`` field. Thanks to :user:`edgars-supe`.
:bug:`2200`
* :doc:`/plugins/albumtypes`: An accompanying plugin for formatting
``albumtypes``. Thanks to :user:`edgars-supe`.
For packagers: For packagers:
* We fixed a flaky test, named `test_album_art` in the `test_zero.py` file, * We fixed a flaky test, named `test_album_art` in the `test_zero.py` file,

2
test/test_albumtypes.py
View file

@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# This file is part of beets. # This file is part of beets.
# Copyright 2021, Edgars Supe. # Copyright 2021, Edgars Supe.
# #
@ -15,7 +14,6 @@
"""Tests for the 'albumtypes' plugin.""" """Tests for the 'albumtypes' plugin."""
from __future__ import division, absolute_import, print_function
import unittest import unittest