arsenetar/dupeguru
1
0
Fork 0
mirror of https://github.com/arsenetar/dupeguru.git synced 2025-05-08 17:59:50 +00:00
Code Releases Wiki Activity

Huge refactoring. I moved MGOutline from moneyGuru (as well as everything that comes with it) and used it to create DirectoryOutline for the directories panel.

Browse Source
This commit is contained in:
Virgil Dupras 2010-02-07 15:26:50 +01:00
parent 3e34502014
commit b5dd9651c3
18 changed files with 503 additions and 403 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cocoa/base/DirectoryOutline.h Normal file
View File

@ -0,0 +1,16 @@
/*
Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
This software is licensed under the "HS" License as described in the "LICENSE" file,
which should be included with this package. The terms are also available at
http://www.hardcoded.net/licenses/hs_license
*/
#import <Cocoa/Cocoa.h>
#import "HSOutline.h"
#import "PyDirectoryOutline.h"
@interface DirectoryOutline : HSOutline {}
- (id)initWithPyParent:(id)aPyParent view:(HSOutlineView *)aOutlineView;
- (PyDirectoryOutline *)py;
@end;

77
cocoa/base/DirectoryOutline.m Normal file
View File

@ -0,0 +1,77 @@
/*
Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
This software is licensed under the "HS" License as described in the "LICENSE" file,
which should be included with this package. The terms are also available at
http://www.hardcoded.net/licenses/hs_license
*/
#import "DirectoryOutline.h"
@implementation DirectoryOutline
- (id)initWithPyParent:(id)aPyParent view:(HSOutlineView *)aOutlineView
{
self = [super initWithPyClassName:@"PyDirectoryOutline" pyParent:aPyParent view:aOutlineView];
[outlineView registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]];
return self;
}
- (PyDirectoryOutline *)py
{
return (PyDirectoryOutline *)py;
}
/* Delegate */
- (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id < NSDraggingInfo >)info proposedItem:(id)item proposedChildIndex:(NSInteger)index
{
NSPasteboard *pboard;
NSDragOperation sourceDragMask;
sourceDragMask = [info draggingSourceOperationMask];
pboard = [info draggingPasteboard];
if ([[pboard types] containsObject:NSFilenamesPboardType]) {
if (sourceDragMask & NSDragOperationLink)
return NSDragOperationLink;
}
return NSDragOperationNone;
}
- (BOOL)outlineView:(NSOutlineView *)outlineView acceptDrop:(id < NSDraggingInfo >)info item:(id)item childIndex:(NSInteger)index
{
NSPasteboard *pboard;
NSDragOperation sourceDragMask;
sourceDragMask = [info draggingSourceOperationMask];
pboard = [info draggingPasteboard];
if ([[pboard types] containsObject:NSFilenamesPboardType]) {
NSArray *filenames = [pboard propertyListForType:NSFilenamesPboardType];
if (!(sourceDragMask & NSDragOperationLink))
return NO;
for (NSString *filename in filenames) {
[[self py] addDirectory:filename];
}
}
return YES;
}
- (void)outlineView:(NSOutlineView *)aOutlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
{
if ([cell isKindOfClass:[NSTextFieldCell class]]) {
NSTextFieldCell *textCell = cell;
NSIndexPath *path = item;
BOOL selected = [path isEqualTo:[outlineView selectedPath]];
if (selected) {
[textCell setTextColor:[NSColor blackColor]];
return;
}
NSInteger state = [self intProperty:@"state" valueAtPath:path];
if (state == 1) {
[textCell setTextColor:[NSColor blueColor]];
}
else if (state == 2) {
[textCell setTextColor:[NSColor redColor]];
}
else {
[textCell setTextColor:[NSColor blackColor]];
}
}
}
@end

16
cocoa/base/DirectoryPanel.h
View File

@ -8,31 +8,23 @@ http://www.hardcoded.net/licenses/hs_license
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import "RecentDirectories.h" #import "RecentDirectories.h"
#import "Outline.h" #import "HSOutlineView.h"
#import "DirectoryOutline.h"
#import "PyDupeGuru.h" #import "PyDupeGuru.h"
@interface DirectoryOutline : OutlineView
{
}
@end
@protocol DirectoryOutlineDelegate
- (void)outlineView:(NSOutlineView *)outlineView addDirectory:(NSString *)directory;
@end
@interface DirectoryPanel : NSWindowController @interface DirectoryPanel : NSWindowController
{ {
IBOutlet NSPopUpButton *addButtonPopUp; IBOutlet NSPopUpButton *addButtonPopUp;
IBOutlet DirectoryOutline *directories; IBOutlet HSOutlineView *outlineView;
IBOutlet NSButton *removeButton; IBOutlet NSButton *removeButton;
PyDupeGuruBase *_py; PyDupeGuruBase *_py;
RecentDirectories *_recentDirectories; RecentDirectories *_recentDirectories;
DirectoryOutline *outline;
} }
- (id)initWithParentApp:(id)aParentApp; - (id)initWithParentApp:(id)aParentApp;
- (IBAction)askForDirectory:(id)sender; - (IBAction)askForDirectory:(id)sender;
- (IBAction)changeDirectoryState:(id)sender;
- (IBAction)popupAddDirectoryMenu:(id)sender; - (IBAction)popupAddDirectoryMenu:(id)sender;
- (IBAction)removeSelectedDirectory:(id)sender; - (IBAction)removeSelectedDirectory:(id)sender;
- (IBAction)toggleVisible:(id)sender; - (IBAction)toggleVisible:(id)sender;

135
cocoa/base/DirectoryPanel.m
View File

