From 667d6acbd6aa48f0a4a1d26f4fc8981a12972580 Mon Sep 17 00:00:00 2001
From: rootmelo92118 <32770959+rootmelo92118@users.noreply.github.com>
Date: Sat, 29 Jul 2023 21:45:28 +0800
Subject: [PATCH 01/11] Create twnic_rpz_1.0.py

---
 AutoBuild/twnic_rpz_1.0.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 AutoBuild/twnic_rpz_1.0.py

diff --git a/AutoBuild/twnic_rpz_1.0.py b/AutoBuild/twnic_rpz_1.0.py
new file mode 100644
index 0000000..4566e83
--- /dev/null
+++ b/AutoBuild/twnic_rpz_1.0.py
@@ -0,0 +1,17 @@
+import requests, json
+from bs4 import BeautifulSoup
+
+soup = BeautifulSoup(requests.get("https://rpz.twnic.tw/e.html").text, "html.parser")
+exec(str(soup.find("script")).split(";")[0].split("const ")[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("twnicRPZ1.0RAW.txt","a") as f:
+    f.write(twnic_rpz_1_0_raw)
+    f.close()
+with open("twnicRPZ1.0AGH.txt","a") as f:
+    f.write(twnic_rpz_1_0_AdGuardHome)
+    f.close()

From 6354102b4aeb0f231506672a5d8c57d19e986656 Mon Sep 17 00:00:00 2001
From: rootmelo92118 <32770959+rootmelo92118@users.noreply.github.com>
Date: Sat, 29 Jul 2023 21:48:41 +0800
Subject: [PATCH 02/11] Update requirements.txt

---
 AutoBuild/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AutoBuild/requirements.txt b/AutoBuild/requirements.txt
index feb5e82..e7bc71d 100644
--- a/AutoBuild/requirements.txt
+++ b/AutoBuild/requirements.txt
@@ -3,3 +3,4 @@ charset-normalizer==2.1.1
 idna==3.3
 requests==2.28.1
 urllib3==1.26.12
+bs4==0.0.1

From 7b9f17ea1d8b531765521c75167b42b8b715a97b Mon Sep 17 00:00:00 2001
From: rootmelo92118 <32770959+rootmelo92118@users.noreply.github.com>
Date: Sat, 29 Jul 2023 21:54:27 +0800
Subject: [PATCH 03/11] Create twnic_rpz_1.0.yml

---
 .github/workflows/twnic_rpz_1.0.yml | 30 +++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 .github/workflows/twnic_rpz_1.0.yml

diff --git a/.github/workflows/twnic_rpz_1.0.yml b/.github/workflows/twnic_rpz_1.0.yml
new file mode 100644
index 0000000..a477940
--- /dev/null
+++ b/.github/workflows/twnic_rpz_1.0.yml
@@ -0,0 +1,30 @@
+name: TWNIC RPZ 1.0
+
+on:
+  schedule:
+    - cron:  '0 0 * * *'
+  workflow_dispatch:
+
+jobs:
+  update_165_data:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
+          cache: 'pip' # caching pip dependencies
+      - run: pip install -r AutoBuild/requirements.txt && python AutoBuild/twnic_rpz_1.0.py
+        env:
+          tw165json: ${{ vars.TW165JSON }}
+          tw165csv: ${{ vars.TW165CSV }}
+          auth: ${{ secrets.AUTH }}
+      - name: push
+        uses: github-actions-x/commit@v2.9
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          push-branch: 'master'
+          commit-message: '🤖 自動更新 TWNIC RPZ 1.0 封鎖域名'
+          files: TWNIC-RPZ-1.0_RAW.txt TWNIC-RPZ-1.0_AGH.txt
+          name: tdc
+          email: tdc@sudo.host

From 97cd7759efc5c095d627ebe86b91d86766332694 Mon Sep 17 00:00:00 2001
From: rootmelo92118 <32770959+rootmelo92118@users.noreply.github.com>
Date: Sat, 29 Jul 2023 21:54:56 +0800
Subject: [PATCH 04/11] Update twnic_rpz_1.0.py

---
 AutoBuild/twnic_rpz_1.0.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AutoBuild/twnic_rpz_1.0.py b/AutoBuild/twnic_rpz_1.0.py
index 4566e83..55f91c7 100644
--- a/AutoBuild/twnic_rpz_1.0.py
+++ b/AutoBuild/twnic_rpz_1.0.py
@@ -9,9 +9,9 @@ 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("twnicRPZ1.0RAW.txt","a") as f:
+with open("TWNIC-RPZ-1.0_RAW.txt","a") as f:
     f.write(twnic_rpz_1_0_raw)
     f.close()
-with open("twnicRPZ1.0AGH.txt","a") as f:
+with open("TWNIC-RPZ-1.0_AGH.txt","a") as f:
     f.write(twnic_rpz_1_0_AdGuardHome)
     f.close()

From 6b235e5bbc4ab2d2dfec846e853b438964a0e0e0 Mon Sep 17 00:00:00 2001
From: rootmelo92118 <32770959+rootmelo92118@users.noreply.github.com>
Date: Sat, 29 Jul 2023 22:34:48 +0800
Subject: [PATCH 05/11] Update twnic_rpz_1.0.py

---
 AutoBuild/twnic_rpz_1.0.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AutoBuild/twnic_rpz_1.0.py b/AutoBuild/twnic_rpz_1.0.py
index 55f91c7..6400b67 100644
--- a/AutoBuild/twnic_rpz_1.0.py
+++ b/AutoBuild/twnic_rpz_1.0.py
@@ -9,9 +9,9 @@ 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","a") as f:
+with open("TWNIC-RPZ-1.0_RAW.txt","w") as f:
     f.write(twnic_rpz_1_0_raw)
     f.close()
-with open("TWNIC-RPZ-1.0_AGH.txt","a") as f:
+with open("TWNIC-RPZ-1.0_AGH.txt","w") as f:
     f.write(twnic_rpz_1_0_AdGuardHome)
     f.close()

From 4b6b7bc2ce8518545e1adc92960dc79373bcfed3 Mon Sep 17 00:00:00 2001
From: rootmelo92118 <32770959+rootmelo92118@users.noreply.github.com>
Date: Sat, 29 Jul 2023 22:41:37 +0800
Subject: [PATCH 06/11] Update twnic_rpz_1.0.py

---
 AutoBuild/twnic_rpz_1.0.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/AutoBuild/twnic_rpz_1.0.py b/AutoBuild/twnic_rpz_1.0.py
index 6400b67..91876b0 100644
--- a/AutoBuild/twnic_rpz_1.0.py
+++ b/AutoBuild/twnic_rpz_1.0.py
@@ -11,7 +11,5 @@ for i in rpzdata:
         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)
-    f.close()
 with open("TWNIC-RPZ-1.0_AGH.txt","w") as f:
     f.write(twnic_rpz_1_0_AdGuardHome)
-    f.close()

From 07623225b4223d5aab9b24bda32d6fd4e8cd18a8 Mon Sep 17 00:00:00 2001
From: rootmelo92118 <32770959+rootmelo92118@users.noreply.github.com>
Date: Sat, 29 Jul 2023 22:50:26 +0800
Subject: [PATCH 07/11] Update twnic_rpz_1.0.py

---
 AutoBuild/twnic_rpz_1.0.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AutoBuild/twnic_rpz_1.0.py b/AutoBuild/twnic_rpz_1.0.py
index 91876b0..1fdd498 100644
--- a/AutoBuild/twnic_rpz_1.0.py
+++ b/AutoBuild/twnic_rpz_1.0.py
@@ -1,8 +1,8 @@
 import requests, json
 from bs4 import BeautifulSoup
 
-soup = BeautifulSoup(requests.get("https://rpz.twnic.tw/e.html").text, "html.parser")
-exec(str(soup.find("script")).split(";")[0].split("const ")[1])
+rawData = BeautifulSoup(requests.get("https://rpz.twnic.tw/e.html").text, "html.parser")
+rpzdata = json.loads(a.split("<script>")[1].split(";")[0].split("= ")[1])
 twnic_rpz_1_0_raw = ""
 twnic_rpz_1_0_AdGuardHome = ""
 for i in rpzdata:

From 6bbcfdc927296b9a9e3797a912cd109136b3883d Mon Sep 17 00:00:00 2001
From: rootmelo92118 <32770959+rootmelo92118@users.noreply.github.com>
Date: Sat, 29 Jul 2023 22:51:22 +0800
Subject: [PATCH 08/11] Update twnic_rpz_1.0.py

---
 AutoBuild/twnic_rpz_1.0.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/AutoBuild/twnic_rpz_1.0.py b/AutoBuild/twnic_rpz_1.0.py
index 1fdd498..1dc4bdd 100644
--- a/AutoBuild/twnic_rpz_1.0.py
+++ b/AutoBuild/twnic_rpz_1.0.py
@@ -1,8 +1,7 @@
 import requests, json
-from bs4 import BeautifulSoup
 
-rawData = BeautifulSoup(requests.get("https://rpz.twnic.tw/e.html").text, "html.parser")
-rpzdata = json.loads(a.split("<script>")[1].split(";")[0].split("= ")[1])
+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:

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 09/11] =?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()

