Merge lp:~themineo/picard/wvc into lp:~musicbrainz-developers/picard/trunk

[Wieland Hoffmann]

WavPack files can have a correction file (.wvc) in hybrid mode that allows lossless decoding. These files need to be moved, too, if a wavpack file is moved.

[Lukáš Lalinský (luks)]

review: Approve

=== modified file 'picard/formats/apev2.py'
--- picard/formats/apev2.py	2011-04-11 17:58:33 +0000
+++ picard/formats/apev2.py	2011-07-24 19:32:32 +0000
@@ -26,6 +26,7 @@
 from picard.file import File
 from picard.metadata import Metadata
 from picard.util import encode_filename, sanitize_date, mimetype
+from os.path import isfile
 
 class APEv2File(File):
     """Generic APEv2-based file."""
@@ -166,6 +167,14 @@
         super(WavPackFile, self)._info(metadata, file)
         metadata['~format'] = self.NAME
 
+    def _save_and_rename(self, old_filename, metadata, settings):
+        """Includes an additional check for WavPack correction files"""
+        wvc_filename = old_filename.replace(".wv", ".wvc")
+        if isfile(wvc_filename):
+            if settings["rename_files"] or settings["move_files"]:
+                self._rename(wvc_filename, metadata, settings)
+        File._save_and_rename(self, old_filename, metadata, settings)
+
 class OptimFROGFile(APEv2File):
     """OptimFROG file."""
     EXTENSIONS = [".ofr", ".ofs"]