[fix]:[][修复了有时无法正常获取英文名称的BUG]

[refactor]:[][规范了部分变量名，完善了提示信息]

Author: bjdbjd

src/api/api.py

@@ -11,19 +11,19 @@
 #         # 从请求URL中获取参数
 #         settings_json = get_settings_json()
 #         return jsonify({
-#             "data": {
-#                 "settings": settings_json
+#             'data': {
+#                 'settings': settings_json
 #             },
-#             "message": "获取设置信息成功。",
-#             "statusCode": "OK"
+#             'message': '获取设置信息成功。',
+#             'statusCode': 'OK'
 #         })
 #     except Exception as e:
 #         return jsonify({
-#             "data": {
-#                 "settings": ""
+#             'data': {
+#                 'settings': ''
 #             },
-#             "message": f"获取设置信息失败：{e}。",
-#             "statusCode": "GENERAL_ERROR"
+#             'message': f'获取设置信息失败：{e}。',
+#             'statusCode': 'GENERAL_ERROR'
 #         }), 400
 #
 #
@@ -35,15 +35,15 @@
 #         request_body = request.json
 #         update_settings_json(request_body)
 #         return jsonify({
-#             "data": {},
-#             "message": "更新设置信息成功。",
-#             "statusCode": "OK"
+#             'data': {},
+#             'message': '更新设置信息成功。',
+#             'statusCode': 'OK'
 #         })
 #     except Exception as e:
 #         return jsonify({
-#             "data": {},
-#             "message": f"更新设置信息失败：{e}。",
-#             "statusCode": "GENERAL_ERROR"
+#             'data': {},
+#             'message': f'更新设置信息失败：{e}。',
+#             'statusCode': 'GENERAL_ERROR'
 #         }), 400
 #
 #

src/api/startapi.py

@@ -6,9 +6,9 @@
 
 def get_auto_feed_link(main_title, second_title, description, media_info, file_name, team, source, category,
                        torrent_url):
-    auto_feed_link = str(get_settings("auto_feed_link"))
-    torrent_name = file_name + '.torrent'  # 种子名称
-    print("变量初始化完成")
+    auto_feed_link = str(get_settings('auto_feed_link'))
+    torrent_name = f'{file_name}.torrent'  # 种子名称
+    print('变量初始化完成')
     name = main_title
     small_descr = second_title
     descr = description
