Merge lp:~openshift/picard/file_system into lp:~musicbrainz-developers/picard/trunk

[Carlin Mangar]

Unmerged revisions

1011. By Carlin Mangar on 2009-11-04

Merge with main.

1010. By Carlin Mangar on 2009-11-04

Code streamline.

1009. By Carlin Mangar on 2009-10-28

Undid a change in priority.

1008. By Carlin Mangar on 2009-10-28

Recompiled ui file and line ending to unix.

1007. By Carlin Mangar on 2009-10-27

Merge with main

1006. By Carlin Mangar on 2009-10-27

After some extensive revision. This is the new file copying algorithm. It does multiple checks to file copying will not fail, and if it fails, it does not leave orphans lying around, aka duplicate files. make_short_filename's behavior has been fine tuned to work in most instances.

1005. By Carlin Mangar on 2009-10-26

Fixes to file saving.

1004. By Carlin Mangar on 2009-10-26

Fix make_short_filename

=== modified file 'picard/file.py'
--- picard/file.py	2009-10-19 06:23:50 +0000
+++ picard/file.py	2009-12-12 02:52:17 +0000
@@ -3,6 +3,7 @@
 # Picard, the next-generation MusicBrainz tagger
 # Copyright (C) 2004 Robert Kaye
 # Copyright (C) 2006 Lukáš Lalinský
+# Copyright (C) 2009 Carlin Mangar
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -24,6 +25,7 @@
 import sys
 import re
 import traceback
+import fnmatch
 from PyQt4 import QtCore
 from picard.metadata import Metadata
 from picard.ui.item import Item
@@ -43,6 +45,8 @@
     LockableObject,
     pathcmp,
     mimetype,
+    copy_adv,
+    move_adv,
     )
 
 
@@ -134,19 +138,33 @@
     def save(self, next, thread_pool, settings):
         metadata = Metadata()
         metadata.copy(self.metadata)
-        self.tagger.load_queue.put((
-            partial(self._save_and_rename, self.filename, metadata, settings),
-            partial(self._saving_finished, next),
-            QtCore.Qt.LowEventPriority + 2))
+        if self.filename in self.tagger.load_queue.queue:
+            self.tagger.load_queue.put((
+                partial(self._save_and_rename, self.filename, metadata, settings),
+                partial(self._saving_finished, next),
+                QtCore.Qt.LowEventPriority + 2))
+        elif self.filename in self.tagger.analyze_queue.queue:
+            self.tagger.analyze_queue.put((
+                partial(self._save_and_rename, self.filename, metadata, settings),
+                partial(self._saving_finished, next),
+                QtCore.Qt.LowEventPriority + 2))
+        else:
+            self.tagger.save_queue.put((
+                partial(self._save_and_rename, self.filename, metadata, settings),
+                partial(self._saving_finished, next),
+                QtCore.Qt.LowEventPriority + 2))
 
     def _save_and_rename(self, old_filename, metadata, settings):
         """Save the metadata."""
         new_filename = old_filename
-        if not settings["dont_write_tags"]:
-            self._save(old_filename, metadata, settings)
         # Rename files
         if settings["rename_files"] or settings["move_files"]:
             new_filename = self._rename(old_filename, metadata, settings)
+        else:
+            new_filename = old_filename
+        # Write tags
+        if not settings["dont_write_tags"]:
+            self._save(new_filename, metadata, settings)
         # Move extra files (images, playlists, etc.)
         if settings["move_files"] and settings["move_additional_files"]:
             self._move_additional_files(old_filename, new_filename,
@@ -251,9 +269,9 @@
                    os.path.exists(encode_filename(new_filename + ext))):
                 new_filename = "%s (%d)" % (tmp_filename, i)
                 i += 1
-            new_filename = new_filename + ext
+            new_filename = new_filename + ext            
             self.log.debug("Moving file %r => %r", old_filename, new_filename)
