FileList

.gitignore

@@ -1,5 +1,7 @@
+.DS_Store
 build
 build/revision
+._*
 *.xcodeproj/
 !*.xcodeproj/project.pbxproj
 Nightly.app.zip

AIURLAdditions.h

@@ -0,0 +1,44 @@
+/* 
+ * Adium is the legal property of its developers, whose names are listed in the copyright file included
+ * with this source distribution.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License as published by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+ * Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along with this program; if not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+/*!
+ * Provides some additional functionality when working with \c NSURL objects.
+ */
+@interface NSURL (AIURLAdditions)
+
+/**
+ * @brief The length of the URL.
+ *
+ * @return The length (number of characters) of the absolute URL.
+ */
+@property (readonly, nonatomic) NSUInteger length;
+
+/*!
+ * @brief Returns the argument for the specified key in the query string component of
+ * the URL.
+ *
+ * The search is case-sensitive, and the caller is responsible for removing any
+ * percent escapes, as well as "+" escapes, too.
+ *
+ * @param key The key whose value should be located and returned.
+ * @return The argument for the specified key, or \c nil if the key could not
+ *   be found in the query string.
+ */
+- (NSString *)queryArgumentForKey:(NSString *)key;
+- (NSString *)queryArgumentForKey:(NSString *)key withDelimiter:(NSString *)delimiter;
+
+@end

AIURLAdditions.m

@@ -0,0 +1,55 @@
+/* 
+ * Adium is the legal property of its developers, whose names are listed in the copyright file included
+ * with this source distribution.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License as published by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+ * Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along with this program; if not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#import "AIURLAdditions.h"
+
+@implementation NSURL (AIURLAdditions)
+
+- (NSUInteger)length
+{
+	return [[self absoluteString] length];
+}
+
+- (NSString *)queryArgumentForKey:(NSString *)key withDelimiter:(NSString *)delimiter
+{
+	for (NSString *obj in [[self query] componentsSeparatedByString:delimiter]) {
+		NSArray *keyAndValue = [obj componentsSeparatedByString:@"="];
+
+		if (([keyAndValue count] >= 2) && ([[keyAndValue objectAtIndex:0] caseInsensitiveCompare:key] == NSOrderedSame)) {
+			return [keyAndValue objectAtIndex:1];
+		}
+	}
+
+	return nil;
+}
+
+- (NSString *)queryArgumentForKey:(NSString *)key
+{
+	NSString		*delimiter;
+
+	// The arguments in query strings can be delimited with a semicolon (';') or an ampersand ('&'). Since it's not
+	// likely a single URL would use both types of delimeters, we'll attempt to pick one and use it.
+	if ([[self query] rangeOfString:@";"].location != NSNotFound) {
+		delimiter = @";";
+	} else {
+		// Assume '&' by default, since that's more common
+		delimiter = @"&";
+	}
+
+	return [self queryArgumentForKey:key withDelimiter:delimiter];
+}
+
+@end

ApplicationController.h

@@ -7,7 +7,6 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import "PBGitRepository.h"
 
 @class PBCloneRepositoryPanel;
 
@@ -20,6 +19,8 @@
 	NSManagedObjectContext *managedObjectContext;
 
 	PBCloneRepositoryPanel *cloneRepositoryPanel;
+
+    NSDictionary *notificationUserInfo;
 }
 
 - (NSPersistentStoreCoordinator *)persistentStoreCoordinator;

ApplicationController.m

@@ -17,6 +17,13 @@
 #import "PBGitDefaults.h"
 #import "PBCloneRepositoryPanel.h"
 #import "Sparkle/SUUpdater.h"
+#import "AIURLAdditions.h"
+#import "PBGitRepository.h"
+
+@interface ApplicationController ()
+- (void) cleanUpRemotesOnError;
+@end
+
 
 @implementation ApplicationController
 
@@ -31,7 +38,7 @@ - (ApplicationController*)init
 
 	if(![[NSBundle bundleWithPath:@"/System/Library/Frameworks/Quartz.framework/Frameworks/QuickLookUI.framework"] load])
 		if(![[NSBundle bundleWithPath:@"/System/Library/PrivateFrameworks/QuickLookUI.framework"] load])
-			NSLog(@"Could not load QuickLook");
+			DLog(@"Could not load QuickLook");
 
 	/* Value Transformers */
 	NSValueTransformer *transformer = [[PBNSURLPathUserDefaultsTransfomer alloc] init];