@@ -60,13 +60,13 @@ def get_auto_feed_link(main_title, second_title, description, media_info, file_n
     if '#separator#' in auto_feed_link:
         string_to_encode = auto_feed_link.split('#separator#')[-1]
         string_encoded = base64encoding(string_to_encode)
-        auto_feed_link = auto_feed_link.replace(string_to_encode, "") + string_encoded
-        print("获取到auto_feed_link：" + auto_feed_link)
+        auto_feed_link = auto_feed_link.replace(string_to_encode, '') + string_encoded
+        print('获取到auto_feed_link：' + auto_feed_link)
         return True, auto_feed_link
     else:
-        return False, "您设置的auto_feed_link不符合规则"
+        return False, '您设置的auto_feed_link不符合规则'
 
-# "https://example.com/upload.php#seperator#name#linkstr#{主标题}#linkstr#small_descr#linkstr#{副标题}#linkstr#url
+# 'https://example.com/upload.php#seperator#name#linkstr#{主标题}#linkstr#small_descr#linkstr#{副标题}#linkstr#url
 # #linkstr#{IMDB}#linkstr#dburl#linkstr{豆瓣}#linkstr#descr#linkstr#{简介}[quote]{MediaInfo}[/quote]#linkstr#log_info
 # #linkstr##linkstr#tracklist#linkstr##linkstr#music_type#linkstr##linkstr#music_media#linkstr##linkstr#edition_info
 # #linkstr##linkstr#music_name#linkstr##linkstr#music_author#linkstr##linkstr#animate_info#linkstr##linkstr#anidb
@@ -76,4 +76,4 @@ def get_auto_feed_link(main_title, second_title, description, media_info, file_n
 # #origin_site#linkstr#{小组}#linkstr#origin_url#linkstr##linkstr#golden_torrent#linkstr#false#linkstr#mediainfo_cmct#linkstr#
 # #linkstr#imgs_cmct#linkstr##linkstr#full_mediainfo#linkstr##linkstr#subtitles#linkstr##linkstr#youtube_url#linkstr#
 # #linkstr#ptp_poster#linkstr##linkstr#comparisons#linkstr##linkstr#version_info#linkstr##linkstr#multi_mediainfo
-# #linkstr##linkstr#labels#linkstr#100"
+# #linkstr##linkstr#labels#linkstr#100'

src/core/autofeed.py

@@ -10,31 +10,31 @@
 def upload_picture(picture_bed_api_url, picture_bed_api_token, picture_path):
     print(picture_bed_api_url, picture_bed_api_token, picture_path)
     if not os.path.exists(picture_path):  # 检测是否存在图片
-        print("图片文件路径不存在")
-        return False, "图片文件路径不存在"
+        print('图片文件路径不存在')
+        return False, '图片文件路径不存在'
     else:
-        print("开始获取图床类型")
+        print('开始获取图床类型')
         # 去除URL的中的' '、'　'和'\n'，针对用户错误输入的优化
         picture_bed_api_url = picture_bed_api_url.replace(' ', '')
         picture_bed_api_url = picture_bed_api_url.replace('　', '')
         picture_bed_api_url = picture_bed_api_url.replace('\n', '')
         get_picture_bed_type_success, picture_bed_type = get_picture_bed_type(picture_bed_api_url)
         if get_picture_bed_type_success:
-            print(f"获取到图床的类型：{picture_bed_type}")
-            if picture_bed_type == "lsky-pro":
+            print(f'获取到图床的类型：{picture_bed_type}')
+            if picture_bed_type == 'lsky-pro':
                 return lsky_pro_picture_bed(picture_bed_api_url, picture_bed_api_token, picture_path)
-            elif picture_bed_type == "bohe":
+            elif picture_bed_type == 'bohe':
                 return bohe_picture_bed(picture_bed_api_url, picture_bed_api_token, picture_path)
-            elif picture_bed_type == "chevereto":
+            elif picture_bed_type == 'chevereto':
                 return chevereto_picture_bed(picture_bed_api_url, picture_bed_api_token, picture_path)
-            elif picture_bed_type == "freeimage":
+            elif picture_bed_type == 'freeimage':
                 return freeimage_picture_bed(picture_bed_api_url, picture_bed_api_token, picture_path)
-            elif picture_bed_type == "imgbb":
+            elif picture_bed_type == 'imgbb':
                 return imgbb_picture_bed(picture_bed_api_url, picture_bed_api_token, picture_path)
-            elif picture_bed_type == "pixhost":
-                return pixhost_picture_bed(picture_bed_api_url, picture_bed_api_token, picture_path)
+            elif picture_bed_type == 'pixhost':
+                return pixhost_picture_bed(picture_bed_api_url, picture_path)
             else:
-                return False, "你错误更改了图床配置文件？冒号前面的类型是不能随便改的！如果需要支持更多新类型的图床请提Issues，前提是图床支持API上传！"
+                return False, '你错误更改了图床配置文件？冒号前面的类型是不能随便改的！如果需要支持更多新类型的图床请提Issues，前提是图床支持API上传！'
         else:
             return False, picture_bed_type
 
@@ -43,48 +43,48 @@ def upload_picture(picture_bed_api_url, picture_bed_api_token, picture_path):
 def lsky_pro_picture_bed(api_url, api_token, frame_path):
     print('接受到上传兰空图床请求')
     url = api_url
-    files = {'file': (frame_path, open(frame_path, 'rb'), "image/png")}
+    files = {'file': (frame_path, open(frame_path, 'rb'), 'image/png')}
     headers = {'Authorization': api_token, 'Accept': 'json'}
     data = {}
     print('值已经获取')
 
     try:
         # 发送POST请求
-        print("开始发送上传图床的请求")
+        print('开始发送上传图床的请求')
         res = requests.post(url, headers=headers, data=data, files=files)
-        print("已成功发送上传图床的请求")
+        print('已成功发送上传图床的请求')
     except requests.RequestException as e:
-        print("请求过程中出现错误：", e)
-        return False, "请求过程中出现错误：" + str(e)
+        print(f'请求过程中出现错误：{str(e)}')
+        return False, f'请求过程中出现错误：{str(e)}'
 
     try:
         data = json.loads(res.text)
         # 提取所需的URL
-        image_url = data["data"]["links"]["bbcode"]
-        print(image_url)
-        return True, image_url
+        image_bbs_url = data['data']['links']['bbcode']
+        print(image_bbs_url)
+        return True, image_bbs_url
     except KeyError as e:
-        print(False, "图床响应结果缺少所需的值：" + str(e))
-        return False, "图床响应结果缺少所需的值：" + str(e) + str(res)
+        print(f'图床响应结果缺少所需的值：{str(e)}，{str(res)}')
+        return False, f'图床响应结果缺少所需的值：{str(e)}，{str(res)}'
     except json.JSONDecodeError as e:
-        print(False, "处理返回的JSON过程中出现错误：" + str(e))
-        return False, "处理返回的JSON过程中出现错误：" + str(e) + str(res)
+        print(f'处理返回的JSON过程中出现错误：{str(e)}，{str(res)}')
+        return False, f'处理返回的JSON过程中出现错误：{str(e)}，{str(res)}'
 
 
 # 薄荷图床
 def bohe_picture_bed(api_url, api_token, frame_path):
-    print("开始上传薄荷图床")
+    print('开始上传薄荷图床')
     url = api_url
-    files = {'uploadedFile': (frame_path, open(frame_path, 'rb'), "image/png")}
+    files = {'uploadedFile': (frame_path, open(frame_path, 'rb'), 'image/png')}
     data = {'api_token': api_token, 'image_compress': 0, 'image_compress_level': 80}
 
     try:
         # 发送POST请求
         res = requests.post(url, data=data, files=files)
-        print("已成功发送上传图床的请求")
+        print('已成功发送上传图床的请求')
     except requests.RequestException as e:
-        print("请求过程中出现错误：", e)
-        return False, "请求过程中出现错误：" + str(e)
+        print(f'请求过程中出现错误：{str(e)}')
+        return False, f'请求过程中出现错误：{str(e)}'
 
     # 关闭文件流，避免资源泄露
     files['uploadedFile'][1].close()
@@ -93,73 +93,73 @@ def bohe_picture_bed(api_url, api_token, frame_path):
     try:
         api_response = json.loads(res.text)
     except json.JSONDecodeError:
-        print("响应不是有效的JSON格式")
-        return False, "响应不是有效的JSON格式"
+        print('响应不是有效的JSON格式')
+        return False, '响应不是有效的JSON格式'
 
     # 打印提取的url
-    status_code = api_response.get("statusCode", "")
-    result_data = api_response.get("resultData", "")
-
-    if status_code == "200":
-        bbs_url = str(api_response.get("bbsurl", ""))
-        return True, bbs_url
-    elif status_code == "":
-        return False, "未接受到响应"
+    status_code = api_response.get('statusCode', '')
+    result_data = api_response.get('resultData', '')
+
+    if status_code == '200':
+        image_bbs_url = str(api_response.get('bbsurl', ''))
+        return True, image_bbs_url
+    elif status_code == '':
+        return False, '未接受到响应'
     else:
-        return False, f"API响应出错了，错误码：{status_code}，错误提示：{result_data}"
+        return False, f'API响应出错了，错误码：{status_code}，错误提示：{result_data}'
 
 
 # chevereto图床
 def chevereto_picture_bed(api_url, api_token, frame_path):
     print('接受到上传chevereto图床请求')
     url = api_url
-    data = {'expiration': 'PT5M', 'X-API-Key': api_token, "key": api_token}
-    files = {'source': (frame_path, open(frame_path, 'rb'), "image/png")}
+    data = {'expiration': 'PT5M', 'X-API-Key': api_token, 'key': api_token}
+    files = {'source': (frame_path, open(frame_path, 'rb'), 'image/png')}
     print('值已经获取')
 
     try:
         # 发送POST请求
-        print("开始发送上传图床的请求")
+        print('开始发送上传图床的请求')
         res = requests.post(url, data=data, files=files)
-        print("已成功发送上传图床的请求")
+        print('已成功发送上传图床的请求')
     except requests.RequestException as e:
-        print("请求过程中出现错误：", e)
-        return False, "请求过程中出现错误：" + str(e)
+        print(f'请求过程中出现错误：{str(e)}')
+        return False, f'请求过程中出现错误：{str(e)}'
 
     try:
         print(res.text)
         data = json.loads(res.text)
         # 提取所需的URL
-        image_url = data["image"]["url"]
+        image_url = data['image']['url']
         print(image_url)
-        return True, '[img]' + image_url + '[/img]'
+        return True, f'[img]{image_url}[/img]'
     except KeyError as e:
-        print(False, "图床响应结果缺少所需的值：" + str(e))
-        return False, "图床响应结果缺少所需的值：" + str(e) + str(res)
+        print(f'图床响应结果缺少所需的值：{str(e)}，{str(res)}')
+        return False, f'图床响应结果缺少所需的值：{str(e)}，{str(res)}'
     except json.JSONDecodeError as e:
-        print(False, "处理返回的JSON过程中出现错误：" + str(e))
-        return False, "处理返回的JSON过程中出现错误：" + str(e) + str(res)
+        print(f'处理返回的JSON过程中出现错误：{str(e)}，{str(res)}')
+        return False, f'处理返回的JSON过程中出现错误：{str(e)}，{str(res)}'
 
 
 # freeimage图床
 def freeimage_picture_bed(api_url, api_token, frame_path):
     print('接受到上传freeimage图床请求')
     url = api_url
     data = {'key': api_token, 'format': 'txt'}
-    files = {'source': (frame_path, open(frame_path, 'rb'), "image/png")}
+    files = {'source': (frame_path, open(frame_path, 'rb'), 'image/png')}
     print('值已经获取')
 
     try:
         # 发送POST请求
-        print("开始发送上传图床的请求")
+        print('开始发送上传图床的请求')
         res = requests.post(url, data=data, files=files)
-        print("已成功发送上传图床的请求")
+        print('已成功发送上传图床的请求')
     except requests.RequestException as e:
-        print("请求过程中出现错误：", e)
-        return False, "请求过程中出现错误：" + str(e)
+        print('请求过程中出现错误：', e)
+        return False, '请求过程中出现错误：' + str(e)
 
     print(res.text)
-    if res.text[:4] == "http":
+    if res.text[:4] == 'http':
         bbs_url = '[img]' + res.text + '[/img]'
         print(bbs_url)
         return True, bbs_url
@@ -172,61 +172,61 @@ def imgbb_picture_bed(api_url, api_token, frame_path):
     print('接受到上传imgbb图床请求')
     url = api_url
     data = {'expiration': '600', 'key': api_token}
-    files = {'image': (frame_path, open(frame_path, 'rb'), "image/png")}
+    files = {'image': (frame_path, open(frame_path, 'rb'), 'image/png')}
     print('值已经获取')
 
     try:
         # 发送POST请求
-        print("开始发送上传图床的请求")
+        print('开始发送上传图床的请求')
         res = requests.post(url, data=data, files=files)
-        print("已成功发送上传图床的请求")
+        print('已成功发送上传图床的请求')
     except requests.RequestException as e:
-        print("请求过程中出现错误：", e)
-        return False, "请求过程中出现错误：" + str(e)
+        print('请求过程中出现错误：', e)
+        return False, '请求过程中出现错误：' + str(e)
 
     try:
         data = json.loads(res.text)
         # 提取所需的URL
-        image_url = data["data"]["image"]["url"]
+        image_url = data['data']['image']['url']
         print(image_url)
-        return True, '[img]' + image_url + '[/img]'
+        return True, f'[img]{image_url}[/img]'
     except KeyError as e:
-        print(False, "图床响应结果缺少所需的值：" + str(e))
-        return False, "图床响应结果缺少所需的值：" + str(e) + str(res)
+        print(f'图床响应结果缺少所需的值：{str(e)}，{str(res)}')
+        return False, f'图床响应结果缺少所需的值：{str(e)}，{str(res)}'
     except json.JSONDecodeError as e:
-        print(False, "处理返回的JSON过程中出现错误：" + str(e))
-        return False, "处理返回的JSON过程中出现错误：" + str(e) + str(res)
+        print(f'处理返回的JSON过程中出现错误：{str(e)}，{str(res)}')
+        return False, f'处理返回的JSON过程中出现错误：{str(e)}，{str(res)}'
 
 
 # pixhost图床
-def pixhost_picture_bed(api_url, api_token, frame_path):
+def pixhost_picture_bed(api_url, frame_path):
     print('接受到上传pixhost图床请求')
     url = api_url
-    files = {'img': (frame_path, open(frame_path, 'rb'), "image/jpeg")}
+    files = {'img': (frame_path, open(frame_path, 'rb'), 'image/jpeg')}
     data = {'content_type': 0, 'max_th_size': 420}
     headers = {'Accept': 'application/json'}
     print('值已经获取')
 
     try:
         # 发送POST请求
-        print("开始发送上传图床的请求")
+        print('开始发送上传图床的请求')
         res = requests.post(url, headers=headers, data=data, files=files)
-        print("已成功发送上传图床的请求")
+        print('已成功发送上传图床的请求')
     except requests.RequestException as e:
-        print("请求过程中出现错误：", e)
-        return False, "请求过程中出现错误：" + str(e)
+        print('请求过程中出现错误：', e)
+        return False, '请求过程中出现错误：' + str(e)
 
     try:
         data = json.loads(res.text)
         # 提取所需的URL
-        image_url = data["th_url"]
-        image_url = image_url.replace("//t", "//img")
-        image_url = image_url.replace("/thumbs/", "/images/")
+        image_url = data['th_url']
+        image_url = image_url.replace('//t', '//img')
+        image_url = image_url.replace('/thumbs/', '/images/')
         print(image_url)
-        return True, '[img]' + image_url + '[/img]'
+        return True, f'[img]{image_url}[/img]'
     except KeyError as e:
-        print(False, "图床响应结果缺少所需的值：" + str(e))
-        return False, "图床响应结果缺少所需的值：" + str(e) + str(res)
+        print(f'图床响应结果缺少所需的值：{str(e)}，{str(res)}')
+        return False, f'图床响应结果缺少所需的值：{str(e)}，{str(res)}'
     except json.JSONDecodeError as e:
-        print(False, "处理返回的JSON过程中出现错误：" + str(e))
-        return False, "处理返回的JSON过程中出现错误：" + str(e) + str(res)
+        print(f'处理返回的JSON过程中出现错误：{str(e)}，{str(res)}')
+        return False, f'处理返回的JSON过程中出现错误：{str(e)}，{str(res)}'