Drop whipper caching

TODO

@@ -44,8 +44,6 @@ MEDIUM
 
 - retry cdrdao a few times when it had to load the tray
 
-- getting cache results should depend on same drive/offset
-
 - do some character mangling so trail of dead is not in a hidden dir
 
 HARD

whipper/command/cd.py

@@ -99,7 +99,6 @@ def do(self):
         self.ittoc = self.program.getFastToc(self.runner, self.device)
 
         # already show us some info based on this
-        self.program.getRipResult(self.ittoc.getCDDBDiscId())
         print("CDDB disc id: %s" % self.ittoc.getCDDBDiscId())
         self.mbdiscid = self.ittoc.getMusicBrainzDiscId()
         print("MusicBrainz disc id %s" % self.mbdiscid)
@@ -499,8 +498,6 @@ def _ripIfNotRipped(number):
                 self.itable.setFile(number, 1, trackResult.filename,
                                     self.itable.getTrackLength(number), number)
 
-            self.program.saveRipResult()
-
         # check for hidden track one audio
         htoa = self.program.getHTOA()
         if htoa:
@@ -541,8 +538,6 @@ def _ripIfNotRipped(number):
 
         accurip.print_report(self.program.result)
 
-        self.program.saveRipResult()
-
         self.program.writeLog(discName, self.logger)
 
 

whipper/common/accurip.py

@@ -21,20 +21,16 @@
 
 import struct
 import whipper
-from os import makedirs
-from os.path import dirname, exists, join
 from urllib.error import URLError, HTTPError
 from urllib.request import urlopen, Request
 
-from whipper.common import directory
 from whipper.program.arc import accuraterip_checksum
 
 import logging
 logger = logging.getLogger(__name__)
 
 
 ACCURATERIP_URL = "http://www.accuraterip.com/accuraterip/"
-_CACHE_DIR = join(directory.cache_path(), 'accurip')
 
 
 class EntryNotFound(Exception):
@@ -142,34 +138,13 @@ def _download_entry(path):
         logger.error('error retrieving AccurateRip entry: %s', e)
 
 
-def _save_entry(raw_entry, path):
-    logger.debug('saving AccurateRip entry to %s', path)
-    try:
-        makedirs(dirname(path), exist_ok=True)
-    except OSError as e:
-        logger.error('could not save entry to %s: %s', path, e)
-        return
-    with open(path, 'wb') as f:
-        f.write(raw_entry)
-
-
 def get_db_entry(path):
     """
-    Retrieve cached AccurateRip disc entry as array of _AccurateRipResponses.
-
-    Downloads entry from accuraterip.com on cache fault.
+    Download entry from accuraterip.com.
 
     ``path`` is in the format of the output of ``table.accuraterip_path()``.
     """
-    cached_path = join(_CACHE_DIR, path)
-    if exists(cached_path):
-        logger.debug('found accuraterip entry at %s', cached_path)
-        with open(cached_path, 'rb') as f:
-            raw_entry = f.read()
-    else:
-        raw_entry = _download_entry(path)
-        if raw_entry:
-            _save_entry(raw_entry, cached_path)
+    raw_entry = _download_entry(path)
     if not raw_entry:
         logger.warning('entry not found in AccurateRip database')
         raise EntryNotFound

whipper/common/directory.py

@@ -29,15 +29,6 @@ def config_path():
     return join(path, 'whipper.conf')
 
 
-def cache_path(name=None):
-    path = join(getenv('XDG_CACHE_HOME') or join(expanduser('~'), '.cache'),
-                'whipper')
-    if name:
-        path = join(path, name)
-    makedirs(path, exist_ok=True)
-    return path
-
-
 def data_path(name=None):
     path = join(getenv('XDG_DATA_HOME') or
                 join(expanduser('~'), '.local/share'),