Changeset 6365

Timestamp:

11/29/08 16:33:13 (1 month ago)

Author:

morris

Message:

Add iPhone/iPod/AppleTV exporting

Files:

• trunk/Spiral/AppleTV.tiff (added)
• trunk/Spiral/English.lproj/Export.nib (added)
• trunk/Spiral/English.lproj/Export.nib/designable.nib (added)
• trunk/Spiral/English.lproj/Export.nib/keyedobjects.nib (added)
• trunk/Spiral/English.lproj/Playlist.nib/classes.nib (modified) (2 diffs)
• trunk/Spiral/English.lproj/Playlist.nib/info.nib (modified) (1 diff)
• trunk/Spiral/English.lproj/Playlist.nib/keyedobjects.nib (modified) (previous)
• trunk/Spiral/PlaylistExportGroup.icns (added)
• trunk/Spiral/SPApplicationController.m (modified) (4 diffs)
• trunk/Spiral/SPExportCell.h (added)
• trunk/Spiral/SPExportCell.m (added)
• trunk/Spiral/SPExportController.h (added)
• trunk/Spiral/SPExportController.m (added)
• trunk/Spiral/SPExportJob.h (added)
• trunk/Spiral/SPExportJob.m (added)
• trunk/Spiral/SPPlaylistController.h (modified) (6 diffs)
• trunk/Spiral/SPPlaylistController.m (modified) (37 diffs)
• trunk/Spiral/SPPlaylistItem.h (modified) (6 diffs)
• trunk/Spiral/SPPlaylistItem.m (modified) (15 diffs)
• trunk/Spiral/SPSettings.h (modified) (1 diff)
• trunk/Spiral/SPSettings.m (modified) (2 diffs)
• trunk/Spiral/Spiral.xcodeproj/project.pbxproj (modified) (25 diffs)
• trunk/Spiral/StopExport.tiff (added)
• trunk/Spiral/StopExportPressed.tiff (added)
• trunk/Spiral/iPhone.tiff (added)
• trunk/Spiral/iPod.tiff (added)

trunk/Spiral/English.lproj/Playlist.nib/classes.nib

@@ -62 +62 @@
-                                <key>browseInFullscreen</key>
-                                <string>id</string>
+                                <key>destination</key>
+                                <string>id</string>
+                                <key>format</key>
+                                <string>id</string>
-                                <key>fullscreen</key>
+                                <string>id</string>
+                                <key>newExportGroup</key>
-                                <string>id</string>
-                                <key>newGroup</key>
@@ -93 +99 @@
-                                <key>_drillMovieView</key>
-                                <string>QTMovieView</string>
+                                <key>_exportGroupDestinationPopUpButton</key>
+                                <string>NSPopUpButton</string>
+                                <key>_exportGroupDirectoryMenuItem</key>
+                                <string>NSMenuItem</string>
+                                <key>_exportGroupFormatPopUpButton</key>
+                                <string>NSPopUpButton</string>
+                                <key>_exportGroupNameTextField</key>
+                                <string>NSTextField</string>
+                                <key>_exportGroupPanel</key>
+                                <string>NSPanel</string>
+                                <key>_exportGroupSameAsOriginalMenuItem</key>
+                                <string>NSMenuItem</string>
+                                <key>_exportGroupiTunesMenuItem</key>
+                                <string>NSMenuItem</string>
-                                <key>_filesTableColumn</key>
-                                <string>NSTableColumn</string>

trunk/Spiral/English.lproj/Playlist.nib/info.nib

@@ -12 +12 @@
-        <array>
-                <integer>6</integer>
+                <integer>252</integer>
+                <integer>97</integer>
-        </array>
-        <key>IBSystem Version</key>

trunk/Spiral/SPApplicationController.m

