Merge pull request #24 from GOOD-AN/dev

Dev

Author: GOOD-AN

config/default_config.ini

@@ -2,7 +2,7 @@
 name = Mys_Exch_Goods
 env = local
 branch = main
-version = 3.0.1
+version = 3.0.2
 
 [update_setting]
 check_enable = true

docs/CHANGELOG.md

@@ -1,5 +1,13 @@
 # 更新日志
 
+## [3.0.2.230505 Alpha] - 2023-0505
+
+### Added
+- 添加星铁兑换支持
+
+### Fixed
+- 修复文件写入错误
+
 ## [3.0.1.230504 Alpha] - 2023-0504
 
 ### Added

main.py

@@ -12,7 +12,7 @@
 from myseg import check_cookie, update_cookie
 from myseg import user_global_var as gl, logger
 
-MAIN_VERSION = '3.0.1'
+MAIN_VERSION = '3.0.2'
 MESSAGE = f"""\
 ===========================================
 |        Mys Exchange Goods v{MAIN_VERSION:13s}|

myseg/com_tool.py

@@ -11,6 +11,7 @@
 from ntplib import NTPClient
 
 from . import user_global_var as gl, logger, logger_file
+from .user_data import ClassEncoder
 
 CHECK_UPDATE_URL_LIST = [
     'https://cdn.jsdelivr.net/gh/GOOD-AN/mys_exch_goods@latest/',
@@ -69,7 +70,7 @@ async def check_update(main_version):
             for check_update_url in CHECK_UPDATE_URL_LIST:
                 check_url = check_update_url + "update_log.json"
                 try:
-                    async with httpx.AsyncClient() as client:
+                    async with httpx.AsyncClient(follow_redirects=True) as client:
                         check_info = await client.get(check_url, timeout=5)
                         check_info = check_info.json()
                     break
@@ -145,3 +146,25 @@ async def async_input(prompt=''):
     except AttributeError:
         loop = asyncio.get_running_loop()
         return await loop.run_in_executor(None, input, prompt)
+
+
+async def save_file(account, class_var, info_list, log_info):
+    """
+    保存文件数据
+    """
+    try:
+        if info_list:
+            setattr(account, class_var, info_list)
+            with open(gl.user_data_path / f"{account.mys_uid}.json", 'w', encoding='utf-8') as f:
+                json.dump(account, f, ensure_ascii=False, indent=4, cls=ClassEncoder)
+            logger.info(f"更新{log_info}信息成功")
+        else:
+            logger.info(f"未获取到{log_info}信息")
+        return True
+    except KeyboardInterrupt:
+        logger.warning("用户强制退出")
+        input("按回车键继续")
+        sys.exit()
+    except Exception as err:
+        logger.error(f"保存文件失败, 原因为{err}, 错误行数为: {err.__traceback__.tb_lineno}")
+        return False

myseg/get_info.py

@@ -13,11 +13,11 @@
 from apscheduler.events import EVENT_JOB_ADDED, EVENT_JOB_MODIFIED, EVENT_JOB_MISSED, EVENT_JOB_REMOVED
 
 from . import user_global_var as gl, scheduler, logger, logger_file
+from .com_tool import async_input, get_time, save_file
 from .exchange_goods import run_task
 from .mi_tool import GAME_NAME, MYS_CHANNEL
 from .mi_tool import update_cookie, get_goods_detail, check_game_roles, get_point
 from .user_data import UserInfo, AddressInfo, ClassEncoder, GoodsInfo
-from .com_tool import async_input, get_time
 
 
 async def select_user(select_user_data: dict):
@@ -518,7 +518,8 @@ async def get_goods_list(account: UserInfo, use_type: str = "set"):
 3.原神
 4.崩坏学园2
 5.未定事件簿
-6.米游社
+6.崩坏：星穹铁道
+7.米游社
 0.返回上一级""")
             game_choice = await async_input("请输入需要查询的序号: ")
             game_type_dict = {
@@ -527,7 +528,8 @@ async def get_goods_list(account: UserInfo, use_type: str = "set"):
                 "3": "hk4e",
                 "4": "bh2",
                 "5": "nxx",
-                "6": "bbs",
+                "6": "hkrpg",
+                "7": "bbs"
             }
             if game_choice == "0":
                 return None
@@ -755,37 +757,14 @@ async def info_menu():
                     print(f"当前米游币数量: {now_point}")
                 else:
                     logger.info("未获取到米游币数量")
-            # 待优化
             elif select_function == "5":
-                update_result = await update_cookie(account)
-                if update_result:
-                    account.cookie = update_result
-                    logger.info("cookie更新成功")
+                await save_file(account, "cookie", await update_cookie(account), "Cookie")
             elif select_function == "6":
-                game_info_list = await check_game_roles(account)
-                if game_info_list:
-                    account.game_list = game_info_list
-                    with open(gl.user_data_path / f"{account.mys_uid}.json", 'w', encoding='utf-8') as f:
-                        json.dump(account, f, ensure_ascii=False, indent=4, cls=ClassEncoder)
-                    logger.info("更新游戏账号信息成功")
-                else:
-                    logger.info("未获取到游戏账号信息")
+                await save_file(account, "game_list", await check_game_roles(account), "游戏账号")
             elif select_function == "7":
-                address_list = await get_address(account)
-                if address_list:
-                    account.address_list = address_list
-                    with open(gl.user_data_path / f"{account.mys_uid}.json", 'w', encoding='utf-8') as f:
-                        json.dump(account, f, ensure_ascii=False, indent=4, cls=ClassEncoder)
-                    logger.info("更新收货地址信息成功")
-                else:
-                    logger.info("未获取到收货地址信息")
+                await save_file(account, "address_list", await get_address(account), "收货地址")
             elif select_function == "8":
-                channel_data_dict = await get_channel_level(account)
-                if channel_data_dict:
-                    account.channel_dict = channel_data_dict
-                    with open(gl.user_data_path / f"{account.mys_uid}.json", 'w', encoding='utf-8') as f:
-                        json.dump(account, f, ensure_ascii=False, indent=4, cls=ClassEncoder)
-                    logger.info("更新频道等级信息成功")
+                await save_file(account, "channel_dict", await get_channel_level(account), "频道等级")
             elif select_function == "9":
                 if gl.user_dict:
                     account = await select_user(gl.user_dict)

update_log.json

@@ -61,6 +61,11 @@
             "version": "3.0.1",
             "update_time": "2023-05-04",
             "update_content": ["1.添加日志配置"]
+        },
+        {
+            "version": "3.0.2",
+            "update_time": "2023-05-05",
+            "update_content": ["1.添加星铁兑换项目", "2.修复部分错误"]
         }
     ]
 }