From 865940746cd0a30719c38dac3197be695a751a28 Mon Sep 17 00:00:00 2001 From: Andrew Rogl Date: Tue, 11 Sep 2018 18:52:55 +1000 Subject: [PATCH] More clean up requests --- beetsplug/mbsync.py | 14 ++++++-------- docs/changelog.rst | 6 +++--- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/beetsplug/mbsync.py b/beetsplug/mbsync.py index c6e7864a3..dd5e0e944 100644 --- a/beetsplug/mbsync.py +++ b/beetsplug/mbsync.py @@ -24,7 +24,7 @@ from collections import defaultdict import re -mb_regex = r"(\d|\w){8}-(\d|\w){4}-(\d|\w){4}-(\d|\w){4}-(\d|\w){12}" +MB_REGEX = r"(\d|\w){8}-(\d|\w){4}-(\d|\w){4}-(\d|\w){4}-(\d|\w){12}" def apply_item_changes(lib, item, move, pretend, write): @@ -86,13 +86,13 @@ class MBSyncPlugin(BeetsPlugin): item_formatted) continue - valid_trackid = re.match(mb_regex, item.mb_trackid) - - # Do we have a valid MusicBrainz TrackId + # Do we have a valid MusicBrainz TrackId? + valid_trackid = re.match(MB_REGEX, item.mb_trackid) if not valid_trackid: self._log.info(u'Skipping singleton with invalid mb_trackid:' + ' {0}', item_formatted) continue + # Get the MusicBrainz recording info. track_info = hooks.track_for_mbid(item.mb_trackid) if not track_info: @@ -120,10 +120,8 @@ class MBSyncPlugin(BeetsPlugin): items = list(a.items()) - valid_albumid = re.match(mb_regex, a.mb_albumid) - - # Do we have a valid MusicBrainz AlbumId - + # Do we have a valid MusicBrainz AlbumId? + valid_albumid = re.match(MB_REGEX, a.mb_albumid) if not valid_albumid: self._log.info(u'Skipping album with invalid mb_albumid: {0}', album_formatted) diff --git a/docs/changelog.rst b/docs/changelog.rst index edc89022b..1b4f5f44e 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -45,12 +45,12 @@ New features: Changes: -* :doc:`/plugins/mbsync` no longer queries MusicBrainz when the either the +* :doc:`/plugins/mbsync` no longer queries MusicBrainz when either the ``mb_albumid`` or ``mb_trackid`` field is invalid - Discussion on Google groups here_ + See also the discussion on Google Groups_ Thanks to :user:`arogl`. -.. _here: https://groups.google.com/forum/#!searchin/beets-users/mbsync|sort:date/beets-users/iwCF6bNdh9A/i1xl4Gx8BQAJ +.. _Groups: https://groups.google.com/forum/#!searchin/beets-users/mbsync|sort:date/beets-users/iwCF6bNdh9A/i1xl4Gx8BQAJ Fixes: