Skip to content

Commit 4bb04d4

Browse files
ZianTTZianTT
authored
fix一点小bug (#114)
比如有时候那个猫娘语言设置不生效
2 parents b399ef2 + c85581e commit 4bb04d4

File tree

8 files changed

+828
-740
lines changed

8 files changed

+828
-740
lines changed

‎api.py

Lines changed: 79 additions & 83 deletions
Large diffs are not rendered by default.

‎globals.py

Lines changed: 46 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -14,33 +14,30 @@
1414

1515
from login import *
1616

17-
from globals import *
1817
from utility import utility
1918

2019
from utils import prompt, save, load
2120

2221
import time
23-
from i18n import i18n
24-
i18n_lang = "中文"
22+
from i18n import *
2523

2624
version = "v0.8.4"
2725

2826
def agree_terms():
29-
global i18n_lang
3027
while True:
3128
agree_prompt = input(
32-
i18n[i18n_lang]["eula"])
29+
i18n_gt()["eula"])
3330
if "同意" in agree_prompt and "死妈" in agree_prompt and "黄牛" in agree_prompt and "不" not in agree_prompt:
3431
break
3532
else:
36-
logger.error(i18n[i18n_lang]["wrong_input"])
33+
logger.error(i18n_gt()["wrong_input"])
3734
with open("agree-terms", "w") as f:
3835
import machineid
3936
f.write(machineid.id())
40-
logger.info(i18n[i18n_lang]["agree_eula"])
37+
logger.info(i18n_gt()["agree_eula"])
4138

4239
def init():
43-
global i18n_lang
40+
4441
logger.remove(handler_id=0)
4542
if sys.argv[0].endswith(".py"):
4643
level = "DEBUG"
@@ -89,7 +86,6 @@ def init():
8986
return version, sentry_sdk
9087

9188
def check_update(version):
92-
global i18n_lang
9389
try:
9490
import requests
9591
data = requests.get("https://api.github.com/repos/biliticket/BHYG/releases/latest",
@@ -115,41 +111,40 @@ def check_update(version):
115111
for distribution in data["assets"]:
116112
if distribution["name"] == name:
117113
logger.warning(
118-
i18n[i18n_lang]["new_version_1"].format(data['tag_name'], distribution['browser_download_url'], distribution['size'] / 1024 / 1024))
114+
i18n_gt()["new_version_1"].format(data['tag_name'], distribution['browser_download_url'], distribution['size'] / 1024 / 1024))
119115
if data['body'] != "":
120-
logger.warning(i18n[i18n_lang]["new_version_notify"].format(data['body']))
116+
logger.warning(i18n_gt()["new_version_notify"].format(data['body']))
121117
find = True
122118
break
123119
if not find:
124-
logger.warning(i18n[i18n_lang]["new_version_2"].format(data['tag_name'], data['html_url']))
120+
logger.warning(i18n_gt()["new_version_2"].format(data['tag_name'], data['html_url']))
125121
if data['body'] != "":
126-
logger.warning(i18n[i18n_lang]["new_version_notify"].format(data['body']))
122+
logger.warning(i18n_gt()["new_version_notify"].format(data['body']))
127123
find = True
128124
except KeyboardInterrupt:
129-
logger.error(i18n[i18n_lang]["update_interrupted"])
125+
logger.error(i18n_gt()["update_interrupted"])
130126
except:
131-
logger.error(i18n[i18n_lang]["update_interrupted"])
127+
logger.error(i18n_gt()["update_interrupted"])
132128

133129

134130
class HygException(Exception):
135131
pass
136132

137133