@@ -55,26 +62,39 @@ - (void)registerServices
 	int serviceVersion = [[NSUserDefaults standardUserDefaults] integerForKey:@"Services Version"];
 	if (serviceVersion < 2)
 	{
-		NSLog(@"Updating services menu…");
+		DLog(@"Updating services menu…");
 		NSUpdateDynamicServices();
 		[[NSUserDefaults standardUserDefaults] setInteger:2 forKey:@"Services Version"];
 	}
 }
 
+- (void)applicationWillFinishLaunching:(NSNotification*)notification
+{
+    [[NSAppleEventManager sharedAppleEventManager] setEventHandler:self
+                                                       andSelector:@selector(getUrl:withReplyEvent:)
+                                                     forEventClass:kInternetEventClass
+                                                        andEventID:kAEGetURL];
+}
+
 - (void)applicationDidFinishLaunching:(NSNotification*)notification
 {
-	[[SUUpdater sharedUpdater] setSendsSystemProfile:YES];
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(getArguments:) name:@"GitCommandSent" object:Nil];
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(cleanGitAfterErrorMessage:) name:@"ErrorMessageDidEnd" object:Nil];
+
+    [[SUUpdater sharedUpdater] setSendsSystemProfile:YES];
     [[SUUpdater sharedUpdater] setDelegate:self];
 
+    if ([PBGitDefaults useAskPasswd]) {
 	// Make sure Git's SSH password requests get forwarded to our little UI tool:
 	setenv( "SSH_ASKPASS", [[[NSBundle mainBundle] pathForResource: @"gitx_askpasswd" ofType: @""] UTF8String], 1 );
 	setenv( "DISPLAY", "localhost:0", 1 );
-
+    }
+
 	[self registerServices];
 
     BOOL hasOpenedDocuments = NO;
     NSArray *launchedDocuments = [[[PBRepositoryDocumentController sharedDocumentController] documents] copy];
-
+    
 	// Only try to open a default document if there are no documents open already.
 	// For example, the application might have been launched by double-clicking a .git repository,
 	// or by dragging a folder to the app icon
@@ -109,11 +129,21 @@ - (void)applicationDidFinishLaunching:(NSNotification*)notification
 
 	if (![[NSApplication sharedApplication] isActive])
 		return;
+}
 
-	// The current directory was not enabled or could not be opened (most likely it’s not a git repository).
-	// show an open panel for the user to select a repository to view
-	if ([PBGitDefaults showOpenPanelOnLaunch] && !hasOpenedDocuments)
-		[[PBRepositoryDocumentController sharedDocumentController] openDocument:self];
+- (void)getUrl:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent
+{
+	NSString *urlString = [[event paramDescriptorForKeyword:keyDirectObject] stringValue];
+    NSURL *url = [NSURL URLWithString:urlString];
+
+    if ([url.host isEqual:@"clone"]) {
+        NSString * repo = [[url queryArgumentForKey:@"repo"] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+
+        [self showCloneRepository:self];
+
+        [cloneRepositoryPanel.repositoryURL setStringValue:repo];
+    }
+
 }
 
 - (void) windowWillClose: sender
@@ -133,6 +163,9 @@ - (IBAction)showAboutPanel:(id)sender
 	if (gitversion)
 		[dict addEntriesFromDictionary:[[NSDictionary alloc] initWithObjectsAndKeys:gitversion, @"Version", nil]];
 
+	[dict addEntriesFromDictionary:[[NSDictionary alloc] initWithObjectsAndKeys:@"GitX (L)", @"ApplicationName", nil]];
+	[dict addEntriesFromDictionary:[[NSDictionary alloc] initWithObjectsAndKeys:@"(c) Pieter de Bie,2008\n(c) German Laullon,2011\nAnd more...", @"Copyright", nil]];
+
 	#ifdef DEBUG_BUILD
 		[dict addEntriesFromDictionary:[[NSDictionary alloc] initWithObjectsAndKeys:@"GitX (DEBUG)", @"ApplicationName", nil]];
 	#endif
@@ -216,7 +249,7 @@ - (NSManagedObjectModel *)managedObjectModel {
         return managedObjectModel;
     }
 
-    managedObjectModel = [[NSManagedObjectModel mergedModelFromBundles:nil] retain];    
+    managedObjectModel = [NSManagedObjectModel mergedModelFromBundles:nil];    
     return managedObjectModel;
 }
 
