Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-02-01 13:03:59 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:sampsyo/beets

Browse source
This commit is contained in:
Andrii Kohut 2014-08-25 20:22:59 +03:00
commit 8017b062fe
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
beets/dbcore/db.py
View file

@ -55,7 +55,9 @@ class FormattedMapping(collections.Mapping):
def __len__(self):
return len(self.model_keys)
def get(self, key, default=u''):
def get(self, key, default=None):
if default is None:
default = self.model._type(key).format(None)
return super(FormattedMapping, self).get(key, default)
def _get_formatted(self, model, key):

2
docs/changelog.rst
View file

@ -26,6 +26,8 @@ Fixes:
converted files.
* Formatting templates with item data no longer confusingly shows album-level
data when the two are inconsistent.
* Resuming imports and beginning incremental imports should now be much faster
when there is a lot of previously-imported music to skip.
.. _discogs_client: https://github.com/discogs/discogs_client