From 6450bbd61cd16be0ffe9378a85e78d131d2982b1 Mon Sep 17 00:00:00 2001
From: Andrew Mahone <andrew.mahone@gmail.com>
Date: Sun, 27 Jun 2010 21:04:27 -0400
Subject: [PATCH] return scanner cache to using higher pickle protocol after
 fixing flac SeekPoint and CueSheetTrackIndex

---
 audiomangler/mutagenext.py | 7 ++++++-
 audiomangler/scanner.py    | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/audiomangler/mutagenext.py b/audiomangler/mutagenext.py
index 763608e..aa4c3fe 100644
--- a/audiomangler/mutagenext.py
+++ b/audiomangler/mutagenext.py
@@ -9,7 +9,7 @@
 import os.path
 from mutagen import FileType
 from mutagen.asf import ASF
-from mutagen.flac import FLAC
+from mutagen.flac import FLAC, SeekPoint, CueSheetTrackIndex
 from mutagen.monkeysaudio import MonkeysAudio
 from mutagen.mp3 import MP3
 from mutagen.mp4 import MP4
@@ -65,6 +65,11 @@ def format(self, filename=None, base=None, preadd={}, postadd={}):
 def has_replaygain(self):
     return reduce(lambda x,y: x and y in self.meta, ('replaygain_album_gain', 'replaygain_album_peak', 'replaygain_track_gain', 'replaygain_track_peak'), True)
 
+_newargs_untuplize = lambda self: super(self.__class__, self).__getnewargs__[0]
+
+SeekPoint.__getnewargs__ = _newargs_untuplize
+CueSheetTrackIndex.__getnewargs__ = _newargs_untuplize
+
 FileType.format = format
 FileType.meta = property(_get_meta,_set_meta)
 FileType.lossless = False
diff --git a/audiomangler/scanner.py b/audiomangler/scanner.py
index 20bf1c2..30cbf4e 100644
--- a/audiomangler/scanner.py
+++ b/audiomangler/scanner.py
@@ -52,7 +52,7 @@ def scan(items, groupby = None, sortby = None, trackid = None):
     dircache = {}
     if shelve:
         try:
-            dircache = shelve.open(cachefile)
+            dircache = shelve.open(cachefile,-1)
         except Exception:
             pass
     if dircache.get('//version',None) != db_version:
-- 
2.11.4.GIT