Move config.ini, user_script.sh into $HOME/.config/vpngate-with-proxy

Dragon2fly · Apr 23, 2017 · f9621b3 · f9621b3
1 parent b145717
commit f9621b3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/vpnproxy_cli.py b/vpnproxy_cli.py
@@ -48,7 +48,7 @@ def __init__(self, data):
         self.country_short = data[6]
         self.NumSessions = data[7]
         self.uptime = data[8]
-        self.logPolicy = data[11]
+        self.logPolicy = "2wk" if data[11]=="2weeks" else "inf"
         self.config_data = base64.b64decode(data[-1])
         self.proto = 'tcp' if '\r\nproto tcp\r\n' in self.config_data else 'udp'
         port = re.findall('remote .+ \d+', self.config_data)
@@ -392,7 +392,7 @@ def vpn_manager(ovpn):
 if not os.path.exists("config.ini"):
     os.symlink(config_file, "config.ini")
 
-if not os.path.exists(user_script_file):
+if not os.path.exists("user_script.sh"):
     call(["cp", "user_script.sh.tmp", user_script_file])
     os.symlink(user_script_file, "user_script.sh")
 
@@ -433,8 +433,8 @@ def vpn_manager(ovpn):
 dns_manager()
 ranked, vpn_list = refresh_data()
 
-labels = ['Idx', 'Geo', 'Ping', 'Speed', 'Up', 'Log', 'Score', 'proto', 'Ip', 'Port']
-spaces = [5, 5, 7, 8, 8, 8, 8, 5, 19, 6]
+labels = ['Idx', 'Geo', 'Ping', 'Speed', 'UpTime', 'Log', 'Score', 'proto', 'Ip', 'Port']
+spaces = [5, 4, 5, 8, 12, 4, 8, 6, 16, 6]
 labels = [label.center(spaces[ind]) for ind, label in enumerate(labels)]
 connected_servers = []
 

diff --git a/vpnproxy_tui.py b/vpnproxy_tui.py
@@ -142,7 +142,7 @@ def __init__(self):
         if not os.path.exists("config.ini"):
             os.symlink(self.config_file, "config.ini")
 
-        if not os.path.exists(self.user_script_file):
+        if not os.path.exists("user_script.sh"):
             call(["cp", "user_script.sh.tmp", self.user_script_file])
             os.symlink(self.user_script_file, "user_script.sh")