change plist form, from array to dictionary

Cenmrev · Cenmrev · commit 6a28d87068d9 · 2016-06-12T18:12:40.000+08:00
diff --git a/V2RayX/AppDelegate.h b/V2RayX/AppDelegate.h
@@ -17,6 +17,7 @@
 - (IBAction)showConfigWindow:(id)sender;
 - (IBAction)editPac:(id)sender;
 - (NSArray*)readDefaultsAsArray;
+- (NSDictionary*)readDefaultsAsDictionary;
 @property (strong, nonatomic)  NSStatusItem *statusBarItem;
 @property (strong, nonatomic) IBOutlet NSMenu *statusBarMenu;
 @property (weak, nonatomic) IBOutlet NSMenuItem *v2rayStatusItem;
diff --git a/V2RayX/AppDelegate.m b/V2RayX/AppDelegate.m
@@ -222,11 +222,11 @@ - (NSArray*)readDefaultsAsArray {
     } else {
         dServerIndex = [NSNumber numberWithInteger:-1];
     }
-    //NSLog(@"local port:%@, udp:%@, profiles:%@",dLocalPort, dUdpSupport, dProfiles);
     return @[dProxyState,dMode,dLocalPort,dUdpSupport,dProfiles,dServerIndex];
 }
 
 - (void)readDefaults {
+    /*
     NSArray *defaultsArray = [self readDefaultsAsArray];
     proxyIsOn = [defaultsArray[0] boolValue];
     isAuto = [defaultsArray[1] boolValue];
@@ -235,9 +235,116 @@ - (void)readDefaults {
     [profiles removeAllObjects]; //Maybe unnecessary
     profiles = defaultsArray[4];
     selectedServerIndex = [defaultsArray[5] integerValue];
+     
+     
+     return @{@"proxyState": dProxyState,
+     @"mode": dMode,
+     @"localPort": dLocalPort,
+     @"udpSupport": dUdpSupport,
+     @"profiles": dProfiles,
+     @"serverIndex": dServerIndex };
+     
+     
+     */
+    NSDictionary *defaultsDic = [self readDefaultsAsDictionary];
+    proxyIsOn = [defaultsDic[@"proxyState"] boolValue];
+    isAuto = [defaultsDic[@"mode"] boolValue];
+    localPort = [defaultsDic[@"localPort"] integerValue];
+    udpSupport = [defaultsDic[@"udpSupport"] integerValue];
+    [profiles removeAllObjects];
+    profiles = defaultsDic[@"profiles"];
+    selectedServerIndex = [defaultsDic[@"serverIndex"] integerValue];
     NSLog(@"read %ld profiles, selected No.%ld", [profiles count] , selectedServerIndex);
 }
 
