From 30a3cd2911c8403acc7871cc54e5f0b215cb4408 Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 1 Apr 2016 11:50:35 +0800 Subject: [PATCH] =?UTF-8?q?feat=20(sort=20search)=20=E5=AF=B9=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E7=BB=93=E6=9E=9C=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit tty登陆连接,搜索时对结果进行排序 finished --- connect.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/connect.py b/connect.py index 7aee8ea83..64a3593f7 100755 --- a/connect.py +++ b/connect.py @@ -438,8 +438,10 @@ class Nav(object): self.user = user self.search_result = None self.user_perm = get_group_user_perm(self.user) - self.perm_assets = tuple(self.user_perm.get('asset', [])) + self.perm_assets = sorted(self.user_perm.get('asset', []).keys(), + key=lambda x: [int(num) for num in x.ip.split('.') if num.isdigit()]) self.perm_asset_groups = self.user_perm.get('asset_group', []) + print self.perm_assets @staticmethod def print_nav(): @@ -494,8 +496,6 @@ class Nav(object): # 如果没有输入就展现所有 self.search_result = self.perm_assets - self.search_result = list(set(self.search_result)) - def print_search_result(self): color_print('[%-3s] %-12s %-15s %-5s %-10s %s' % ('ID', '主机名', 'IP', '端口', '系统用户', '备注'), 'title') if hasattr(self.search_result, '__iter__'):