Merge pull request #25 from debuggerx01/dev

merge dev to master

Author: debuggerx01

Test/IgnoreMapResp.dart

@@ -0,0 +1,68 @@
+import 'dart:convert' show json;
+
+class IgnoreMapResp {
+
+  Data data;
+
+  IgnoreMapResp.fromParams({this.data});
+
+  factory IgnoreMapResp(jsonStr) => jsonStr == null ? null : jsonStr is String ? new IgnoreMapResp.fromJson(json.decode(jsonStr)) : new IgnoreMapResp.fromJson(jsonStr);
+
+  IgnoreMapResp.fromJson(jsonRes) {
+    data = jsonRes['data'] == null ? null : new Data.fromJson(jsonRes['data']);
+  }
+
+  @override
+  String toString() {
+    return '{"data": $data}';
+  }
+}
+
+class Data {
+
+  int wc;
+  String author;
+  String content;
+  String digest;
+  String title;
+  Map<String, dynamic> date;
+  Extra extra;
+
+  Data.fromParams({this.wc, this.author, this.content, this.digest, this.title, this.date, this.extra});
+
+  Data.fromJson(jsonRes) {
+    wc = jsonRes['wc'];
+    author = jsonRes['author'];
+    content = jsonRes['content'];
+    digest = jsonRes['digest'];
+    title = jsonRes['title'];
+    date = jsonRes['date'];
+    extra = jsonRes['extra'] == null ? null : new Extra.fromJson(jsonRes['extra']);
+  }
+
+  @override
+  String toString() {
+    return '{"wc": $wc,"author": ${author != null?'${json.encode(author)}':'null'},"content": ${content != null?'${json.encode(content)}':'null'},"digest": ${digest != null?'${json.encode(digest)}':'null'},"title": ${title != null?'${json.encode(title)}':'null'},"date": ${date != null?'${json.encode(date)}':'null'},"extra": $extra}';
+  }
+}
+
+class Extra {
+
+  int a;
+  int b;
+  int c;
+
+  Extra.fromParams({this.a, this.b, this.c});
+
+  Extra.fromJson(jsonRes) {
+    a = jsonRes['a'];
+    b = jsonRes['b'];
+    c = jsonRes['c'];
+  }
+
+  @override
+  String toString() {
+    return '{"a": $a,"b": $b,"c": $c}';
+  }
+}
+

Test/IgnoreMapTest.json

@@ -0,0 +1,19 @@
+{
+  "data": {
+    "author": "顾湘",
+    "content": "content",
+    "date": {
+      "curr": "20180216",
+      "next": "20180217",
+      "prev": "20180215"
+    },
+    "extra":{
+      "a": 1,
+      "b": 2,
+      "c": 3
+    },
+    "digest": "digest",
+    "title": "新年的求婚者",
+    "wc": 845
+  }
+}

Test/test.dart

@@ -6,6 +6,7 @@ import 'EmptyResp.dart';
 import 'RegionResp.dart';
 import 'WanResp.dart';
 import 'ListsResp.dart';
+import 'IgnoreMapResp.dart';
 
 void main() {
 
@@ -201,12 +202,38 @@ void main() {
     expect(jsonRes, json.decode(resp.toString()));
 });
 
+  test('test ignore map', () {
+
+    String str = readFromFile('IgnoreMap');
+    IgnoreMapResp resp = new IgnoreMapResp(str);
+    var jsonRes = json.decode(str);
+
+    /// 测试传入String和json进行解析的结果是否相同
+    expect(resp.toString(), new IgnoreMapResp(jsonRes).toString());
+
+    /// 逐个字段检查是否与json.decode()的结果相同
+    expect(resp.data.wc, jsonRes['data']['wc']);
+    expect(resp.data.author, jsonRes['data']['author']);
+    expect(resp.data.content, jsonRes['data']['content']);
+    expect(resp.data.digest, jsonRes['data']['digest']);
+    expect(resp.data.title, jsonRes['data']['title']);
+    expect(resp.data.extra.a, jsonRes['data']['extra']['a']);
+    expect(resp.data.extra.b, jsonRes['data']['extra']['b']);
+    expect(resp.data.extra.c, jsonRes['data']['extra']['c']);
+    expect(resp.data.date, jsonRes['data']['date']);
+
+    /// 检查bean对象toString还原成json字符串后再交给json解析的结果是否与原始字符串相同
+    expect(jsonRes, json.decode(resp.toString()));
+  });
+
 
 }
 
 String readFromFile(String name) {
   String str = new File('${name}Test.json').readAsStringSync();
   int index1 = str.indexOf('{');
   int index2 = str.indexOf('[');
+  index1 = index1 == -1 ? 0: index1;
+  index2 = index2 == -1 ? 0: index2;
   return str.substring(min(index1, index2));
 }