-            shutil.move(encode_filename(old_filename), encode_filename(new_filename))
+            move_adv(encode_filename(old_filename), encode_filename(new_filename),settings["keep_copy"])
             return new_filename
         else:
             return old_filename
@@ -288,29 +306,60 @@
                 image_filename = "%s (%d)" % (filename, i)
                 i += 1
             else:
+                try:
+                    os.unlink(image_filename + ext)
+                except:
+                    pass
                 self.log.debug("Saving cover images to %r", image_filename)
                 f = open(image_filename + ext, "wb")
                 f.write(data)
                 f.close()
 
+    def _get_supported(self):
+        from picard.formats import supported_formats
+        filters = []
+        for exts, name in supported_formats():
+            filters.extend("*" + e for e in exts)
+        return filters
+    
     def _move_additional_files(self, old_filename, new_filename, settings):
         """Move extra files, like playlists..."""
         old_path = encode_filename(os.path.dirname(old_filename))
         new_path = encode_filename(os.path.dirname(new_filename))
+        (gone, ext) = os.path.splitext(old_filename)
         patterns = encode_filename(settings["move_additional_files_pattern"])
         patterns = filter(bool, [p.strip() for p in patterns.split()])
+        ignore_patterns  = filter(bool, self._get_supported())
         files = []
+        # 'glob1' is a helper function that non-recursively glob inside a literal directory.
+        # It returns a list of basenames. 'glob1' accepts a pattern.
+        # Current version ensures no music files are dragged along until they get tagged
         for pattern in patterns:
-            # FIXME glob1 is not documented, maybe we need our own implemention?
+            ignore_file_list = []
+            for ignore_pattern in ignore_patterns:
+                for ignore_file in glob.glob1(old_path, ignore_pattern):
+                    ignore_file_list.append(ignore_file)
             for old_file in glob.glob1(old_path, pattern):
-                new_file = os.path.join(new_path, old_file)
-                old_file = os.path.join(old_path, old_file)
-                # FIXME we shouldn't do this from a thread!
+                if (old_file in ignore_file_list):
+                    continue
                 if self.tagger.get_file_by_filename(decode_filename(old_file)):
                     self.log.debug("File loaded in the tagger, not moving %r", old_file)
                     continue
-                self.log.debug("Moving %r to %r", old_file, new_file)
-                shutil.move(old_file, new_file)
+                filenameonly, ext = os.path.splitext(old_file)
+                new_file = os.path.normpath(os.path.join(new_path,make_short_filename(new_path, filenameonly)+ext))
+                old_file = os.path.normpath(os.path.join(old_path, old_file))
+                if encode_filename(old_file) != encode_filename(new_file):
+                    self.log.debug("Moving %r to %r", old_file, new_file)
+                    #TODO: make keep additional files separate
+                    try:
+                        move_adv(encode_filename(old_file), encode_filename(new_file) ,settings["keep_copy"])
+                    except:
+                        # Required when some filenames have a tendency to be locked by the system
+                        if fnmatch.fnmatch(old_file,"*Album*") or fnmatch.fnmatch(old_file,"*.ini") \
+                        or fnmatch.fnmatch(old_file,"*Folder*"):
+                            pass
+                        else:
+                            raise
 
     def remove(self, from_parent=True):
         if from_parent and self.parent:

=== modified file 'picard/ui/options/moving.py'
--- picard/ui/options/moving.py	2009-01-04 19:08:29 +0000
+++ picard/ui/options/moving.py	2009-12-12 02:52:17 +0000
@@ -25,7 +25,7 @@
 from picard.script import ScriptParser
 from picard.ui.options import OptionsPage, OptionsCheckError, register_options_page
 from picard.ui.ui_options_moving import Ui_MovingOptionsPage
-from picard.util import decode_filename
+from picard.util import decode_filename, make_short_filename
 
 class MovingOptionsPage(OptionsPage):
 