@@ -30 +30 @@
-#import "SPApplicationController.h"
-#import "SPDrillController.h"
+#import "SPExportController.h"
-#import "SPInspectorController.h"
-#import "SPMobileRemote.h"
@@ -376 +377 @@
-- (void)applicationWillResignActive:(NSNotification *)notification {
-    [[SPAppleRemote sharedRemote] stopListening];
+}
+
+
+
+- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender {
+        if([[SPExportController exportController] numberOfExports] > 0 ||
+           [[SPPlaylistController playlistController] numberOfExports] > 0) {
+                return [(WIApplication *) NSApp runTerminationDelayPanelWithTimeInterval:30.0 message:NSLS(@"There are unfinished exports. Quitting now will terminate them.", @"Quit warning")];
+        }
+
+        return NSTerminateNow;
-}
-
@@ -489 +501 @@
-                delegate = [[NSApp keyWindow] delegate];
-                
-
-
-
-
+
-        }
-        
@@ -787 +796 @@
-
-- (IBAction)export:(id)sender {
-
-
-
+
+
-        
-        delegate = [[NSApp keyWindow] delegate];
-        
-        if([delegate isKindOfClass:[SPPlayerController class]]) {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        }
-}

trunk/Spiral/SPPlaylistController.h

@@ -27 +27 @@
- */
-
+#import "SPExportJob.h"
-#import "SPPlaylistLoader.h"
-
@@ -39 +40 @@
-@class SPFullscreenWindow, SPPlaylistGroup, SPPlaylistFile, SPPlaylistLoader;
-
-
+, SPExportJobDelegate
-        IBOutlet WIOutlineView                          *_outlineView;
-        IBOutlet NSTableColumn                          *_filesTableColumn;
@@ -60 +61 @@
-        IBOutlet NSPredicateEditor                      *_predicateEditor;
-        
+        IBOutlet NSPanel                                        *_exportGroupPanel;
+        IBOutlet NSTextField                            *_exportGroupNameTextField;
+        IBOutlet NSPopUpButton                          *_exportGroupFormatPopUpButton;
+        IBOutlet NSPopUpButton                          *_exportGroupDestinationPopUpButton;
+        IBOutlet NSMenuItem                                     *_exportGroupSameAsOriginalMenuItem;
+        IBOutlet NSMenuItem                                     *_exportGroupiTunesMenuItem;
+        IBOutlet NSMenuItem                                     *_exportGroupDirectoryMenuItem;
+        
-        SPPlaylistGroup                                         *_playlist;
-        SPPlaylistGroup                                         *_recentPlaylist;
-        
-        SPPlaylistLoader                                        *_loader;
+        
+        NSUInteger                                                      _exports;
+        NSMutableArray                                          *_exportQueue;
-
-        SPPlaylistRepeatMode                            _repeatMode;
@@ -80 +92 @@
-- (void)setShuffle:(BOOL)shuffle;
-- (BOOL)shuffle;
+- (NSUInteger)numberOfExports;
-
-- (void)openSelection;
@@ -90 +103 @@
-- (IBAction)newGroup:(id)sender;
-- (IBAction)newSmartGroup:(id)sender;
+- (IBAction)newExportGroup:(id)sender;
+- (IBAction)format:(id)sender;
+- (IBAction)destination:(id)sender;
-- (IBAction)remove:(id)sender;
-- (IBAction)revealInFinder:(id)sender;
@@ -98 +114 @@
-- (IBAction)browseInFullscreen:(id)sender;
-
-- (NSArray *)selectedFiles;
-- (SPPlaylistFile *)previousFileForFile:(SPPlaylistFile *)file;
-- (SPPlaylistFile *)nextFileForFile:(SPPlaylistFile *)file;

trunk/Spiral/SPPlaylistController.m