check_version.py

@@ -16,7 +16,7 @@
 from PyQt5.QtWidgets import QMessageBox
 from tools import msg_box_ui
 
-code = 0.6
+code = 0.7
 ignore_code = 0.0
 
 check_last_version_thread = None

formatter.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
-# @Filename :   formater.py
+# @Filename :   formatter.py
 # @Date     :   18-1-26 下午5:48
 # @Author   :   DebuggerX
 from functools import partial
@@ -13,7 +13,7 @@
 import pyperclip
 
 # 定义显示的json格式化字符串的缩进量为4个空格
-indent = '    '
+indent = ' ' * 4
 
 # 临时存储
 last_list_com_box = None
@@ -54,7 +54,14 @@ def analyse_json_obj(json_obj, level=0, res=None, json_key=None):
         else:
             res.append('%s<%s> : <[list]>9' % (indent * level, json_key))
         if len(json_obj) > 0:
-            analyse_json_obj(json_obj[0], level + 1, res)
+            json_obj_temp = json_obj[0] if json_obj[0] is not None else {}
+            if len(list(filter(lambda item: type(item) is dict or item is None, json_obj))) == len(json_obj):
+                for i in range(1, len(json_obj)):
+                    for k in json_obj[i]:
+                        if json_obj_temp is None or (k not in json_obj_temp or json_obj_temp[k] is None):
+                            json_obj_temp[k] = json_obj[i][k]
+            json_obj_temp = None if json_obj_temp is {} else json_obj_temp
+            analyse_json_obj(json_obj_temp, level + 1, res)
 
     else:
         # 针对基本数据类型，在插入的键值对数据后再加入类型序号标志位
@@ -110,6 +117,7 @@ def get_type_combobox(need_connect, line):
 
         com_box.setCurrentIndex(obj_type)
     elif obj_type == 8:
+        com_box.addItem('Map<String, dynamic>')
         com_box.setCurrentText('')
     elif obj_type == 9:
         com_box.setCurrentText('List<>')
@@ -131,7 +139,8 @@ def update_list(json_str):
     json_obj = json.loads(json_str)
     # 传入json对象，返回所需要的格式化协议数据数组
     res = analyse_json_obj(json_obj)
-
+    global last_list_com_box
+    last_list_com_box = None
     ui.tv_fields.setRowCount(len(res))
 
     pre_type_combobox = None
@@ -206,11 +215,32 @@ def generate_bean():
         ui.te_json.setText(res)
 
 
+def str_to_camel_case(text):
+    try:
+        arr = filter(None, text.split('_'))
+        res = ''
+        for i in arr:
+            res = res + i[0].upper() + i[1:]
+        return res[0].lower() + res[1:]
+    except IndexError:
+        return text
+
+
+def convert_names_to_camel_case(index):
+    if ui.tv_fields.horizontalHeaderItem(index).text() == 'Name(click to camelCase)':
+        for i in range(ui.tv_fields.rowCount()):
+            name_cell = ui.tv_fields.cellWidget(i, 2)
+            if type(name_cell) is QtWidgets.QTextEdit:
+                assert isinstance(name_cell, QtWidgets.QTextEdit)
+                name_cell.setText(str_to_camel_case(name_cell.toPlainText()))
+
+
 def init_event():
     # 绑定json解析按钮事件
     ui.btn_format.clicked.connect(json_format)
     ui.btn_generate.clicked.connect(generate_bean)
     ui.btn_copy.clicked.connect(copy_left_text)
+    ui.tv_fields.horizontalHeader().sectionClicked.connect(convert_names_to_camel_case)
 
 
 def copy_left_text():
@@ -222,7 +252,7 @@ def copy_left_text():
 # 设置表格基础样式
 def init_table():
     # 设置表头，表头文字居中
-    ui.tv_fields.setHorizontalHeaderLabels(['Fields', 'Types', 'Name'])
+    ui.tv_fields.setHorizontalHeaderLabels(['Fields', 'Types', 'Name(click to camelCase)'])
     ui.tv_fields.horizontalHeader().setDefaultAlignment(QtCore.Qt.AlignHCenter)
     # 表头自动平分宽度
     ui.tv_fields.horizontalHeader().setSectionResizeMode(QtWidgets.QHeaderView.Stretch)
