From dd00fe0cff41f055ec4b2377fd93ff05dad1930d Mon Sep 17 00:00:00 2001
From: Adrian Sampson <adrian@radbox.org>
Date: Sat, 11 May 2013 12:54:53 -0700
Subject: [PATCH] fix stray character and tweak whitespace

---
 beets/library.py   |  21 ++++++++++-----------
 test/rsrc/test.blb | Bin 7168 -> 7168 bytes
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/beets/library.py b/beets/library.py
index 47c42f398..4967e3f36 100644
--- a/beets/library.py
+++ b/beets/library.py
@@ -103,13 +103,13 @@ ITEM_FIELDS = [
     ('original_month',       'int',  True, True),
     ('original_day',         'int',  True, True),
 
-    ('length',      'real', False, True),
-    ('bitrate',     'int',  False, True),
-    ('format',      'text', False, True),
-    ('samplerate',  'int',  False, True),
-    ('bitdepth',    'int',  False, True),
-    ('channels',    'int',  False, True),
-    ('mtime',       'int',  False, False),
+    ('length',      'real',      False, True),
+    ('bitrate',     'int',       False, True),
+    ('format',      'text',      False, True),
+    ('samplerate',  'int',       False, True),
+    ('bitdepth',    'int',       False, True),
+    ('channels',    'int',       False, True),
+    ('mtime',       'int',       False, False),
     ('itime',       'datetime',  False, False),
 ]
 ITEM_KEYS_WRITABLE = [f[0] for f in ITEM_FIELDS if f[3] and f[2]]
@@ -122,10 +122,11 @@ ITEM_KEYS          = [f[0] for f in ITEM_FIELDS]
 ALBUM_FIELDS = [
     ('id',      'integer primary key', False),
     ('artpath', 'blob',                False),
+    ('itime',   'datetime',            False),
 
     ('albumartist',        'text', True),
     ('albumartist_sort',   'text', True),
-    ('albumartist_credit', 'text', True, True),
+    ('albumartist_credit', 'text', True),
     ('album',              'text', True),
     ('genre',              'text', True),
     ('year',               'int',  True),
@@ -148,12 +149,10 @@ ALBUM_FIELDS = [
     ('media',              'text', True),
     ('albumdisambig',      'text', True),
     ('rg_album_gain',      'real', True),
-    ('rg_album_peak',      'real', True),®
+    ('rg_album_peak',      'real', True),
     ('original_year',      'int',  True),
     ('original_month',     'int',  True),
     ('original_day',       'int',  True),
-
-    ('itime',       'datetime',  False),
 ]
 ALBUM_KEYS = [f[0] for f in ALBUM_FIELDS]
 ALBUM_KEYS_ITEM = [f[0] for f in ALBUM_FIELDS if f[2]]
diff --git a/test/rsrc/test.blb b/test/rsrc/test.blb
index 85765e7155bbd3274ec8eede8f8266f236c6c8c4..bd92dd6fdb4068e0254e0b61205f8694d6ad33ae 100644
GIT binary patch
delta 146
zcmZp$Xt0<dEojTYz`zd0OhDRbqK+}EEraeO^^GZuxLFJs7z`$J@u+dN`!ceNi;FY%
zRc>sEVVWdtv-uI9ETgoJLS{*3ZmL2`Vo559p~(w0gOTwt1LNV%f*d;;xmv84*u^C!
a89V$p-xXA162#E3nNfs|Wiy+^FJ=HkGb8{2

delta 118
zcmZp$Xt0<dEojZaz`zd0OhDRTqK+}EHG}RW)r~2OxLF(+7#t>Z@u*Gg5a4RJWn>o@
z7ia8?+}IGqH2H&&&E`vdvW(oCyg+@7jF%Z0FK-s)ILXM>qQ%56E-A^_p}+a8pb`_K
P=4M6_HkQq762F)Mr|cRZ