add app info and key-values in user default

yanqizhou · yanqizhou · commit 2ceadae0b8b6 · 2017-09-11T11:47:24.000+08:00
diff --git a/DebugDatabase/DatabaseUtil.h b/DebugDatabase/DatabaseUtil.h
@@ -22,4 +22,6 @@
 - (BOOL)updateRecordInDatabase:(NSString*)database tableName:(NSString*)tableName data:(NSDictionary*)data condition:(NSDictionary*)condition;
 - (BOOL)deleteRecordInDatabase:(NSString *)database tableName:(NSString *)tableName condition:(NSDictionary *)condition limit:(NSString *)limit;
 - (NSDictionary*)executeQueryInDatabase:(NSString*)database tableName:(NSString*)tableName operator:(NSString*)operator query:(NSString*)query;
+- (NSDictionary*)userDefaultData;
+- (NSDictionary*)getAppInfoData;
 @end
diff --git a/DebugDatabase/DatabaseUtil.m b/DebugDatabase/DatabaseUtil.m
@@ -288,4 +288,107 @@ - (NSDictionary*)executeQueryInDatabase:(NSString*)database tableName:(NSString*
     }
 }
 
+- (NSDictionary*)userDefaultData {
+    
+    NSMutableDictionary *tableData = [NSMutableDictionary dictionary];
+    [tableData safe_setObject:@(1) forKey:@"isSelectQuery"];
+    [tableData safe_setObject:@(1) forKey:@"isSuccessful"];
+    
+    NSMutableArray *tableInfoResult = [NSMutableArray array];
+    [tableInfoResult safe_addObject:@{@"title": @"key", @"isPrimary" : @(1), @"dataType" : @"text"}];
+    [tableInfoResult safe_addObject:@{@"title": @"value", @"isPrimary" : @(0), @"dataType" : @"text"}];
+    
+    [tableData safe_setObject:tableInfoResult forKey:@"tableInfos"];
+    
+    [tableData safe_setObject:@(NO) forKey:@"isEditable"];
+    
+    NSMutableArray *rows = @[].mutableCopy;
+    
+    NSDictionary *userData = [[NSUserDefaults standardUserDefaults]dictionaryRepresentation];
+    
+    for (NSString *key in userData.allKeys) {
+        NSMutableArray *row = @[].mutableCopy;
+        
+        [row safe_addObject:@{@"dataType" : @"text", @"value" : key?key:@""}];
+        
+        id value = [userData objectForKey:key];
+        
+        if ([value isKindOfClass:[NSString class]] || [value isKindOfClass:[NSNumber class]]) {
+            [row safe_addObject:@{@"dataType" : @"text", @"value" : yy_dicGetStringSafe(userData, key)}];
+        }else {
+            [row safe_addObject:@{@"dataType" : @"text", @"value" : [value description]?:@""}];
+        }
+        
+        [rows addObject:row];
+    }
+    [tableData safe_setObject:rows forKey:@"rows"];
+    
+    return tableData;
+}
+
+- (NSDictionary*)getAppInfoData {
+    NSMutableDictionary *tableData = [NSMutableDictionary dictionary];
+    [tableData safe_setObject:@(1) forKey:@"isSelectQuery"];
+    [tableData safe_setObject:@(1) forKey:@"isSuccessful"];
+    
+    NSMutableArray *tableInfoResult = [NSMutableArray array];
+    [tableInfoResult safe_addObject:@{@"title": @"property name", @"isPrimary" : @(1), @"dataType" : @"text"}];
+    [tableInfoResult safe_addObject:@{@"title": @"property value", @"isPrimary" : @(0), @"dataType" : @"text"}];
+    
+    [tableData safe_setObject:tableInfoResult forKey:@"tableInfos"];
+    
+    [tableData safe_setObject:@(NO) forKey:@"isEditable"];
+    
+    NSMutableArray *rows = @[].mutableCopy;
+    
+    NSDictionary *infoDic = [[NSBundle mainBundle] infoDictionary];
+    //app name
+    NSString *displayName = yy_dicGetStringSafe(infoDic, @"CFBundleDisplayName");
+    NSMutableArray *displayRow = @[].mutableCopy;
+    [displayRow safe_addObject:@{@"dataType": @"text", @"value": @"Display Name"}];
+    [displayRow safe_addObject:@{@"dataType": @"text", @"value": displayName}];
+    [rows safe_addObject:displayRow];
+    
+    //app bundle identifier
+    NSString *bundleIdentifer = yy_dicGetStringSafe(infoDic, kCFBundleIdentifierKey);
+    NSMutableArray *bundleRow = @[].mutableCopy;
+    [bundleRow safe_addObject:@{@"dataType": @"text", @"value": @"Bundle Identifer"}];
+    [bundleRow safe_addObject:@{@"dataType": @"text", @"value": bundleIdentifer}];
+    [rows safe_addObject:bundleRow];
+    
+    //app version
+    NSString *version = yy_dicGetStringSafe(infoDic, @"CFBundleShortVersionString");
+    NSMutableArray *versionRow = @[].mutableCopy;
+    [versionRow safe_addObject:@{@"dataType": @"text", @"value": @"Version"}];
+    [versionRow safe_addObject:@{@"dataType": @"text", @"value": version}];
+    [rows safe_addObject:versionRow];
+    
+    //app build number
+    NSString *build = yy_dicGetStringSafe(infoDic, kCFBundleVersionKey);
+    NSMutableArray *buildRow = @[].mutableCopy;
+    [buildRow safe_addObject:@{@"dataType": @"text", @"value": @"Build"}];
+    [buildRow safe_addObject:@{@"dataType": @"text", @"value": build}];
+    [rows safe_addObject:buildRow];
+    
+    //document path
+    NSArray *pathSearch = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+    NSString *documentsPath = [pathSearch objectAtIndex:0];
+    NSMutableArray *documentRow = @[].mutableCopy;
+    [documentRow safe_addObject:@{@"dataType": @"text", @"value": @"Documents"}];
+    [documentRow safe_addObject:@{@"dataType": @"text", @"value": documentsPath?documentsPath:@""}];
+    [rows safe_addObject:documentRow];
+    
+    //cache path
+    NSArray *pathSearchCache = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
+    NSString *cachePath = [pathSearchCache objectAtIndex:0];
+    NSMutableArray *cacheRow = @[].mutableCopy;
+    [cacheRow safe_addObject:@{@"dataType": @"text", @"value": @"Cache"}];
+    [cacheRow safe_addObject:@{@"dataType": @"text", @"value": cachePath?cachePath:@""}];
+    [rows safe_addObject:cacheRow];
+    
+    [tableData safe_setObject:rows forKey:@"rows"];
+    
+    return tableData;
+}
+
 @end
