From 66470da8762da3d0458cd4969e46e97a6c90c289 Mon Sep 17 00:00:00 2001
From: tdc <tdc@tdccc.com.tw>
Date: Wed, 10 Apr 2024 15:07:57 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20NRD=20=E6=8F=90=E4=BE=9B?=
 =?UTF-8?q?=E5=A4=9A=E9=81=94=2030=20=E5=A4=A9=E6=B8=85=E5=96=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AutoBuild/builder.py | 20 +++++++-------------
 AutoBuild/nrdlist.py |  2 +-
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/AutoBuild/builder.py b/AutoBuild/builder.py
index 8ef55f5..fbb4680 100644
--- a/AutoBuild/builder.py
+++ b/AutoBuild/builder.py
@@ -1,7 +1,7 @@
 import re
 from datetime import datetime, timedelta, timezone
-from shutil import copyfile
 import requests
+from glob import glob
 
 filterlist = {
     "abp": [
@@ -10,24 +10,18 @@ filterlist = {
         "PureView/news.txt",
         "PureView/news_mobile.txt",
     ],
-    "hosts": [
-        "hosts.txt",
-        "nofarm.txt",
-        "TW165.txt",
-        "TWNIC-RPZ.txt",
-        "nrd/past-1day.txt",
-        "nrd/past-2day.txt",
-        "nrd/past-3day.txt",
-        "nrd/past-4day.txt",
-        "nrd/past-5day.txt",
-        "nrd/past-6day.txt",
-    ],
+    "hosts": ["hosts.txt", "nofarm.txt", "TW165.txt", "TWNIC-RPZ.txt"],
 }
 url = "https://filter.futa.gg/"
 tz = timezone(timedelta(hours=+8))
 today = datetime.now(tz).date()
 
 
+#  新增 nrd 清單
+for files in glob("nrd/past-*.txt"):
+    filterlist["hosts"].append(files)
+
+
 class HEAD:
     abp: str = (
         "[Adblock Plus]\n"
diff --git a/AutoBuild/nrdlist.py b/AutoBuild/nrdlist.py
index 749c95f..599b827 100644
--- a/AutoBuild/nrdlist.py
+++ b/AutoBuild/nrdlist.py
@@ -60,7 +60,7 @@ class Downloader:
         today = arrow.utcnow()
         task = []
 
-        for i in range(1, 8):
+        for i in range(1, 30):
             date = today.shift(days=-i)
             task.append(loop.create_task(self.fetch(date)))
         loop.run_until_complete(asyncio.gather(*task))