@@ -37,6 +37,7 @@
 
     options = [
         BoolOption("setting", "move_files", False),
+        BoolOption("setting", "keep_copy", False),
         TextOption("setting", "move_files_to", ""),
         BoolOption("setting", "move_additional_files", False),
         TextOption("setting", "move_additional_files_pattern", "*.jpg *.png"),
@@ -58,11 +59,18 @@
         self.ui.move_additional_files_pattern.setText(self.config.setting["move_additional_files_pattern"])
         self.update_move_additional_files()
         self.ui.delete_empty_dirs.setChecked(self.config.setting["delete_empty_dirs"])
+        self.ui.keep_copy.setChecked(self.config.setting["keep_copy"])
 
 
     def check(self):
-        if self.ui.move_files.isChecked() and not unicode(self.ui.move_files_to.text()).strip():
-            raise OptionsCheckError(_("Error"), _("The location to move files to must not be empty."))
+        if self.ui.move_files.isChecked():
+            move_to_path = unicode(self.ui.move_files_to.text()).strip()
+            if not move_to_path:
+                raise OptionsCheckError(_("Error"), _("The location to move files to must not be empty."))
+            try:
+                make_short_filename(move_to_path, "ULTRALONG/AVERAGE FILENAME TEST - 01 - YEAH YEAH YEAH.mpLONG")
+            except IOError, e:
+                raise OptionsCheckError(_("Error"), _("The location to move files to is too long, please choose a shorter path."))
         
     def save(self):
         self.config.setting["move_files"] = self.ui.move_files.isChecked()
@@ -70,6 +78,7 @@
         self.config.setting["move_additional_files"] = self.ui.move_additional_files.isChecked()
         self.config.setting["move_additional_files_pattern"] = unicode(self.ui.move_additional_files_pattern.text())
         self.config.setting["delete_empty_dirs"] = self.ui.delete_empty_dirs.isChecked()
+        self.config.setting["keep_copy"] = self.ui.keep_copy.isChecked()
         self.tagger.window.enable_moving_action.setChecked(self.config.setting["move_files"])
 
     def move_files_to_browse(self):

=== modified file 'picard/ui/ui_options_moving.py'
--- picard/ui/ui_options_moving.py	2009-01-30 20:46:55 +0000
+++ picard/ui/ui_options_moving.py	2009-12-12 02:52:17 +0000
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'ui/options_moving.ui'
+# Form implementation generated from reading ui file 'ui\options_moving.ui'
 #
-# Created: Fri Jan 30 21:45:34 2009
-#      by: PyQt4 UI code generator 4.4.3
+# Created: Thu Oct 29 05:20:03 2009
+#      by: PyQt4 UI code generator 4.6.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,31 +12,64 @@
 class Ui_MovingOptionsPage(object):
     def setupUi(self, MovingOptionsPage):
         MovingOptionsPage.setObjectName("MovingOptionsPage")
-        MovingOptionsPage.resize(504, 563)
+        MovingOptionsPage.resize(500, 333)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(MovingOptionsPage.sizePolicy().hasHeightForWidth())
+        MovingOptionsPage.setSizePolicy(sizePolicy)
         self.gridlayout = QtGui.QGridLayout(MovingOptionsPage)
         self.gridlayout.setObjectName("gridlayout")
-        spacerItem = QtGui.QSpacerItem(378, 16, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.gridlayout.addItem(spacerItem, 8, 0, 1, 1)
-        self.move_additional_files_pattern = QtGui.QLineEdit(MovingOptionsPage)
+        spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.gridlayout.addItem(spacerItem, 15, 0, 1, 1)
+        self.MoveFiles = QtGui.QGroupBox(MovingOptionsPage)
+        self.MoveFiles.setEnabled(True)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.MoveFiles.sizePolicy().hasHeightForWidth())
+        self.MoveFiles.setSizePolicy(sizePolicy)
+        self.MoveFiles.setMinimumSize(QtCore.QSize(100, 120))
+        self.MoveFiles.setObjectName("MoveFiles")
+        self.delete_empty_dirs = QtGui.QCheckBox(self.MoveFiles)
+        self.delete_empty_dirs.setGeometry(QtCore.QRect(10, 40, 486, 18))
+        self.delete_empty_dirs.setObjectName("delete_empty_dirs")
+        self.keep_copy = QtGui.QCheckBox(self.MoveFiles)
+        self.keep_copy.setGeometry(QtCore.QRect(10, 20, 486, 18))
+        self.keep_copy.setObjectName("keep_copy")
+        self.move_additional_files_pattern = QtGui.QLineEdit(self.MoveFiles)
+        self.move_additional_files_pattern.setEnabled(True)
+        self.move_additional_files_pattern.setGeometry(QtCore.QRect(30, 80, 400, 20))
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Maximum)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.move_additional_files_pattern.sizePolicy().hasHeightForWidth())
+        self.move_additional_files_pattern.setSizePolicy(sizePolicy)
+        self.move_additional_files_pattern.setFrame(True)
+        self.move_additional_files_pattern.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
         self.move_additional_files_pattern.setObjectName("move_additional_files_pattern")