@@ -253,5 +283,5 @@ def custom_ui():
     custom_ui()
     widget.show()
     code = check_version()
-    widget.setWindowTitle(widget.windowTitle().replace('code',str(code)))
+    widget.setWindowTitle(widget.windowTitle().replace('code', str(code)))
     sys.exit(app.exec_())

tools.py

@@ -32,6 +32,9 @@ def jformat(inp):
 
 
 def check_level_type(t):
+    if t == 'Map<String, dynamic>':
+        # 不用处理的Map类型
+        return 0
     if t in ('int', 'double', 'bool', 'Object'):
         # 普通数据类型
         return 1
@@ -64,10 +67,10 @@ def list_code_loop(code, count, total, n, ct):
 
 
 # 向代码模板中插入变量
-def build_list_construction(t, n):
+def build_list_construction(t, f, n):
     class_type = t.replace('List<', '').replace('>', '')
 
-    list_loop = 'jsonRes[\'%s\'] == null ? null : [];\n' % n
+    list_loop = 'jsonRes[\'%s\'] == null ? null : [];\n' % f
     assert isinstance(t, str)
 
     code = ''
@@ -83,7 +86,7 @@ def build_list_construction(t, n):
     else:
         code = code.replace('%s' % ('Child' * total), '%s' % ('Item' * total))
     code = code[code.find(';') + 1:]
-    code = code.replace('%s){' % n, 'jsonRes[\'%s\']){' % n).replace('${loop}\n', '')
+    code = code.replace('%s){' % n, 'jsonRes[\'%s\']){' % n).replace('${loop}\n', '').replace('jsonRes[\'%s\']){' % n, 'jsonRes[\'%s\']){' % f)
 
     return list_loop + code
 
@@ -109,11 +112,10 @@ def add_param_to_code(code, param):
     ps = code.find('${toString}')
     code = code[:ps] + to_string + code[ps:]
 
-    # 字符串类型处理,只需要修改toString中的输出方式
-
     t_code = check_level_type(t)
 
-    if t_code == 2:
+    # 字符串类型和Map类型处理,只需要修改toString中的输出方式
+    if t_code in [0, 2]:
         code = code.replace(': $%s' % n, ': ${%s != null?\'${json.encode(%s)}\':\'null\'}' % (n, n))
 
     # dict类型处理，只需要修改construction中的输出方式
@@ -122,7 +124,7 @@ def add_param_to_code(code, param):
 
     # list类型处理，只需要修改construction中的输出方式
     elif t_code == 3:
-        list_loop = build_list_construction(t, n)
+        list_loop = build_list_construction(t, f, n)
 
         code = code.replace('jsonRes[\'%s\'];' % f, list_loop)
 
@@ -227,16 +229,22 @@ def check_and_generate_code(bean):
     work_bean = []
     global msg_box_ui
     msg_box_ui = bean[0][1]
-
+    ignore_level = None
     for f, t, n in bean:
         field_text = f.text()
 
         level = field_text.find('※') // 4
+        if ignore_level is not None and level > ignore_level:
+            continue
+        ignore_level = None
+
         field_text = field_text[field_text.find("》") + 1: field_text.find(":") - 1] if ":" in field_text else ''
         type_text = t.currentText() if type(t) is QComboBox else t.toPlainText()
         name_text = n.text() if type(n) is QLabel else n.toPlainText()
+        if type_text == 'Map<String, dynamic>':
+            ignore_level = level
 
-        if type_text.strip() != '':
+        if type_text.strip() != '' or ignore_level is not None:
             work_bean.append([level, field_text, type_text, name_text])
         else:
             QMessageBox().information(msg_box_ui, "警告", "字段类型未设置", QMessageBox.Ok)

version

@@ -1,4 +1,4 @@
 {
-  "code": 0.6,
-  "desc": "1.修复json中字段不存在或者为null时可能导致的bean对象创建错误，也就是各字段处理时加入了null判断\n2.放弃对于普通数据类型数组的生成代码优化\n3.修复List嵌套泛型时由于错误的优化逻辑导致的异常代码\n4.优化清理无用空行"
+  "code": 0.7,
+  "desc": "1.可以通过下拉框将对象类型设置为Map<String, dynamic>来避免该对象字段的解析，参考issue #13\n2.点击Name栏使字段转为驼峰 & 解析List的时候读取多个元素，参考issue #17\n3.修复闪退崩溃issue #23"
 }