From 7158c01ff8e47aab81cc5fe17466099eebb2301a Mon Sep 17 00:00:00 2001
From: Adrian Sampson <adrian@radbox.org>
Date: Sat, 27 Oct 2012 18:47:04 -0700
Subject: [PATCH] clean up outdated FIXMEs

---
 beets/autotag/match.py    | 4 ----
 beets/library.py          | 3 +--
 beets/ui/commands.py      | 4 ++--
 beetsplug/bpd/__init__.py | 6 +++---
 test/test_query.py        | 2 --
 5 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/beets/autotag/match.py b/beets/autotag/match.py
index 0708671c2..9cdb02f40 100644
--- a/beets/autotag/match.py
+++ b/beets/autotag/match.py
@@ -320,10 +320,6 @@ def match_by_id(items):
         log.debug('No album ID consensus.')
         return None
 
-    #fixme In the future, at the expense of performance, we could use
-    # other IDs (i.e., track and artist) in case the album tag isn't
-    # present, but that event seems very unlikely.
-
 def recommendation(results):
     """Given a sorted list of AlbumMatch or TrackMatch objects, return a
     recommendation flag (RECOMMEND_STRONG, RECOMMEND_MEDIUM,
diff --git a/beets/library.py b/beets/library.py
index caf132ce4..b1b81e75f 100644
--- a/beets/library.py
+++ b/beets/library.py
@@ -799,7 +799,7 @@ class BaseLibrary(object):
 
     # Basic operations.
 
-    def add(self, item, copy=False): #FIXME copy should default to true
+    def add(self, item, copy=False):
         """Add the item as a new object to the library database. The id
         field will be updated; the new id is returned. If copy, then
         each item is copied to the destination location before it is
@@ -1380,7 +1380,6 @@ class Library(BaseLibrary):
         don't yet have an ID. Returns an Album object.
         """
         # Set the metadata from the first item.
-        #fixme: check for consensus?
         item_values = dict(
             (key, getattr(items[0], key)) for key in ALBUM_KEYS_ITEM)
 
diff --git a/beets/ui/commands.py b/beets/ui/commands.py
index 71a80c8fe..76f55a660 100644
--- a/beets/ui/commands.py
+++ b/beets/ui/commands.py
@@ -635,8 +635,8 @@ def import_files(lib, paths, query):
         logfile = None
 
     # Never ask for input in quiet mode.
-    if config['import']['resume'] is None and \
-            config['import']['quiet']:  # FIXME resume
+    if config['import']['resume'].get() == 'ask' and \
+            config['import']['quiet']:
         config['import']['resume'] = False
 
     session = TerminalImportSession(lib, logfile, paths, query)
diff --git a/beetsplug/bpd/__init__.py b/beetsplug/bpd/__init__.py
index 641b6293e..b921aa377 100644
--- a/beetsplug/bpd/__init__.py
+++ b/beetsplug/bpd/__init__.py
@@ -923,12 +923,12 @@ class Server(BaseServer):
             item = self.playlist[self.current_index]
 
             yield u'bitrate: ' + unicode(item.bitrate/1000)
-            #fixme: missing 'audio'
+            # Missing 'audio'.
 
             (pos, total) = self.player.time()
             yield u'time: ' + unicode(pos) + u':' + unicode(total)
 
-        #fixme: also missing 'updating_db'
+        # Also missing 'updating_db'.
 
 
     def cmd_stats(self, conn):
@@ -945,7 +945,7 @@ class Server(BaseServer):
                u'albums: ' + unicode(albums),
                u'songs: ' + unicode(songs),
                u'uptime: ' + unicode(int(time.time() - self.startup_time)),
-               u'playtime: ' + u'0', #fixme
+               u'playtime: ' + u'0', # Missing.
                u'db_playtime: ' + unicode(int(totaltime)),
                u'db_update: ' + unicode(int(self.updated_time)),
               )
diff --git a/test/test_query.py b/test/test_query.py
index eae9abced..f00ff928c 100644
--- a/test/test_query.py
+++ b/test/test_query.py
@@ -428,8 +428,6 @@ class BrowseTest(unittest.TestCase, AssertsMixin):
         items = self.lib.items('2007')
         self.assert_done(items)
 
-    #FIXME Haven't tested explicit (non-query) criteria.
-
 class CountTest(unittest.TestCase):
     def setUp(self):
         self.lib = beets.library.Library(':memory:')