From 2a6b02bcad85ce1d7bfa36d348db2e8e4b583dbb 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:54:54 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=F0=9F=A4=96=20=E6=9B=B4=E6=96=B0=20Actio?=
 =?UTF-8?q?n=20=E8=A8=AD=E5=AE=9A=EF=BC=8C=E9=81=BF=E5=85=8D=E9=87=8D?=
 =?UTF-8?q?=E8=A4=87=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflows/{twnic_rpz_1.0.yml => twnic_rpz.yml} | 14 +++++---------
 AutoBuild/{twnic_rpz_1.0.py => twnic_rpz.py}       |  0
 2 files changed, 5 insertions(+), 9 deletions(-)
 rename .github/workflows/{twnic_rpz_1.0.yml => twnic_rpz.yml} (62%)
 rename AutoBuild/{twnic_rpz_1.0.py => twnic_rpz.py} (100%)

diff --git a/.github/workflows/twnic_rpz_1.0.yml b/.github/workflows/twnic_rpz.yml
similarity index 62%
rename from .github/workflows/twnic_rpz_1.0.yml
rename to .github/workflows/twnic_rpz.yml
index a477940..d81bfc6 100644
--- a/.github/workflows/twnic_rpz_1.0.yml
+++ b/.github/workflows/twnic_rpz.yml
@@ -1,4 +1,4 @@
-name: TWNIC RPZ 1.0
+name: TWNIC RPZ
 
 on:
   schedule:
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  update_165_data:
+  update_twnic_rpz_data:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -14,17 +14,13 @@ jobs:
         with:
           python-version: '3.9'
           cache: 'pip' # caching pip dependencies
