From e2cc5aa42af079cef0701727ea271b3f77ba41d5 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 02 九月 2025 14:24:05 +0800
Subject: [PATCH] bug修复
---
huaxin_client/l1_subscript_codes_manager.py | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/huaxin_client/l1_subscript_codes_manager.py b/huaxin_client/l1_subscript_codes_manager.py
index 405fa91..838658e 100644
--- a/huaxin_client/l1_subscript_codes_manager.py
+++ b/huaxin_client/l1_subscript_codes_manager.py
@@ -8,7 +8,6 @@
from huaxin_client import socket_util
from huaxin_client.client_network import SendResponseSkManager
-
# 璇锋眰l1璁㈤槄鐨勭洰鏍囦唬鐮�
from utils import tool
@@ -36,7 +35,6 @@
codes_sz.append(code.encode("utf-8"))
else:
codes_sh.append(code.encode("utf-8"))
- print("鑾峰彇璁㈤槄鐩爣浠ｆ暟閲忥細", len(codes_sh), len(codes_sz))
return codes_sh, codes_sz
except ConnectionResetError:
SendResponseSkManager.del_send_response_sk(type_)
@@ -71,31 +69,38 @@
f.write("\n")
-def get_codes_from_file():
+def get_codes_from_file(only_can_buy=True):
codes_sh, codes_sz = [], []
if os.path.exists(__CODE_SH_PATH):
with open(__CODE_SH_PATH, 'r') as f:
- line = f.readline()
- while line:
- if line.strip():
- codes_sh.append(line.strip().encode('utf-8'))
- line = f.readline()
+ lines = f.readlines()
+ for line in lines:
+ if line:
+ if line.strip():
+ code = line.strip()
+ if not tool.is_can_buy_code(code) and only_can_buy:
+ continue
+ codes_sh.append(code.encode('utf-8'))
+
if os.path.exists(__CODE_SZ_PATH):
with open(__CODE_SZ_PATH, 'r') as f:
- line = f.readline()
- while line:
- if line.strip():
- codes_sz.append(line.strip().encode('utf-8'))
- line = f.readline()
+ lines = f.readlines()
+ for line in lines:
+ if line:
+ if line.strip():
+ code = line.strip()
+ if not tool.is_can_buy_code(code) and only_can_buy:
+ continue
+ codes_sz.append(code.encode('utf-8'))
return codes_sh, codes_sz
-def get_codes():
- codes_sh, codes_sz = get_codes_from_file()
+def get_codes(only_can_buy=True):
+ codes_sh, codes_sz = get_codes_from_file(only_can_buy)
if not codes_sh or not codes_sz:
return request_l1_subscript_target_codes()
return codes_sh, codes_sz
if __name__ == '__main__':
- print( request_l1_subscript_target_codes())
+ print(get_codes())
--
Gitblit v1.8.0