From eec1db02c1df1d552576f86b3f5668f6d0af3990 Mon Sep 17 00:00:00 2001
From: Ghlerrix <Ghlerrix@outlook.com>
Date: Sat, 26 Aug 2023 22:13:53 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E6=9C=AA=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AEAction=20Secrets=E6=AF=8F=E6=97=A5=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- URL配置异常捕获，若URL配置错误会给出提示信息
- 未配置相关信息处理方式
  - 未配置URL：则啥也不干
  - 未配置Bing API KEY：则不推送至Bing
  - 未配置Baidu Token：则不推送至百度
---
 pushUrl.py | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/pushUrl.py b/pushUrl.py
index e25f86c5..7a66c57e 100644
--- a/pushUrl.py
+++ b/pushUrl.py
@@ -9,11 +9,18 @@ ssl._create_default_https_context = ssl._create_unverified_context
 def parse_stiemap(site):
     site = f'{site}/sitemap.xml'
     print('解析站点地图中，请稍后……')
-    result = requests.get(site)
-    big = re.findall('<loc>(.*?)</loc>', result.content.decode('utf-8'), re.S)
-    print('当前已有url:')
-    print(list(big))
-    return list(big)
+    try:
+        result = requests.get(site)
+        big = re.findall('<loc>(.*?)</loc>', result.content.decode('utf-8'), re.S)
+        print('当前已有url:')
+        print(list(big))
+        return list(big)
+    except:
+        print('请检查你的url是否有误。')
+        print('正确的应是完整的域名，包含https://，且不包含‘sitemap.xml’, 如下所示：')
+        print('正确的示例: https://ghlcode.cn')
+        print('详情参见: https://ghlcode.cn/fe032806-5362-4d82-b746-a0b26ce8b9d9')
+
 
 
 def push_to_bing(site, urls, api_key):
@@ -62,16 +69,17 @@ if __name__ == '__main__':
     args = parser.parse_args()
     if args.url:
         urls = parse_stiemap(args.url)
-        if args.bing_api_key:
-            push_to_bing(args.url, urls, args.bing_api_key)
-        else:
-            print('未配置 Bing API Key')
-            print('详情参见: https://ghlcode.cn/fe032806-5362-4d82-b746-a0b26ce8b9d9')
-        if args.baidu_token:
-            push_to_baidu(args.url, urls, args.baidu_token)
-        else:
-            print('未配置 Baidu Token')
-            print('详情参见: https://ghlcode.cn/fe032806-5362-4d82-b746-a0b26ce8b9d9')
+        if urls is not None:
+            if args.bing_api_key:
+                push_to_bing(args.url, urls, args.bing_api_key)
+            else:
+                print('未配置 Bing API Key')
+                print('详情参见: https://ghlcode.cn/fe032806-5362-4d82-b746-a0b26ce8b9d9')
+            if args.baidu_token:
+                push_to_baidu(args.url, urls, args.baidu_token)
+            else:
+                print('未配置 Baidu Token')
+                print('详情参见: https://ghlcode.cn/fe032806-5362-4d82-b746-a0b26ce8b9d9')
     else:
         print('请前往 Github Action Secrets 配置 URL')
         print('详情参见: https://ghlcode.cn/fe032806-5362-4d82-b746-a0b26ce8b9d9')