From ff7d9ce8a08088316e9e0b61a9f15d6dc4d94481 Mon Sep 17 00:00:00 2001 From: liuf5 Date: Wed, 24 Mar 2021 23:10:24 +0800 Subject: [PATCH 1/3] fix:histroy display repeat and chinese characters are not encoded --- zoomeye/show.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/zoomeye/show.py b/zoomeye/show.py index ddb155e..860c973 100644 --- a/zoomeye/show.py +++ b/zoomeye/show.py @@ -39,6 +39,8 @@ def convert_str(s): for c in s: if ord(c) in range(32, 127): res.append(c) + elif ord(c) in range(19968, 40869): + res.append(c) elif c in d.keys(): res.append(d[c]) else: @@ -320,9 +322,9 @@ def print_filter_history(fileds, hist_data, condition=None): for condition_item in condition: k, v = condition_item.split('=') re_result = re.search(str(v), str(item_item), re.I | re.M) - content = "\033[31m{}\033[0m".format(re_result.group()) # replace to highlight if re_result: - item_item = item_item.replace(re_result.group(), content) + content_item = "\033[31m{}\033[0m".format(re_result.group()) + item_item = str(item_item).replace(re_result.group(), content_item) content += "{:<27}".format(item_item) printf(content) From c16d6516a9f5eb44923740287074b700bdd8189a Mon Sep 17 00:00:00 2001 From: liuf5 Date: Wed, 24 Mar 2021 23:11:31 +0800 Subject: [PATCH 2/3] feat:update version --- zoomeye/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zoomeye/__init__.py b/zoomeye/__init__.py index 1a8c58c..9689819 100644 --- a/zoomeye/__init__.py +++ b/zoomeye/__init__.py @@ -11,5 +11,5 @@ __name__ = 'zoomeye' __package__ = 'zoomeye' -__version__ = ' 2.0.4.3' +__version__ = ' 2.0.4.4' __site__ = "https://www.zoomeye.org/doc" From f44062247297c306d34f8b1d0f89ba22b0124557 Mon Sep 17 00:00:00 2001 From: liuf5 Date: Thu, 25 Mar 2021 16:50:54 +0800 Subject: [PATCH 3/3] fix some bug and update print format --- zoomeye/show.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/zoomeye/show.py b/zoomeye/show.py index 860c973..fb60960 100644 --- a/zoomeye/show.py +++ b/zoomeye/show.py @@ -34,17 +34,15 @@ def convert_str(s): d = { '\n': '\\n', '\r': '\\r', - '\t': '\\t' + '\t': '\\t', + '\b': '\\b', + '\a': '\\a', } for c in s: - if ord(c) in range(32, 127): - res.append(c) - elif ord(c) in range(19968, 40869): - res.append(c) - elif c in d.keys(): + if c in d.keys(): res.append(d[c]) else: - res.append('\\x%.2x' % ord(c)) + res.append(c) return ''.join(res)