优化代码

guonning · Mar 12, 2021 · 72b704b · 72b704b
1 parent eb68344
commit 72b704b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/v2ray_util/config_modify/multiple.py b/v2ray_util/config_modify/multiple.py
@@ -6,7 +6,7 @@
 from ..util_core.v2ray import restart
 from ..util_core.loader import Loader
 from ..util_core.writer import NodeWriter
-from ..util_core.group import Vmess, Socks, Mtproto, SS, Vless, Trojan, Xtls
+from ..util_core.group import Vmess, Socks, Mtproto, SS, Vless, Trojan
 from ..util_core.selector import GroupSelector, ClientSelector, CommonSelector
 from ..util_core.utils import is_email, clean_iptables, random_email, ColorStr, readchar, random_port, port_is_use, xtls_flow, StreamType
 
@@ -53,7 +53,7 @@ def new_user():
         pass
     else:
         email = ""
-        if type(group.node_list[0]) in (Vmess, Vless, Trojan, Xtls): 
+        if type(group.node_list[0]) in (Vmess, Vless, Trojan): 
             while True:
                 is_duplicate_email=False
                 remail = random_email()
@@ -85,7 +85,7 @@ def new_user():
                 if password == "":
                     password = random_pass
                 info['password'] = password
-            elif type(group.node_list[0]) == Xtls:
+            elif type(group.node_list[0]) == Vless and group.tls == "xtls":
                 flow_list = xtls_flow()
                 print("")
                 flow = CommonSelector(flow_list, _("please select xtls flow type: ")).select()

diff --git a/v2ray_util/util_core/client.py b/v2ray_util/util_core/client.py
@@ -3,7 +3,7 @@
 import json
 
 from .config import Config
-from .group import Vmess, Vless, Socks, SS, Mtproto, Trojan, Xtls
+from .group import Vmess, Vless, Socks, SS, Mtproto, Trojan
 from .selector import ClientSelector
 
 class ClientWriter:
@@ -34,14 +34,14 @@ def transform(self):
             user_json["users"][0]["id"] = self.node.password
             user_json["users"][0]["alterId"] = self.node.alter_id
 
-        elif type(self.node) in (Vless, Xtls):
+        elif type(self.node) == Vless:
             self.client_config = self.load_template('client.json')
             user_json = self.client_config["outbounds"][0]["settings"]["vnext"][0]
             user_json["users"][0]["id"] = self.node.password
             del user_json["users"][0]["alterId"]
             del user_json["users"][0]["security"]
             user_json["users"][0]["encryption"] = self.node.encryption
-            if type(self.node) == Xtls:
+            if self.node.tls == "xtls":
                 user_json["users"][0]["flow"] = self.node.flow
             self.client_config["outbounds"][0]["protocol"] = "vless" 
 

diff --git a/v2ray_util/util_core/writer.py b/v2ray_util/util_core/writer.py
@@ -7,7 +7,7 @@
 
 from .config import Config
 from .utils import StreamType, random_port
-from .group import Mtproto, Vmess, Socks, Vless, Trojan, Xtls
+from .group import Mtproto, Vmess, Socks, Vless, Trojan
 
 def clean_mtproto_tag(config, group_index):
     '''
@@ -589,7 +589,7 @@ def del_user(self, group, client_index):
             if type(node) == Mtproto:
                 clean_mtproto_tag(self.config, group.index)
             del self.config["inbounds"][group.index]
-        elif type(node) in (Vmess, Socks, Vless, Trojan, Xtls):
+        elif type(node) in (Vmess, Socks, Vless, Trojan):
             client_str = 'accounts' if type(node) == Socks else 'clients'
             del self.config["inbounds"][group.index]["settings"][client_str][client_index]