diff --git a/DebugDatabase/DebugDatabaseManager.m b/DebugDatabase/DebugDatabaseManager.m
@@ -17,6 +17,7 @@
 @interface DebugDatabaseManager ()<GCDAsyncSocketDelegate>
 
 @property(nonatomic, strong) GCDAsyncSocket *webServer;
+@property(nonatomic, strong) GCDAsyncSocket *connectedSocket;
 @property(nonatomic, copy) NSString *host;
 @property(nonatomic, assign) NSInteger port;
 @property(nonatomic, strong) NSDictionary *databasePaths;
@@ -73,7 +74,7 @@ - (void)socket:(GCDAsyncSocket *)sock didConnectToHost:(nonnull NSString *)host
 - (void)socket:(GCDAsyncSocket *)sock didAcceptNewSocket:(GCDAsyncSocket *)newSocket {
     NSLog(@"didAcceptNewSocket");
     NSLog(@"newSocket %@ %zd", newSocket.localHost, newSocket.localPort);
-    
+    _connectedSocket = newSocket;
     [newSocket readDataWithTimeout:-1 tag:0];
 }
 
@@ -211,6 +212,19 @@ - (void)socket:(GCDAsyncSocket *)sock didReadData:(NSData *)data withTag:(long)t
         response.contentType = @"application/octet-stream";
         [sock writeData:response.contentData withTimeout:-1 tag:0];
     }
