From b8687999e216b3feeeb48fd32bebb85a60ed32cc Mon Sep 17 00:00:00 2001 From: Thomas Scholtes Date: Wed, 16 Apr 2014 14:18:07 +0200 Subject: [PATCH] Query string for computed fields. Fixes #693 --- beetsplug/mbsync.py | 9 +-------- test/test_mbsync.py | 1 + 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/beetsplug/mbsync.py b/beetsplug/mbsync.py index 30885d88f..a21ad3c0f 100644 --- a/beetsplug/mbsync.py +++ b/beetsplug/mbsync.py @@ -20,7 +20,6 @@ from beets.plugins import BeetsPlugin from beets import autotag, library, ui, util from beets.autotag import hooks from beets import config -from beets import dbcore log = logging.getLogger('beets') @@ -29,17 +28,12 @@ def mbsync_singletons(lib, query, move, pretend, write): """Retrieve and apply info from the autotagger for items matched by query. """ - singletons_query = library.get_query(query, library.Item) - singletons_query.subqueries.append( - dbcore.query.BooleanQuery('singleton', True) - ) - for item in lib.items(singletons_query): + for item in lib.items(query + ['singletons:true']): if not item.mb_trackid: log.info(u'Skipping singleton {0}: has no mb_trackid' .format(item.title)) continue - # Get the MusicBrainz recording info. track_info = hooks.track_for_mbid(item.mb_trackid) if not track_info: @@ -118,7 +112,6 @@ def apply_item_changes(lib, item, move, pretend, write): item.store() - def mbsync_func(lib, opts, args): """Command handler for the mbsync function. """ diff --git a/test/test_mbsync.py b/test/test_mbsync.py index ed8d98014..c7bf43575 100644 --- a/test/test_mbsync.py +++ b/test/test_mbsync.py @@ -21,6 +21,7 @@ from helper import TestHelper,\ from beets.library import Item + class MbsyncCliTest(unittest.TestCase, TestHelper): def setUp(self):