group select no case sensitive

Jrohy · Oct 3, 2019 · 11afc40 · 11afc40
1 parent 7828238
commit 11afc40
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/v2ray_util/__init__.py b/v2ray_util/__init__.py
@@ -1,3 +1,3 @@
-__version__ = '3.6.6'
+__version__ = '3.6.7'
 
 from .util_core.trans import _
diff --git a/v2ray_util/locale_i18n/zh_CH/LC_MESSAGES/lang.mo b/v2ray_util/locale_i18n/zh_CH/LC_MESSAGES/lang.mo
diff --git a/v2ray_util/locale_i18n/zh_CH/LC_MESSAGES/lang.po b/v2ray_util/locale_i18n/zh_CH/LC_MESSAGES/lang.po
@@ -185,8 +185,8 @@ msgstr "请输入数字来"
 msgid "last group can't delete!!!"
 msgstr "仅剩最后一个端口无法删除!!!"
 
-msgid "please input group alphabet to"
-msgstr "请输入节点Group字母来"
+msgid "please input group to"
+msgstr "请输入节点Group来"
 
 msgid "input error, please check group"
 msgstr "输入有误，请检查组"

diff --git a/v2ray_util/util_core/profile.py b/v2ray_util/util_core/profile.py
@@ -71,7 +71,10 @@ def read_json(self):
             group = self.parse_group(json_part, index, local_ip)
             if group != None:
                 group_ascii = group_ascii + 1
-                group.tag = chr(group_ascii)
+                if group_ascii > 90:
+                    group.tag = str(group_ascii)
+                else:
+                    group.tag = chr(group_ascii)
                 self.group_list.append(group)
 
         if len(self.group_list) == 0:

diff --git a/v2ray_util/util_core/selector.py b/v2ray_util/util_core/selector.py
@@ -83,8 +83,8 @@ def __init__(self, action):
 
     def select_group(self):
         print(self.profile)
-        choice = input("{} {}: ".format(_("please input group alphabet to"), self.action))
-        group_list = [x for x in self.group_list if x.tag == choice]
+        choice = input("{} {}: ".format(_("please input group to"), self.action))
+        group_list = [x for x in self.group_list if x.tag == str.upper(choice)]
         if len(group_list) == 0:
             print(ColorStr.red('{0} {1} {2}'.format(_("input error, please check group"), choice, _("exist"))))
             self.group = None