-        self.gridlayout.addWidget(self.move_additional_files_pattern, 5, 0, 1, 1)
-        self.move_additional_files = QtGui.QCheckBox(MovingOptionsPage)
+        self.move_additional_files = QtGui.QCheckBox(self.MoveFiles)
+        self.move_additional_files.setGeometry(QtCore.QRect(10, 60, 486, 18))
         self.move_additional_files.setObjectName("move_additional_files")
-        self.gridlayout.addWidget(self.move_additional_files, 4, 0, 1, 1)
-        self.hboxlayout = QtGui.QHBoxLayout()
-        self.hboxlayout.setSpacing(2)
-        self.hboxlayout.setMargin(0)
-        self.hboxlayout.setObjectName("hboxlayout")
+        self.gridlayout.addWidget(self.MoveFiles, 6, 0, 1, 2)
         self.move_files_to = QtGui.QLineEdit(MovingOptionsPage)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.move_files_to.sizePolicy().hasHeightForWidth())
+        self.move_files_to.setSizePolicy(sizePolicy)
+        self.move_files_to.setMaximumSize(QtCore.QSize(750, 16777215))
+        self.move_files_to.setFrame(True)
         self.move_files_to.setObjectName("move_files_to")
-        self.hboxlayout.addWidget(self.move_files_to)
+        self.gridlayout.addWidget(self.move_files_to, 1, 0, 1, 1)
         self.move_files_to_browse = QtGui.QPushButton(MovingOptionsPage)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.move_files_to_browse.sizePolicy().hasHeightForWidth())
+        self.move_files_to_browse.setSizePolicy(sizePolicy)
         self.move_files_to_browse.setObjectName("move_files_to_browse")
-        self.hboxlayout.addWidget(self.move_files_to_browse)
-        self.gridlayout.addLayout(self.hboxlayout, 2, 0, 1, 1)
-        self.delete_empty_dirs = QtGui.QCheckBox(MovingOptionsPage)
-        self.delete_empty_dirs.setObjectName("delete_empty_dirs")
-        self.gridlayout.addWidget(self.delete_empty_dirs, 3, 0, 1, 1)
+        self.gridlayout.addWidget(self.move_files_to_browse, 1, 1, 1, 1)
         self.move_files = QtGui.QCheckBox(MovingOptionsPage)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
@@ -44,14 +77,16 @@
         sizePolicy.setHeightForWidth(self.move_files.sizePolicy().hasHeightForWidth())
         self.move_files.setSizePolicy(sizePolicy)
         self.move_files.setObjectName("move_files")
-        self.gridlayout.addWidget(self.move_files, 1, 0, 1, 1)
+        self.gridlayout.addWidget(self.move_files, 0, 0, 1, 1)
 
         self.retranslateUi(MovingOptionsPage)
         QtCore.QMetaObject.connectSlotsByName(MovingOptionsPage)
 
     def retranslateUi(self, MovingOptionsPage):