@ -11,48 +11,6 @@ http://www.hardcoded.net/licenses/hs_license
#import "Utils.h" #import "Utils.h"
#import "AppDelegate.h" #import "AppDelegate.h"
@implementation DirectoryOutline
- (void)doInit
{
[super doInit];
[self registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]];
}
- (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id < NSDraggingInfo >)info proposedItem:(id)item proposedChildIndex:(NSInteger)index
{
NSPasteboard *pboard;
NSDragOperation sourceDragMask;
sourceDragMask = [info draggingSourceOperationMask];
pboard = [info draggingPasteboard];
if ([[pboard types] containsObject:NSFilenamesPboardType])
{
if (sourceDragMask & NSDragOperationLink)
return NSDragOperationLink;
}
return NSDragOperationNone;
}
- (BOOL)outlineView:(NSOutlineView *)outlineView acceptDrop:(id < NSDraggingInfo >)info item:(id)item childIndex:(NSInteger)index
{
NSPasteboard *pboard;
NSDragOperation sourceDragMask;
sourceDragMask = [info draggingSourceOperationMask];
pboard = [info draggingPasteboard];
if ( [[pboard types] containsObject:NSFilenamesPboardType] )
{
NSArray *filenames = [pboard propertyListForType:NSFilenamesPboardType];
if (!(sourceDragMask & NSDragOperationLink))
return NO;
if (([self delegate] == nil) || (![[self delegate] respondsToSelector:@selector(outlineView:addDirectory:)]))
return NO;
for (NSString *filename in filenames)
[[self delegate] outlineView:self addDirectory:filename];
}
return YES;
}
@end
@implementation DirectoryPanel @implementation DirectoryPanel
- (id)initWithParentApp:(id)aParentApp - (id)initWithParentApp:(id)aParentApp
{ {
@ -61,23 +19,19 @@ http://www.hardcoded.net/licenses/hs_license
AppDelegateBase *app = aParentApp; AppDelegateBase *app = aParentApp;
_py = [app py]; _py = [app py];
_recentDirectories = [app recentDirectories]; _recentDirectories = [app recentDirectories];
[directories setPy:_py]; outline = [[DirectoryOutline alloc] initWithPyParent:_py view:outlineView];
NSPopUpButtonCell *cell = [[directories tableColumnWithIdentifier:@"1"] dataCell];
[cell addItemWithTitle:@"Normal"];
[cell addItemWithTitle:@"Reference"];
[cell addItemWithTitle:@"Excluded"];
for (NSInteger i=0;i<[[cell itemArray] count];i++)
{
NSMenuItem *mi = [[cell itemArray] objectAtIndex:i];
[mi setTarget:self];
[mi setAction:@selector(changeDirectoryState:)];
[mi setTag:i];
}
[self refreshRemoveButtonText]; [self refreshRemoveButtonText];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(directorySelectionChanged:) name:NSOutlineViewSelectionDidChangeNotification object:directories]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(directorySelectionChanged:)
name:NSOutlineViewSelectionDidChangeNotification object:outlineView];
return self; return self;
} }
- (void)dealloc
{
[outline release];
[super dealloc];
}
/* Actions */ /* Actions */
- (IBAction)askForDirectory:(id)sender - (IBAction)askForDirectory:(id)sender
@ -95,15 +49,6 @@ http://www.hardcoded.net/licenses/hs_license
} }
} }
- (IBAction)changeDirectoryState:(id)sender
{
OVNode *node = [directories itemAtRow:[directories clickedRow]];
[_py setDirectory:p2a([node indexPath]) state:i2n([sender tag])];
[node resetAllBuffers];
[directories reloadItem:node reloadChildren:YES];
[directories display];
}
- (IBAction)popupAddDirectoryMenu:(id)sender - (IBAction)popupAddDirectoryMenu:(id)sender
{ {
if ([[_recentDirectories directories] count] == 0) if ([[_recentDirectories directories] count] == 0)
@ -125,21 +70,17 @@ http://www.hardcoded.net/licenses/hs_license
- (IBAction)removeSelectedDirectory:(id)sender - (IBAction)removeSelectedDirectory:(id)sender
{ {
[[self window] makeKeyAndOrderFront:nil]; [[self window] makeKeyAndOrderFront:nil];
if ([directories selectedRow] < 0) if ([outlineView selectedRow] < 0)
return; return;
OVNode *node = [directories itemAtRow:[directories selectedRow]]; NSIndexPath *path = [outline selectedIndexPath];
if ([node level] == 1) NSInteger state = [outline intProperty:@"state" valueAtPath:path];
{ if (([path length] == 1) && (state != 2)) {
[_py removeDirectory:i2n([node index])]; [_py removeDirectory:i2n([path indexAtPosition:0])];
[directories reloadData];
} }
else else {
{
NSInteger state = n2i([[node buffer] objectAtIndex:1]);
NSInteger newState = state == 2 ? 0 : 2; // If excluded, put it back NSInteger newState = state == 2 ? 0 : 2; // If excluded, put it back
[_py setDirectory:p2a([node indexPath]) state:i2n(newState)]; [outline setIntProperty:@"state" value:newState atPath:path];
[node resetAllBuffers]; [outlineView display];
[directories display];
} }
[self refreshRemoveButtonText]; [self refreshRemoveButtonText];
} }
@ -150,70 +91,40 @@ http://www.hardcoded.net/licenses/hs_license
} }
/* Public */ /* Public */
- (void)addDirectory:(NSString *)directory - (void)addDirectory:(NSString *)directory
{ {
NSInteger r = [[_py addDirectory:directory] intValue]; NSInteger r = [[_py addDirectory:directory] intValue];
if (r) if (r) {
{
NSString *m; NSString *m;
switch (r) switch (r) {
{ case 1: {
case 1:
{
m = @"This directory already is in the list."; m = @"This directory already is in the list.";
break; break;
} }
case 2: case 2: {
{
m = @"This directory does not exist."; m = @"This directory does not exist.";
break; break;
} }
} }
[Dialogs showMessage:m]; [Dialogs showMessage:m];
} }
[directories reloadData];
[_recentDirectories addDirectory:directory]; [_recentDirectories addDirectory:directory];
[[self window] makeKeyAndOrderFront:nil]; [[self window] makeKeyAndOrderFront:nil];
} }
- (void)refreshRemoveButtonText - (void)refreshRemoveButtonText
{ {
if ([directories selectedRow] < 0) if ([outlineView selectedRow] < 0) {
{
[removeButton setEnabled:NO]; [removeButton setEnabled:NO];
return; return;
} }
[removeButton setEnabled:YES]; [removeButton setEnabled:YES];
OVNode *node = [directories itemAtRow:[directories selectedRow]]; NSInteger state = [outline intProperty:@"state" valueAtPath:[outline selectedIndexPath]];
NSInteger state = n2i([[node buffer] objectAtIndex:1]);
NSString *buttonText = state == 2 ? @"Put Back" : @"Remove"; NSString *buttonText = state == 2 ? @"Put Back" : @"Remove";
[removeButton setTitle:buttonText]; [removeButton setTitle:buttonText];
} }
/* Delegate */ /* Delegate */
- (void)outlineView:(NSOutlineView *)outlineView addDirectory:(NSString *)directory
{
[self addDirectory:directory];
}
- (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
{
OVNode *node = item;
NSInteger state = n2i([[node buffer] objectAtIndex:1]);
if ([cell isKindOfClass:[NSTextFieldCell class]])
{
NSTextFieldCell *textCell = cell;
if (state == 1)
[textCell setTextColor:[NSColor blueColor]];
else if (state == 2)
[textCell setTextColor:[NSColor redColor]];
else
[textCell setTextColor:[NSColor blackColor]];
}
}
- (BOOL)panel:(id)sender shouldShowFilename:(NSString *)path - (BOOL)panel:(id)sender shouldShowFilename:(NSString *)path
{ {
BOOL isdir; BOOL isdir;

14
cocoa/base/PyDirectoryOutline.h Normal file
View File

@ -0,0 +1,14 @@
/*
Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
This software is licensed under the "HS" License as described in the "LICENSE" file,
which should be included with this package. The terms are also available at
http://www.hardcoded.net/licenses/hs_license
*/
#import <Cocoa/Cocoa.h>
#import "PyOutline.h"
@interface PyDirectoryOutline : PyOutline
- (void)addDirectory:(NSString *)directoryPath;
@end

1
cocoa/base/PyDupeGuru.h
View File

@ -13,7 +13,6 @@ http://www.hardcoded.net/licenses/hs_license
//Actions //Actions
- (NSNumber *)addDirectory:(NSString *)name; - (NSNumber *)addDirectory:(NSString *)name;
- (void)removeDirectory:(NSNumber *)index; - (void)removeDirectory:(NSNumber *)index;
- (void)setDirectory:(NSArray *)indexPath state:(NSNumber *)state;
- (void)loadResults; - (void)loadResults;
- (void)saveResults; - (void)saveResults;
- (void)loadIgnoreList; - (void)loadIgnoreList;

237
cocoa/base/xib/DirectoryPanel.xib
View File

@ -2,17 +2,17 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data> <data>
<int key="IBDocument.SystemTarget">1050</int> <int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">10B504</string> <string key="IBDocument.SystemVersion">10C540</string>
<string key="IBDocument.InterfaceBuilderVersion">740</string> <string key="IBDocument.InterfaceBuilderVersion">740</string>
<string key="IBDocument.AppKitVersion">1038.2</string> <string key="IBDocument.AppKitVersion">1038.25</string>
<string key="IBDocument.HIToolboxVersion">437.00</string> <string key="IBDocument.HIToolboxVersion">458.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">740</string> <string key="NS.object.0">740</string>
</object> </object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<integer value="6"/> <integer value="50"/>
</object> </object>
<object class="NSArray" key="IBDocument.PluginDependencies"> <object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
@ -70,7 +70,6 @@
<int key="NSvFlags">256</int> <int key="NSvFlags">256</int>
<string key="NSFrameSize">{327, 165}</string> <string key="NSFrameSize">{327, 165}</string>
<reference key="NSSuperview" ref="514281221"/> <reference key="NSSuperview" ref="514281221"/>
<int key="NSTag">1</int>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTableHeaderView" key="NSHeaderView" id="885660940"> <object class="NSTableHeaderView" key="NSHeaderView" id="885660940">
<reference key="NSNextResponder" ref="395832192"/> <reference key="NSNextResponder" ref="395832192"/>
@ -88,7 +87,7 @@
<object class="NSMutableArray" key="NSTableColumns"> <object class="NSMutableArray" key="NSTableColumns">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTableColumn" id="547470852"> <object class="NSTableColumn" id="547470852">
<string key="NSIdentifier">0</string> <string key="NSIdentifier">name</string>
<double key="NSWidth">236</double> <double key="NSWidth">236</double>
<double key="NSMinWidth">16</double> <double key="NSMinWidth">16</double>
<double key="NSMaxWidth">1000</double> <double key="NSMaxWidth">1000</double>
@ -142,7 +141,7 @@
<reference key="NSTableView" ref="10140319"/> <reference key="NSTableView" ref="10140319"/>
</object> </object>
<object class="NSTableColumn" id="50798966"> <object class="NSTableColumn" id="50798966">
<string key="NSIdentifier">1</string> <string key="NSIdentifier">state</string>
<double key="NSWidth">85.35595703125</double> <double key="NSWidth">85.35595703125</double>
<double key="NSMinWidth">30.35595703125</double> <double key="NSMinWidth">30.35595703125</double>
<double key="NSMaxWidth">1000</double> <double key="NSMaxWidth">1000</double>
@ -173,15 +172,41 @@
<string key="NSKeyEquivalent"/> <string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int> <int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int> <int key="NSPeriodicInterval">75</int>
<nil key="NSMenuItem"/> <object class="NSMenuItem" key="NSMenuItem" id="71151438">
<reference key="NSMenu" ref="104112446"/>
<string key="NSTitle">Normal</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<int key="NSState">1</int>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="867721721"/>
</object>
<bool key="NSMenuItemRespectAlignment">YES</bool> <bool key="NSMenuItemRespectAlignment">YES</bool>
<object class="NSMenu" key="NSMenu" id="104112446"> <object class="NSMenu" key="NSMenu" id="104112446">
<string key="NSTitle"/> <string key="NSTitle">Normal</string>
<object class="NSMutableArray" key="NSMenuItems"> <object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="71151438"/>
<object class="NSMenuItem" id="828402206">
<reference key="NSMenu" ref="104112446"/>
<string key="NSTitle">Reference</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="867721721"/>
</object>
<object class="NSMenuItem" id="142495353">
<reference key="NSMenu" ref="104112446"/>
<string key="NSTitle">Excluded</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="867721721"/>
</object>
</object> </object>
<bool key="NSNoAutoenable">YES</bool>
<bool key="NSMenuExcludeMarkColumn">YES</bool>
</object> </object>
<int key="NSSelectedIndex">-1</int>
<int key="NSPreferredEdge">3</int> <int key="NSPreferredEdge">3</int>
<bool key="NSUsesItemFromMenu">YES</bool> <bool key="NSUsesItemFromMenu">YES</bool>
<bool key="NSAltersState">YES</bool> <bool key="NSAltersState">YES</bool>
@ -189,6 +214,7 @@
</object> </object>
<int key="NSResizingMask">2</int> <int key="NSResizingMask">2</int>
<bool key="NSIsResizeable">YES</bool> <bool key="NSIsResizeable">YES</bool>
<bool key="NSIsEditable">YES</bool>
<reference key="NSTableView" ref="10140319"/> <reference key="NSTableView" ref="10140319"/>
</object> </object>
</object> </object>
@ -415,30 +441,6 @@
</object> </object>
<int key="connectionID">19</int> <int key="connectionID">19</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
<reference key="source" ref="963602908"/>
<reference key="destination" ref="10140319"/>
</object>
<int key="connectionID">20</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
<reference key="source" ref="10140319"/>
<reference key="destination" ref="630693842"/>
</object>
<int key="connectionID">21</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
<reference key="source" ref="630693842"/>
<reference key="destination" ref="963602908"/>
</object>
<int key="connectionID">22</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection"> <object class="IBActionConnection" key="connection">
<string key="label">popupAddDirectoryMenu:</string> <string key="label">popupAddDirectoryMenu:</string>
@ -471,22 +473,6 @@
</object> </object>
<int key="connectionID">26</int> <int key="connectionID">26</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">directories</string>
<reference key="source" ref="566600593"/>
<reference key="destination" ref="10140319"/>
</object>
<int key="connectionID">27</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="10140319"/>
<reference key="destination" ref="566600593"/>
</object>
<int key="connectionID">29</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection"> <object class="IBActionConnection" key="connection">
<string key="label">performClose:</string> <string key="label">performClose:</string>
@ -503,6 +489,14 @@
</object> </object>
<int key="connectionID">43</int> <int key="connectionID">43</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">outlineView</string>
<reference key="source" ref="566600593"/>
<reference key="destination" ref="10140319"/>
</object>
<int key="connectionID">54</int>
</object>
</object> </object>
<object class="IBMutableOrderedSet" key="objectRecords"> <object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects"> <object class="NSArray" key="orderedObjects">
@ -685,6 +679,12 @@
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">50</int> <int key="objectID">50</int>
<reference key="object" ref="104112446"/> <reference key="object" ref="104112446"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="71151438"/>
<reference ref="828402206"/>
<reference ref="142495353"/>
</object>
<reference key="parent" ref="867721721"/> <reference key="parent" ref="867721721"/>
</object> </object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
@ -702,6 +702,21 @@
<reference key="object" ref="885660940"/> <reference key="object" ref="885660940"/>
<reference key="parent" ref="242279311"/> <reference key="parent" ref="242279311"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">55</int>
<reference key="object" ref="71151438"/>
<reference key="parent" ref="104112446"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">56</int>
<reference key="object" ref="828402206"/>
<reference key="parent" ref="104112446"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">57</int>
<reference key="object" ref="142495353"/>
<reference key="parent" ref="104112446"/>
</object>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="flattenedProperties"> <object class="NSMutableDictionary" key="flattenedProperties">
@ -739,6 +754,7 @@
<string>5.ImportedFromIB2</string> <string>5.ImportedFromIB2</string>
<string>5.windowTemplate.hasMinSize</string> <string>5.windowTemplate.hasMinSize</string>
<string>5.windowTemplate.minSize</string> <string>5.windowTemplate.minSize</string>
<string>50.IBEditorWindowLastContentRect</string>
<string>50.IBPluginDependency</string> <string>50.IBPluginDependency</string>
<string>51.IBPluginDependency</string> <string>51.IBPluginDependency</string>
<string>51.IBShouldRemoveOnLegacySave</string> <string>51.IBShouldRemoveOnLegacySave</string>
@ -746,6 +762,9 @@
<string>52.IBShouldRemoveOnLegacySave</string> <string>52.IBShouldRemoveOnLegacySave</string>
<string>53.IBPluginDependency</string> <string>53.IBPluginDependency</string>
<string>53.IBShouldRemoveOnLegacySave</string> <string>53.IBShouldRemoveOnLegacySave</string>
<string>55.IBPluginDependency</string>
<string>56.IBPluginDependency</string>
<string>57.IBPluginDependency</string>
<string>6.IBPluginDependency</string> <string>6.IBPluginDependency</string>
<string>6.ImportedFromIB2</string> <string>6.ImportedFromIB2</string>
<string>7.IBPluginDependency</string> <string>7.IBPluginDependency</string>
@ -761,7 +780,7 @@
<boolean value="YES"/> <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>DirectoryOutline</string> <string>HSOutlineView</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -788,6 +807,7 @@
<boolean value="YES"/> <boolean value="YES"/>
<boolean value="YES"/> <boolean value="YES"/>
<string>{369, 269}</string> <string>{369, 269}</string>
<string>{{98, 740}, {327, 63}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/> <boolean value="YES"/>
@ -796,6 +816,9 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/> <boolean value="YES"/>
@ -821,27 +844,11 @@
</object> </object>
</object> </object>
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">53</int> <int key="maxID">57</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions"> <object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">DirectoryOutline</string>
<string key="superclassName">OutlineView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="462913745">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">dgbase/DirectoryPanel.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">DirectoryPanel</string>
<string key="superclassName">NSWindowController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">DirectoryPanel.h</string>
</object>
</object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">DirectoryPanel</string> <string key="className">DirectoryPanel</string>
<string key="superclassName">NSWindowController</string> <string key="superclassName">NSWindowController</string>
@ -850,7 +857,6 @@
<object class="NSArray" key="dict.sortedKeys"> <object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<string>askForDirectory:</string> <string>askForDirectory:</string>
<string>changeDirectoryState:</string>
<string>popupAddDirectoryMenu:</string> <string>popupAddDirectoryMenu:</string>
<string>removeSelectedDirectory:</string> <string>removeSelectedDirectory:</string>
<string>toggleVisible:</string> <string>toggleVisible:</string>
@ -861,7 +867,6 @@
<string>id</string> <string>id</string>
<string>id</string> <string>id</string>
<string>id</string> <string>id</string>
<string>id</string>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="outlets"> <object class="NSMutableDictionary" key="outlets">
@ -869,60 +874,29 @@
<object class="NSArray" key="dict.sortedKeys"> <object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<string>addButtonPopUp</string> <string>addButtonPopUp</string>
<string>directories</string> <string>outlineView</string>
<string>removeButton</string> <string>removeButton</string>
</object> </object>
<object class="NSMutableArray" key="dict.values"> <object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<string>NSPopUpButton</string> <string>NSPopUpButton</string>
<string>NSOutlineView</string> <string>HSOutlineView</string>
<string>NSButton</string> <string>NSButton</string>
</object> </object>
</object> </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">../base/DirectoryPanel.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">DirectoryPanel</string>
<string key="superclassName">NSWindowController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier"> <object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string> <string key="majorKey">IBUserSource</string>
<string key="minorKey"/> <string key="minorKey"/>
</object> </object>
</object> </object>
<object class="IBPartialClassDescription">
<string key="className">DirectoryPanel</string>
<string key="superclassName">NSWindowController</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>askForDirectory:</string>
<string>changeDirectoryState:</string>
<string>popupAddDirectoryMenu:</string>
<string>removeSelectedDirectory:</string>
<string>toggleVisible:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addButtonPopUp</string>
<string>directories</string>
<string>removeButton</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSPopUpButton</string>
<string>DirectoryOutline</string>
<string>NSButton</string>
</object>
</object>
<reference key="sourceIdentifier" ref="462913745"/>
</object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">FirstResponder</string> <string key="className">FirstResponder</string>
<string key="superclassName">NSObject</string> <string key="superclassName">NSObject</string>
@ -932,40 +906,27 @@
</object> </object>
</object> </object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">OutlineView</string> <string key="className">HSOutlineView</string>
<string key="superclassName">NSOutlineView</string> <string key="superclassName">NSOutlineView</string>
<object class="NSMutableDictionary" key="outlets"> <object class="IBClassDescriptionSource" key="sourceIdentifier" id="53364925">
<string key="NS.key.0">py</string>
<string key="NS.object.0">PyApp</string>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string> <string key="majorKey">IBProjectSource</string>
<string key="minorKey">cocoalib/Outline.h</string> <string key="minorKey">../views/HSOutlineView.h</string>
</object> </object>
</object> </object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">OutlineView</string> <string key="className">NSObject</string>
<string key="superclassName">NSOutlineView</string> <reference key="sourceIdentifier" ref="53364925"/>
<object class="IBClassDescriptionSource" key="sourceIdentifier"> </object>
<string key="majorKey">IBUserSource</string> <object class="IBPartialClassDescription">
<string key="minorKey"/> <string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="42597526">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">../views/NSTableViewAdditions.h</string>
</object> </object>
</object> </object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">PyApp</string> <string key="className">NSTableView</string>
<string key="superclassName">PyRegistrable</string> <reference key="sourceIdentifier" ref="42597526"/>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">cocoalib/PyApp.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">PyRegistrable</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">cocoalib/PyRegistrable.h</string>
</object>
</object> </object>
</object> </object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+"> <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
@ -1497,7 +1458,7 @@
<integer value="3000" key="NS.object.0"/> <integer value="3000" key="NS.object.0"/>
</object> </object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<string key="IBDocument.LastKnownRelativeProjectPath">../../dupeguru.xcodeproj</string> <string key="IBDocument.LastKnownRelativeProjectPath">../../se/dupeguru.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int> <int key="IBDocument.defaultPropertyAccessControl">3</int>
</data> </data>
</archive> </archive>

20
cocoa/me/dg_cocoa.py
View File

@ -18,27 +18,27 @@ from hsmedia import aiff, flac, genres, id3v1, id3v2, mp4, mpeg, ogg, wma
class PyDupeGuru(PyDupeGuruBase): class PyDupeGuru(PyDupeGuruBase):
def init(self): def init(self):
self = super(PyDupeGuru,self).init() self = super(PyDupeGuru,self).init()
self.app = DupeGuruME() self.py = DupeGuruME()
return self return self
def removeDeadTracks(self): def removeDeadTracks(self):
self.app.remove_dead_tracks() self.py.remove_dead_tracks()
def scanDeadTracks(self): def scanDeadTracks(self):
self.app.scan_dead_tracks() self.py.scan_dead_tracks()
#---Information #---Information
@signature('i@:') @signature('i@:')
def deadTrackCount(self): def deadTrackCount(self):
return len(self.app.dead_tracks) return len(self.py.dead_tracks)
#---Properties #---Properties
def setMinMatchPercentage_(self, percentage): def setMinMatchPercentage_(self, percentage):
self.app.scanner.min_match_percentage = int(percentage) self.py.scanner.min_match_percentage = int(percentage)
def setScanType_(self, scan_type): def setScanType_(self, scan_type):
try: try:
self.app.scanner.scan_type = [ self.py.scanner.scan_type = [
SCAN_TYPE_FILENAME, SCAN_TYPE_FILENAME,
SCAN_TYPE_FIELDS, SCAN_TYPE_FIELDS,
SCAN_TYPE_FIELDS_NO_ORDER, SCAN_TYPE_FIELDS_NO_ORDER,
@ -50,16 +50,16 @@ class PyDupeGuru(PyDupeGuruBase):
pass pass
def setWordWeighting_(self, words_are_weighted): def setWordWeighting_(self, words_are_weighted):
self.app.scanner.word_weighting = words_are_weighted self.py.scanner.word_weighting = words_are_weighted
def setMatchSimilarWords_(self, match_similar_words): def setMatchSimilarWords_(self, match_similar_words):
self.app.scanner.match_similar_words = match_similar_words self.py.scanner.match_similar_words = match_similar_words
def enable_scanForTag_(self, enable, scan_tag): def enable_scanForTag_(self, enable, scan_tag):
if enable: if enable:
self.app.scanner.scanned_tags.add(scan_tag) self.py.scanner.scanned_tags.add(scan_tag)
else: else:
self.app.scanner.scanned_tags.discard(scan_tag) self.py.scanner.scanned_tags.discard(scan_tag)
#---Registration #---Registration
def appName(self): def appName(self):

12
cocoa/pe/dg_cocoa.py
View File

@ -13,25 +13,25 @@ from core_pe import block, cache, matchbase, data, _block_osx
class PyDupeGuru(PyDupeGuruBase): class PyDupeGuru(PyDupeGuruBase):
def init(self): def init(self):
self = super(PyDupeGuru, self).init() self = super(PyDupeGuru, self).init()
self.app = app_pe_cocoa.DupeGuruPE() self.py = app_pe_cocoa.DupeGuruPE()
return self return self
def clearPictureCache(self): def clearPictureCache(self):
self.app.scanner.clear_picture_cache() self.py.scanner.clear_picture_cache()
#---Information #---Information
def getSelectedDupePath(self): def getSelectedDupePath(self):
return unicode(self.app.selected_dupe_path()) return unicode(self.py.selected_dupe_path())
def getSelectedDupeRefPath(self): def getSelectedDupeRefPath(self):
return unicode(self.app.selected_dupe_ref_path()) return unicode(self.py.selected_dupe_ref_path())
#---Properties #---Properties
def setMatchScaled_(self,match_scaled): def setMatchScaled_(self,match_scaled):
self.app.scanner.match_scaled = match_scaled self.py.scanner.match_scaled = match_scaled
def setMinMatchPercentage_(self,percentage): def setMinMatchPercentage_(self,percentage):
self.app.scanner.threshold = int(percentage) self.py.scanner.threshold = int(percentage)
#---Registration #---Registration
def appName(self): def appName(self):

12
cocoa/se/dg_cocoa.py
View File

@ -16,16 +16,16 @@ from core_se import fs, data
class PyDupeGuru(PyDupeGuruBase): class PyDupeGuru(PyDupeGuruBase):
def init(self): def init(self):
self = super(PyDupeGuru,self).init() self = super(PyDupeGuru,self).init()
self.app = DupeGuru() self.py = DupeGuru()
return self return self
#---Properties #---Properties
def setMinMatchPercentage_(self,percentage): def setMinMatchPercentage_(self,percentage):
self.app.scanner.min_match_percentage = int(percentage) self.py.scanner.min_match_percentage = int(percentage)
def setScanType_(self,scan_type): def setScanType_(self,scan_type):
try: try:
self.app.scanner.scan_type = [ self.py.scanner.scan_type = [
scanner.SCAN_TYPE_FILENAME, scanner.SCAN_TYPE_FILENAME,
scanner.SCAN_TYPE_CONTENT scanner.SCAN_TYPE_CONTENT
][scan_type] ][scan_type]
@ -33,14 +33,14 @@ class PyDupeGuru(PyDupeGuruBase):
pass pass
def setWordWeighting_(self,words_are_weighted): def setWordWeighting_(self,words_are_weighted):
self.app.scanner.word_weighting = words_are_weighted self.py.scanner.word_weighting = words_are_weighted
def setMatchSimilarWords_(self,match_similar_words): def setMatchSimilarWords_(self,match_similar_words):
self.app.scanner.match_similar_words = match_similar_words self.py.scanner.match_similar_words = match_similar_words
@signature('v@:i') @signature('v@:i')
def setSizeThreshold_(self, size_threshold): def setSizeThreshold_(self, size_threshold):
self.app.scanner.size_threshold = size_threshold self.py.scanner.size_threshold = size_threshold
#---Registration #---Registration
def appName(self): def appName(self):

75
cocoa/se/dupeguru.xcodeproj/project.pbxproj
View File

@ -20,6 +20,13 @@
CE45579B0AE3BC2B005A9546 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE45579A0AE3BC2B005A9546 /* Sparkle.framework */; }; CE45579B0AE3BC2B005A9546 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE45579A0AE3BC2B005A9546 /* Sparkle.framework */; };
CE4557B40AE3BC50005A9546 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE45579A0AE3BC2B005A9546 /* Sparkle.framework */; }; CE4557B40AE3BC50005A9546 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE45579A0AE3BC2B005A9546 /* Sparkle.framework */; };
CE6E0DFE1054E9EF008D9390 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = CE6E0DFD1054E9EF008D9390 /* dsa_pub.pem */; }; CE6E0DFE1054E9EF008D9390 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = CE6E0DFD1054E9EF008D9390 /* dsa_pub.pem */; };
CE76FDC4111EE37C006618EA /* HSOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDBF111EE37C006618EA /* HSOutlineView.m */; };
CE76FDC5111EE37C006618EA /* NSIndexPathAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDC1111EE37C006618EA /* NSIndexPathAdditions.m */; };
CE76FDC6111EE37C006618EA /* NSTableViewAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDC3111EE37C006618EA /* NSTableViewAdditions.m */; };
CE76FDCF111EE38E006618EA /* HSGUIController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDC9111EE38E006618EA /* HSGUIController.m */; };
CE76FDD4111EE3A7006618EA /* DirectoryOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDD2111EE3A7006618EA /* DirectoryOutline.m */; };
CE76FDDF111EE42F006618EA /* HSOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDDE111EE42F006618EA /* HSOutline.m */; };
CE76FDF7111EE561006618EA /* NSEventAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDF6111EE561006618EA /* NSEventAdditions.m */; };
CEAC6811109B0B7E00B43C85 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEAC6810109B0B7E00B43C85 /* Preferences.xib */; }; CEAC6811109B0B7E00B43C85 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEAC6810109B0B7E00B43C85 /* Preferences.xib */; };
CEDD92DA0FDD01640031C7B7 /* BRSingleLineFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = CEDD92D70FDD01640031C7B7 /* BRSingleLineFormatter.m */; }; CEDD92DA0FDD01640031C7B7 /* BRSingleLineFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = CEDD92D70FDD01640031C7B7 /* BRSingleLineFormatter.m */; };
CEE7EA130FE675C80004E467 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CEE7EA120FE675C80004E467 /* DetailsPanel.m */; }; CEE7EA130FE675C80004E467 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CEE7EA120FE675C80004E467 /* DetailsPanel.m */; };
@ -76,6 +83,23 @@
CE45579A0AE3BC2B005A9546 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = /Library/Frameworks/Sparkle.framework; sourceTree = "<absolute>"; }; CE45579A0AE3BC2B005A9546 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = /Library/Frameworks/Sparkle.framework; sourceTree = "<absolute>"; };
CE6E0DFD1054E9EF008D9390 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = ../base/dsa_pub.pem; sourceTree = "<group>"; }; CE6E0DFD1054E9EF008D9390 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = ../base/dsa_pub.pem; sourceTree = "<group>"; };
CE6E7407111C997500C350E3 /* PyDetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDetailsPanel.h; path = ../base/PyDetailsPanel.h; sourceTree = SOURCE_ROOT; }; CE6E7407111C997500C350E3 /* PyDetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDetailsPanel.h; path = ../base/PyDetailsPanel.h; sourceTree = SOURCE_ROOT; };
CE76FDBE111EE37C006618EA /* HSOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSOutlineView.h; sourceTree = "<group>"; };
CE76FDBF111EE37C006618EA /* HSOutlineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSOutlineView.m; sourceTree = "<group>"; };
CE76FDC0111EE37C006618EA /* NSIndexPathAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSIndexPathAdditions.h; sourceTree = "<group>"; };
CE76FDC1111EE37C006618EA /* NSIndexPathAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSIndexPathAdditions.m; sourceTree = "<group>"; };
CE76FDC2111EE37C006618EA /* NSTableViewAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSTableViewAdditions.h; sourceTree = "<group>"; };
CE76FDC3111EE37C006618EA /* NSTableViewAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSTableViewAdditions.m; sourceTree = "<group>"; };
CE76FDC8111EE38E006618EA /* HSGUIController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSGUIController.h; sourceTree = "<group>"; };
CE76FDC9111EE38E006618EA /* HSGUIController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSGUIController.m; sourceTree = "<group>"; };
CE76FDCD111EE38E006618EA /* PyGUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyGUI.h; sourceTree = "<group>"; };
CE76FDCE111EE38E006618EA /* PyOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyOutline.h; sourceTree = "<group>"; };
CE76FDD1111EE3A7006618EA /* DirectoryOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryOutline.h; path = ../base/DirectoryOutline.h; sourceTree = SOURCE_ROOT; };
CE76FDD2111EE3A7006618EA /* DirectoryOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DirectoryOutline.m; path = ../base/DirectoryOutline.m; sourceTree = SOURCE_ROOT; };
CE76FDD3111EE3A7006618EA /* PyDirectoryOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDirectoryOutline.h; path = ../base/PyDirectoryOutline.h; sourceTree = SOURCE_ROOT; };
CE76FDDD111EE42F006618EA /* HSOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSOutline.h; sourceTree = "<group>"; };
CE76FDDE111EE42F006618EA /* HSOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSOutline.m; sourceTree = "<group>"; };
CE76FDF5111EE561006618EA /* NSEventAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSEventAdditions.h; path = ../../cocoalib/NSEventAdditions.h; sourceTree = SOURCE_ROOT; };
CE76FDF6111EE561006618EA /* NSEventAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSEventAdditions.m; path = ../../cocoalib/NSEventAdditions.m; sourceTree = SOURCE_ROOT; };
CEAC6810109B0B7E00B43C85 /* Preferences.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Preferences.xib; path = xib/Preferences.xib; sourceTree = "<group>"; }; CEAC6810109B0B7E00B43C85 /* Preferences.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Preferences.xib; path = xib/Preferences.xib; sourceTree = "<group>"; };
CEDD92D60FDD01640031C7B7 /* BRSingleLineFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BRSingleLineFormatter.h; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.h; sourceTree = SOURCE_ROOT; }; CEDD92D60FDD01640031C7B7 /* BRSingleLineFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BRSingleLineFormatter.h; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.h; sourceTree = SOURCE_ROOT; };
CEDD92D70FDD01640031C7B7 /* BRSingleLineFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BRSingleLineFormatter.m; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.m; sourceTree = SOURCE_ROOT; }; CEDD92D70FDD01640031C7B7 /* BRSingleLineFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BRSingleLineFormatter.m; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.m; sourceTree = SOURCE_ROOT; };
@ -216,6 +240,42 @@
path = ../../cocoalib/xib; path = ../../cocoalib/xib;
sourceTree = SOURCE_ROOT; sourceTree = SOURCE_ROOT;
}; };
CE76FDBD111EE37C006618EA /* views */ = {
isa = PBXGroup;
children = (
CE76FDBE111EE37C006618EA /* HSOutlineView.h */,
CE76FDBF111EE37C006618EA /* HSOutlineView.m */,
CE76FDC0111EE37C006618EA /* NSIndexPathAdditions.h */,
CE76FDC1111EE37C006618EA /* NSIndexPathAdditions.m */,
CE76FDC2111EE37C006618EA /* NSTableViewAdditions.h */,
CE76FDC3111EE37C006618EA /* NSTableViewAdditions.m */,
);
name = views;
path = ../../cocoalib/views;
sourceTree = SOURCE_ROOT;
};
CE76FDC7111EE38E006618EA /* controllers */ = {
isa = PBXGroup;
children = (
CE76FDDD111EE42F006618EA /* HSOutline.h */,
CE76FDDE111EE42F006618EA /* HSOutline.m */,
CE76FDC8111EE38E006618EA /* HSGUIController.h */,
CE76FDC9111EE38E006618EA /* HSGUIController.m */,
);
name = controllers;
path = ../../cocoalib/controllers;
sourceTree = SOURCE_ROOT;
};
CE76FDCC111EE38E006618EA /* proxies */ = {
isa = PBXGroup;
children = (
CE76FDCD111EE38E006618EA /* PyGUI.h */,
CE76FDCE111EE38E006618EA /* PyOutline.h */,
);
name = proxies;
path = ../../cocoalib/proxies;
sourceTree = SOURCE_ROOT;
};
CEDD92D50FDD01640031C7B7 /* brsinglelineformatter */ = { CEDD92D50FDD01640031C7B7 /* brsinglelineformatter */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
@ -250,6 +310,11 @@
CEFC7F890FC9513600CD5728 /* cocoalib */ = { CEFC7F890FC9513600CD5728 /* cocoalib */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
CE76FDF5111EE561006618EA /* NSEventAdditions.h */,
CE76FDF6111EE561006618EA /* NSEventAdditions.m */,
CE76FDC7111EE38E006618EA /* controllers */,
CE76FDCC111EE38E006618EA /* proxies */,
CE76FDBD111EE37C006618EA /* views */,
CE19BC5F11199231007CCEB0 /* xib */, CE19BC5F11199231007CCEB0 /* xib */,
CEDD92D50FDD01640031C7B7 /* brsinglelineformatter */, CEDD92D50FDD01640031C7B7 /* brsinglelineformatter */,
CEFC7F8A0FC9517500CD5728 /* Dialogs.h */, CEFC7F8A0FC9517500CD5728 /* Dialogs.h */,
@ -277,6 +342,9 @@
CEFC7FB00FC9518F00CD5728 /* dgbase */ = { CEFC7FB00FC9518F00CD5728 /* dgbase */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
CE76FDD1111EE3A7006618EA /* DirectoryOutline.h */,
CE76FDD2111EE3A7006618EA /* DirectoryOutline.m */,
CE76FDD3111EE3A7006618EA /* PyDirectoryOutline.h */,
CEFC7FB10FC951A700CD5728 /* AppDelegate.h */, CEFC7FB10FC951A700CD5728 /* AppDelegate.h */,
CEFC7FB20FC951A700CD5728 /* AppDelegate.m */, CEFC7FB20FC951A700CD5728 /* AppDelegate.m */,
CEFC7FB30FC951A700CD5728 /* Consts.h */, CEFC7FB30FC951A700CD5728 /* Consts.h */,
@ -379,6 +447,13 @@
CEFC7FBB0FC951A700CD5728 /* ResultWindow.m in Sources */, CEFC7FBB0FC951A700CD5728 /* ResultWindow.m in Sources */,
CEDD92DA0FDD01640031C7B7 /* BRSingleLineFormatter.m in Sources */, CEDD92DA0FDD01640031C7B7 /* BRSingleLineFormatter.m in Sources */,
CEE7EA130FE675C80004E467 /* DetailsPanel.m in Sources */, CEE7EA130FE675C80004E467 /* DetailsPanel.m in Sources */,
CE76FDC4111EE37C006618EA /* HSOutlineView.m in Sources */,
CE76FDC5111EE37C006618EA /* NSIndexPathAdditions.m in Sources */,
CE76FDC6111EE37C006618EA /* NSTableViewAdditions.m in Sources */,
CE76FDCF111EE38E006618EA /* HSGUIController.m in Sources */,
CE76FDD4111EE3A7006618EA /* DirectoryOutline.m in Sources */,
CE76FDDF111EE42F006618EA /* HSOutline.m in Sources */,
CE76FDF7111EE561006618EA /* NSEventAdditions.m in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };

9
core/app.py
View File

@ -84,6 +84,7 @@ class DupeGuru(RegistrableApplication, Broadcaster):
def _do_load(self, j): def _do_load(self, j):
self.directories.load_from_file(op.join(self.appdata, 'last_directories.xml')) self.directories.load_from_file(op.join(self.appdata, 'last_directories.xml'))
self.notify('directories_changed')
j = j.start_subjob([1, 9]) j = j.start_subjob([1, 9])
self.results.load_from_xml(op.join(self.appdata, 'last_results.xml'), self._get_file, j) self.results.load_from_xml(op.join(self.appdata, 'last_results.xml'), self._get_file, j)
files = flatten(g[:] for g in self.results.groups) files = flatten(g[:] for g in self.results.groups)
@ -128,6 +129,7 @@ class DupeGuru(RegistrableApplication, Broadcaster):
def add_directory(self, d): def add_directory(self, d):
try: try:
self.directories.add_path(Path(d)) self.directories.add_path(Path(d))
self.notify('directories_changed')
return 0 return 0
except directories.AlreadyThereError: except directories.AlreadyThereError:
return 1 return 1
@ -236,6 +238,13 @@ class DupeGuru(RegistrableApplication, Broadcaster):
if self.selected_dupes: if self.selected_dupes:
self._open_path(self.selected_dupes[0].path) self._open_path(self.selected_dupes[0].path)
def remove_directory(self,index):
try:
del self.directories[index]
self.notify('directories_changed')
except IndexError:
pass
def remove_duplicates(self, duplicates): def remove_duplicates(self, duplicates):
self.results.remove_duplicates(duplicates) self.results.remove_duplicates(duplicates)

41
core/app_cocoa.py
View File

@ -87,16 +87,6 @@ class DupeGuru(app.DupeGuru):
except IndexError: except IndexError:
return (None,None) return (None,None)
def get_folder_path(self, node_path, curr_path=None):
if not node_path:
return curr_path
current_index = node_path[0]
if curr_path is None:
curr_path = self.directories[current_index]
else:
curr_path = self.directories.get_subfolders(curr_path)[current_index]
return self.get_folder_path(node_path[1:], curr_path)
#---Public #---Public
copy_or_move_marked = demo_method(app.DupeGuru.copy_or_move_marked) copy_or_move_marked = demo_method(app.DupeGuru.copy_or_move_marked)
delete_marked = demo_method(app.DupeGuru.delete_marked) delete_marked = demo_method(app.DupeGuru.delete_marked)
@ -104,12 +94,6 @@ class DupeGuru(app.DupeGuru):
def PurgeIgnoreList(self): def PurgeIgnoreList(self):
self.scanner.ignore_list.Filter(lambda f,s:op.exists(f) and op.exists(s)) self.scanner.ignore_list.Filter(lambda f,s:op.exists(f) and op.exists(s))
def RemoveDirectory(self,index):
try:
del self.directories[index]
except IndexError:
pass
def RenameSelected(self, newname): def RenameSelected(self, newname):
try: try:
d = self.selected_dupes[0] d = self.selected_dupes[0]
@ -172,10 +156,6 @@ class DupeGuru(app.DupeGuru):
dupes = [self.results.dupes[row] for row in rows if row in xrange(len(self.results.dupes))] dupes = [self.results.dupes[row] for row in rows if row in xrange(len(self.results.dupes))]
self._select_dupes(dupes) self._select_dupes(dupes)
def SetDirectoryState(self, node_path, state):
p = self.get_folder_path(node_path)
self.directories.set_state(p, state)
def sort_dupes(self,key,asc): def sort_dupes(self,key,asc):
self.results.sort_dupes(key,asc,self.display_delta_values) self.results.sort_dupes(key,asc,self.display_delta_values)
@ -190,8 +170,6 @@ class DupeGuru(app.DupeGuru):
def GetOutlineViewMaxLevel(self, tag): def GetOutlineViewMaxLevel(self, tag):
if tag == 0: if tag == 0:
return 2 return 2
elif tag == 1:
return 0
elif tag == 2: elif tag == 2:
return 1 return 1
@ -201,16 +179,6 @@ class DupeGuru(app.DupeGuru):
if tag == 0: #Normal results if tag == 0: #Normal results
assert not node_path # no other value is possible assert not node_path # no other value is possible
return [len(g.dupes) for g in self.results.groups] return [len(g.dupes) for g in self.results.groups]
elif tag == 1: #Directories
try:
if node_path:
path = self.get_folder_path(node_path)
subfolders = self.directories.get_subfolders(path)
else:
subfolders = self.directories
return [len(self.directories.get_subfolders(path)) for path in subfolders]
except IndexError: # node_path out of range
return []
else: #Power Marker else: #Power Marker
assert not node_path # no other value is possible assert not node_path # no other value is possible
return [0 for d in self.results.dupes] return [0 for d in self.results.dupes]
@ -230,13 +198,6 @@ class DupeGuru(app.DupeGuru):
g = self.results.get_group_of_duplicate(d) g = self.results.get_group_of_duplicate(d)
result = self._get_display_info(d, g, self.display_delta_values) result = self._get_display_info(d, g, self.display_delta_values)
return result return result
elif tag == 1: #Directories
try:
path = self.get_folder_path(node_path)
name = unicode(path) if len(node_path) == 1 else path[-1]
return [name, self.directories.get_state(path)]
except IndexError: # node_path out of range
return []
def GetOutlineViewMarked(self, tag, node_path): def GetOutlineViewMarked(self, tag, node_path):
# 0=unmarked 1=marked 2=unmarkable # 0=unmarked 1=marked 2=unmarkable
@ -244,8 +205,6 @@ class DupeGuru(app.DupeGuru):
return return
if not node_path: if not node_path:
return 2 return 2
if tag == 1: #Directories
return 2
if tag == 0: #Normal results if tag == 0: #Normal results
g, d = self.GetObjects(node_path) g, d = self.GetObjects(node_path)
else: #Power Marker else: #Power Marker

119
core/app_cocoa_inter.py
View File

@ -11,10 +11,11 @@
from hsutil.cocoa.objcmin import NSObject from hsutil.cocoa.objcmin import NSObject
from hsutil.cocoa import signature from hsutil.cocoa.inter import signature, PyOutline
from hsutil.reg import InvalidCodeError from hsutil.reg import InvalidCodeError
from .gui.details_panel import DetailsPanel from .gui.details_panel import DetailsPanel
from .gui.directory_tree import DirectoryTree
# Fix py2app's problems on relative imports # Fix py2app's problems on relative imports
from core import app, app_cocoa, data, directories, engine, export, ignore, results, fs, scanner from core import app, app_cocoa, data, directories, engine, export, ignore, results, fs, scanner
@ -26,185 +27,182 @@ class PyApp(NSObject):
class PyDupeGuruBase(PyApp): class PyDupeGuruBase(PyApp):
#---Directories #---Directories
def addDirectory_(self, directory): def addDirectory_(self, directory):
return self.app.add_directory(directory) return self.py.add_directory(directory)
def removeDirectory_(self, index): def removeDirectory_(self, index):
self.app.RemoveDirectory(index) self.py.remove_directory(index)
def setDirectory_state_(self, node_path, state):
self.app.SetDirectoryState(node_path, state)
#---Results #---Results
def clearIgnoreList(self): def clearIgnoreList(self):
self.app.scanner.ignore_list.Clear() self.py.scanner.ignore_list.Clear()
def doScan(self): def doScan(self):
return self.app.start_scanning() return self.py.start_scanning()
def exportToXHTMLwithColumns_(self, column_ids): def exportToXHTMLwithColumns_(self, column_ids):
return self.app.export_to_xhtml(column_ids) return self.py.export_to_xhtml(column_ids)
def loadIgnoreList(self): def loadIgnoreList(self):
self.app.load_ignore_list() self.py.load_ignore_list()
def loadResults(self): def loadResults(self):
self.app.load() self.py.load()
def markAll(self): def markAll(self):
self.app.results.mark_all() self.py.results.mark_all()
def markNone(self): def markNone(self):
self.app.results.mark_none() self.py.results.mark_none()
def markInvert(self): def markInvert(self):
self.app.results.mark_invert() self.py.results.mark_invert()
def purgeIgnoreList(self): def purgeIgnoreList(self):
self.app.PurgeIgnoreList() self.py.PurgeIgnoreList()
def toggleSelectedMark(self): def toggleSelectedMark(self):
self.app.ToggleSelectedMarkState() self.py.ToggleSelectedMarkState()
def saveIgnoreList(self): def saveIgnoreList(self):
self.app.save_ignore_list() self.py.save_ignore_list()
def saveResults(self): def saveResults(self):
self.app.save() self.py.save()
def selectedResultNodePaths(self): def selectedResultNodePaths(self):
return self.app.selected_result_node_paths() return self.py.selected_result_node_paths()
def selectResultNodePaths_(self,node_paths): def selectResultNodePaths_(self,node_paths):
self.app.SelectResultNodePaths(node_paths) self.py.SelectResultNodePaths(node_paths)
def selectedPowerMarkerNodePaths(self): def selectedPowerMarkerNodePaths(self):
return self.app.selected_powermarker_node_paths() return self.py.selected_powermarker_node_paths()
def selectPowerMarkerNodePaths_(self,node_paths): def selectPowerMarkerNodePaths_(self,node_paths):
self.app.SelectPowerMarkerNodePaths(node_paths) self.py.SelectPowerMarkerNodePaths(node_paths)
#---Actions #---Actions
def addSelectedToIgnoreList(self): def addSelectedToIgnoreList(self):
self.app.add_selected_to_ignore_list() self.py.add_selected_to_ignore_list()
def deleteMarked(self): def deleteMarked(self):
self.app.delete_marked() self.py.delete_marked()
def applyFilter_(self, filter): def applyFilter_(self, filter):
self.app.apply_filter(filter) self.py.apply_filter(filter)
def makeSelectedReference(self): def makeSelectedReference(self):
self.app.make_selected_reference() self.py.make_selected_reference()
def copyOrMove_markedTo_recreatePath_(self, copy, destination, recreate_path): def copyOrMove_markedTo_recreatePath_(self, copy, destination, recreate_path):
self.app.copy_or_move_marked(copy, destination, recreate_path) self.py.copy_or_move_marked(copy, destination, recreate_path)
def openSelected(self): def openSelected(self):
self.app.open_selected() self.py.open_selected()
def removeMarked(self): def removeMarked(self):
self.app.results.perform_on_marked(lambda x:True, True) self.py.results.perform_on_marked(lambda x:True, True)
def removeSelected(self): def removeSelected(self):
self.app.remove_selected() self.py.remove_selected()
def renameSelected_(self,newname): def renameSelected_(self,newname):
return self.app.RenameSelected(newname) return self.py.RenameSelected(newname)
def revealSelected(self): def revealSelected(self):
self.app.reveal_selected() self.py.reveal_selected()
#---Misc #---Misc
def sortDupesBy_ascending_(self, key, asc): def sortDupesBy_ascending_(self, key, asc):
self.app.sort_dupes(key, asc) self.py.sort_dupes(key, asc)
def sortGroupsBy_ascending_(self, key, asc): def sortGroupsBy_ascending_(self, key, asc):
self.app.sort_groups(key, asc) self.py.sort_groups(key, asc)
#---Information #---Information
def getIgnoreListCount(self): def getIgnoreListCount(self):
return len(self.app.scanner.ignore_list) return len(self.py.scanner.ignore_list)
def getMarkCount(self): def getMarkCount(self):
return self.app.results.mark_count return self.py.results.mark_count
def getStatLine(self): def getStatLine(self):
return self.app.stat_line return self.py.stat_line
def getOperationalErrorCount(self): def getOperationalErrorCount(self):
return self.app.last_op_error_count return self.py.last_op_error_count
#---Data #---Data
@signature('i@:i') @signature('i@:i')
def getOutlineViewMaxLevel_(self, tag): def getOutlineViewMaxLevel_(self, tag):
return self.app.GetOutlineViewMaxLevel(tag) return self.py.GetOutlineViewMaxLevel(tag)
@signature('@@:i@') @signature('@@:i@')
def getOutlineView_childCountsForPath_(self, tag, node_path): def getOutlineView_childCountsForPath_(self, tag, node_path):
return self.app.GetOutlineViewChildCounts(tag, node_path) return self.py.GetOutlineViewChildCounts(tag, node_path)
def getOutlineView_valuesForIndexes_(self, tag, node_path): def getOutlineView_valuesForIndexes_(self, tag, node_path):
return self.app.GetOutlineViewValues(tag, node_path) return self.py.GetOutlineViewValues(tag, node_path)
def getOutlineView_markedAtIndexes_(self, tag, node_path): def getOutlineView_markedAtIndexes_(self, tag, node_path):
return self.app.GetOutlineViewMarked(tag, node_path) return self.py.GetOutlineViewMarked(tag, node_path)
def getTableViewCount_(self, tag): def getTableViewCount_(self, tag):
return self.app.GetTableViewCount(tag) return self.py.GetTableViewCount(tag)
def getTableViewMarkedIndexes_(self, tag): def getTableViewMarkedIndexes_(self, tag):
return self.app.GetTableViewMarkedIndexes(tag) return self.py.GetTableViewMarkedIndexes(tag)
def getTableView_valuesForRow_(self, tag, row): def getTableView_valuesForRow_(self, tag, row):
return self.app.GetTableViewValues(tag, row) return self.py.GetTableViewValues(tag, row)
#---Properties #---Properties
def setMixFileKind_(self, mix_file_kind): def setMixFileKind_(self, mix_file_kind):
self.app.scanner.mix_file_kind = mix_file_kind self.py.scanner.mix_file_kind = mix_file_kind
def setDisplayDeltaValues_(self, display_delta_values): def setDisplayDeltaValues_(self, display_delta_values):
self.app.display_delta_values= display_delta_values self.py.display_delta_values= display_delta_values
def setEscapeFilterRegexp_(self, escape_filter_regexp): def setEscapeFilterRegexp_(self, escape_filter_regexp):
self.app.options['escape_filter_regexp'] = escape_filter_regexp self.py.options['escape_filter_regexp'] = escape_filter_regexp
def setRemoveEmptyFolders_(self, remove_empty_folders): def setRemoveEmptyFolders_(self, remove_empty_folders):
self.app.options['clean_empty_dirs'] = remove_empty_folders self.py.options['clean_empty_dirs'] = remove_empty_folders
#---Worker #---Worker
def getJobProgress(self): def getJobProgress(self):
return self.app.progress.last_progress return self.py.progress.last_progress
def getJobDesc(self): def getJobDesc(self):
return self.app.progress.last_desc return self.py.progress.last_desc
def cancelJob(self): def cancelJob(self):
self.app.progress.job_cancelled = True self.py.progress.job_cancelled = True
#---Registration #---Registration
def demoLimitDescription(self): def demoLimitDescription(self):
return self.app.DEMO_LIMIT_DESC return self.py.DEMO_LIMIT_DESC
@signature('i@:') @signature('i@:')
def isRegistered(self): def isRegistered(self):
return self.app.registered return self.py.registered
def isCodeValid_withEmail_(self, code, email): def isCodeValid_withEmail_(self, code, email):
try: try:
self.app.validate_code(code, email) self.py.validate_code(code, email)
return None return None
except InvalidCodeError as e: except InvalidCodeError as e:
return unicode(e) return unicode(e)
def setRegisteredCode_andEmail_(self, code, email): def setRegisteredCode_andEmail_(self, code, email):
self.app.set_registration(code, email) self.py.set_registration(code, email)
class PyDetailsPanel(NSObject): class PyDetailsPanel(NSObject):
def initWithCocoa_pyParent_(self, cocoa, pyparent): def initWithCocoa_pyParent_(self, cocoa, pyparent):
super(PyDetailsPanel, self).init() super(PyDetailsPanel, self).init()
self.cocoa = cocoa self.cocoa = cocoa
self.py = DetailsPanel(self, pyparent.app) self.py = DetailsPanel(self, pyparent.py)
return self return self
@signature('i@:') @signature('i@:')
@ -219,3 +217,10 @@ class PyDetailsPanel(NSObject):
def refresh(self): def refresh(self):
self.cocoa.refresh() self.cocoa.refresh()
class PyDirectoryOutline(PyOutline):
py_class = DirectoryTree
def addDirectory_(self, path):
self.py.add_directory(path)

23
core/gui/base.py Normal file
View File

@ -0,0 +1,23 @@
# -*- coding: utf-8 -*-
# Created By: Virgil Dupras
# Created On: 2010-02-06
# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
#
# This software is licensed under the "HS" License as described in the "LICENSE" file,
# which should be included with this package. The terms are also available at
# http://www.hardcoded.net/licenses/hs_license
from hsutil.notify import Listener
class GUIObject(Listener):
def __init__(self, view, app):
Listener.__init__(self, app)
self.view = view
self.app = app
def directories_changed(self):
pass
def dupes_selected(self):
pass

8
core/gui/details_panel.py
View File

@ -7,13 +7,11 @@
# which should be included with this package. The terms are also available at # which should be included with this package. The terms are also available at
# http://www.hardcoded.net/licenses/hs_license # http://www.hardcoded.net/licenses/hs_license
from hsutil.notify import Listener from .base import GUIObject
class DetailsPanel(Listener): class DetailsPanel(GUIObject):
def __init__(self, view, app): def __init__(self, view, app):
Listener.__init__(self, app) GUIObject.__init__(self, view, app)
self.app = app
self.view = view
self._table = [] self._table = []
self._refresh() self._refresh()
self.connect() self.connect()

73
core/gui/directory_tree.py Normal file
View File

@ -0,0 +1,73 @@
# -*- coding: utf-8 -*-
# Created By: Virgil Dupras
# Created On: 2010-02-06
# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
#
# This software is licensed under the "HS" License as described in the "LICENSE" file,
# which should be included with this package. The terms are also available at
# http://www.hardcoded.net/licenses/hs_license
from hsgui.tree import Tree, Node
from ..directories import STATE_NORMAL, STATE_REFERENCE, STATE_EXCLUDED
from .base import GUIObject
STATE_ORDER = [STATE_NORMAL, STATE_REFERENCE, STATE_EXCLUDED]
# Lazily loads children
class DirectoryNode(Node):
def __init__(self, app, path, name):
Node.__init__(self, name)
self._app = app
self._directory_path = path
self._loaded = False
self._state = STATE_ORDER.index(self._app.directories.get_state(path))
def _load(self):
self.clear()
subpaths = self._app.directories.get_subfolders(self._directory_path)
for path in subpaths:
self.append(DirectoryNode(self._app, path, path[-1]))
self._loaded = True
@property
def children_count(self):
if not self._loaded:
self._load()
return len(self)
# The state propery is an index to the combobox
@property
def state(self):
return self._state
@state.setter
def state(self, value):
if value == self._state:
return
self._state = value
state = STATE_ORDER[value]
self._app.directories.set_state(self._directory_path, state)
class DirectoryTree(GUIObject, Tree):
def __init__(self, view, app):
GUIObject.__init__(self, view, app)
Tree.__init__(self)
self.connect()
self._refresh()
self.view.refresh()
def _refresh(self):
self.clear()
for path in self.app.directories:
self.append(DirectoryNode(self.app, path, unicode(path)))
def add_directory(self, path):
self.app.add_directory(path)
#--- Event Handlers
def directories_changed(self):
self._refresh()
self.view.refresh()

18
core/tests/app_cocoa_test.py
View File

@ -27,6 +27,7 @@ except ImportError:
from nose.plugins.skip import SkipTest from nose.plugins.skip import SkipTest
raise SkipTest("These tests can only be run on OS X") raise SkipTest("These tests can only be run on OS X")
from ..gui.details_panel import DetailsPanel from ..gui.details_panel import DetailsPanel
from ..gui.directory_tree import DirectoryTree
class DupeGuru(DupeGuruBase): class DupeGuru(DupeGuruBase):
def __init__(self): def __init__(self):
@ -61,6 +62,8 @@ class TCDupeGuru(TestCase):
self.app = DupeGuru() self.app = DupeGuru()
self.dpanel_gui = CallLogger() self.dpanel_gui = CallLogger()
self.dpanel = DetailsPanel(self.dpanel_gui, self.app) self.dpanel = DetailsPanel(self.dpanel_gui, self.app)
self.dtree_gui = CallLogger()
self.dtree = DirectoryTree(self.dtree_gui, self.app)
self.objects,self.matches,self.groups = GetTestGroups() self.objects,self.matches,self.groups = GetTestGroups()
self.app.results.groups = self.groups self.app.results.groups = self.groups
tmppath = self.tmppath() tmppath = self.tmppath()
@ -339,21 +342,6 @@ class TCDupeGuru(TestCase):
app.SelectPowerMarkerNodePaths(r2np([2])) #The dupe of the second, 2 sized group app.SelectPowerMarkerNodePaths(r2np([2])) #The dupe of the second, 2 sized group
app.add_selected_to_ignore_list() app.add_selected_to_ignore_list()
def test_GetOutlineViewChildCounts_out_of_range(self):
# Out of range requests don't crash and return an empty value
app = self.app
# [0, 2] is out of range
eq_(app.GetOutlineViewChildCounts(1, [0, 2]), []) # no crash
def test_GetOutlineViewValues_out_of_range(self):
# Out of range requests don't crash and return an empty value
app = self.app
# [0, 2] is out of range
# Directories
eq_(app.GetOutlineViewValues(1, [0, 2]), []) # no crash
# Normal results
app.GetOutlineViewValues(0, [42, 0]) # no crash
class TCDupeGuru_renameSelected(TestCase): class TCDupeGuru_renameSelected(TestCase):
def setUp(self): def setUp(self):