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

simplify album-adding by marking itime as album

Browse source 
Since both albums and items have an itime field, I'm putting itime into
ALBUM_KEYS_ITEM. This simplifies a lot of handling code. It also will make the
item and album itimes synchronize at some points, which is probably fine -- I
can't see a major use case for maintaining separate added dates for an album
and its tracks.
This commit is contained in:
Adrian Sampson 2013-05-11 13:20:04 -07:00
parent 8806f2d02b
commit 4704c4a3c8
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
beets/library.py
View file

@ -116,7 +116,7 @@ ITEM_KEYS = [f[0] for f in ITEM_FIELDS]
ALBUM_FIELDS = [
('id', 'integer primary key', False),
('artpath', 'blob', False),
('itime', 'datetime', False),
('itime', 'datetime', True),
('albumartist', 'text', True),
('albumartist_sort', 'text', True),
@ -1296,7 +1296,6 @@ class Library(BaseLibrary):
def add(self, item, copy=False):
item.itime = time.time()
item.library = self
if copy:
self.move(item, copy=True)
@ -1505,21 +1504,19 @@ class Library(BaseLibrary):
from its items. The items are added to the database if they
don't yet have an ID. Returns an Album object.
"""
album_keys = ALBUM_KEYS_ITEM + ['itime']
# Set the metadata from the first item.
album_values = dict(
(key, getattr(items[0], key)) for key in ALBUM_KEYS_ITEM)
# Manually set the date when the album was added,
# because the items don't yet have these
# When adding an album and its items for the first time, the
# items do not yet have a timestamp.
album_values['itime'] = time.time()
with self.transaction() as tx:
sql = 'INSERT INTO albums (%s) VALUES (%s)' % \
(', '.join(album_keys),
', '.join(['?'] * len(album_keys)))
subvals = [album_values[key] for key in album_keys]
(', '.join(ALBUM_KEYS_ITEM),
', '.join(['?'] * len(ALBUM_KEYS_ITEM)))
subvals = [album_values[key] for key in ALBUM_KEYS_ITEM]
album_id = tx.mutate(sql, subvals)
# Add the items to the library.
@ -1533,11 +1530,8 @@ class Library(BaseLibrary):
# Construct the new Album object.
record = {}
for key in ALBUM_KEYS:
if key in album_keys:
record[key] = album_values[key]
else:
# Non-item fields default to None.
record[key] = None
# Unset (non-item) fields default to None.
record[key] = album_values.get(key)
record['id'] = album_id
album = Album(self, record)