me v5.7.1

.hgtags

@@ -6,3 +6,4 @@ a8f232f880b6f9ada565d472996a627ebf69b6e9 before-tiger-drop
 adc73ccd14b1386cb04dee773c53a2d126800e31 se2.9.0
 cbcf9c80fee4c908ef2efbf1c143c9e47676c9b2 pe1.8.0
 61c4101851bdea3cb37dfb76f0d404c78c7c594c se2.9.1
+0e923897a3389331d4ab3debbc40b8dd616199d9 pe1.8.1

build.py

@@ -23,7 +23,10 @@ def main():
     edition = conf['edition']
     ui = conf['ui']
     dev = conf['dev']
+    build64 = conf['build64']
     print "Building dupeGuru {0} with UI {1}".format(edition.upper(), ui)
+    if build64:
+        print "If possible, 64-bit builds will be made"
     if dev:
         print "Building in Dev mode"
     add_to_pythonpath('.')
@@ -78,7 +81,11 @@ def main():
             open(pthpath, 'w').write(op.abspath('.'))
         os.chdir(cocoa_project_path)
         print "Building the XCode project"
-        os.system('xcodebuild')
+        args = []
+        if build64:
+            args.append('ARCHS="x86_64 i386 ppc"')
+        args = ' '.join(args)
+        os.system('xcodebuild {0}'.format(args))
         os.chdir('..')
     elif ui == 'qt':
         os.chdir(op.join('qt', edition))

cocoa/base/DirectoryPanel.m

@@ -66,7 +66,7 @@ http://www.hardcoded.net/licenses/hs_license
     [cell addItemWithTitle:@"Normal"];
     [cell addItemWithTitle:@"Reference"];
     [cell addItemWithTitle:@"Excluded"];
