Changeset 3500

Timestamp:

12/29/06 00:54:05 (2 years ago)

Author:

timothy

Message:

Import the old buddy list if there is not a new one made yet.

Files:

• trunk/Additions/NSStringAdditions.h (modified) (1 diff)
• trunk/Additions/NSStringAdditions.m (modified) (1 diff)
• trunk/Controllers/MVBuddyListController.m (modified) (2 diffs)

trunk/Additions/NSStringAdditions.h

@@ -23 +23 @@
-
-- (NSString *) stringByStrippingIllegalXMLCharacters;
+
+- (NSString *) stringWithDomainNameSegmentOfAddress;
-@end
-

trunk/Additions/NSStringAdditions.m

@@ -274 +274 @@
-        [result stripIllegalXMLCharacters];
-        return [result autorelease];
+}
+
+#pragma mark -
+
+- (NSString *) stringWithDomainNameSegmentOfAddress {
+        NSString *ret = self;
+        unsigned int ip = 0;
+        BOOL ipAddress = ( sscanf( [self UTF8String], "%u.%u.%u.%u", &ip, &ip, &ip, &ip ) == 4 );
+
+        if( ! ipAddress ) {
+                NSArray *parts = [self componentsSeparatedByString:@"."];
+                unsigned count = [parts count];
+                if( count > 2 )
+                        ret = [NSString stringWithFormat:@"%@.%@", [parts objectAtIndex:(count - 2)], [parts objectAtIndex:(count - 1)]];
+        }
+
+        return ret;
-}
-@end

trunk/Controllers/MVBuddyListController.m

@@ -319 +319 @@
-
-        while( ( server = [enumerator nextObject] ) ) {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        }
-
@@ -1023 +1015 @@
-}
-
+- (void) _importOldBuddyList {
+        NSArray *list = [[NSUserDefaults standardUserDefaults] objectForKey:@"JVChatBuddies"];
+        if( ! [list count] ) return;
+
+        NSEnumerator *enumerator = [list objectEnumerator];
+        NSString *identifier = nil;
+
+        while( ( identifier = [enumerator nextObject] ) ) {
+                ABPerson *person = (ABPerson *)[[ABAddressBook sharedAddressBook] recordForUniqueId:identifier];
+                if( ! person ) continue;
+
+                JVBuddy *buddy = [[JVBuddy allocWithZone:[self zone]] init];
+
+                [buddy setPicture:[[[NSImage alloc] initWithData:[person imageData]] autorelease]];
+                [buddy setGivenNickname:[person valueForProperty:kABNicknameProperty]];
+                [buddy setFirstName:[person valueForProperty:kABFirstNameProperty]];
+                [buddy setLastName:[person valueForProperty:kABLastNameProperty]];
+
+                ABMultiValue *value = [person valueForProperty:kABEmailProperty];
+                [buddy setPrimaryEmail:[value valueAtIndex:[value indexForIdentifier:[value primaryIdentifier]]]];
+
+                [buddy setSpeechVoice:[person valueForProperty:@"cc.javelin.colloquy.JVBuddy.TTSvoice"]];
+
+                [buddy setAddressBookPersonRecord:person];
+
+                value = [person valueForProperty:@"IRCNickname"];
+                unsigned count = [value count];
+
+                for( unsigned i = 0; i < count; i++ ) {
+                        NSString *nick = [value valueAtIndex:i];
+                        NSString *server = [[value labelAtIndex:i] stringWithDomainNameSegmentOfAddress];
+                        if( ! [nick length] || ! [server length] )
+                                continue;
+
+                        MVChatUserWatchRule *rule = [[MVChatUserWatchRule allocWithZone:nil] init];
+                        [rule setNickname:nick];
+                        [rule setApplicableServerDomains:[NSArray arrayWithObject:server]];
+
+                        [buddy addWatchRule:rule];
+
+                        [rule release];
+                }
+
+                if( buddy && [[buddy watchRules] count] )
+                        [self addBuddy:buddy];
+
+                [buddy release];
+        }
+
+        [self save];
+
+        [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"JVChatBuddies"];
+}
+
-- (void) _loadBuddyList {
-        NSArray *list = [[NSArray allocWithZone:nil] initWithContentsOfFile:[@"~/Library/Application Support/Colloquy/Buddy List.plist" stringByExpandingTildeInPath]];
+        if( ! [list count] ) [self _importOldBuddyList];
+
-        NSEnumerator *enumerator = [list objectEnumerator];
-        NSDictionary *buddyDictionary = nil;