+    else if ([url.path isEqualToString:@"/getUserDefault"]) {
+        NSMutableDictionary *userData = [[DatabaseUtil shared] userDefaultData].mutableCopy;
+        
+        [userData safe_setObject:@YES forKey:@"userDefault"];
+        
+        DebugDatabaseResponse *response = [[DebugDatabaseResponse alloc] initWithHtmlData:[[self mapOrArrayTransformToJsonString:userData] dataUsingEncoding:NSUTF8StringEncoding] contentType:@"application/json"];
+        [sock writeData:response.contentData withTimeout:-1 tag:0];
+    }
+    else if ([url.path isEqualToString:@"/getAppInfo"]) {
+        NSDictionary *appInfo = [[DatabaseUtil shared] getAppInfoData];
+        DebugDatabaseResponse *response = [[DebugDatabaseResponse alloc] initWithHtmlData:[[self mapOrArrayTransformToJsonString:appInfo] dataUsingEncoding:NSUTF8StringEncoding] contentType:@"application/json"];
+        [sock writeData:response.contentData withTimeout:-1 tag:0];
+    }
     //404 not found
     else {
         DebugDatabaseResponse *response = [[DebugDatabaseResponse alloc] initWithHtmlData:[@"404" dataUsingEncoding:NSUTF8StringEncoding]];
diff --git a/DebugDatabase/Web.bundle/app.js b/DebugDatabase/Web.bundle/app.js
@@ -1,5 +1,4 @@
 $( document ).ready(function() {
-    getDBList();
     $("#query").keypress(function(e){
         if(e.which == 13) {
             queryFunction();
@@ -152,32 +151,46 @@ function inflateData(result){
        $("#db-data-div").remove();
        $("#parent-data-div").append('<div id="db-data-div"><table class="display nowrap" cellpadding="0" border="0" cellspacing="0" width="100%" class="table table-striped table-bordered display" id="db-data"></table></div>');
 
-       $(tableId).dataTable({
-           "data": columnData,
-           "columnDefs": columnHeader,
-           'bPaginate': true,
-           'searching': true,
-           'bFilter': true,
-           'bInfo': true,
-           "bSort" : true,
-           "scrollX": true,
-           "iDisplayLength": 10,
-           "dom": "Bfrtip",
-            select: 'single',
-            altEditor: true,     // Enable altEditor
-            buttons: [
-                {
-                    extend: 'selected', // Bind to Selected row
-                    text: 'Edit',
-                    name: 'edit'        // do not change name
-                },
-                {
-                    extend: 'selected',
-                    text: 'Delete',
-                    name: 'delete'
-                }
-            ]
-       })
+       if (result.userDefault) {
+           $(tableId).dataTable({
+                                "data": columnData,
+                                "columnDefs": columnHeader,
+                                'bPaginate': true,
+                                'searching': true,
+                                'bFilter': true,
+                                'bInfo': true,
+                                "bSort" : true,
+                                "scrollX": true,
+                                "iDisplayLength": 10
+                                })
+       }else {
+           $(tableId).dataTable({
+                                "data": columnData,
+                                "columnDefs": columnHeader,
+                                'bPaginate': true,
+                                'searching': true,
+                                'bFilter': true,
+                                'bInfo': true,
+                                "bSort" : true,
+                                "scrollX": true,
+                                "iDisplayLength": 10,
+                                "dom": "Bfrtip",
+                                select: 'single',
+                                altEditor: true,     // Enable altEditor
+                                buttons: [
+                                          {
+                                          extend: 'selected', // Bind to Selected row
+                                          text: 'Edit',
+                                          name: 'edit'        // do not change name
+                                          },
+                                          {
+                                          extend: 'selected',
+                                          text: 'Delete',
+                                          name: 'delete'
+                                          }
+                                          ]
+                                })
+       }
 
        //attach row-updated listener
        $(tableId).on('update-row.dt', function (e, updatedRowData, callback) {
@@ -228,6 +241,69 @@ function inflateData(result){
 
 }
 
+function inflateAppInfoData(result){
+
+    if(result.isSuccessful){
+
+        if(!result.isSelectQuery){
+            showSuccessInfo("Query Executed Successfully");
+            return;
+        }
+
+        var columnHeader = result.tableInfos;
+
+        // set function to return cell data for different usages like set, display, filter, search etc..
+        for(var i = 0; i < columnHeader.length; i++) {
+            columnHeader[i]['targets'] = i;
+            columnHeader[i]['data'] = function(row, type, val, meta) {
+                var dataType = row[meta.col].dataType;
+                if (type == "sort" && dataType == "boolean") {
+                    return row[meta.col].value ? 1 : 0;
+                }
+                return row[meta.col].value;
+            }
+        }
+        var columnData = result.rows;
+        var tableId = "#db-appinfo";
+        if ($.fn.DataTable.isDataTable(tableId) ) {
+            $(tableId).DataTable().destroy();
+        }
+
+        $("#db-appinfo-div").remove();
+        $("#parent-appinfo-div").append('<div id="db-appinfo-div"><table class="display nowrap" cellpadding="0" border="0" cellspacing="0" width="100%" class="table table-striped table-bordered display hide-column-names" id="db-appinfo"></table></div>');
+
+        $(tableId).dataTable({
+            "data": columnData,
+            "columnDefs": columnHeader,
+            'bPaginate': false,
+            'searching': false,
+            'bFilter': false,
+            'bInfo': false,
+            "bSort" : false,
+            "scrollX": true,
+            "iDisplayLength": 99,
+            "fnDrawCallback": function (oSettings) {
+                $(oSettings.nTHead).hide();
+            }
+        })
+
+        // hack to fix alignment issue when scrollX is enabled
+        $(".dataTables_scrollHeadInner").css({"width":"100%"});
+        $(".table ").css({"width":"100%"});
+    }else{
+        if(!result.isSelectQuery){
+            showErrorInfo("Query Execution Failed");
+        }else {
+            if(result.errorMessage){
+                showErrorInfo(result.errorMessage);
+            }else{
+                showErrorInfo("Some Error Occurred");
+            }
+        }
+    }
+
+}
+
 //send update database request to server
 function updateTableData(updatedData, callback) {
     //get currently selected element
@@ -329,3 +405,16 @@ function showErrorInfo(message){
         snackbarElement.removeClass("show");
     }, 3000);
 }
+
+function getUserDefault() {
+    $.ajax({url: "getUserDefault", success: function(result){
+           inflateData(result);
+    }});
+}
+
+function getAppInfo() {
+    $.ajax({url: "getAppInfo", success: function(result){
+           inflateAppInfoData(result);
+           getUserDefault();
+    }});
+}
diff --git a/DebugDatabase/Web.bundle/appinfo.html b/DebugDatabase/Web.bundle/appinfo.html
diff --git a/DebugDatabase/Web.bundle/index.html b/DebugDatabase/Web.bundle/index.html