+- (NSDictionary*)readDefaultsAsDictionary {
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    NSNumber *dProxyState = [defaults objectForKey:@"proxyIsOn"];
+    if (dProxyState == nil) {
+        dProxyState = [NSNumber numberWithBool:YES];//turn on proxy as default
+    }
+    NSNumber *dMode = [defaults objectForKey:@"isAuto"];
+    if (dMode == nil) {
+        dMode = [NSNumber numberWithBool:YES];//use auto mode as default
+    }
+    NSNumber* dLocalPort = [defaults objectForKey:@"localPort"];
+    if (dLocalPort == nil) {
+        dLocalPort = [NSNumber numberWithInteger:1081];//use 1081 as default local port
+    }
+    NSNumber* dUdpSupport = [defaults objectForKey:@"udpSupport"];
+    if (dUdpSupport == nil) {
+        dUdpSupport = [NSNumber numberWithBool:NO];// do not support udp as default
+    }
+    NSMutableArray *dProfilesInPlist = [defaults objectForKey:@"profiles"];
+    NSMutableArray *dProfiles = [[NSMutableArray alloc] init];
+    NSNumber *dServerIndex;
+    if ([dProfilesInPlist isKindOfClass:[NSArray class]] && [dProfilesInPlist count] > 0) {
+        for (NSDictionary *aProfile in dProfilesInPlist) {
+            
+            ServerProfile *newProfile = [[ServerProfile alloc] init];
+            [newProfile setAddress:aProfile[@"address"]];
+            [newProfile setPort:[aProfile[@"port"] integerValue]];
+            [newProfile setUserId:aProfile[@"userId"]];
+            [newProfile setAlterId:[aProfile[@"alterId"] integerValue]];
+            [newProfile setRemark:aProfile[@"remark"]];
+            [dProfiles addObject:newProfile];
+        }
+        dServerIndex = [defaults objectForKey:@"selectedServerIndex"];
+        if ([dServerIndex integerValue] <= 0 || [dServerIndex integerValue] >= [dProfiles count]) {
+            // "<= 0" also includes the case where dServerIndex is nil
+            dServerIndex = [NSNumber numberWithInteger:0]; // treate illeagle selectedServerIndex value
+        }
+    } else {
+        dServerIndex = [NSNumber numberWithInteger:-1];
+    }
+    //return @[dProxyState,dMode,dLocalPort,dUdpSupport,dProfiles,dServerIndex];
+    return @{@"proxyState": dProxyState,
+             @"mode": dMode,
+             @"localPort": dLocalPort,
+             @"udpSupport": dUdpSupport,
+             @"profiles": dProfiles,
+             @"serverIndex": dServerIndex };
+}
+/*
+- (void)readDefaultsAsDictionary {
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    
+    NSNumber *dProxyState = [defaults objectForKey:@"proxyIsOn"];
+    proxyIsOn = dProxyState == nil ? YES  : [dProxyState boolValue];//turn on proxy as default
+    
+    NSNumber *dMode = [defaults objectForKey:@"isAuto"];
+    isAuto = dMode == nil ? YES : [dMode boolValue];//use auto mode as default
+    
+    NSNumber* dLocalPort = [defaults objectForKey:@"localPort"];
+    localPort = dLocalPort == nil ? 1081 : [dLocalPort integerValue];//use 1081 as default local port
+    
+    NSNumber* dUdpSupport = [defaults objectForKey:@"udpSupport"];
+    udpSupport = dUdpSupport == nil ? NO : [dUdpSupport boolValue];// do not support udp as default
+    
+    
+    [profiles removeAllObjects]; //Maybe unnecessary
+    NSMutableArray *dProfilesInPlist = [defaults objectForKey:@"profiles"];
+    if ([dProfilesInPlist isKindOfClass:[NSArray class]] && [dProfilesInPlist count] > 0) {
+        for (NSDictionary *aProfile in dProfilesInPlist) {
+            ServerProfile *newProfile = [[ServerProfile alloc] init];
+            [newProfile setAddress:aProfile[@"address"]];
+            [newProfile setPort:[aProfile[@"port"] integerValue]];
+            [newProfile setUserId:aProfile[@"userId"]];
+            [newProfile setAlterId:[aProfile[@"alterId"] integerValue]];
+            [newProfile setRemark:aProfile[@"remark"]];
+            [profiles addObject:newProfile];
+        }
+        selectedServerIndex = [[defaults objectForKey:@"selectedServerIndex"] integerValue];
+        if (selectedServerIndex <= 0 || selectedServerIndex >= [profiles count]) {
+            // "<= 0" also includes the case where dServerIndex is nil
+            selectedServerIndex = 0; // treate illeagle selectedServerIndex value
+        }
+    } else {
+        selectedServerIndex = -1;
+    }
+}*/
+
+
 -(BOOL)reloadV2ray {
     runCommandLine(@"/bin/launchctl", @[@"unload", plistPath]);
     NSLog(@"V2Ray core unloaded.");
@@ -374,7 +481,7 @@ - (BOOL)isSysconfVersionOK {
 
 -(void)configurationDidChange {
     [self readDefaults];
-    //NSLog(@"profiles = %ld, just after read.",[profiles count]);
+    NSLog(@"profiles = %ld, just after read.",[profiles count]);
     if (![self reloadV2ray]) {
         proxyIsOn = NO;
         [[NSUserDefaults standardUserDefaults] setValue:[NSNumber numberWithBool:NO] forKey:@"proxyIsOn"];
diff --git a/V2RayX/ConfigWindowController.h b/V2RayX/ConfigWindowController.h
@@ -13,6 +13,7 @@
 @optional
 - (void)configurationDidChange;
 - (NSArray*)readDefaultsAsArray;
+- (NSDictionary*)readDefaultsAsDictionary;
 
 @end
 
diff --git a/V2RayX/ConfigWindowController.m b/V2RayX/ConfigWindowController.m
@@ -25,14 +25,21 @@ - (void)windowDidLoad {
     [_localPortField setFormatter:formatter];
     
     profiles = [[NSMutableArray alloc] init];
-    
+    //profiles = [[NSMutableDictionary alloc] init];
     //read defaults
-    NSArray *defaultsArray = [[self delegate] readDefaultsAsArray];
+    //NSArray *defaultsArray = [[self delegate] readDefaultsAsArray];
+    NSDictionary *defaultsDic = [[self delegate] readDefaultsAsDictionary];
+    [self setLocalPort:[defaultsDic[@"localPort"] integerValue]];
+    [self setUdpSupport:[defaultsDic[@"udpSupport"] boolValue]];
+    profiles = defaultsDic[@"profiles"];
+    [_profileTable reloadData];
+    _selectedServerIndex = [defaultsDic[@"serverIndex"] integerValue];
+    /*
     [self setLocalPort:[defaultsArray[2] integerValue]];
     [self setUdpSupport:[defaultsArray[3] boolValue]];
     profiles = defaultsArray[4];
     [_profileTable reloadData];
-    _selectedServerIndex = [defaultsArray[5] integerValue];
+    _selectedServerIndex = [defaultsArray[5] integerValue];*/
 }
 
 
@@ -99,7 +106,7 @@ - (IBAction)okSave:(id)sender {
     [defaults setObject:[NSNumber numberWithInteger:localPort] forKey:@"localPort"];
     NSMutableArray* profileDicArray = [[NSMutableArray alloc] init];
     for (ServerProfile *p in profiles) {
-        [profileDicArray addObject:[p toArray]];
+        [profileDicArray addObject:[p dictionaryForm]];
     }
     [defaults setObject:profileDicArray forKey:@"profiles"];
     [defaults setObject:[NSNumber numberWithInteger:[_profileTable selectedRow]] forKey:@"selectedServerIndex"];
diff --git a/V2RayX/ServerProfile.h b/V2RayX/ServerProfile.h
@@ -9,6 +9,7 @@
 
 @interface ServerProfile : NSObject
 - (NSArray*)toArray;
+- (NSDictionary*)dictionaryForm;
 - (NSDictionary*)v2rayConfigWithLocalPort:(NSInteger)localPort udpSupport:(BOOL)udp;
 @property (nonatomic) NSString* address;
 @property (nonatomic) NSInteger port;
diff --git a/V2RayX/ServerProfile.m b/V2RayX/ServerProfile.m
@@ -13,11 +13,11 @@ - (ServerProfile*)init {
     self = [super init];
     if (self) {
         // use v2ray public server as default
-        [self setAddress:@"45.32.24.103"];
-        [self setPort:38291];
-        [self setUserId:@"8833948b-5861-4a0f-a1d6-83c5606881ff"];
+        [self setAddress:@"v2ray.cool"];
+        [self setPort:10086];
+        [self setUserId:@"23ad6b10-8d1a-40f7-8ad0-e3e35cd38297"];
         [self setAlterId:64];
-        [self setRemark:@""];
+        [self setRemark:@"test server"];
     }
     return self;
 }
@@ -30,6 +30,20 @@ - (NSArray*)toArray {
     return @[address,[NSNumber numberWithInteger:port], userId, [NSNumber numberWithInteger:alterId], remark];
 }
 
+- (NSDictionary*)dictionaryForm {
+    return @{@"address": address,
+             @"port": [NSNumber numberWithInteger:port],
+             @"userId": userId,
+             @"alterId": [NSNumber numberWithInteger:alterId],
+             @"remark": remark };
+}
+/*
+[newProfile setAddress:aProfile[@"address"]];
+[newProfile setPort:[aProfile[@"port"] integerValue]];
+[newProfile setUserId:aProfile[@"userId"]];
+[newProfile setAlterId:[aProfile[@"alterId"] integerValue]];
+[newProfile setRemark:aProfile[@"remark"]];
+*/
 - (NSDictionary*)v2rayConfigWithLocalPort:(NSInteger)localPort udpSupport:(BOOL)udp {
     //generate config template
     NSMutableDictionary *config = [NSMutableDictionary dictionaryWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"config-sample" ofType:@"plist"]];