@@ -242,7 +275,7 @@ - (NSPersistentStoreCoordinator *) persistentStoreCoordinator {
     fileManager = [NSFileManager defaultManager];
     applicationSupportFolder = [self applicationSupportFolder];
     if ( ![fileManager fileExistsAtPath:applicationSupportFolder isDirectory:NULL] ) {
-        [fileManager createDirectoryAtPath:applicationSupportFolder attributes:nil];
+        [fileManager createDirectoryAtPath:applicationSupportFolder withIntermediateDirectories:YES attributes:nil error:nil];
     }
 
     url = [NSURL fileURLWithPath: [applicationSupportFolder stringByAppendingPathComponent: @"GitTest.xml"]];
@@ -363,6 +396,21 @@ - (void)applicationWillTerminate:(NSNotification *)aNotification
 			[PBGitDefaults setPreviousDocumentPaths:paths];
 		}
 	}
+
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender
+{
+    id dc = [PBRepositoryDocumentController sharedDocumentController];
+
+    // Reopen last document if user prefers
+    if ([PBGitDefaults showOpenPanelOnLaunch])
+    {
+        [dc openDocument:self];
+    }
+
+    return NO;
 }
 
 /**
@@ -371,10 +419,9 @@ - (void)applicationWillTerminate:(NSNotification *)aNotification
 
 - (void) dealloc {
 
-    [managedObjectContext release], managedObjectContext = nil;
-    [persistentStoreCoordinator release], persistentStoreCoordinator = nil;
-    [managedObjectModel release], managedObjectModel = nil;
-    [super dealloc];
+    managedObjectContext = nil;
+    persistentStoreCoordinator = nil;
+    managedObjectModel = nil;
 }
 
 
@@ -411,9 +458,39 @@ - (IBAction)showHelp:(id)sender
 
 - (IBAction)reportAProblem:(id)sender
 {
-    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://gitx.lighthouseapp.com/tickets"]];
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://github.com/laullon/gitx/issues"]];
 }
 
 
+#pragma mark - Observer methods
+
+- (void)getArguments:(NSNotification*)notification
+{
+    notificationUserInfo = [notification userInfo];
+}
+
+
+- (void)cleanGitAfterErrorMessage:(NSNotification*)notification
+{
+    // When adding a remote occurs an error the remote
+    // will be set on git and has to be removed to clean the remotes list
+    [self cleanUpRemotesOnError];
+
+
+
+}
+
+#pragma mark - Extensions
+- (void) cleanUpRemotesOnError
+{    
+    // check, if arguments was to add a remote
+    if ( ([(NSString*)[notificationUserInfo valueForKey:@"Arg0"] compare:@"remote"] == NSOrderedSame) &&
+        ([(NSString*)[notificationUserInfo valueForKey:@"Arg1"] compare:@"add"] == NSOrderedSame)
+        )
+    {
+        PBGitRef *remoteRef = [PBGitRef refFromString:[NSString stringWithFormat:@"%@%@", kGitXRemoteRefPrefix,[notificationUserInfo valueForKey:@"Arg3"]]];
+        [[notificationUserInfo valueForKey:@"Repository"] deleteRemote:remoteRef];
+    }
+}
 
 @end