MacGui: Warn of duplicate output filenames when adding to the queue.

- Thanks travistex

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1192 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 4e53fa1f8cb5035bae38d7c316fa7120152fe577..891564230bb010d321984641942fd55b1c8efcef 100644 (file)
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -1700,6 +1700,19 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
             [fDstFile2Field stringValue]] );
         // overwriteAddToQueueAlertDone: will be called when the alert is dismissed.
     }
+    
+    // Warn if another pending job in the queue has the same destination path
+    else if ([fQueueController pendingJobGroupWithDestinationPath:[fDstFile2Field stringValue]] != nil)
+    {
+        NSBeginCriticalAlertSheet( _( @"Another queued encode has specified the same destination." ),
+            _( @"Cancel" ), _( @"Overwrite" ), NULL, fWindow, self,
+            @selector( overwriteAddToQueueAlertDone:returnCode:contextInfo: ),
+            NULL, NULL, [NSString stringWithFormat:
+            _( @"Do you want to overwrite %@?" ),
+            [fDstFile2Field stringValue]] );
+        // overwriteAddToQueueAlertDone: will be called when the alert is dismissed.
+    }
+    
     else
     {
         [self doAddToQueue];

diff --git a/macosx/HBQueueController.h b/macosx/HBQueueController.h
index d1bb0c7823c9136589b31ef268e223acf90861a3..2070f041855e250a465e572e4991214eacae0ae7 100644 (file)
--- a/macosx/HBQueueController.h
+++ b/macosx/HBQueueController.h
@@ -178,7 +178,7 @@ BOOL                        fIsDragging;
 - (HBQueueJobGroupStatus)  status;
 - (void)               setPresetName: (NSString *)name;
 - (NSString *)         presetName;
-- (NSString *)         path;
+- (NSString *)         destinationPath;
 - (NSString *)         name;
 
 // Creating a description
@@ -264,6 +264,9 @@ BOOL                        fIsDragging;
 - (HBJobGroup *) currentJobGroup;
 - (HBJob *) currentJob;
 
+// Getting job groups
+- (HBJobGroup *) pendingJobGroupWithDestinationPath: (NSString *)path;
+
 // Getting queue statistics
 - (unsigned int) pendingCount;
 - (unsigned int) completedCount;

diff --git a/macosx/HBQueueController.mm b/macosx/HBQueueController.mm
index 6743b378ce2f946f6f775d353fcff09f38bda617..75095af69ae77b95f6524482540f6b555f3d1d26 100644 (file)
--- a/macosx/HBQueueController.mm
+++ b/macosx/HBQueueController.mm
@@ -805,7 +805,7 @@ NSString *HBJobGroupStatusNotification = @"HBJobGroupStatusNotification";
     return firstJob ? firstJob->titleName : nil;
 }
 
-- (NSString *) path
+- (NSString *) destinationPath
 {
     HBJob * firstJob = [self jobAtIndex:0];
     return firstJob ? firstJob->file : nil;
@@ -907,6 +907,8 @@ static NSString*    HBQueuePauseResumeToolbarIdentifier       = @"HBQueuePauseRe
     return fCurrentJob;
 }
 
+#pragma mark -
+
 //------------------------------------------------------------------------------------
 // Displays and brings the queue window to the front
 //------------------------------------------------------------------------------------
@@ -976,6 +978,24 @@ static NSString*    HBQueuePauseResumeToolbarIdentifier       = @"HBQueuePauseRe
     fCurrentJobGroup = aJobGroup;
 }
 
+#pragma mark - Finding job groups
+
+//------------------------------------------------------------------------------------
+// Returns the first pending job with a specified destination path or nil if no such
+// job exists.
+//------------------------------------------------------------------------------------
+- (HBJobGroup *) pendingJobGroupWithDestinationPath: (NSString *)path
+{
+    HBJobGroup * aJobGroup;
+    NSEnumerator * groupEnum = [fJobGroups objectEnumerator];
+    while ( (aJobGroup = [groupEnum nextObject]) )
+    {
+        if ([[aJobGroup destinationPath] isEqualToString: path])
+            return aJobGroup;
+    }
+    return nil;
+}
+
 //------------------------------------------------------------------------------------
 // Locates and returns a HBJob whose sequence_id matches a specified value.
 //------------------------------------------------------------------------------------
@@ -1604,8 +1624,8 @@ static NSString*    HBQueuePauseResumeToolbarIdentifier       = @"HBQueuePauseRe
         while (row != NSNotFound)
         {
             HBJobGroup * jobGroup = [fOutlineView itemAtRow: row];
-            if ([[jobGroup path] length])
-                [[NSWorkspace sharedWorkspace] selectFile:[jobGroup path] inFileViewerRootedAtPath:nil];
+            if ([[jobGroup destinationPath] length])
+                [[NSWorkspace sharedWorkspace] selectFile:[jobGroup destinationPath] inFileViewerRootedAtPath:nil];
         
             row = [selectedRows indexGreaterThanIndex: row];
         }

diff --git a/macosx/InstantHandBrake/InstantHandBrake.xcodeproj/project.pbxproj b/macosx/InstantHandBrake/InstantHandBrake.xcodeproj/project.pbxproj
index 5264013cf19dc37f817266b7d7ceec028d44e90f..a62c18d2e71871a6a55ee67a54c14a4689b00791 100644 (file)
--- a/macosx/InstantHandBrake/InstantHandBrake.xcodeproj/project.pbxproj
+++ b/macosx/InstantHandBrake/InstantHandBrake.xcodeproj/project.pbxproj
@@ -29,28 +29,28 @@
                        isa = PBXContainerItemProxy;
                        containerPortal = A9DB3A080D37EC2800F77345 /* libhb.xcodeproj */;
                        proxyType = 2;
-                       remoteGlobalIDString = 0DFF0B720B6BC6E600549488 /* libhb.a */;
+                       remoteGlobalIDString = 0DFF0B720B6BC6E600549488;
                        remoteInfo = libhb;
                };
                A9DB3A100D37EC2800F77345 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = A9DB3A080D37EC2800F77345 /* libhb.xcodeproj */;
                        proxyType = 2;
-                       remoteGlobalIDString = 0D096DFF0B707D1200A845D4 /* libhb.dylib */;
+                       remoteGlobalIDString = 0D096DFF0B707D1200A845D4;
                        remoteInfo = "libhb dlib";
                };
                A9DB3A120D37EC2800F77345 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = A9DB3A080D37EC2800F77345 /* libhb.xcodeproj */;
                        proxyType = 2;
-                       remoteGlobalIDString = A9DB38E00D37E9BA00F77345 /* HB.framework */;
+                       remoteGlobalIDString = A9DB38E00D37E9BA00F77345;
                        remoteInfo = HB;
                };
                A9DB3A140D37EC4200F77345 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = A9DB3A080D37EC2800F77345 /* libhb.xcodeproj */;
                        proxyType = 1;
-                       remoteGlobalIDString = 0DFF0B710B6BC6E600549488 /* libhb */;
+                       remoteGlobalIDString = 0DFF0B710B6BC6E600549488;
                        remoteInfo = libhb;
                };
 /* End PBXContainerItemProxy section */