Skip to content

Commit

Permalink
fix: vpn设置为空
Browse files Browse the repository at this point in the history
  • Loading branch information
yuhldr committed Dec 11, 2024
1 parent 5140f2e commit 17a9b32
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 16 deletions.
8 changes: 2 additions & 6 deletions lfy/gtk/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,11 @@
from lfy.gtk.translate import TranslateWindow
from lfy.utils import cal_md5, get_cache_img_path, is_text
from lfy.utils.check_update import main as check_update
from lfy.utils.code import parse_lfy
from lfy.utils.code import parse_lfy, set_vpn
from lfy.utils.settings import Settings

# 设置代理地址和端口号
PROXY_ADDRESS = Settings().g("vpn-addr-port")
if PROXY_ADDRESS:
# 设置环境变量
os.environ['http_proxy'] = PROXY_ADDRESS
os.environ['https_proxy'] = PROXY_ADDRESS
set_vpn()


class LfyApplication(Adw.Application):
Expand Down
12 changes: 3 additions & 9 deletions lfy/qt/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,9 @@
from lfy import APP_ID, APP_NAME
from lfy.qt.translate import TranslateWindow
from lfy.qt.tray import TrayIcon
from lfy.utils.code import parse_lfy
from lfy.utils.settings import Settings

# 设置代理地址和端口号
PROXY_ADDRESS = Settings().g("vpn-addr-port")
if PROXY_ADDRESS:
# 设置环境变量
os.environ['http_proxy'] = PROXY_ADDRESS
os.environ['https_proxy'] = PROXY_ADDRESS
from lfy.utils.code import parse_lfy, set_vpn

set_vpn()


def main():
Expand Down
2 changes: 1 addition & 1 deletion lfy/utils/code.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def set_vpn():

# 设置代理地址和端口号
proxy_address = Settings().g("vpn-addr-port")
if len(proxy_address) > 0:
if proxy_address:
# 设置环境变量
os.environ['http_proxy'] = proxy_address
os.environ['https_proxy'] = proxy_address
Expand Down

0 comments on commit 17a9b32

Please sign in to comment.