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

requested changes: where there is no artist_sort, there is no need for composer_sort; cleaning up whitespaces.

Browse source
This commit is contained in:
dosoe 2017-04-28 13:41:54 +02:00
parent d4ff82e46f
commit 4a17da8e10
4 changed files with 1 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
beets/autotag/__init__.py
View file

@ -53,8 +53,6 @@ def apply_item_metadata(item, track_info):
item.composer_sort = track_info.composer_sort
if track_info.arranger is not None:
item.arranger = track_info.arranger
# At the moment, the other metadata is left intact (including album
# and track number). Perhaps these should be emptied?

2
beets/autotag/hooks.py
View file

@ -156,7 +156,7 @@ class TrackInfo(object):
length=None, index=None, medium=None, medium_index=None,
medium_total=None, artist_sort=None, disctitle=None,
artist_credit=None, data_source=None, data_url=None,
media=None, lyricist=None, composer=None, composer_sort=None,
media=None, lyricist=None, composer=None, composer_sort=None,
arranger=None, track_alt=None):
self.title = title
self.track_id = track_id

4
beets/mediafile.py
View file

@ -1632,28 +1632,24 @@ class MediaFile(object):
StorageStyle('LYRICIST'),
ASFStorageStyle('WM/Writer'),
)
composer = MediaField(
MP3StorageStyle('TCOM'),
MP4StorageStyle('\xa9wrt'),
StorageStyle('COMPOSER'),
ASFStorageStyle('WM/Composer'),
)
composer_sort = MediaField(
MP3StorageStyle('TSOC'),
MP4StorageStyle('soco'),
StorageStyle('COMPOSERSORT'),
ASFStorageStyle('WM/Composersortorder'),
)
arranger = MediaField(
MP3PeopleStorageStyle('TIPL', involvement='arranger'),
MP4StorageStyle('----:com.apple.iTunes:Arranger'),
StorageStyle('ARRANGER'),
ASFStorageStyle('beets/Arranger'),
)
grouping = MediaField(
MP3StorageStyle('TIT1'),
MP4StorageStyle('\xa9grp'),

24
test/test_mediafile.py
View file

@ -141,12 +141,6 @@ class ImageStructureTestMixin(ArtTestMixin):
type=ImageType.composer)
mediafile.images += [image]
mediafile.save()
image = Image(data=self.png_data, desc=u'the sortname of the composer',
type=ImageType.composer_sort)
mediafile.images += [image]
mediafile.save()
mediafile = MediaFile(mediafile.path)
self.assertEqual(len(mediafile.images), 3)
@ -156,12 +150,6 @@ class ImageStructureTestMixin(ArtTestMixin):
self.assertExtendedImageAttributes(
image, desc=u'the composer', type=ImageType.composer
)
images = (i for i in mediafile.images if i.desc == u'the sortname of the composer')
image = next(images, None)
self.assertExtendedImageAttributes(
image, desc=u'the sortname of the composer', type=ImageType.composer_sort
)
def test_delete_image_structures(self):
mediafile = self._mediafile_fixture('image')
@ -205,11 +193,6 @@ class ExtendedImageStructureTestMixin(ImageStructureTestMixin):
type=ImageType.composer)
mediafile.images += [image]
mediafile.save()
image = Image(data=self.tiff_data, desc=u'the sortname of the composer',
type=ImageType.composer_sort)
mediafile.images += [image]
mediafile.save()
mediafile = MediaFile(mediafile.path)
self.assertEqual(len(mediafile.images), 3)
@ -219,11 +202,6 @@ class ExtendedImageStructureTestMixin(ImageStructureTestMixin):
mediafile.images))[0]
self.assertExtendedImageAttributes(
image, desc=u'the composer', type=ImageType.composer)
image = list(filter(lambda i: i.mime_type == 'image/tiff',
mediafile.images))[0]
self.assertExtendedImageAttributes(
image, desc=u'the sortname of the composer', type=ImageType.composer_sort)
class LazySaveTestMixin(object):
@ -345,7 +323,6 @@ class ReadWriteTestBase(ArtTestMixin, GenreListTestMixin,
'album': u'the album',
'genre': u'the genre',
'composer': u'the composer',
'composer_sort': u'the sortname of the composer',
'grouping': u'the grouping',
'year': 2001,
'month': None,
@ -373,7 +350,6 @@ class ReadWriteTestBase(ArtTestMixin, GenreListTestMixin,
'genre',
'lyricist',
'composer',
'composer_sort',
'arranger',
'grouping',
'year',