Browse Source

修改快手url提取方式&修改配置王媛改为阮望

zhangliang 1 week ago
parent
commit
5a3ee2e344
3 changed files with 14 additions and 5 deletions
  1. 1 1
      product.env
  2. 12 3
      utils/dy_ks_get_url.py
  3. 1 1
      workers/consumption_work.py

+ 1 - 1
product.env

@@ -5,7 +5,7 @@ FS_DATA_2=鲁涛,EZef39,task:carry_data_redis_lt,AIzaSyBXU3VIilXxDbIg5riYTu5t6WE
 FS_DATA_3=余海涛,Frush6,task:carry_data_redis_yht,AIzaSyCaurhmnci1jooXSN8Q3dKWbYYndUllbzs
 FS_DATA_4=罗情,wolznW,task:carry_data_redis_lq,AIzaSyDBtbQNf-Fvc0UIDphV6QErDKjmjUNpN4o
 FS_DATA_5=刘诗雨,5MXdSK,task:carry_data_redis_lsy,AIzaSyDWNwy7SIHLaJ7gROE7qeLB5XjDIDIq644
-FS_DATA_6=王媛,Nv8E4z,task:carry_data_redis_wy,AIzaSyCQkHRsQyLQTRny_3nPqVGjL0Y8U4ls4tw
+FS_DATA_6=阮望,Nv8E4z,task:carry_data_redis_wy,AIzaSyCQkHRsQyLQTRny_3nPqVGjL0Y8U4ls4tw
 FS_DATA_7=周仙琴,2WIcBU,task:carry_data_redis_zxq,AIzaSyD46rphXd-Ie51sQiQ61lrSqKu1O2qGyXo
 FS_DATA_8=信欣,v0fFCb,task:carry_data_redis_xx,AIzaSyB16JcJHwoz-YcvEUO96Dm1n0zf89GOdms
 FS_DATA_9=邓锋,DEpi6V,task:carry_data_redis_df,AIzaSyCWilmMZyG4xW_pujpRGflaa7SIBjLQHiI

+ 12 - 3
utils/dy_ks_get_url.py

@@ -91,8 +91,17 @@ class Dy_KS:
             location = response.headers.get('Location', None)
             if location == "https://kuaishou.com/":
                 return "作品不存在", None, None
-            video_id = re.search(r'/(f|photo|short-video|long-video)/(.*)/?',
-                                 location.split('?')[0] if location else url).group(2)
+            # video_id = re.search(r'/(f|photo|short-video|long-video)/(.*)/?',
+            #                      location.split('?')[0] if location else url).group(2)
+            match = re.search(r'/(f|photo|short-video|long-video)/(.*)/?',
+                              location.split('?')[0] if location else url)
+            if match:
+                video_id = match.group(2)
+            else:
+                parts = url.rstrip('/').split('/')
+                if parts:
+                    video_id = parts[-1]
+            logger.info(f"[+]提取到的视频ID=={video_id}")
             url = "http://8.217.192.46:8889/crawler/kuai_shou/detail"
             if not video_id or not video_id.strip():
                 return None, None, None
@@ -186,7 +195,7 @@ class Dy_KS:
                 tag_transport_channel = "抖音"
                 logger.info(f"[+] {url}开始获取抖音视频链接")
                 url, original_title, video_id = cls.get_text_dy_video(url=url)
-            elif host in ['v.kuaishou.com', 'www.kuaishou.com', 'v.m.chenzhongtech.com', 'creater.eozatvmq.com']:
+            elif host in ['v.kuaishou.com', 'www.kuaishou.com', 'v.m.chenzhongtech.com', 'creater.eozatvmq.com','live.kuaishou.com']:
                 tag_transport_channel = "快手"
                 logger.info(f"[+] {url}开始获取快手视频链接")
                 url, original_title, video_id = cls.get_text_ks_video(url=url)

+ 1 - 1
workers/consumption_work.py

@@ -106,7 +106,7 @@ class ConsumptionRecommend(object):
                     "余海涛": "dTzUlI",
                     "罗情": "8JPv9g",
                     "刘诗雨": "HqwG0o",
-                    "王媛": "vtWvle",
+                    "阮望": "vtWvle",
                     "周仙琴": "MWUqWt",
                     "王雪珂": "xN1KrU",
                     "信欣": "PtoeGT",