mirror of
https://github.com/beetbox/beets.git
synced 2025-12-06 08:39:17 +01:00
2fa3717731
This changes greatly improves the speed of `beet export` and `beet info` when the `--include-keys` option is used. It also removes the globbing feature of `--include-keys` that was added in #1295. (See #3762 for discussion). Listing all fields for an item requires querying the database to find any flex attributes. This is slow when done for every item being exported. We already have a way for the user to specify a fixed set of keys, but we previously queried everything and filtered it afterwards. The new approach is more efficient. Code that iterates through all fields now have to handle invalid field names. The export and info plugins output invalid fields as None. Timings before: > /usr/bin/time beet export -i title,path,artist -l Bob Dylan 13.26user 20.22system 0:34.01elapsed 98%CPU (0avgtext+0avgdata 52544maxresident)k > /usr/bin/time beet export -l Bob Dylan 12.93user 20.15system 0:33.58elapsed 98%CPU (0avgtext+0avgdata 53632maxresident)k Timings after: > /usr/bin/time beet export -l Bob Dylan 13.33user 20.17system 0:34.02elapsed 98%CPU (0avgtext+0avgdata 53500maxresident)k > /usr/bin/time beet export -i title,path,artist -l Bob Dylan 0.49user 0.07system 0:00.56elapsed 98%CPU (0avgtext+0avgdata 50496maxresident)k Notice the dramatic speedup in the last example!
106 lines
3.4 KiB
Python
106 lines
3.4 KiB
Python
# -*- coding: utf-8 -*-
|
|
# This file is part of beets.
|
|
# Copyright 2016, Thomas Scholtes.
|
|
#
|
|
# Permission is hereby granted, free of charge, to any person obtaining
|
|
# a copy of this software and associated documentation files (the
|
|
# "Software"), to deal in the Software without restriction, including
|
|
# without limitation the rights to use, copy, modify, merge, publish,
|
|
# distribute, sublicense, and/or sell copies of the Software, and to
|
|
# permit persons to whom the Software is furnished to do so, subject to
|
|
# the following conditions:
|
|
#
|
|
# The above copyright notice and this permission notice shall be
|
|
# included in all copies or substantial portions of the Software.
|
|
|
|
from __future__ import division, absolute_import, print_function
|
|
|
|
import unittest
|
|
from test.helper import TestHelper
|
|
|
|
from mediafile import MediaFile
|
|
from beets.util import displayable_path
|
|
|
|
|
|
class InfoTest(unittest.TestCase, TestHelper):
|
|
|
|
def setUp(self):
|
|
self.setup_beets()
|
|
self.load_plugins('info')
|
|
|
|
def tearDown(self):
|
|
self.unload_plugins()
|
|
self.teardown_beets()
|
|
|
|
def test_path(self):
|
|
path = self.create_mediafile_fixture()
|
|
|
|
mediafile = MediaFile(path)
|
|
mediafile.albumartist = 'AAA'
|
|
mediafile.disctitle = 'DDD'
|
|
mediafile.genres = ['a', 'b', 'c']
|
|
mediafile.composer = None
|
|
mediafile.save()
|
|
|
|
out = self.run_with_output('info', path)
|
|
self.assertIn(path, out)
|
|
self.assertIn('albumartist: AAA', out)
|
|
self.assertIn('disctitle: DDD', out)
|
|
self.assertIn('genres: a; b; c', out)
|
|
self.assertNotIn('composer:', out)
|
|
self.remove_mediafile_fixtures()
|
|
|
|
def test_item_query(self):
|
|
item1, item2 = self.add_item_fixtures(count=2)
|
|
item1.album = 'xxxx'
|
|
item1.write()
|
|
item1.album = 'yyyy'
|
|
item1.store()
|
|
|
|
out = self.run_with_output('info', 'album:yyyy')
|
|
self.assertIn(displayable_path(item1.path), out)
|
|
self.assertIn(u'album: xxxx', out)
|
|
|
|
self.assertNotIn(displayable_path(item2.path), out)
|
|
|
|
def test_item_library_query(self):
|
|
item, = self.add_item_fixtures()
|
|
item.album = 'xxxx'
|
|
item.store()
|
|
|
|
out = self.run_with_output('info', '--library', 'album:xxxx')
|
|
self.assertIn(displayable_path(item.path), out)
|
|
self.assertIn(u'album: xxxx', out)
|
|
|
|
def test_collect_item_and_path(self):
|
|
path = self.create_mediafile_fixture()
|
|
mediafile = MediaFile(path)
|
|
item, = self.add_item_fixtures()
|
|
|
|
item.album = mediafile.album = 'AAA'
|
|
item.tracktotal = mediafile.tracktotal = 5
|
|
item.title = 'TTT'
|
|
mediafile.title = 'SSS'
|
|
|
|
item.write()
|
|
item.store()
|
|
mediafile.save()
|
|
|
|
out = self.run_with_output('info', '--summarize', 'album:AAA', path)
|
|
self.assertIn(u'album: AAA', out)
|
|
self.assertIn(u'tracktotal: 5', out)
|
|
self.assertIn(u'title: [various]', out)
|
|
self.remove_mediafile_fixtures()
|
|
|
|
def test_custom_format(self):
|
|
self.add_item_fixtures()
|
|
out = self.run_with_output('info', '--library', '--format',
|
|
'$track. $title - $artist ($length)')
|
|
self.assertEqual(u'02. tïtle 0 - the artist (0:01)\n', out)
|
|
|
|
|
|
def suite():
|
|
return unittest.TestLoader().loadTestsFromName(__name__)
|
|
|
|
if __name__ == '__main__':
|
|
unittest.main(defaultTest='suite')
|