me v6.4.1

.hgtags

@@ -74,3 +74,4 @@ fad463ae749b7189dce92f1e42a57ac4ee03987d se3.3.3
 c153aef25e5c9911f2197d13899591c50cf38ffc se3.4.1
 71b7e18613f3790cea18cb0dd8c9c986ce237267 me6.3.1
 c3d9f91dc9c9d60f370c72bc211f09be3e4fc18d se3.5.0
+254bce83ad6e56c102d69fd603f6845e2324b470 me6.4.0

cocoa/inter/app_me.py

@@ -146,12 +146,12 @@ class DupeGuruME(DupeGuruBase):
         self.directories = Directories(fileclasses=self.directories.fileclasses)
         self.dead_tracks = []
     
-    def _do_delete(self, j, replace_with_hardlinks):
+    def _do_delete(self, j, replace_with_hardlinks, direct_deletion):
         # XXX If I read correctly, Python 3.3 will allow us to go fetch inner function easily, so
         # we'll be able to replace "op" below with DupeGuruBase._do_delete.op.
         def op(dupe):
             j.add_progress()
-            return self._do_delete_dupe(dupe, replace_with_hardlinks)
+            return self._do_delete_dupe(dupe, replace_with_hardlinks, direct_deletion)
         
         marked = [dupe for dupe in self.results.dupes if self.results.is_marked(dupe)]
         j.start_job(self.results.mark_count, tr("Sending dupes to the Trash"))
@@ -164,10 +164,10 @@ class DupeGuruME(DupeGuruBase):
                 pass
         self.results.perform_on_marked(op, True)
     
-    def _do_delete_dupe(self, dupe, replace_with_hardlinks):
+    def _do_delete_dupe(self, dupe, replace_with_hardlinks, direct_deletion):
         if isinstance(dupe, ITunesSong):
             dupe.remove_from_library()
-        DupeGuruBase._do_delete_dupe(self, dupe, replace_with_hardlinks)
+        DupeGuruBase._do_delete_dupe(self, dupe, replace_with_hardlinks, direct_deletion)
     
     def _create_file(self, path):
         if (self.directories.itunes_libpath is not None) and (path in self.directories.itunes_libpath[:-1]):

cocoa/inter/app_pe.py

@@ -135,10 +135,10 @@ class DupeGuruPE(DupeGuruBase):
         DupeGuruBase.__init__(self, view, appdata)
         self.directories = Directories()
     
-    def _do_delete(self, j, replace_with_hardlinks):
+    def _do_delete(self, j, replace_with_hardlinks, direct_deletion):
         def op(dupe):
             j.add_progress()
-            return self._do_delete_dupe(dupe, replace_with_hardlinks)
+            return self._do_delete_dupe(dupe, replace_with_hardlinks, direct_deletion)
         
         marked = [dupe for dupe in self.results.dupes if self.results.is_marked(dupe)]
         j.start_job(self.results.mark_count, tr("Sending dupes to the Trash"))
@@ -152,7 +152,7 @@ class DupeGuruPE(DupeGuruBase):
                 pass
         self.results.perform_on_marked(op, True)
     
-    def _do_delete_dupe(self, dupe, replace_with_hardlinks):
+    def _do_delete_dupe(self, dupe, replace_with_hardlinks, direct_deletion):
         if isinstance(dupe, IPhoto):
             try:
                 a = app('iPhoto')
@@ -168,7 +168,7 @@ class DupeGuruPE(DupeGuruBase):
             except (CommandError, RuntimeError) as e:
                 raise EnvironmentError(str(e))
         else:
-            DupeGuruBase._do_delete_dupe(self, dupe, replace_with_hardlinks)
+            DupeGuruBase._do_delete_dupe(self, dupe, replace_with_hardlinks, direct_deletion)
     
     def _create_file(self, path):
         if (self.directories.iphoto_libpath is not None) and (path in self.directories.iphoto_libpath[:-1]):

core_me/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '6.4.0'
+__version__ = '6.4.1'
 __appname__ = 'dupeGuru Music Edition'

help/changelog_me

@@ -1,3 +1,7 @@
+=== 6.4.1 (2012-06-04)
+
+* Fixed bug introduced in 6.4.0 preventing deletions from working. [Mac]
+
 === 6.4.0 (2012-06-02)
 
 * Added a Deletion Options panel.