138134
def load_config():
139-
global i18n_lang
140135
go_utility = False
141136
if os.path.exists("config.json"):
142-
logger.info(i18n[i18n_lang]["welcome_new_version"])
137+
logger.info(i18n_gt()["welcome_new_version"])
143138
if os.path.isdir("data"):
144139
import shutil
145140
shutil.rmtree("data")
146141
with open("config.json", "r", encoding="utf-8") as f:
147142
config = json.load(f)
148143
save(config)
149144
os.remove("config.json")
150-
logger.info(i18n[i18n_lang]["new_version_ok"])
145+
logger.info(i18n_gt()["new_version_ok"])
151146
if os.path.exists("share.json"):
152-
logger.info(i18n[i18n_lang]["check_share"])
147+
logger.info(i18n_gt()["check_share"])
153148
with open("share.json", "r", encoding="utf-8") as f:
154149
config = json.load(f)
155150
save(config)
@@ -161,19 +156,19 @@ def load_config():
161156
run_info = prompt([
162157
inquirer.List(
163158
"run_info",
164-
message=i18n[i18n_lang]["select_setting"],
165-
choices=[i18n[i18n_lang]["select_keep_all"],
166-
i18n[i18n_lang]["select_keep_login"],
167-
i18n[i18n_lang]["select_new_boot"],
168-
i18n[i18n_lang]["select_tools"],
169-
i18n[i18n_lang]["select_tools_relogin"],
170-
i18n[i18n_lang]["select_reset"],
159+
message=i18n_gt()["select_setting"],
160+
choices=[i18n_gt()["select_keep_all"],
161+
i18n_gt()["select_keep_login"],
162+
i18n_gt()["select_new_boot"],
163+
i18n_gt()["select_tools"],
164+
i18n_gt()["select_tools_relogin"],
165+
i18n_gt()["select_reset"],
171166
"语言设置/Language setting"],
172-
default= i18n[i18n_lang]["select_keep_all"]
167+
default= i18n_gt()["select_keep_all"]
173168
)]
174169
)["run_info"]
175-
if run_info == i18n[i18n_lang]["select_new_boot"]:
176-
logger.info(i18n[i18n_lang]["select_new_boot_msg"])
170+
if run_info == i18n_gt()["select_new_boot"]:
171+
logger.info(i18n_gt()["select_new_boot_msg"])
177172
temp = load()
178173
config = {}
179174
if "pushplus" in temp:
@@ -191,8 +186,8 @@ def load_config():
191186
if "proxy_channel" in temp:
192187
config["proxy_channel"] = temp["proxy_channel"]
193188
use_login = False
194-
elif run_info == i18n[i18n_lang]["select_keep_login"]:
195-
logger.info(i18n[i18n_lang]["select_keep_login_msg"])
189+
elif run_info == i18n_gt()["select_keep_login"]:
190+
logger.info(i18n_gt()["select_keep_login_msg"])
196191
temp = load()
197192
config = {}
198193
if "gaia_vtoken" in temp:
@@ -216,44 +211,35 @@ def load_config():
216211
if "proxy_channel" in temp:
217212
config["proxy_channel"] = temp["proxy_channel"]
218213
use_login = True
219-
elif run_info == i18n[i18n_lang]["select_keep_all"]:
220-
logger.info(i18n[i18n_lang]["select_keep_all_msg"])
214+
elif run_info == i18n_gt()["select_keep_all"]:
215+
logger.info(i18n_gt()["select_keep_all_msg"])
221216
config = load()
222217
use_login = True
223-
elif run_info == i18n[i18n_lang]["select_tools"]:
224-
logger.info(i18n[i18n_lang]["select_tools"])
218+
elif run_info == i18n_gt()["select_tools"]:
219+
logger.info(i18n_gt()["select_tools"])
225220
go_utility = True
226221
use_login = True
227222
config = load()
228-
elif run_info == i18n[i18n_lang]["select_tools_relogin"]:
229-
logger.info(i18n[i18n_lang]["select_tools_relogin"])
223+
elif run_info == i18n_gt()["select_tools_relogin"]:
224+
logger.info(i18n_gt()["select_tools_relogin"])
230225
go_utility = True
231226
use_login = False
232227
config = {}
233-
elif run_info == i18n[i18n_lang]["select_reset"]:
234-
choice = prompt([inquirer.List("again", message=i18n[i18n_lang]["select_reset_msg"],
235-
choices=[i18n[i18n_lang]["no"], i18n[i18n_lang]["yes"]], default=i18n[i18n_lang]["no"])])[
228+
elif run_info == i18n_gt()["select_reset"]:
229+
choice = prompt([inquirer.List("again", message=i18n_gt()["select_reset_msg"],
230+
choices=[i18n_gt()["no"], i18n_gt()["yes"]], default=i18n_gt()["no"])])[
236231
"again"]
237-
if choice == i18n[i18n_lang]["yes"]:
232+
if choice == i18n_gt()["yes"]:
238233
os.remove("language")
239234
os.remove("data")
240235
os.remove("agree-terms")
241236
config = {}
242-
logger.info(i18n[i18n_lang]["select_reset_ok"])
237+
logger.info(i18n_gt()["select_reset_ok"])
243238
else:
244-
logger.info(i18n[i18n_lang]["select_reset_cancel"])
239+
logger.info(i18n_gt()["select_reset_cancel"])
245240
return
246241
elif run_info == "语言设置/Language setting":
247-
i18n_lang = inquirer.prompt([
248-
inquirer.List(
249-
name="lang_select",
250-
message="Please select language",
251-
choices=["中文", "English", "中文(猫娘)"],
252-
)]
253-
)["lang_select"]
254-
with open("language", "w", encoding="utf-8") as f:
255-
f.write(i18n_lang)
256-
f.close
242+
set_language(True)
257243
config = load()
258244
go_utility = True
259245
use_login = True
@@ -283,12 +269,12 @@ def load_config():
283269
else:
284270
break
285271
if skip >= 10:
286-
logger.error(i18n[i18n_lang]["time_sync_fail"])
272+
logger.error(i18n_gt()["time_sync_fail"])
287273
config["time_offset"] = 0
288274
else:
289275
time_offset = response.offset
290276
if time_offset > 0.5:
291-
logger.warning(i18n[i18n_lang]["time_sync_delta"].format(time_offset))
277+
logger.warning(i18n_gt()["time_sync_delta"].format(time_offset))
292278
config["time_offset"] = time_offset
293279
while True:
294280
if "cookie" not in config or not use_login:
@@ -302,9 +288,9 @@ def load_config():
302288
)
303289
user = user.json()
304290
if user["data"]["isLogin"]:
305-
logger.success(i18n[i18n_lang]["user"] +' '+ user["data"]["uname"] +' '+ i18n[i18n_lang]["login_success"])
291+
logger.success(i18n_gt()["user"] +' '+ user["data"]["uname"] +' '+ i18n_gt()["login_success"])
306292
if user["data"]["vipStatus"] != 0:
307-
logger.info(i18n[i18n_lang]["user_bigvip"].format((user['data']['vipDueDate'] / 1000 - time.time()) / 60 / 60 / 24))
293+
logger.info(i18n_gt()["user_bigvip"].format((user['data']['vipDueDate'] / 1000 - time.time()) / 60 / 60 / 24))
308294
import machineid
309295
sentry_sdk.set_user(
310296
{
@@ -313,12 +299,12 @@ def load_config():
313299
}
314300
)
315301
if "hunter" in config:
316-
logger.success(i18n[i18n_lang]["hunter_mode"])
317-
logger.info(i18n[i18n_lang]["hunter_grade"].format(config['hunter']))
302+
logger.success(i18n_gt()["hunter_mode"])
303+
logger.info(i18n_gt()["hunter_grade"].format(config['hunter']))
318304
save(config)
319305
break
320306
else:
321-
logger.error(i18n[i18n_lang]["login_failure"])
307+
logger.error(i18n_gt()["login_failure"])
322308
use_login = False
323309
config.pop("cookie")
324310
save(config)

0 commit comments

Comments
 (0)