From f6199c26b2161cffde3e14d02135002f85180352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B8=A2=E4=BD=8E=E5=90=B8?= <tdc@sudo.host>
Date: Sat, 29 Jul 2023 23:48:11 +0800
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=E9=87=8D=E6=A7=8B?=
 =?UTF-8?q?=E5=A4=A7=E9=83=A8=E5=88=86=E4=B8=94=E5=AE=89=E5=85=A8=E5=9F=B7?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AutoBuild/twnic_rpz_1.0.py | 44 +++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/AutoBuild/twnic_rpz_1.0.py b/AutoBuild/twnic_rpz_1.0.py
index 1dc4bdd..d6914fa 100644
--- a/AutoBuild/twnic_rpz_1.0.py
+++ b/AutoBuild/twnic_rpz_1.0.py
@@ -1,14 +1,32 @@
-import requests, json
+import requests
+import json
+import logging
+from json.decoder import JSONDecodeError
+import sys
+from typing import List
 
-rawData = requests.get("https://rpz.twnic.tw/e.html").text
-rpzdata = json.loads(rawData.split("<script>")[1].split(";")[0].split("= ")[1])
-twnic_rpz_1_0_raw = ""
-twnic_rpz_1_0_AdGuardHome = ""
-for i in rpzdata:
-    for datap in i["domains"]:
-        twnic_rpz_1_0_raw += datap + "\n"
-        twnic_rpz_1_0_AdGuardHome += "||" + datap + "^\n"
-with open("TWNIC-RPZ-1.0_RAW.txt","w") as f:
-    f.write(twnic_rpz_1_0_raw)
-with open("TWNIC-RPZ-1.0_AGH.txt","w") as f:
-    f.write(twnic_rpz_1_0_AdGuardHome)
+logger = logging.getLogger(__name__)
+
+
+def main():
+    r = requests.get('https://rpz.twnic.tw/e.html')
+    if r.status_code != 200:
+        logger.critical('Fetch Data Err')
+        sys.exit(1)
+
+    # split text from <script> tag
+    raw: str = r.text.split('<script>')[1].split(';')[0].split('= ')[1]
+    parse_data: List[dict] = [dict()]
+    try:
+        parse_data = json.loads(raw)
+    except JSONDecodeError:
+        logger.critical('Parse JSON Err')
+        sys.exit(1)
+
+    output = [domain for in_dic in parse_data for domain in in_dic['domains']]
+    with open('TWNIC-RPZ.txt', 'w') as f:
+        f.write(''.join(f'||{e}^\n' for e in output))
+
+
+if __name__ == '__main__':
+    main()