-    for (int i=0;i<[[cell itemArray] count];i++)
+    for (NSInteger i=0;i<[[cell itemArray] count];i++)
     {
         NSMenuItem *mi = [[cell itemArray] objectAtIndex:i];
         [mi setTarget:self];
@@ -135,8 +135,8 @@ http://www.hardcoded.net/licenses/hs_license
     }
     else
     {
-        int state = n2i([[node buffer] objectAtIndex:1]);
-        int newState = state == 2 ? 0 : 2; // If excluded, put it back
+        NSInteger state = n2i([[node buffer] objectAtIndex:1]);
+        NSInteger newState = state == 2 ? 0 : 2; // If excluded, put it back
         [_py setDirectory:p2a([node indexPath]) state:i2n(newState)];
         [node resetAllBuffers];
         [directories display];
@@ -153,7 +153,7 @@ http://www.hardcoded.net/licenses/hs_license
 
 - (void)addDirectory:(NSString *)directory
 {
-    int r = [[_py addDirectory:directory] intValue];
+    NSInteger r = [[_py addDirectory:directory] intValue];
     if (r)
     {
         NSString *m;
@@ -186,7 +186,7 @@ http://www.hardcoded.net/licenses/hs_license
     }
     [removeButton setEnabled:YES];
     OVNode *node = [directories itemAtRow:[directories selectedRow]];
-    int state = n2i([[node buffer] objectAtIndex:1]);
+    NSInteger state = n2i([[node buffer] objectAtIndex:1]);
     NSString *buttonText = state == 2 ? @"Put Back" : @"Remove";
     [removeButton setTitle:buttonText];
 }
@@ -201,7 +201,7 @@ http://www.hardcoded.net/licenses/hs_license
 - (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
 { 
     OVNode *node = item;
-    int state = n2i([[node buffer] objectAtIndex:1]);
+    NSInteger state = n2i([[node buffer] objectAtIndex:1]);
     if ([cell isKindOfClass:[NSTextFieldCell class]])
     {
         NSTextFieldCell *textCell = cell;

cocoa/base/PyDupeGuru.h

@@ -62,5 +62,5 @@ http://www.hardcoded.net/licenses/hs_license
 - (void)setDisplayDeltaValues:(NSNumber *)display_delta_values;
 - (void)setEscapeFilterRegexp:(NSNumber *)escape_filter_regexp;
 - (void)setRemoveEmptyFolders:(NSNumber *)remove_empty_folders;
-- (void)setSizeThreshold:(int)size_threshold;
+- (void)setSizeThreshold:(NSInteger)size_threshold;
 @end

cocoa/base/ResultWindow.h

@@ -32,7 +32,7 @@ http://www.hardcoded.net/licenses/hs_license
 }
 /* Helpers */
 - (void)fillColumnsMenu;
-- (NSTableColumn *)getColumnForIdentifier:(int)aIdentifier title:(NSString *)aTitle width:(int)aWidth refCol:(NSTableColumn *)aColumn;
+- (NSTableColumn *)getColumnForIdentifier:(NSInteger)aIdentifier title:(NSString *)aTitle width:(NSInteger)aWidth refCol:(NSTableColumn *)aColumn;
 - (NSArray *)getColumnsOrder;
 - (NSDictionary *)getColumnsWidth;
 - (NSArray *)getSelected:(BOOL)aDupesOnly;

cocoa/base/ResultWindow.m

@@ -19,7 +19,7 @@ http://www.hardcoded.net/licenses/hs_license
 {
     unichar key = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
     // get flags and strip the lower 16 (device dependant) bits
-    unsigned int flags = ( [theEvent modifierFlags] & 0x00FF );
+    NSUInteger flags = ( [theEvent modifierFlags] & 0x00FF );
     if (((key == NSDeleteFunctionKey) || (key == NSDeleteCharacter)) && (flags == 0))
         [self sendAction:@selector(removeSelected:) to:[self delegate]];
     else
@@ -85,9 +85,9 @@ http://www.hardcoded.net/licenses/hs_license
     [mi setTarget:self];
 }
 
-- (NSTableColumn *)getColumnForIdentifier:(int)aIdentifier title:(NSString *)aTitle width:(int)aWidth refCol:(NSTableColumn *)aColumn
+- (NSTableColumn *)getColumnForIdentifier:(NSInteger)aIdentifier title:(NSString *)aTitle width:(NSInteger)aWidth refCol:(NSTableColumn *)aColumn
 {
-    NSNumber *n = [NSNumber numberWithInt:aIdentifier];
+    NSNumber *n = [NSNumber numberWithInteger:aIdentifier];
     NSTableColumn *col = [[NSTableColumn alloc] initWithIdentifier:[n stringValue]];
     [col setWidth:aWidth];
     [col setEditable:NO];
@@ -123,7 +123,7 @@ http://www.hardcoded.net/licenses/hs_license
     while (col = [e nextObject])
     {
         colId = [col identifier];
-        width = [NSNumber numberWithFloat:[col width]];
+        width = [NSNumber numberWithDouble:[col width]];
         [result setObject:width forKey:colId];
     }
     return result;
@@ -136,7 +136,7 @@ http://www.hardcoded.net/licenses/hs_license
     NSIndexSet *indexes = [matches selectedRowIndexes];
     NSMutableArray *nodeList = [NSMutableArray array];
     OVNode *node;
-    int i = [indexes firstIndex];
+    NSInteger i = [indexes firstIndex];
     while (i != NSNotFound)
     {
         node = [matches itemAtRow:i];
@@ -238,7 +238,7 @@ http://www.hardcoded.net/licenses/hs_license
 
 - (IBAction)copyMarked:(id)sender
 {
-    int mark_count = [[py getMarkCount] intValue];
+    NSInteger mark_count = [[py getMarkCount] intValue];
     if (!mark_count)
         return;
     NSOpenPanel *op = [NSOpenPanel openPanel];
@@ -257,7 +257,7 @@ http://www.hardcoded.net/licenses/hs_license
 
 - (IBAction)deleteMarked:(id)sender
 {
-    int mark_count = [[py getMarkCount] intValue];
+    NSInteger mark_count = [[py getMarkCount] intValue];
     if (!mark_count)
         return;
     if ([Dialogs askYesNo:[NSString stringWithFormat:@"You are about to send %d files to Trash. Continue?",mark_count]] == NSAlertSecondButtonReturn) // NO
@@ -269,7 +269,7 @@ http://www.hardcoded.net/licenses/hs_license
 
 - (IBAction)expandAll:(id)sender
 {
-    for (int i=0;i < [matches numberOfRows];i++)
+    for (NSInteger i=0;i < [matches numberOfRows];i++)
         [matches expandItem:[matches itemAtRow:i]];
 }
 
@@ -281,7 +281,7 @@ http://www.hardcoded.net/licenses/hs_license
 
 - (IBAction)moveMarked:(id)sender
 {
-    int mark_count = [[py getMarkCount] intValue];
+    NSInteger mark_count = [[py getMarkCount] intValue];
     if (!mark_count)
         return;
     NSOpenPanel *op = [NSOpenPanel openPanel];
@@ -313,8 +313,8 @@ http://www.hardcoded.net/licenses/hs_license
 {
     // It might look like a complicated way to get the length of the current dupe list on the py side
     // but after a lot of fussing around, believe it or not, it actually is.
-    int matchesTag = _powerMode ? 2 : 0;
-    int startLen = [[py getOutlineView:matchesTag childCountsForPath:[NSArray array]] count];
+    NSInteger matchesTag = _powerMode ? 2 : 0;
+    NSInteger startLen = [[py getOutlineView:matchesTag childCountsForPath:[NSArray array]] count];
     [self performPySelection:[self getSelectedPaths:YES]];
     [py makeSelectedReference];
     // In some cases (when in a filtered view in Power Marker mode, it's possible that the demoted
@@ -384,7 +384,7 @@ http://www.hardcoded.net/licenses/hs_license
 - (void)jobCompleted:(NSNotification *)aNotification
 {
     [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
-    int r = n2i([py getOperationalErrorCount]);
+    NSInteger r = n2i([py getOperationalErrorCount]);
     id lastAction = [[ProgressController mainProgressController] jobId];
     if ([lastAction isEqualTo:jobCopy]) {
         if (r > 0)

cocoa/me/AppDelegate.m

@@ -82,6 +82,16 @@ http://www.hardcoded.net/licenses/hs_license
 - (PyDupeGuru *)py { return (PyDupeGuru *)py; }
 
 //Delegate
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
+{
+    NSMenu *actionsMenu = [[[NSApp mainMenu] itemWithTitle:@"Actions"] submenu];
+    // index 3 is just after "Export Results to XHTML"
+    NSMenuItem *mi = [actionsMenu insertItemWithTitle:@"Remove Dead Tracks in iTunes" 
+        action:@selector(removeDeadTracks:) keyEquivalent:@"" atIndex:3];
+    [mi setTarget:result];
+    [super applicationDidFinishLaunching:aNotification];
+}
+
 - (void)applicationWillBecomeActive:(NSNotification *)aNotification
 {
     if (![[result window] isVisible])
@@ -95,7 +105,7 @@ http://www.hardcoded.net/licenses/hs_license
     [ud setObject: [result getColumnsWidth] forKey:@"columnsWidth"];
     [py saveIgnoreList];
     [py saveResults];
-    int sc = [ud integerForKey:@"sessionCountSinceLastIgnorePurge"];
+    NSInteger sc = [ud integerForKey:@"sessionCountSinceLastIgnorePurge"];
     if (sc >= 10)
     {
         sc = -1;

cocoa/me/Info.plist

@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>hsft</string>
 	<key>CFBundleVersion</key>
-	<string>5.7.0</string>
+	<string>5.7.1</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

cocoa/me/PyDupeGuru.h

@@ -19,5 +19,5 @@ http://www.hardcoded.net/licenses/hs_license
 - (void)enable:(NSNumber *)enable scanForTag:(NSString *)tag;
 - (void)scanDeadTracks;
 - (void)removeDeadTracks;
-- (int)deadTrackCount;
+- (NSInteger)deadTrackCount;
 @end

cocoa/me/ResultWindow.m

@@ -36,7 +36,7 @@ http://www.hardcoded.net/licenses/hs_license
 /* Actions */
 - (IBAction)clearIgnoreList:(id)sender
 {
-    int i = n2i([py getIgnoreListCount]);
+    NSInteger i = n2i([py getIgnoreListCount]);
     if (!i)
         return;
     if ([Dialogs askYesNo:[NSString stringWithFormat:@"Do you really want to remove all %d items from the ignore list?",i]] == NSAlertSecondButtonReturn) // NO
@@ -139,8 +139,8 @@ http://www.hardcoded.net/licenses/hs_license
 
 - (IBAction)renameSelected:(id)sender
 {
-    int col = [matches columnWithIdentifier:@"0"];
-    int row = [matches selectedRow];
+    NSInteger col = [matches columnWithIdentifier:@"0"];
+    NSInteger row = [matches selectedRow];
     [matches editColumn:col row:row withEvent:[NSApp currentEvent] select:YES];
 }
 
@@ -187,7 +187,7 @@ http://www.hardcoded.net/licenses/hs_license
     [_py setWordWeighting:[ud objectForKey:@"wordWeighting"]];
     [_py setMixFileKind:[ud objectForKey:@"mixFileKind"]];
     [_py setMatchSimilarWords:[ud objectForKey:@"matchSimilarWords"]];
-    int r = n2i([py doScan]);
+    NSInteger r = n2i([py doScan]);
     [matches reloadData];
     [self refreshStats];
     if (r == 1)
@@ -272,7 +272,7 @@ http://www.hardcoded.net/licenses/hs_license
     id lastAction = [[ProgressController mainProgressController] jobId];
     if ([lastAction isEqualTo:jobScanDeadTracks])
     {
-        int deadTrackCount = [(PyDupeGuru *)py deadTrackCount];
+        NSInteger deadTrackCount = [(PyDupeGuru *)py deadTrackCount];
         if (deadTrackCount > 0)
         {
             NSString *msg = @"Your iTunes Library contains %d dead tracks ready to be removed. Continue?";

cocoa/me/dg_cocoa.py

@@ -5,7 +5,9 @@
 # http://www.hardcoded.net/licenses/hs_license
 
 import objc
-from AppKit import *
+from Foundation import NSObject
+
+from hsutil.cocoa import signature
 
 from core_me.app_cocoa import DupeGuruME
 from core.scanner import (SCAN_TYPE_FILENAME, SCAN_TYPE_FIELDS, SCAN_TYPE_FIELDS_NO_ORDER,
@@ -133,7 +135,7 @@ class PyDupeGuru(PyApp):
         self.app.sort_groups(key,asc)
     
     #---Information
-    @objc.signature('i@:')
+    @signature('i@:')
     def deadTrackCount(self):
         return len(self.app.dead_tracks)
     
@@ -150,11 +152,11 @@ class PyDupeGuru(PyApp):
         return self.app.last_op_error_count
     
     #---Data
-    @objc.signature('i@:i')
+    @signature('i@:i')
     def getOutlineViewMaxLevel_(self, tag):
         return self.app.GetOutlineViewMaxLevel(tag)
     
-    @objc.signature('@@:i@')
+    @signature('@@:i@')
     def getOutlineView_childCountsForPath_(self, tag, node_path):
         return self.app.GetOutlineViewChildCounts(tag, node_path)
     
@@ -231,11 +233,11 @@ class PyDupeGuru(PyApp):
     def demoLimitDescription(self):
         return self.app.DEMO_LIMIT_DESC
     
-    @objc.signature('i@:')
+    @signature('i@:')
     def isRegistered(self):
         return self.app.registered
     
-    @objc.signature('i@:@@')
+    @signature('i@:@@')
     def isCodeValid_withEmail_(self, code, email):
         return self.app.is_code_valid(code, email)
     

cocoa/me/dupeguru.xcodeproj/project.pbxproj

@@ -88,7 +88,7 @@
 		CE381C9509914ACE003581CE /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = SOURCE_ROOT; };
 		CE381C9A09914ADF003581CE /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = ResultWindow.m; sourceTree = SOURCE_ROOT; };
 		CE381C9B09914ADF003581CE /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = ResultWindow.h; sourceTree = SOURCE_ROOT; };
-		CE381CF509915304003581CE /* dg_cocoa.plugin */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dg_cocoa.plugin; path = dg_cocoa.plugin; sourceTree = SOURCE_ROOT; };
+		CE381CF509915304003581CE /* dg_cocoa.plugin */ = {isa = PBXFileReference; lastKnownFileType = folder; path = dg_cocoa.plugin; sourceTree = SOURCE_ROOT; };
 		CE3FBDD11094637800B72D77 /* DetailsPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = DetailsPanel.xib; path = ../../base/xib/DetailsPanel.xib; sourceTree = "<group>"; };
 		CE3FBDD21094637800B72D77 /* DirectoryPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = DirectoryPanel.xib; path = ../../base/xib/DirectoryPanel.xib; sourceTree = "<group>"; };
 		CE49DEF20FDFEB810098617B /* BRSingleLineFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BRSingleLineFormatter.h; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.h; sourceTree = SOURCE_ROOT; };
@@ -456,9 +456,10 @@
 		C01FCF5008A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
-				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
+				ARCHS = "$(ARCHS_STANDARD_64_BIT_PRE_XCODE_3_1)";
+				ARCHS_STANDARD_64_BIT_PRE_XCODE_3_1 = x86_64;
 				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;

cocoa/pe/dg_cocoa.py

@@ -5,7 +5,7 @@
 # http://www.hardcoded.net/licenses/hs_license
 
 import objc
-from AppKit import *
+from Foundation import NSObject
 
 from core_pe import app_cocoa as app_pe_cocoa
 

cocoa/se/dg_cocoa.py

@@ -5,7 +5,7 @@
 # http://www.hardcoded.net/licenses/hs_license
 
 import objc
-from AppKit import *
+from Foundation import NSObject
 
 from core_se.app_cocoa import DupeGuru
 from core import scanner

configure.py

@@ -12,17 +12,20 @@ from optparse import OptionParser
 
 import yaml
 
-def main(edition, ui, dev):
+def main(edition, ui, dev, build64):
     if edition not in ('se', 'me', 'pe'):
         edition = 'se'
     if ui not in ('cocoa', 'qt'):
         ui = 'cocoa' if sys.platform == 'darwin' else 'qt'
     build_type = 'Dev' if dev else 'Release'
     print "Configuring dupeGuru {0} for UI {1} ({2})".format(edition.upper(), ui, build_type)
+    if build64:
+        print "If possible, 64-bit builds will be made"
     conf = {
         'edition': edition,
         'ui': ui,
         'dev': dev,
+        'build64': build64,
     }
     yaml.dump(conf, open('conf.yaml', 'w'))
 
@@ -35,5 +38,7 @@ if __name__ == '__main__':
         help="Type of UI to build. 'qt' or 'cocoa'. Default is determined by your system.")
     parser.add_option('--dev', action='store_true', dest='dev', default=False,
         help="If this flag is set, will configure for dev builds.")
+    parser.add_option('--64bit', action='store_false', dest='build64', default=False,
+        help="Build 64-bit app if possible.")
     (options, args) = parser.parse_args()
-    main(options.edition, options.ui, options.dev)
+    main(options.edition, options.ui, options.dev, options.build64)

core/app_cocoa.py

@@ -7,12 +7,12 @@
 # http://www.hardcoded.net/licenses/hs_license
 
 import objc
-from Foundation import *
-from AppKit import *
+from Foundation import (NSNotificationCenter, NSUserDefaults, NSSearchPathForDirectoriesInDomains,
+    NSApplicationSupportDirectory, NSUserDomainMask)
 import logging
 import os.path as op
 
-from hsutil import io, cocoa, job
+from hsutil import cocoa, job
 from hsutil.cocoa import install_exception_hook
 from hsutil.misc import stripnone
 from hsutil.reg import RegistrationRequired
@@ -53,6 +53,8 @@ class DupeGuru(app.DupeGuru):
     #--- Override
     @staticmethod
     def _recycle_dupe(dupe):
+        # local import because first appkit import takes a lot of memory. we want to avoid it.
+        from AppKit import NSWorkspace, NSWorkspaceRecycleOperation
         directory = unicode(dupe.path[:-1])
         filename = dupe.name
         if objc.__version__ == '1.4': # For a while, we have to support this.
@@ -114,6 +116,8 @@ class DupeGuru(app.DupeGuru):
         self.make_reference(self.selected_dupes)
     
     def OpenSelected(self):
+        # local import because first appkit import takes a lot of memory. we want to avoid it.
+        from AppKit import NSWorkspace
         if self.selected_dupes:
             path = unicode(self.selected_dupes[0].path)
             NSWorkspace.sharedWorkspace().openFile_(path)
@@ -149,6 +153,8 @@ class DupeGuru(app.DupeGuru):
         return False
     
     def RevealSelected(self):
+        # local import because first appkit import takes a lot of memory. we want to avoid it.
+        from AppKit import NSWorkspace
         if self.selected_dupes:
             path = unicode(self.selected_dupes[0].path)
             NSWorkspace.sharedWorkspace().selectFile_inFileViewerRootedAtPath_(path,'')

core_pe/app_cocoa.py

@@ -11,7 +11,7 @@ import logging
 import plistlib
 import re
 
-from AppKit import NSBundle, NSUserDefaults, NSURL
+from Foundation import NSBundle, NSUserDefaults, NSURL
 from appscript import app, k, CommandError
 
 from hsutil import io

core_se/app_cocoa.py

@@ -11,11 +11,10 @@ from __future__ import unicode_literals
 import logging
 
 import objc
-from AppKit import *
+from AppKit import NSWorkspace
 
 from hsutil import io
 from hsutil.path import Path
-from hsutil.str import get_file_ext
 
 from core import fs
 from core.app_cocoa import DupeGuru as DupeGuruBase

help_me/changelog.yaml

@@ -1,3 +1,11 @@
+- date: 2010-01-19
+  version: 5.7.1
+  description: |
+    * The Mac OS X version of dupeGuru ME is now 64-bit!
+    * Improved memory usage for Contents scans. (#75)
+    * Improved scanning speed when ref directories are involved. (#77)
+    * Show a message dialog at the end of the scan if no duplicates are found. (#81)
+    * Re-added the "Remove Dead Tracks in iTunes" menu item which got lost in 5.7.0.
 - date: 2009-12-18
   version: 5.7.0
   description: |

qt/me/app.py

@@ -16,7 +16,7 @@ from preferences_dialog import PreferencesDialog
 class DupeGuru(DupeGuruBase):
     LOGO_NAME = 'logo_me'
     NAME = 'dupeGuru Music Edition'
-    VERSION = '5.7.0'
+    VERSION = '5.7.1'
     DELTA_COLUMNS = frozenset([2, 3, 4, 5, 7, 8])
     
     def __init__(self):