-      - run: pip install -r AutoBuild/requirements.txt && python AutoBuild/twnic_rpz_1.0.py
-        env:
-          tw165json: ${{ vars.TW165JSON }}
-          tw165csv: ${{ vars.TW165CSV }}
-          auth: ${{ secrets.AUTH }}
+      - run: pip install -r AutoBuild/requirements.txt && python AutoBuild/twnic_rpz.py
       - name: push
         uses: github-actions-x/commit@v2.9
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           push-branch: 'master'
-          commit-message: '🤖 自動更新 TWNIC RPZ 1.0 封鎖域名'
-          files: TWNIC-RPZ-1.0_RAW.txt TWNIC-RPZ-1.0_AGH.txt
+          commit-message: '🤖 自動更新 TWNIC RPZ 封鎖域名'
+          files: TWNIC-RPZ.txt
           name: tdc
           email: tdc@sudo.host
diff --git a/AutoBuild/twnic_rpz_1.0.py b/AutoBuild/twnic_rpz.py
similarity index 100%
rename from AutoBuild/twnic_rpz_1.0.py
rename to AutoBuild/twnic_rpz.py

From cb56b0ea3f65bb8a83a93217926ddcc859213fe0 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:55:06 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=F0=9F=94=A5=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E4=BE=9D=E8=B3=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AutoBuild/requirements.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/AutoBuild/requirements.txt b/AutoBuild/requirements.txt
index e7bc71d..057db9f 100644
--- a/AutoBuild/requirements.txt
+++ b/AutoBuild/requirements.txt
@@ -2,5 +2,4 @@ certifi==2023.7.22
 charset-normalizer==2.1.1
 idna==3.3
 requests==2.28.1
-urllib3==1.26.12
-bs4==0.0.1
+urllib3==1.26.12
\ No newline at end of file