Merge branch 'master' of https://gitea.qnloft.com/qnloft/qnloft-spider

# Conflicts:
#	PT/pt_config.toml
#	junit/pt_operation_junit.py

PT/PT站点汇总.md

@@ -738,3 +738,10 @@ http://pt.zhixing.bjtu.edu.cn/ | ZXPT【知行PT】
  | http://zelka.org/" ADD_DATE="1694131200">Zelka.ORG
  | http://zombtracker.the-zomb.com/" ADD_DATE="1694131200">ZombTracker
  | http://ztracker.cc/" ADD_DATE="1694131200">Ztracker
+
+后续补充：
+
+|https://crabpt.vip | 蟹黄堡||
+|https://amani.top | amani | 音乐 |
+|https://new.qingwa.pro | qingwa |  |
+

PT/pt_config.toml

@@ -5,7 +5,7 @@
 # flag = 1 表示不请求网站
 # torrents 表示抓取资源的页面，默认是 torrents.php
 
-# ===========================【start】 nastools 合作站点 【start】===========================
+# ===========================【start】 nastools/MoviePilot 合作站点 【start】===========================
 ['鲨鱼PT']
 url = "https://sharkpt.net"
 cookie = ""
@@ -68,7 +68,43 @@ cookie = "c_secure_uid=MTk0OTI%3D; c_secure_pass=d7f655d5b8e90739f23620b9d24241e
 level = 3
 label = "动漫、综艺、电视剧"
 
-# ===========================【end】 nastools 合作站点 【end】===========================
+['PTLSP 零食铺']
+url = "https://www.ptlsp.com"
+cookie = ""
+level = 3
+label = ""
+
+['xingtan 杏坛']
+url = "https://xingtan.one"
+cookie = ""
+level = 3
+label = ""
+
+['PTVicomo 象站']
+url = "https://ptvicomo.net"
+cookie = ""
+level = 3
+label = ""
+
+['AGSV 末日种子库']
+url = "https://www.agsvpt.com"
+cookie = ""
+level = 3
+label = ""
+
+['HDKylin 麒麟']
+url = "https://www.hdkyl.in"
+cookie = ""
+level = 3
+label = ""
+
+['qingwa 青蛙']
+url = "https://new.qingwa.pro"
+cookie = "c_secure_uid=NzAwNDM1; c_secure_pass=303b3da242041150d56526f166213c86; c_secure_ssl=eWVhaA%3D%3D; c_secure_tracker_ssl=eWVhaA%3D%3D; c_secure_login=bm9wZQ%3D%3D; cf_clearance=wdgkQgafh7Z.ytwVM8FEqLmC8zJFNONOigtAeQ2z81Y-1711447677-1.0.1.1-tQRzJ56wcynWEAA1puQZEVgcWE2qfdGN4R.VqITW9IQuHfLIZDI5JSrTxAbDI3O.gAf1gs9lYZF0QMG5tUugqA"
+level = 3
+label = ""
+
+# ===========================【end】 nastools/MoviePilot 合作站点 【end】===========================
 
 # ===========================【start】 9kg 站点 【start】===========================
 ['pttime']
@@ -88,7 +124,7 @@ label = "9kg"
 url = "https://fsm.name"
 cookie = ""
 level = 2
-label = "9kg"
+label = "纯9kg站点、json数据格式、日本AV、国产AV、AV动漫"
 flag = 1
 
 ['ilolicon 萝莉控 ' ]
@@ -115,6 +151,7 @@ url = "https://kp.m-team.cc"
 cookie = ""
 level = 1
 label = "9kg"
+flag = 1
 
 ['NicePT 老师 ' ]
 url = "https://www.nicept.net"

PT/pt_operation.py

@@ -95,6 +95,9 @@ class PtOperation:
 				pushme("开注提醒" + section_name, remind_me)
 				pushplus_bot("开注提醒" + section_name, remind_me)
 				logger.info(remind_me)
+			elif "对不起" in html or ("关闭" in html and "自由注册" in html) or "维护" in html:
+				remind_me = f"现在 {text} 关闭注册，请知晓~！"
+				logger.info(remind_me)
 			else:
 				soup = BeautifulSoup(html, 'html.parser')
 				text_content = soup.find(class_='text').get_text()
@@ -108,6 +111,7 @@ class PtOperation:
 		for _ in range(5):
 			try:
 				response = requests.get(url, headers=self.headers, timeout=5 * 60)
+				response.encoding = "utf-8"
 				if response.status_code == 403 or response.text in "Just a moment":
 					return self.flaresolverr_get(url, text)
 				elif response.status_code == 200:
@@ -138,7 +142,7 @@ class PtOperation:
 				response = requests.post(flaresolverr_url, headers=headers, data=payload)
 				res = json.loads(response.text)
 				if res['status'] == 'ok' and res['solution']['status'] == 200:
-					logging.info(f"最终耗时：{(res['endTimestamp'] - res['startTimestamp'])/ 1000 / 60:.2f} 分钟")
+					logging.info(f"最终耗时：{(res['endTimestamp'] - res['startTimestamp']) / 1000 / 60:.2f} 分钟")
 					return res['solution']['response']
 				elif res['status'] == 'error':
 					logger.error(f"{text} , 访问返回 {res['message']} ！！！")
@@ -166,4 +170,3 @@ class PtOperation:
 			print(f"Error: The file '{self.toml_file}' was not found.")
 		except toml.TomlDecodeError as e:
 			print(f"Error decoding TOML: {e}")
-