Changeset 3515

Timestamp:

12/31/06 21:49:52 (2 years ago)

Author:

timothy

Message:

Auto detect for valid UTF-8 characters in server and chat messages. You can now have a chat room set to some other encoding and if someone talks in UTF-8, it will still display correctly. #188

Files:

• trunk/Additions/NSAttributedStringAdditions.m (modified) (4 diffs)
• trunk/Additions/NSStringAdditions.h (modified) (1 diff)
• trunk/Additions/NSStringAdditions.m (modified) (1 diff)
• trunk/Chat Core.exp (modified) (1 diff)
• trunk/Chat Core/MVIRCChatConnection.h (modified) (1 diff)
• trunk/Chat Core/MVIRCChatConnection.m (modified) (11 diffs)

trunk/Additions/NSAttributedStringAdditions.m

@@ -244 +244 @@
-                        end = i;
-                        j = ++i;
-
+
+
-                        if( i >= length ) break;
-                        if( i == j ) continue;
+
-                        if( bytes[j++] == 'E' ) {
-                                NSString *encodingStr = [[NSString allocWithZone:nil] initWithBytes:&(bytes[j]) length:(i-j) encoding:NSASCIIStringEncoding];
@@ -294 +296 @@
-                                if( newEncoding && newEncoding != currentEncoding ) {
-                                        if( ( end - start ) > 0 ) {
-start, end-start
+ start, ( end - start ) 
-                                                if( currentEncoding != NSUTF8StringEncoding ) {
-                                                        NSString *tempStr = [[NSString allocWithZone:nil] initWithData:subdata encoding:currentEncoding];
-// I'd check for nil, except only UTF-8 could fail since the others all
-// define values for all bytes 0-255
-subdata = [tempStr dataUsingEncoding:NSUTF8StringEncoding
+NSData *tempData = [tempStr dataUsingEncoding:NSUTF8StringEncoding];
+if( tempData ) subdata = tempData;
+[tempStr release
-                                                }
-
@@ -314 +316 @@
-        if( [newData length] > 0 || currentEncoding != encoding ) {
-                if( start < length ) {
-start, length-start
+ start, ( length - start) 
-                        if( currentEncoding != NSUTF8StringEncoding ) {
-                                NSString *tempStr = [[NSString allocWithZone:nil] initWithData:subdata encoding:currentEncoding];
-
+
+
+
-                        }
-
@@ -327 +331 @@
-        }
-
-
+
+
-        if( ! message ) {
-                [self release];

trunk/Additions/NSStringAdditions.h

@@ +1 @@
+BOOL isValidUTF8( const char *s, unsigned len );
+
-@interface NSString (NSStringAdditions)
-+ (NSString *) locallyUniqueString;

trunk/Additions/NSStringAdditions.m

@@ -1 +1 @@
-#import "NSStringAdditions.h"
-#include <sys/time.h>
+
+#define is7Bit(ch) (((ch) & 0x80) == 0)
+#define isUTF8Tupel(ch) (((ch) & 0xE0) == 0xC0)
+#define isUTF8LongTupel(ch) (((ch) & 0xFE) == 0xC0)
+#define isUTF8Triple(ch) (((ch) & 0xF0) == 0xE0)
+#define isUTF8LongTriple(ch1,ch2) (((ch1) & 0xFF) == 0xE0 && ((ch2) & 0xE0) == 0x80)
+#define isUTF8Quartet(ch) (((ch) & 0xF8) == 0xF0)
+#define isUTF8LongQuartet(ch1,ch2) (((ch1) & 0xFF) == 0xF0 && ((ch2) & 0xF0) == 0x80)
+#define isUTF8Quintet(ch) (((ch) & 0xFC) == 0xF8)
+#define isUTF8LongQuintet(ch1,ch2) (((ch1) & 0xFF) == 0xF8 && ((ch2) & 0xF8) == 0x80)
+#define isUTF8Sextet(ch) (((ch) & 0xFE) == 0xFC)
+#define isUTF8LongSextet(ch1,ch2) (((ch1) & 0xFF) == 0xFC && ((ch2) & 0xFC) == 0x80)
+#define isUTF8Cont(ch) (((ch) & 0xC0) == 0x80)
+
+BOOL isValidUTF8( const char *s, unsigned len ) {
+        for( unsigned i = 0; i < len; ++i ) {
+                const unsigned char ch = s[i];
+
+                if( is7Bit( ch ) )
+                        continue;
+
+                if( isUTF8Tupel( ch ) ) {
+                        if( len - i < 1 ) // too short
+                                return NO;
+                        if( isUTF8LongTupel( ch ) ) // not minimally encoded
+                                return NO;
+                        if( ! isUTF8Cont( s[i + 1] ) )
+                                return NO;
+                        i += 1;
+                } else if( isUTF8Triple( ch ) ) {
+                        if( len - i < 2 ) // too short
+                                return NO;
+                        if( isUTF8LongTriple( ch, s[i + 1] ) ) // not minimally encoded
+                                return NO;
+                        if( ! isUTF8Cont( s[i + 2] ) )
+                                return NO;
+                        i += 2;
+                } else if( isUTF8Quartet( ch ) ) {
+                        if( len - i < 3 ) // too short
+                                return NO;
+                        if( isUTF8LongQuartet( ch, s[i + 1] ) ) // not minimally encoded
+                                return NO;
+                        if( ! isUTF8Cont( s[i + 2] ) || ! isUTF8Cont( s[i + 3] ) )
+                                return NO;
+                        i += 3;
+                } else if( isUTF8Quintet( ch ) ) {
+                        if( len - i < 4 ) // too short
+                                return NO;
+                        if( isUTF8LongQuintet( ch, s[i + 1] ) ) // not minimally encoded
+                                return NO;
+                        if( ! isUTF8Cont( s[i + 2] ) || ! isUTF8Cont( s[i + 3] ) || ! isUTF8Cont( s[i + 4] ) )
+                                return NO;
+                        i += 4;
+                } else if( isUTF8Sextet( ch ) ) {
+                        if( len - i < 5 ) // too short
+                                return NO;
+                        if( isUTF8LongSextet( ch, s[i + 1] ) ) // not minimally encoded
+                                return NO;
+                        if( ! isUTF8Cont( s[i + 2] ) || ! isUTF8Cont( s[i + 3] ) || ! isUTF8Cont( s[i + 4] ) || ! isUTF8Cont( s[i + 5] ) )
+                                return NO;
+                        i += 5;
+                } else return NO;
+        }
+
+        return YES;
+}
+
+#undef is7Bit
+#undef isUTF8Tupel
+#undef isUTF8LongTupel
+#undef isUTF8Triple
+#undef isUTF8LongTriple
+#undef isUTF8Quartet
+#undef isUTF8LongQuartet
+#undef isUTF8Quintet
+#undef isUTF8LongQuintet
+#undef isUTF8Sextet
+#undef isUTF8LongSextet
+#undef isUTF8Cont
-
-@implementation NSString (NSStringAdditions)

trunk/Chat Core.exp

@@ -1 +1 @@
-.objc_class_name_MVChatConnection
+.objc_class_name_MVChatPluginManager
-.objc_class_name_MVChatRoom
-.objc_class_name_MVChatUser
-.objc_class_name_MVChatUserWatchRule
+.objc_class_name_MVDownloadFileTransfer
-.objc_class_name_MVFileTransfer
-.objc_class_name_MVDownloadFileTransfer
-.objc_class_name_MVUploadFileTransfer
-
-
+
-_MVChatConnectionDidConnectNotification
+_MVChatConnectionDidDisconnectNotification
-_MVChatConnectionDidNotConnectNotification
-
-
+
-_MVChatConnectionErrorNotification
+_MVChatConnectionGotBeepNotification
+_MVChatConnectionGotPrivateMessageNotification
+_MVChatConnectionGotRawMessageNotification
+_MVChatConnectionNeedCertificatePasswordNotification
-_MVChatConnectionNeedNicknamePasswordNotification
-_MVChatConnectionNeedCertificatePasswordNotification
-_MVChatConnectionNeedPublicKeyVerificationNotification
-_MVChatConnectionGotBeepNotification
-_MVChatConnectionGotRawMessageNotification
-_MVChatConnectionGotPrivateMessageNotification
-_MVChatConnectionChatRoomListUpdatedNotification
-_MVChatConnectionSelfAwayStatusChangedNotification
-_MVChatConnectionWatchedUserOnlineNotification
-_MVChatConnectionWatchedUserOfflineNotification
-_MVChatConnectionNicknameAcceptedNotification
-_MVChatConnectionNicknameRejectedNotification
+_MVChatConnectionSelfAwayStatusChangedNotification
+_MVChatConnectionSubcodeReplyNotification
-_MVChatConnectionSubcodeRequestNotification
-
-
+
+
+
+
+
+
+
+
+
+
-_MVChatRoomJoinedNotification
-_MVChatRoomPartedNotification
-_MVChatRoomKickedNotification
-
-
-
+
+
-_MVChatRoomMemberHalfOperatorFeature
-_MVChatRoomMemberOperatorFeature
-
-
+
-_MVChatRoomMemberUsersSyncedNotification
-
+
+
+
+
+
+
-_MVChatRoomUserJoinedNotification
+_MVChatRoomUserKickedNotification
+_MVChatRoomUserModeChangedNotification
-_MVChatRoomUserPartedNotification
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-_MVChatUserKnownRoomsAttribute
+_MVChatUserLocalTimeAttribute
+_MVChatUserModeChangedNotification
+_MVChatUserMoodAttribute
+_MVChatUserNicknameChangedNotification
-_MVChatUserPictureAttribute
-_MVChatUserPingAttribute
-
-
+
+
+
+
+
+
+
+
+
-_MVChatUserVCardAttribute
-_MVChatUserServiceAttribute
-_MVChatUserMoodAttribute
-_MVChatUserStatusMessageAttribute
-_MVChatUserPreferredLanguageAttribute
-_MVChatUserPreferredContactMethodsAttribute
-_MVChatUserTimezoneAttribute
-_MVChatUserGeoLocationAttribute
-_MVChatUserDeviceInfoAttribute
-_MVChatUserExtensionAttribute
-_MVChatUserPublicKeyAttribute
-_MVChatUserServerPublicKeyAttribute
-_MVChatUserDigitalSignatureAttribute
-_MVChatUserBanServerAttribute
-_MVChatUserBanAuthorAttribute
-_MVChatUserBanDateAttribute
-_MVChatUserServerDigitalSignatureAttribute
-_MVChatUserNicknameChangedNotification
-_MVChatUserStatusChangedNotification
-_MVChatUserAwayStatusMessageChangedNotification
-_MVChatUserIdleTimeUpdatedNotification
-_MVChatUserModeChangedNotification
-_MVChatUserInformationUpdatedNotification
-_MVChatUserAttributeUpdatedNotification
-_MVChatUserWatchRuleMatchedNotification
-_MVChatUserWatchRuleRemovedMatchedUserNotification
-_MVDownloadFileTransferOfferNotification
+_MVFileTransferErrorDomain
+_MVFileTransferErrorOccurredNotification
+_MVFileTransferFinishedNotification
-_MVFileTransferStartedNotification
-
-
-
-
-
+
-_NSChatWindowsIRCFormatType
-NSChatCTCPTwoFormatType
+isValidUTF8

trunk/Chat Core/MVIRCChatConnection.h

@@ -67 +67 @@
-- (void) _resetSupportedFeatures;
-
+- (NSString *) _newStringWithBytes:(const char *) bytes length:(unsigned) length;
-- (NSString *) _stringFromPossibleData:(id) input;
-@end

trunk/Chat Core/MVIRCChatConnection.m

@@ -26 +26 @@
-#define JVMaximumISONCommandLength 450
-#define JVMaximumMembersForWhoRequest 100
+#define JVFallbackEncoding NSISOLatin1StringEncoding
-
-static const NSStringEncoding supportedEncodings[] = {
@@ -746 +747 @@
-
-- (void) socket:(AsyncSocket *) sock didReadData:(NSData *) data withTag:(long) tag {
-
-
+
-
-        const char *line = (const char *)[data bytes];
@@ -827 +827 @@
-                                currentParameter = line;
-                                while( notEndOfLine() && *line != ' ' ) line++;
-
-
+
-                                checkAndMarkIfDone();
-                                if( ! done ) line++;
@@ -855 +854 @@
-
-                if( [self respondsToSelector:selector] ) {
-
-
-
-
-
+
-
-                        MVChatUser *chatUser = nil;
@@ -867 +862 @@
-                                chatUser = [self chatUserWithUniqueIdentifier:senderString];
-                                if( ! [chatUser address] && host && hostLength ) {
-
-
+
-                                        [chatUser _setAddress:hostString];
-                                        [hostString release];
@@ -874 +868 @@
-
-                                if( ! [chatUser username] ) {
-
-
+
-                                        [chatUser _setUsername:userString];
-                                        [userString release];
@@ -1254 +1247 @@
-#pragma mark -
-
+- (NSString *) _newStringWithBytes:(const char *) bytes length:(unsigned) length {
+        if( bytes && length ) {
+                BOOL validUTF8 = isValidUTF8( bytes, length );
+                NSStringEncoding encoding = ( [self encoding] != NSUTF8StringEncoding ? [self encoding] : JVFallbackEncoding );
+                NSString *ret = [[NSString allocWithZone:nil] initWithBytes:bytes length:length encoding:( validUTF8 ? NSUTF8StringEncoding : encoding )];
+                if( ! ret && encoding != JVFallbackEncoding ) ret = [[NSString allocWithZone:nil] initWithBytes:bytes length:length encoding:JVFallbackEncoding];
+                return ret;
+        }
+
+        if( ! length ) return @"";
+        return nil;
+}
+
-- (NSString *) _stringFromPossibleData:(id) input {
-
-
-
-
-
+
+
-        return input;
-}
@@ -1505 +1508 @@
-                                [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatConnectionGotPrivateMessageNotification object:sender userInfo:[NSDictionary dictionaryWithObjectsAndKeys:msgData, @"message", [NSString locallyUniqueString], @"identifier", [NSNumber numberWithBool:YES], @"notice", nil]];
-                                if( [[sender nickname] isEqualToString:@"NickServ"] ) {
-[NSString allocWithZone:nil] initWithData:msgData encoding:[self encoding
-
+self _newStringWithBytes:[msgData bytes] length:[msgData length
+
-                                        if( [msg rangeOfString:@"NickServ"].location != NSNotFound && [msg rangeOfString:@"IDENTIFY"].location != NSNotFound ) {
-                                                if( ! [self nicknamePassword] ) {
@@ -1516 +1519 @@
-                                                [[self localUser] _setIdentified:NO];
-                                        }
+
-                                        [msg release];
-                                }
@@ -1534 +1538 @@
-
-        while( line != end && *line != ' ' ) line++;
-
-
-
+
+
-        NSMutableData *arguments = nil;
-        if( line != end ) {
@@ -1596 +1599 @@
-                        if( [arguments length] < 100 ) [sender sendSubcodeReply:command withArguments:arguments];
-                } else if( [command caseInsensitiveCompare:@"DCC"] == NSOrderedSame ) {
-
-
-
+
-                        NSString *subCommand = nil;
-                        NSString *fileName = nil;