@@ -58 +58 @@
-- (void)_setShuffle:(BOOL)shuffle;
-
+- (void)_setExportGroupDirectory:(NSString *)path;
+- (void)_startNextExportJob;
+
-- (void)_validate;
-
@@ -66 +69 @@
-
-+ (SPPlaylistGroup *)_defaultPlaylist {
-
+
+
-        
-        playlist = [[SPPlaylistGroup alloc] initWithName:@"<SPPlaylist>"];
@@ -75 +79 @@
-        
-        [playlist addItem:group];
+        
+        exportGroup = [SPPlaylistExportGroup exportGroupWithName:NSLS(@"Export for iPhone", @"Playlist export group name")];
+        [exportGroup setFormat:SPExportiPhone];
+        
+        [playlist addItem:exportGroup];
-        
-        return [playlist autorelease];
@@ -132 +141 @@
-
-- (void)_reloadItem:(id)item {
+        NSString                *name, *path, *destinationPath;
+        SPExportJob             *job;
+        id                              exportItem;
+        NSUInteger              counter;
+        
-        if([item isKindOfClass:[SPPlaylistFolder class]]) {
-                if(![item isLoading]) {
@@ -146 +160 @@
-                }
-        }
+        else if([item isKindOfClass:[SPPlaylistExportGroup class]]) {
+                for(exportItem in [item items]) {
+                        if([exportItem isKindOfClass:[SPPlaylistExportItem class]]) {
+                                if(![exportItem job]) {
+                                        name = [[[exportItem path] lastPathComponent] stringByDeletingPathExtension];
+
+                                        if([item destination] == SPPlaylistExportToiTunes) {
+                                                destinationPath = [NSFileManager temporaryPathWithPrefix:name];
+                                                
+                                                [[NSFileManager defaultManager] createDirectoryAtPath:destinationPath];
+                                                
+                                                path = [destinationPath stringByAppendingPathComponent:[name stringByAppendingPathExtension:@"mp4"]];
+                                        } else {
+                                                if([item destination] == SPPlaylistExportToOriginalPath)
+                                                        destinationPath = [[exportItem path] stringByDeletingLastPathComponent];
+                                                else
+                                                        destinationPath = [item destinationPath];
+                                                
+                                                path = [destinationPath stringByAppendingPathComponent:[name stringByAppendingPathExtension:@"mp4"]];
+                                                counter = 2;
+                                                
+                                                while([[NSFileManager defaultManager] fileExistsAtPath:path]) {
+                                                        path = [destinationPath stringByAppendingPathComponent:
+                                                                [[NSSWF:@"%@ %u", name, counter++] stringByAppendingPathExtension:@"mp4"]];
+                                                }
+                                        }
+                                        
+                                        job = [SPExportJob exportJobWithPath:[exportItem path]
+                                                                                                        file:path
+                                                                                                  format:[(SPPlaylistExportGroup *) item format]];
+                                        [job setDelegate:self];
+                                        [job setPlaylistItem:exportItem];
+                                        
+                                        [exportItem setDestinationPath:path];
+                                        [exportItem setJob:job];
+                                
+                                        if(_exports >= [[NSProcessInfo processInfo] processorCount]) {
+                                                [_exportQueue addObject:job];
+                                        } else {
+                                                _exports++;
+                                                [job start];
+                                        }
+                                }
+                        }
+                }
+                
+                if(![item isLoading]) {
+                        _spinners++;
+                        [_progressIndicator startAnimation:self];
+                        [_loader loadMetadataOfItemsInContainer:item synchronously:NO];
+                }
+        }
-        else if([item isKindOfClass:[SPPlaylistGroup class]]) {
-                if(![item isLoading]) {
@@ -162 +228 @@
-        for(item in items) {
-                if([item isExpanded]) {
-                        [self _reloadItem:item];
-                        
-                        [_outlineView expandItem:item];
-                        
@@ -231 +295 @@
-#pragma mark -
-
+- (void)_setExportGroupDirectory:(NSString *)path {
+        NSImage         *image;
+        
+        image = [[NSWorkspace sharedWorkspace] iconForFile:path];
+        [image setSize:NSMakeSize(16.0, 16.0)];
+        
+        [_exportGroupDirectoryMenuItem setTitle:[[NSFileManager defaultManager] displayNameAtPath:path]];
+        [_exportGroupDirectoryMenuItem setImage:image];
+        [_exportGroupDirectoryMenuItem setRepresentedObject:path];
+}
+
+
+
+- (void)_startNextExportJob {
+        SPExportJob             *job;
+        
+        if([_exportQueue count] > 0) {
+                job = [[[_exportQueue objectAtIndex:0] retain] autorelease];
+                [_exportQueue removeObjectAtIndex:0];
+                _exports++;
+                [job start];
+        }
+}
+
+
+
+- (BOOL)_launchiTunesAndImportFile:(NSString *)path error:(NSError **)error {
+        NSDictionary            *application;
+        FSRef                           fsRef;
+        AliasHandle                     alias;
+        AppleEvent                      request, reply;
+        AEBuildError            buildError;
+        OSType                          iTunesSignature = 'hook';
+        OSStatus                        status;
+        BOOL                            running = NO;
+        const char                      *event =
+                "'insh':'obj '{form: indx, want: type(cLiP), seld: long(1), from:'null'()}, '----':alis (@@)";
+        
+        for(application in [[NSWorkspace sharedWorkspace] launchedApplications]) {
+                if([[application objectForKey:@"NSApplicationName"] isEqualToString:@"iTunes"]) {
+                        running = YES;
+                        
+                        break;
+                }
+        }
+        
+        [[NSWorkspace sharedWorkspace] launchApplication:@"iTunes"];
+
+        if(!running)
+                [NSThread sleepForTimeInterval:10.0];
+        
+        status = FSPathMakeRef((UInt8 *) [path fileSystemRepresentation], &fsRef, NULL);
+        
+        if(status != noErr) {
+                *error = [NSError errorWithDomain:NSOSStatusErrorDomain code:status];
+                
+                return NO;
+        }
+        
+        status = FSNewAlias(NULL, &fsRef, &alias);
+        
+        if(status != noErr) {
+                *error = [NSError errorWithDomain:NSOSStatusErrorDomain code:status];
+                
+                return NO;
+        }
+
+        status = AEBuildAppleEvent('hook',
+                                                           'Add ',
+                                                           typeApplSignature,
+                                                           &iTunesSignature,
+                                                           sizeof(iTunesSignature),
+                                                           kAutoGenerateReturnID,
+                                                           kAnyTransactionID,
+                                                           &request,
+                                                           &buildError,
+                                                           event,
+                                                           alias);
+        
+        if(status == noErr) {
+                status = AESendMessage(&request, &reply, kAEWaitReply, kAEDefaultTimeout);
+                
+                if(status == noErr)
+                        AEDisposeDesc(&reply);
+                else
+                        *error = [NSError errorWithDomain:NSOSStatusErrorDomain code:status];
+        } else {
+                *error = [NSError errorWithDomain:NSOSStatusErrorDomain code:status];
+        }
+        
+        AEDisposeDesc(&request);
+        DisposeHandle((Handle) alias);
+        
+        return (status == noErr);
+}
+
+
+
+#pragma mark -
+
-- (void)_validate {
-&& ![[self _selectedItem] isRepresented]
+!= NULL
-}
-
@@ -259 +423 @@
-        _loader = [[SPPlaylistLoader alloc] init];
-        [_loader setDelegate:self];
+        
+        _exportQueue = [[NSMutableArray alloc] init];
-        
-        _simplifyFilenames = [SPSettings boolForKey:SPSimplifyFilenames];
@@ -267 +433 @@
-                           name:NSApplicationWillTerminateNotification];
-
-NSWorkspace sharedWorkspac
+WIEventQueue sharedQueu
-                addObserver:self
-                   selector:@selector(eventFileWrite:)
@@ -297 +463 @@
-        [_eventQueueItems release];
-        
+        [_exportQueue release];
+        
-        [_loader release];
-
@@ -307 +475 @@
-
-- (void)windowDidLoad {
+        NSImage                         *icon;
-        NSData                          *data;
-        SPPlaylistCell          *cell;
@@ -347 +516 @@
-        [self _restoreExpansionStateForItems:[_playlist items]];
-        
-[[_actionPopUpButton cell] setArrowPosition:NSPopUpNoArrow
-[[_actionPopUpButton menu] itemAtIndex:[_actionPopUpButton indexOfSelectedItem]] setState:NSOffState
-actionPopUpButton setImagePosition:NSNoImage
+icon = [[NSWorkspace sharedWorkspace] iconForFile:[[NSWorkspace sharedWorkspace] fullPathForApplication:@"iTunes"]
+icon setSize:NSMakeSize(16.0, 16.0)
+exportGroupiTunesMenuItem setImage:icon
-        
-        [self _setRepeatMode:[SPSettings intForKey:SPPlaylistRepeat]];
@@ -441 +610 @@
-
-
+- (void)exportJobProgressed:(SPExportJob *)job {
+        [_outlineView display];
+}
+
+
+
+- (void)exportJobCompleted:(SPExportJob *)job {
+        NSString                                        *path;
+        NSError                                         *error;
+        SPPlaylistExportGroup           *group;
+        SPPlaylistExportItem            *item;
+        SPPlaylistFile                          *newItem;
+        NSUInteger                                      index;
+        
+        item    = [job playlistItem];
+        group   = [item parentItem];
+        path    = [item destinationPath];
+        index   = [[group items] indexOfObject:item];
+        
+        [group removeItem:item];
+        
+        if([group destination] == SPPlaylistExportToiTunes) {
+                if(![self _launchiTunesAndImportFile:path error:&error])
+                        [[error alert] beginSheetModalForWindow:[self window] modalDelegate:NULL didEndSelector:NULL contextInfo:NULL];
+                
+                [[NSFileManager defaultManager] removeItemAtPath:[path stringByDeletingLastPathComponent] error:NULL];
+        } else {
+                newItem = [SPPlaylistFile fileWithPath:path];
+                
+                if(index >= 0 && (NSUInteger) index < [group numberOfItems])
+                        [group insertItem:newItem atIndex:index];
+                else
+                        [group addItem:newItem];
+        }
+
+        [_outlineView reloadData];
+        
+        [self _reloadItem:group];
+        
+        _exports--;
+        
+        [self _startNextExportJob];
+}
+
+
+
+- (void)exportJobStopped:(SPExportJob *)job {
+        _exports--;
+        
+        [self _startNextExportJob];
+}
+
+
+
+- (void)exportJob:(SPExportJob *)job failedWithError:(NSError *)error {
+        SPPlaylistExportGroup           *group;
+        SPPlaylistExportItem            *item;
+
+        [[error alert] beginSheetModalForWindow:[self window] modalDelegate:NULL didEndSelector:NULL contextInfo:NULL];
+        
+        item    = [job playlistItem];
+        group   = [item parentItem];
+        
+        [group removeItem:item];
+        
+        [_outlineView reloadData];
+
+        _exports--;
+
+        [self _startNextExportJob];
+}
+
+
+
-- (void)preferencesDidChange:(NSNotification *)notification {
-        _simplifyFilenames = [SPSettings boolForKey:SPSimplifyFilenames];
@@ -454 +697 @@
-
-- (void)movieControllerViewCountChanged:(NSNotification *)notification {
-
+:YES
-}
-
@@ -471 +714 @@
-                return (item != NULL && [item isInFileSystem]);
-        else if(selector == @selector(remove:))
- && ![item isRepresented]
+
-        
-        return YES;
@@ -540 +783 @@
-
-
+- (NSUInteger)numberOfExports {
+        return _exports + [_exportQueue count];
+}
+
+
+
-#pragma mark -
-
@@ -638 +887 @@
-                          contextInfo:[item retain]];
-        }
+        else if([item isKindOfClass:[SPPlaylistExportGroup class]]) {
+                [_exportGroupNameTextField setStringValue:[item name]];
+                [_exportGroupFormatPopUpButton selectItemWithTag:[(SPPlaylistExportGroup *) item format]];
+                [_exportGroupDestinationPopUpButton selectItemWithTag:[item destination]];
+                
+                if([item destinationPath])
+                        [self _setExportGroupDirectory:[item destinationPath]];
+                else
+                        [self _setExportGroupDirectory:[@"~/Desktop" stringByExpandingTildeInPath]];
+                
+                [NSApp beginSheet:_exportGroupPanel
+                   modalForWindow:[self window]
+                        modalDelegate:self
+                   didEndSelector:@selector(editExportGroupSheetDidEnd:returnCode:contextInfo:)
+                          contextInfo:[item retain]];
+        }
-}
-
@@ -651 +916 @@
-                if([_outlineView isItemExpanded:smartGroup])
-                        [self _reloadItem:smartGroup];
+
+                [self _savePlaylist];
-        }
-        
-        [smartGroup release];
-        [_smartGroupPanel close];
+}
+
+
+
+- (void)editExportGroupSheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
+        SPPlaylistExportGroup   *exportGroup = contextInfo;
+        
+        if(returnCode == NSAlertDefaultReturn) {
+                [exportGroup setName:[_exportGroupNameTextField stringValue]];
+                [exportGroup setFormat:[_exportGroupFormatPopUpButton tagOfSelectedItem]];
+                [exportGroup setDestination:[_exportGroupDestinationPopUpButton tagOfSelectedItem]];
+                [exportGroup setDestinationPath:[_exportGroupDestinationPopUpButton representedObjectOfSelectedItem]];
+
+                [self _savePlaylist];
+        }
+        
+        [exportGroup release];
+        [_exportGroupPanel close];
-}
-
@@ -683 +968 @@
-        NSString                        *path;
-        id                                      item, newItem;
+        BOOL                            exportGroup;
-        
-        if(returnCode == NSOKButton) {
@@ -692 +978 @@
-                if(!item)
-                        item = _playlist;
+                
+                exportGroup = [item isKindOfClass:[SPPlaylistExportGroup class]];
-                
-                items = [NSMutableArray array];
@@ -698 +986 @@
-                        if([[NSFileManager defaultManager] directoryExistsAtPath:path])
-                                newItem = [SPPlaylistFolder folderWithPath:path];
+                        else if(exportGroup)
+                                newItem = [SPPlaylistExportItem exportItemWithPath:path];
-                        else
-                                newItem = [SPPlaylistFile fileWithPath:path];
@@ -803 +1093 @@
-
-
+- (IBAction)newExportGroup:(id)sender {
+        [_exportGroupNameTextField setStringValue:NSLS(@"Export for iPhone", @"Playlist export group name")];
+
+        [self _setExportGroupDirectory:[@"~/Desktop" stringByExpandingTildeInPath]];
+        
+        [_exportGroupDestinationPopUpButton selectItem:_exportGroupSameAsOriginalMenuItem];
+
+        [NSApp beginSheet:_exportGroupPanel
+           modalForWindow:[self window]
+                modalDelegate:self
+           didEndSelector:@selector(newExportGroupSheetDidEnd:returnCode:contextInfo:)
+                  contextInfo:NULL];
+}
+
+
+
+- (void)newExportGroupSheetDidEnd:(NSWindow *)window returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
+        SPPlaylistExportGroup   *exportGroup;
+        id                                              item;
+        NSInteger                               row;
+        
+        if(returnCode == NSAlertDefaultReturn) {
+                exportGroup = [SPPlaylistExportGroup exportGroupWithName:[_exportGroupNameTextField stringValue]];
+                [exportGroup setFormat:[_exportGroupFormatPopUpButton tagOfSelectedItem]];
+                [exportGroup setDestination:[_exportGroupDestinationPopUpButton tagOfSelectedItem]];
+                [exportGroup setDestinationPath:[_exportGroupDestinationPopUpButton representedObjectOfSelectedItem]];
+                
+                item = [self _selectedItem];
+                
+                while(item && ![item isKindOfClass:[SPPlaylistGroup class]])
+                        item = [item parentItem];
+                
+                if(!item)
+                        item = _playlist;
+                
+                [(SPPlaylistGroup *) item addItem:exportGroup];
+                
+                [_outlineView expandItem:item];
+                [_outlineView reloadData];
+                
+                row = [_outlineView rowForItem:exportGroup];
+                
+                if(row >= 0)
+                        [_outlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO];
+
+                [self _savePlaylist];
+        }
+        
+        [_exportGroupPanel close];
+}
+
+
+
+- (IBAction)format:(id)sender {
+        NSMutableString                 *string;
+        NSMenuItem                              *item;
+        
+        string = [[_exportGroupNameTextField stringValue] mutableCopy];
+        
+        for(item in [_exportGroupFormatPopUpButton itemArray])
+                [string replaceOccurrencesOfString:[item title] withString:[_exportGroupFormatPopUpButton titleOfSelectedItem]];
+        
+        [_exportGroupNameTextField setStringValue:string];
+        [string release];
+}
+
+
+
+- (IBAction)destination:(id)sender {
+        NSOpenPanel             *openPanel;
+        
+        openPanel = [NSOpenPanel openPanel];
+        [openPanel setCanChooseFiles:NO];
+        [openPanel setCanChooseDirectories:YES];
+        [openPanel setPrompt:NSLS(@"Select", @"Export destination open panel button")];
+        
+        if([openPanel runModalForDirectory:NULL file:NULL types:NULL] == NSOKButton) {
+                [self _setExportGroupDirectory:[openPanel filename]];
+                
+                [_exportGroupDestinationPopUpButton selectItem:_exportGroupDirectoryMenuItem];
+        }
+}
+
+
+
-- (IBAction)remove:(id)sender {
-
-
+
+
+
+
+
+
+
-        
-        for(item in [[self _selectedItems] reversedArray]) {
-
+
+
+
-                        if([item isKindOfClass:[SPPlaylistFolder class]]) {
-                                path = [item resolvedPath];
@@ -816 +1198 @@
-                                [_eventQueueItems removeObjectForKey:path];
-                        }
+                        else if([item isKindOfClass:[SPPlaylistExportGroup class]]) {
+                                for(exportItem in [item items]) {
+                                        if([exportItem isKindOfClass:[SPPlaylistExportItem class]])
+                                                [[exportItem job] stop];
+                                }
+                        }
+                        else if([item isKindOfClass:[SPPlaylistExportItem class]]) {
+                                [[item job] stop];
+                        }
-                        
-                        [(SPPlaylistGroup *) [item parentItem] removeItem:item];
+                }
+        }
+        
+        if([files count] > 0) {
+                if([files count] == 1) {
+                        title = [NSSWF:NSLS(@"Are you sure you want to move \"%@\" to Trash?", @"Remove file dialog title (filename)"),
+                                [[files objectAtIndex:0] name]];
+                } else {
+                        title = [NSSWF:NSLS(@"Are you sure you want to move %lu items to Trash?", @"Remove file dialog title (count)"),
+                                [files count]];
+                }
+                
+                alert = [NSAlert alertWithMessageText:title
+                                                                defaultButton:NSLS(@"OK", @"Remove file dialog button")
+                                                          alternateButton:NSLS(@"Cancel", @"Remove file dialog button")
+                                                                  otherButton:NULL informativeTextWithFormat:@""];
+                
+                if([alert runModal] == NSAlertDefaultReturn) {
+                        paths = [NSMutableDictionary dictionary];
+                        
+                        for(item in files) {
+                                path = [[item resolvedPath] stringByDeletingLastPathComponent];
+                                names = [paths objectForKey:path];
+                                
+                                if(!names) {
+                                        names = [NSMutableArray array];
+                                        [paths setObject:names forKey:path];
+                                }
+                                
+                                [names addObject:[item name]];
+                        }
+                        
+                        for(path in paths) {
+                                names = [paths objectForKey:path];
+                                
+                                [[NSWorkspace sharedWorkspace]
+                                        performFileOperation:NSWorkspaceRecycleOperation 
+