+        self.MoveFiles.setTitle(_("Additional options"))
+        self.delete_empty_dirs.setText(_("Delete empty directories"))
+        self.keep_copy.setText(_("Keep copies of original files"))
         self.move_additional_files.setText(_("Move additional files:"))
         self.move_files_to_browse.setText(_("Browse..."))
-        self.delete_empty_dirs.setText(_("Delete empty directories"))
         self.move_files.setText(_("Move files to this directory when saving:"))
 

=== modified file 'picard/util/__init__.py'
--- picard/util/__init__.py	2009-10-04 11:28:24 +0000
+++ picard/util/__init__.py	2009-12-12 02:52:17 +0000
@@ -22,6 +22,9 @@
 import re
 import sys
 import unicodedata
+import shutil
+import time
+import stat
 from PyQt4 import QtCore
 from encodings import rot_13;
 from string import Template
@@ -203,49 +206,32 @@
 def sanitize_filename(string, repl="_"):
     return _re_slashes.sub(repl, string)
 
-def make_short_filename(prefix, filename, max_path_length=240, max_length=200,
-                        mid_length=32, min_length=2):
+def make_short_filename(prefix, filename, length_limit=242, path_length_limit=237, part_limit=125):
     """
     Attempts to shorten the file name to the maximum allowed length.
     
-    max_path_length: The maximum length of the complete path.
-    max_length: The maximum length of a single file or directory name.
-    mid_length: The medium preferred length of a single file or directory.
-    min_length: The minimum allowed length of a single file or directory.
+    length_limit: The maximum length of the complete path.
+    path_length_limit: The maxmimum length of prefix + dirname(filename)
+    part_length: The maximum length of a single file or directory name.
     """
-    parts = [part.strip() for part in _re_slashes.split(filename)]
-    parts.reverse()
-    filename = os.path.join(*parts)
-    left = len(prefix) + len(filename) + 1 - max_path_length
-
-    for i in range(len(parts)):
-        left -= max(0, len(parts[i]) - max_length)
-        parts[i] = parts[i][:max_length]
-
-    if left > 0:
-        for i in range(len(parts)):
-            length = len(parts[i]) - mid_length
-            if length > 0:
-                length = min(left, length)
-                parts[i] = parts[i][:-length]
-                left -= length
-                if left <= 0:
-                    break
-
-        if left > 0:
-            for i in range(len(parts)):
-                length = len(parts[i]) - min_length
-                if length > 0:
-                    length = min(left, length)
-                    parts[i] = parts[i][:-length]
-                    left -= length
-                    if left <= 0:
-                        break
-
-            if left > 0:
-                raise IOError, "File name is too long."
-
-    return os.path.join(*[a.strip() for a in reversed(parts)])
+    (path, filename) = os.path.split(filename)
+    try:
+        if sys.platform == "win32":
+            path = os.path.join(*[p.strip()[:part_limit].strip() for p in _re_slashes.split(path)])
+            prefix_length = len(prefix)
+            if prefix_length > path_length_limit:
+                raise IOError, "Path is too long. You can try changing the directory to move files to."
+            path_length = path_length_limit - prefix_length
+            path = path.strip()
+            if len(path) > path_length:
+                path = path[:path_length].strip() + "_"
+            file_length_limit = length_limit - (prefix_length + len(path) + 1)
+            filename = filename.strip()
+            if len(filename) > file_length_limit:
+                filename = filename[:file_length_limit].strip() + "_"
+    except:
+        raise
+    return os.path.join(path, filename)
 
 
 def _reverse_sortname(sortname):
@@ -325,3 +311,46 @@
 
 def rot13(input):
     return u''.join(unichr(rot_13.encoding_map.get(ord(c), ord(c))) for c in input)
