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

Dragon2fly · Apr 21, 2017 · 3682169 · 3682169
1 parent fce8aae
commit 3682169
Show file tree

Hide file tree

Showing 14 changed files with 11 additions and 4 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/config.py b/config.py
diff --git a/icon/connected.svg b/icon/connected.svg
diff --git a/icon/connecting1.svg b/icon/connecting1.svg
diff --git a/icon/connecting2.svg b/icon/connecting2.svg
diff --git a/icon/connecting3.svg b/icon/connecting3.svg
diff --git a/icon/connectnot.svg b/icon/connectnot.svg
diff --git a/old/LICENSE b/old/LICENSE
diff --git a/old/README.md b/old/README.md
diff --git a/old/config.py b/old/config.py
diff --git a/ui_elements.py b/ui_elements.py
diff --git a/user_script.sh b/user_script.sh
diff --git a/vpnproxy_cli.py b/vpnproxy_cli.py
@@ -79,7 +79,7 @@ def __str__(self):
         uptime = datetime.timedelta(milliseconds=int(self.uptime))
         uptime = re.split(',|\.', str(uptime))[0]
         txt = [self.country_short, str(self.ping), '%.2f' % speed, uptime, self.logPolicy, str(self.score), self.proto,
-               self.port]
+               self.ip, self.port]
         txt = [dta.center(spaces[ind + 1]) for ind, dta in enumerate(txt)]
         return ''.join(txt)
 
@@ -327,7 +327,7 @@ def vpn_manager(ovpn):
 
 # get config file path
 path = os.path.realpath(sys.argv[0])
-config_file = os.path.split(path)[0] + '/config.ini'
+config_file = os.path.expanduser('~/.config/vpngate-with-proxy/config.ini')
 cfg = Setting(config_file)
 args = sys.argv[1:]
 
@@ -342,6 +342,9 @@ def vpn_manager(ovpn):
             get_input(cfg, args)
 
 else:
+    if not os.path.exists(os.path.expanduser('~/.config/vpngate-with-proxy')):
+        os.makedirs(os.path.expanduser('~/.config/vpngate-with-proxy'))
+
     print '\n' + '_' * 12 + ctext(' First time config ', 'gB') + '_' * 12 + '\n'
 
     cfg.proxy['use_proxy'] = 'no' if raw_input(
@@ -384,6 +387,10 @@ def vpn_manager(ovpn):
     get_input(cfg, 'config')
     print '\n' + '_' * 12 + ctext(' Config done', 'gB') + '_' * 12 + '\n'
 
+
+if not os.path.exists("config.ini"):
+    os.symlink(config_file, "config.ini")
+
 # ------------------- check_dependencies: ----------------------
 mirrors.extend(cfg.mirror['url'].split(', '))
 use_proxy, proxy, port, ip = cfg.proxy.values()
@@ -421,8 +428,8 @@ def vpn_manager(ovpn):
 dns_manager()
 ranked, vpn_list = refresh_data()
 
-labels = ['Index', 'Country', 'Ping', 'Speed', 'Up time', 'Log Policy', 'Score', 'protocol', 'Portal']
-spaces = [6, 7, 6, 10, 10, 10, 10, 8, 8]
+labels = ['Idx', 'Geo', 'Ping', 'Speed', 'Up', 'Log', 'Score', 'proto', 'Ip', 'Port']
+spaces = [5, 5, 7, 8, 8, 8, 8, 5, 19, 6]
 labels = [label.center(spaces[ind]) for ind, label in enumerate(labels)]
 connected_servers = []