+
+
+def copy_adv(src, dst):
+    shutil.copyfile(src, dst)
+    try:
+        shutil.copystat(src, dst)
+    except OSError, err:
+        if WindowsError is not None and isinstance(err, WindowsError):
+            pass
+        else:
+            raise
+
+
+def move_adv(src, dst, keep=False):
+    real_dst = dst
+    if os.path.isdir(dst):
+        real_dst = os.path.join(dst, shutil._basename(src))
+        if os.path.exists(real_dst): pass
+    try:
+        os.rename(src, real_dst)
+        if keep: copy_adv(real_dst,src)
+    except OSError:
+        #self.log.debug("Using alternate copy methods" ,src, dst)
+        if os.path.isdir(src):
+            if shutil.destinsrc(src, dst):
+                #self.log.debug("Cannot move a directory '%r' into itself '%r'.", src, dst)
+                raise Error, "Cannot move a directory '%s' into itself '%s'." % (src, dst)
+            shutil.copytree(src, real_dst, symlinks=True)
+            shutil.rmtree(src)
+        else:
+            copy_adv(src,dst)
+            if not keep:
+                for wait in range (1, 200):
+                    if os.path.exists(dst) or int(os.path.getsize(src)) != int(os.path.getsize(dst)):
+                        continue
+                    else:
+                        time.sleep(0.01)
+                if int(os.path.getsize(src)) == int(os.path.getsize(dst)):
+                    os.unlink(src)
+                else:
+                    try: os.unlink(dst)
+                    except: pass
+                    raise IOError, "File could not be copied."

=== modified file 'test/test_utils.py'
--- test/test_utils.py	2007-03-25 12:08:59 +0000
+++ test/test_utils.py	2009-12-12 02:52:17 +0000
@@ -36,12 +36,12 @@
 class ReplaceWin32IncompatTest(unittest.TestCase):
 
     def test_correct(self):
-        self.failUnlessEqual(util.replace_win32_incompat("c:\\test\\te\"st2"),
-                             "c__test_te_st2")
+        self.failUnlessEqual(util.replace_win32_incompat("c:\\te*st\\t<e>\"st2"),
+                             "c_\\te_st\\t_e__st2")
 
     def test_incorrect(self):
-        self.failIfEqual(util.replace_win32_incompat("c:\\test\\te\"st2"),
-                             "c:\\test\\te\"st2")
+        self.failIfEqual(util.replace_win32_incompat("c:\\te*st\\t<e>\"st2"),
+                             "c:\\te*st\\t<e>\"st2")
 
 
 class SanitizeDateTest(unittest.TestCase):
@@ -61,23 +61,25 @@
 class ShortFilenameTest(unittest.TestCase):
 
     def test_short(self):
-        fn = util.make_short_filename("/home/me/", os.path.join("a1234567890", "b1234567890"), 255)
+        fn = util.make_short_filename("/home/me/", os.path.join("a1234567890", "b1234567890"), length_limit=240)
         self.failUnlessEqual(fn, os.path.join("a1234567890", "b1234567890"))
 
     def test_long(self):
-        fn = util.make_short_filename("/home/me/", os.path.join("a1234567890", "b1234567890"), 20)
-        self.failUnlessEqual(fn, os.path.join("a123456", "b1"))
-
-    def test_long_2(self):
-        fn = util.make_short_filename("/home/me/", os.path.join("a1234567890", "b1234567890"), 22)
-        self.failUnlessEqual(fn, os.path.join("a12345678", "b1"))
-
-    def test_too_long(self):
-        self.failUnlessRaises(IOError, util.make_short_filename, "/home/me/", os.path.join("a1234567890", "b1234567890"), 10)
-
+        fn = util.make_short_filename("/home/me/", os.path.join("a1234567890", "b1234567890", "c1234567890"), length_limit=30, path_length_limit=24, part_limit=10)
+        self.failUnlessEqual(fn, os.path.join("a123456789", "b12", "c1234"))
+
+    def test_prefix_exceeds_path_length_limit(self):
+        self.failUnlessRaises(IOError, util.make_short_filename, "/home/me/", os.path.join("a1234567890", "b1234567890"), path_length_limit=9)
+    
+    def test_prefix_equals_path_length_limit(self):
+        try:
+            util.make_short_filename("/home/me/", os.path.join("a1234567890", "b1234567890"), path_length_limit=10)
+        except IOError:
+            self.fail("make_short_filename must not throw IOError")
+    
     def test_whitespace(self):
-        fn = util.make_short_filename("/home/me/", os.path.join("a1234567890   ", "  b1234567890  "), 22)
-        self.failUnlessEqual(fn, os.path.join("a12345678", "b1"))
+        fn = util.make_short_filename("/home/me/", os.path.join("a1234567890   ", "  b1234567890  "), length_limit=24, path_length_limit=20, part_limit=10)
+        self.failUnlessEqual(fn, os.path.join("a123456789", "b12"))
 
 
 class TranslateArtistTest(unittest.TestCase):

=== modified file 'ui/options_moving.ui'
--- ui/options_moving.ui	2009-01-30 20:46:55 +0000
+++ ui/options_moving.ui	2009-12-12 02:52:17 +0000
@@ -1,80 +1,171 @@
-<ui version="4.0" >
- <class>MovingOptionsPage</class>
- <widget class="QWidget" name="MovingOptionsPage" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>504</width>
-    <height>563</height>
-   </rect>
-  </property>
-  <layout class="QGridLayout" >
-   <item row="8" column="0" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0" >
-      <size>
-       <width>378</width>
-       <height>16</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="5" column="0" >
-    <widget class="QLineEdit" name="move_additional_files_pattern" />
-   </item>
-   <item row="4" column="0" >
-    <widget class="QCheckBox" name="move_additional_files" >
-     <property name="text" >
-      <string>Move additional files:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" >
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
-      <number>2</number>
-     </property>
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QLineEdit" name="move_files_to" />
-     </item>
-     <item>
-      <widget class="QPushButton" name="move_files_to_browse" >
-       <property name="text" >
-        <string>Browse...</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="3" column="0" >
-    <widget class="QCheckBox" name="delete_empty_dirs" >
-     <property name="text" >
-      <string>Delete empty directories</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" >
-    <widget class="QCheckBox" name="move_files" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text" >
-      <string>Move files to this directory when saving:</string>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MovingOptionsPage</class>
+ <widget class="QWidget" name="MovingOptionsPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>500</width>
+    <height>333</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <layout class="QGridLayout">
+   <item row="15" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="6" column="0" colspan="2">
+    <widget class="QGroupBox" name="MoveFiles">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>100</width>
+       <height>120</height>
+      </size>
+     </property>
+     <property name="title">
+      <string>Additional options</string>
+     </property>
+     <widget class="QCheckBox" name="delete_empty_dirs">
+      <property name="geometry">
+       <rect>
+        <x>10</x>
+        <y>40</y>
+        <width>486</width>
+        <height>18</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Delete empty directories</string>
+      </property>
+     </widget>
+     <widget class="QCheckBox" name="keep_copy">
+      <property name="geometry">
+       <rect>
+        <x>10</x>
+        <y>20</y>
+        <width>486</width>
+        <height>18</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Keep copies of original files</string>
+      </property>
+     </widget>
+     <widget class="QLineEdit" name="move_additional_files_pattern">
+      <property name="enabled">
+       <bool>true</bool>
+      </property>
+      <property name="geometry">
+       <rect>
+        <x>30</x>
+        <y>80</y>
+        <width>400</width>
+        <height>20</height>
+       </rect>
+      </property>
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="frame">
+       <bool>true</bool>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+      </property>
+     </widget>
+     <widget class="QCheckBox" name="move_additional_files">
+      <property name="geometry">
+       <rect>
+        <x>10</x>
+        <y>60</y>
+        <width>486</width>
+        <height>18</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Move additional files:</string>
+      </property>
+     </widget>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLineEdit" name="move_files_to">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>750</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="frame">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QPushButton" name="move_files_to_browse">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>Browse...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QCheckBox" name="move_files">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>Move files to this directory when saving:</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>