فهرست منبع

增加小时榜单

wangkun 2 سال پیش
والد
کامیت
6f3a69ea99
7فایلهای تغییر یافته به همراه662 افزوده شده و 33 حذف شده
  1. 9 1
      README.md
  2. 14 0
      main/demo.py
  3. 2 1
      main/download.py
  4. 98 28
      main/feishu_lib.py
  5. 3 2
      main/get_feeds.py
  6. 505 0
      main/hour_list.py
  7. 31 1
      main/run.py

+ 9 - 1
README.md

@@ -1 +1,9 @@
-小年糕爬虫 Mac 版本
+小年糕爬虫 Mac 版本
+
+7 天内,播放量>=5000
+时长 1-10min
+
+每小时新增播放数据
+
+爬取时间要小于上升榜时间
+上升榜中写入的数据:当前播放量 - 上个时间段的播放量

+ 14 - 0
main/demo.py

@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+# @Author: wangkun
+# @Time: 2022/5/16
+import datetime
+import time
+
+id1 = "4536997774"
+id2 = "627e1e350000010768f89232"
+time1 = 44697
+time2 = time.strftime("%Y-%m-%d", time.localtime(time1))
+time3 = datetime.datetime.now().strftime("%Y-%m-%d")
+print(time3)
+
+print(int("09"))

+ 2 - 1
main/download.py

@@ -127,9 +127,10 @@ class Download:
                             # 保存视频 ID 到云文档:https://w42nne6hzg.feishu.cn/sheets/shtcngRPoDYAi24x52j2nDuHMih?sheet=onyBDH
                             Common.logger().info("保存视频ID至云文档:{}", download_video_title)
                             # 视频ID工作表,插入首行
-                            Feishu.insert_columns("onyBDH")
+                            Feishu.insert_columns("onyBDH", "ROWS", 1, 2)
                             # 视频ID工作表,首行写入数据
                             upload_time = int(time.time())
+                            time.sleep(1)
                             Feishu.update_values("onyBDH",
                                                  str(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(upload_time))),
                                                  str(download_video_id),

+ 98 - 28
main/feishu_lib.py

@@ -1,7 +1,10 @@
 # -*- coding: utf-8 -*-
 # @Author: wangkun
 # @Time: 2022/5/11
+import datetime
 import json
+import time
+
 import requests
 import urllib3
 
@@ -99,12 +102,15 @@ class Feishu:
         except Exception as e:
             Common.logger().error("读取工作表所有数据异常:{}", e)
 
-    # 工作表,插入
+    # 工作表,插入行
     @classmethod
-    def insert_columns(cls, sheetid):
+    def insert_columns(cls, sheetid, majordimension, startindex, endindex):
         """
-        插入行或列
-        :return:插入首行
+        工作表插入数据
+        sheetid:哪张工作表
+        majordimension:行或者列
+        startindex:开始位置
+        endindex:结束位置
         """
         url = "https://open.feishu.cn/open-apis/sheets/v2/spreadsheets/"\
               + cls.spreadsheetToken + "/insert_dimension_range"
@@ -115,18 +121,18 @@ class Feishu:
         body = {
             "dimension": {
                 "sheetId": sheetid,
-                "majorDimension": "ROWS",  # 默认 ROWS ,可选 ROWS、COLUMNS
-                "startIndex": 1,  # 开始的位置
-                "endIndex": 2  # 结束的位置
+                "majorDimension": majordimension,  # 默认 ROWS ,可选 ROWS、COLUMNS
+                "startIndex": startindex,  # 开始的位置
+                "endIndex": endindex  # 结束的位置
             },
             "inheritStyle": "AFTER"  # BEFORE 或 AFTER,不填为不继承 style
         }
         try:
             urllib3.disable_warnings()
             r = requests.post(url=url, headers=headers, json=body, proxies=proxies, verify=False)
-            Common.logger().info("插入行:{}", r.json()["msg"])
+            Common.logger().info("插入行或列:{}", r.json()["msg"])
         except Exception as e:
-            Common.logger().error("插入行异常:{}", e)
+            Common.logger().error("插入行或列异常:{}", e)
 
     # 工作表,首行写入数据
     @classmethod
@@ -174,6 +180,63 @@ class Feishu:
         except Exception as e:
             Common.logger().error("空行写入视频数据异常:{}", e)
 
+    # 写入数据
+    @classmethod
+    def update_hour_list_values(cls, sheetid, ranges, values):
+        """
+        小时榜写入数据
+        sheetid:工作表 ID
+        ranges:单元格范围
+        values:写入的具体数据,list
+        """
+        # 表格 ID
+        url = "https://open.feishu.cn/open-apis/sheets/v2/spreadsheets/" + cls.spreadsheetToken + "/values_batch_update"
+        headers = {
+            "Authorization": "Bearer " + cls.get_token(),
+            "Content-Type": "application/json; charset=utf-8"
+        }
+        body = {
+            "valueRanges": [
+                {
+                    "range": sheetid + "!" + ranges,
+                    "values": values
+                },
+            ],
+        }
+
+        try:
+            urllib3.disable_warnings()
+            r = requests.post(url=url, headers=headers, json=body, proxies=proxies, verify=False)
+            Common.logger().info("小时榜写入数据:{}", r.json()["msg"])
+        except Exception as e:
+            Common.logger().error("小时榜写入数据异常:{}", e)
+
+    # 合并单元格
+    @classmethod
+    def merge_cells(cls, sheetid, ranges):
+        """
+        合并刚插入的单元格 G1:I1
+        sheetid:哪张工作表
+        ranges:需要合并的单元格范围
+        """
+        url = "https://open.feishu.cn/open-apis/sheets/v2/spreadsheets/" + cls.spreadsheetToken + "/merge_cells"
+        headers = {
+            "Authorization": "Bearer " + cls.get_token(),
+            "Content-Type": "application/json; charset=utf-8"
+        }
+
+        body = {
+            "range": sheetid + "!" + ranges,
+            "mergeType": "MERGE_ROWS"
+        }
+
+        try:
+            urllib3.disable_warnings()
+            r = requests.post(url=url, headers=headers, json=body, proxies=proxies, verify=False)
+            Common.logger().info("合并单元格:{}", r.json()["msg"])
+        except Exception as e:
+            Common.logger().error("合并单元格异常:{}", e)
+
     # 读取单元格数据
     @classmethod
     def get_range_value(cls, sheetid, cell):
@@ -192,9 +255,9 @@ class Feishu:
         params = {
             # valueRenderOption=ToString 可返回纯文本的值(数值类型除外);
             # valueRenderOption=FormattedValue 计算并格式化单元格;
-            # valueRenderOption=Formula单元格中含有公式时返回公式本身;
-            # valueRenderOption=UnformattedValue计算但不对单元格进行格式化。
-            "valueRenderOption": "ToString",
+            # valueRenderOption=Formula 单元格中含有公式时返回公式本身;
+            # valueRenderOption=UnformattedValue 计算但不对单元格进行格式化。
+            "valueRenderOption": "FormattedValue",
 
             # dateTimeRenderOption=FormattedString 计算并对时间日期按照其格式进行格式化,但不会对数字进行格式化,返回格式化后的字符串。
             "dateTimeRenderOption": "",
@@ -205,6 +268,7 @@ class Feishu:
         try:
             urllib3.disable_warnings()
             r = requests.get(url=url, headers=headers, params=params, proxies=proxies, verify=False)
+            # print(url)
             return r.json()["data"]["valueRange"]["values"][0]
         except Exception as e:
             Common.logger().error("读取单元格数据异常:{}", e)
@@ -246,30 +310,36 @@ if __name__ == "__main__":
 
     # # 获取飞书api token
     # feishu.get_token()
-    # # 获取表格元数据
+    # 获取表格元数据
     # feishu.get_metainfo()
 
     # 读取工作表中所有数据
-    # print(feishu.get_values_batch("Y8N3Vl"))
-    # print(len(feishu.get_values_batch("SdCHOM")))
-    # for i in range(len(feishu.get_values_batch("Y8N3Vl"))):
-    #     videoid = feishu.get_values_batch("Y8N3Vl")[i][1]
-    #     if videoid == "b3":
-    #         # 删除行或列,可选 ROWS、COLUMNS
-    #         feishu.dimension_range("Y8N3Vl", "ROWS", i+1, i+1)
-    #         print(videoid)
-
-    # # 看一看+工作表,插入首行
-    # print(feishu.insert_columns("Y8N3Vl"))
+    # print(feishu.get_values_batch("k2rKkv"))
+    # print(len(feishu.get_values_batch("k2rKkv")))
+    # for i in range(3, len(feishu.get_values_batch("k2rKkv"))+1):
+    #     print(feishu.get_range_value("k2rKkv", "A" + str(i) + ":" + "A" + str(i))[0])
+    #     print(feishu.update_hour_list_values("k2rKkv", "G" + str(i) + ":" + "H" + str(i), [["333"]]))
+    #     time.sleep(0.5)
+    # feishu.get_range_value("k2rKkv", "F3:F3")[0]
+    print(type(feishu.get_range_value("k2rKkv", "H19:H19")[0].split(" ")[-1].split(":")[0]))
+    print(feishu.get_range_value("k2rKkv", "H19:H19")[0])
+    print(int(feishu.get_range_value("k2rKkv", "H19:H19")[0].split(" ")[-1].split(":")[0]))
+
+    feishu.update_hour_list_values("k2rKkv", "H12:H12", [["2022-05-17 15:14:27"]])
+
+    # 看一看+工作表,插入首行
+    # print(feishu.insert_columns("k2rKkv", "COLUMNS", 6, 9))
+    # print(feishu.update_hour_list_values("k2rKkv"))
+    # print(feishu.merge_cells("k2rKkv", "G1:I1"))
     #
     # # 看一看+工作表,首行写入数据
     # print(feishu.update_values("Y8N3Vl", "a1", "b1", "c1", "d1", "e1", "f1", "g1",
     #                            "h1", "i1", "j1", "k1", "l1", "m1", "n1", "o1"))
 
-    # # 查询单元格内容
-    # print(feishu.get_range_value("Y8N3Vl", "B8:C8"))
+    # 查询单元格内容
+    # print(type(feishu.get_range_value("k2rKkv", "G1:G1")[0]))
     #
-    # # 删除行或列,可选 ROWS、COLUMNS
-    # feishu.dimension_range("Y8N3Vl", "ROWS")
+    # 删除行或列,可选 ROWS、COLUMNS
+    # feishu.dimension_range("k2rKkv", "ROWS", 3, 3)
 
     pass

+ 3 - 2
main/get_feeds.py

@@ -292,7 +292,7 @@ def get_feeds():
                 elif any(word if word in video_title else False for word in sensitive_words()) is True:
                     Common.logger().info("视频已中敏感词:{}".format(video_title))
                 # 过滤水印视频
-                elif str(video_logo) == "1" and feeds[i]["tpl_id"] != 0:
+                elif str(video_logo) == "1" and feeds[i]["tpl_id"] != 0 and len(video_id) > 15:
                     Common.logger().info("视频有水印:{}", video_title)
                 # 从云文档去重:https://w42nne6hzg.feishu.cn/sheets/shtcngRPoDYAi24x52j2nDuHMih?sheet=onyBDH
                 elif video_id in [j for i in Feishu.get_values_batch("onyBDH") for j in i]:
@@ -303,11 +303,12 @@ def get_feeds():
                 else:
                     Common.logger().info("该视频未下载,添加至feeds中:{}".format(video_title))
                     # feeds工作表,插入首行
-                    Feishu.insert_columns("S714lO")
+                    Feishu.insert_columns("S714lO", "ROWS", 1, 2)
 
                     # 获取当前时间
                     get_feeds_time = int(time.time())
                     # 看一看云文档,工作表 kanyikan_feeds 中写入数据
+                    time.sleep(1)
                     Feishu.update_values("S714lO",
                                          a1=str(get_feeds_time),
                                          b1=str(video_id),

+ 505 - 0
main/hour_list.py

@@ -0,0 +1,505 @@
+# -*- coding: utf-8 -*-
+# @Author: wangkun
+# @Time: 2022/5/16
+import datetime
+import time
+
+import requests
+import urllib3
+
+from main.common import Common
+from main.feishu_lib import Feishu
+
+proxies = {"http": None, "https": None}
+
+
+class HourList:
+    # 今天的日期:年-月-日
+    today = datetime.datetime.now().strftime("%Y-%m-%d")
+
+    # 已下载小时榜视频列表
+    download_hour_video_list = []
+
+    # 下载规则
+    @staticmethod
+    def download_rule(d_duration, d_width, d_height, d_play_cnt, d_like_cnt, d_share_cnt):
+        """
+        下载视频的基本规则
+        :param d_duration: 时长
+        :param d_width: 宽
+        :param d_height: 高
+        :param d_play_cnt: 播放量
+        :param d_like_cnt: 点赞量
+        :param d_share_cnt: 分享量
+        :return: 满足规则,返回 True;反之,返回 False
+        """
+        if 600 >= int(float(d_duration)) >= 60:
+            if int(d_width) >= 0 or int(d_height) >= 0:
+                if int(d_play_cnt) >= 0:
+                    if int(d_like_cnt) >= 0:
+                        if int(d_share_cnt) >= 0:
+                            return True
+                        else:
+                            return False
+                    else:
+                        return False
+                else:
+                    return False
+            return False
+        return False
+
+    # 获取列表
+    @classmethod
+    def get_hour_list_feeds(cls):
+        """
+        1.从列表获取视频,7 天内,播放量>=5000
+        2.时长 1-10min
+        3.每天10:00、15:00、20:00 把符合规则的视频,写入云文档
+        https://w42nne6hzg.feishu.cn/sheets/shtcngRPoDYAi24x52j2nDuHMih?sheet=k2rKkv
+        """
+        url = "https://kapi.xiaoniangao.cn/trends/get_recommend_trends"
+        headers = {
+            "x-b3-traceid": "15d0e28c9a74d5",
+            "X-Token-Id": "af9c47bb6c942236ff35ee10d355f3b0-1164637358",
+            "uid": "3d460a1b-ab85-426b-bd80-62029acaa2c0",
+            "content-type": "application/json",
+            "Accept-Encoding": "gzip,compress,br,deflate",
+            "User-Agent": 'Mozilla/5.0 (iPhone; CPU iPhone OS 14_7_1 like Mac OS X)'
+                          ' AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 '
+                          'MicroMessenger/8.0.20(0x18001432) NetType/WIFI Language/zh_CN',
+            "Referer": "https://servicewechat.com/wxd7911e4c177690e4/617/page-frame.html"
+        }
+        data = {
+            "log_params": {
+                "page": "discover_rec",
+                "common": {
+                    "brand": "iPhone",
+                    "device": "iPhone 11",
+                    "os": "iOS 14.7.1",
+                    "weixinver": "8.0.20",
+                    "srcver": "2.24.3",
+                    "net": "none"
+                }
+            },
+            "qs": "imageMogr2/gravity/center/rotate/$/thumbnail/!750x500r/crop/750x500/interlace/1/format/jpg",
+            "h_qs": "imageMogr2/gravity/center/rotate/$/thumbnail/!80x80r/crop/80x80/interlace/1/format/jpg",
+            "share_width": 625,
+            "share_height": 500,
+            "ext": {
+                "fmid": 0,
+                "items": {}
+            },
+            "app": "xng",
+            "rec_scene": "discover_rec",
+            "log_common_params": {
+                "e": [{
+                    "data": {
+                        "page": "discoverIndexPage",
+                        "topic": "recommend"
+                    },
+                    "ab": {}
+                }],
+                "ext": {
+                    "brand": "iPhone",
+                    "device": "iPhone 11",
+                    "os": "iOS 14.7.1",
+                    "weixinver": "8.0.20",
+                    "srcver": "2.24.3",
+                    "net": "wifi",
+                    "scene": "1089"
+                },
+                "pj": "1",
+                "pf": "2",
+                "session_id": "c0a5d52b-8f09-48ee-99ab-0feb4f881fe8"
+            },
+            "refresh": False,
+            "token": "451273638af2c8bb90266bcfaf601a68",
+            "uid": "3d460a1b-ab85-426b-bd80-62029acaa2c0",
+            "proj": "ma",
+            "wx_ver": "8.0.20",
+            "code_ver": "3.62.0"
+        }
+        try:
+            urllib3.disable_warnings()
+            r = requests.post(url=url, headers=headers, json=data, proxies=proxies, verify=False)
+            if "data" not in r.json():
+                Common.logger().warning("获取视频feeds错误:{}", r.text)
+            elif "list" not in r.json()["data"]:
+                Common.logger().warning("获取视频feeds无数据,休眠10s:{}", r.json()["data"])
+            else:
+                # 视频列表数据
+                feeds = r.json()["data"]["list"]
+                for i in range(len(feeds)):
+                    # 标题
+                    if "title" in feeds[i]:
+                        video_title = feeds[i]["title"].strip().replace("\n", "") \
+                            .replace("/", "").replace("\r", "").replace("#", "") \
+                            .replace(".", "。").replace("\\", "").replace("&NBSP", "") \
+                            .replace(":", "").replace("*", "").replace("?", "") \
+                            .replace("?", "").replace('"', "").replace("<", "") \
+                            .replace(">", "").replace("|", "").replace(" ", "")
+                        Common.logger().info("标题:{}", video_title)
+                    else:
+                        video_title = ""
+                        Common.logger().info("当前视频无标题:{}", video_title)
+
+                    # 视频 ID
+                    if "vid" in feeds[i]:
+                        video_id = feeds[i]["vid"]
+                        Common.logger().info("视频ID:{}", video_id)
+                    else:
+                        video_id = ""
+                        Common.logger().info("当前视频无ID:{}", video_id)
+
+                    # 播放量
+                    if "play_pv" in feeds[i]:
+                        video_play_cnt = feeds[i]["play_pv"]
+                        Common.logger().info("视频播放量:{}", video_play_cnt)
+                    else:
+                        video_play_cnt = ""
+                        Common.logger().info("当前视频无播放量:{}", video_play_cnt)
+
+                    # 点赞量
+                    if "favor" in feeds[i]:
+                        video_like_cnt = feeds[i]["favor"]["total"]
+                        Common.logger().info("视频点赞量:{}", video_like_cnt)
+                    else:
+                        video_like_cnt = ""
+                        Common.logger().info("当前视频无点赞量:{}", video_like_cnt)
+
+                    # 分享量
+                    if "share" in feeds[i]:
+                        video_share_cnt = feeds[i]["share"]
+                        Common.logger().info("视频分享量:{}", video_share_cnt)
+                    else:
+                        video_share_cnt = ""
+                        Common.logger().info("当前视频无分享量:{}", video_share_cnt)
+
+                    # 评论量
+                    if "comment_count" in feeds[i]:
+                        video_comment_cnt = feeds[i]["comment_count"]
+                        Common.logger().info("视频评论数:{}", video_comment_cnt)
+                    else:
+                        video_comment_cnt = ""
+                        Common.logger().info("当前视频无评论:{}", video_comment_cnt)
+
+                    # 时长
+                    if "du" in feeds[i]:
+                        video_duration = int(feeds[i]["du"] / 1000)
+                        Common.logger().info("视频时长:{}秒", video_duration)
+                    else:
+                        video_duration = ""
+                        Common.logger().info("当前视频无时长:{}", video_duration)
+
+                    # 宽和高
+                    if "w" or "h" in feeds[i]:
+                        video_width = feeds[i]["w"]
+                        video_height = feeds[i]["h"]
+                        Common.logger().info("视频宽高:{}*{}", video_width, video_height)
+                    else:
+                        video_width = ""
+                        video_height = ""
+                        Common.logger().info("当前视频无宽高:{}{}", video_width, video_height)
+
+                    # 发布时间
+                    if "t" in feeds[i]:
+                        video_send_time = feeds[i]["t"]
+                        Common.logger().info(
+                            "视频发布时间:{}", time.strftime(
+                                "%Y-%m-%d %H:%M:%S", time.localtime(int(video_send_time) / 1000)))
+                    else:
+                        video_send_time = ""
+                        Common.logger().info("当前视频无发布时间:{}", video_send_time)
+
+                    # 用户名 / 头像
+                    if "user" in feeds[i]:
+                        user_name = feeds[i]["user"]["nick"].strip().replace("\n", "") \
+                            .replace("/", "").replace("快手", "").replace(" ", "") \
+                            .replace(" ", "").replace("&NBSP", "").replace("\r", "")
+                        head_url = feeds[i]["user"]["hurl"]
+                        Common.logger().info("用户名:{}", user_name)
+                        Common.logger().info("用户头像:{}", head_url)
+                    else:
+                        user_name = ""
+                        head_url = ""
+                        Common.logger().info("当前视频无用户名:{}", user_name)
+                        Common.logger().info("当前视频无用户头像:{}", head_url)
+
+                    # 用户 ID
+                    profile_id = feeds[i]["id"]
+
+                    # 用户 mid
+                    profile_mid = feeds[i]["user"]["mid"]
+
+                    # 视频封面
+                    if "url" in feeds[i]:
+                        cover_url = feeds[i]["url"]
+                        Common.logger().info("视频封面:{}", cover_url)
+                    else:
+                        cover_url = ""
+                        Common.logger().info("当前视频无视频封面:{}", cover_url)
+
+                    # 视频播放地址
+                    if "v_url" in feeds[i]:
+                        video_url = feeds[i]["v_url"]
+                        Common.logger().info("播放地址:{}", video_url)
+                    else:
+                        video_url = ""
+                        Common.logger().info("当前视频无播放地址:{}", video_url)
+
+                    # 过滤无效视频
+                    if video_title == "" or video_id == "" or video_duration == "" \
+                            or video_send_time == "" or user_name == "" or head_url == "" \
+                            or cover_url == "" or video_url == "":
+                        Common.logger().warning("无效视频")
+                    # 判断发布时间是否 > 7天
+                    # elif int(time.time()) - int(video_send_time)/1000 > 2592000:
+                    #     Common.logger().info("发布时间大于30天", video_title)
+                    elif int(time.time()) - int(video_send_time)/1000 > 604800:
+                        Common.logger().info("发布时间大于7天", video_title)
+                    # 判断播放量是否 > 5000
+                    # elif int(video_play_cnt) < 500:
+                    #     Common.logger().info("该视频30天内播放量<500:{}", video_title)
+                    elif int(video_play_cnt) < 5000:
+                        Common.logger().info("该视频7天内播放量<5000:{}", video_title)
+                    # 从云文档去重:https://w42nne6hzg.feishu.cn/sheets/shtcngRPoDYAi24x52j2nDuHMih?sheet=onyBDH
+                    elif video_id in [j for i in Feishu.get_values_batch("k2rKkv") for j in i]:
+                        Common.logger().info("该视频已保存过:{}", video_title)
+                    else:
+                        Common.logger().info("该视频未下载,添加至feeds中:{}".format(video_title))
+                        # feeds工作表,插入空行
+                        Feishu.insert_columns("k2rKkv", "ROWS", 2, 3)
+
+                        # 等待 1s,防止操作云文档太频繁,导致报错
+                        time.sleep(1)
+                        # 获取当前时间
+                        get_feeds_time = int(time.time())
+                        # 看一看云文档,工作表中写入数据
+                        values = [[profile_id, profile_mid, video_id, video_title, user_name, video_url, time.strftime(
+                                "%Y-%m-%d %H:%M:%S", time.localtime(int(video_send_time) / 1000)),
+                                   str(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(get_feeds_time))),
+                                   video_play_cnt]]
+                        Feishu.update_hour_list_values("k2rKkv", "A3:I3", values)
+
+        except Exception as e:
+            Common.logger().error("获取小时榜视频列表异常:{}", e)
+
+    # 检查是否有今日的上升榜日期
+    @classmethod
+    def check_hour_list_data(cls):
+        # 判断J1单元格的日期是否为今天
+        if Feishu.get_range_value("k2rKkv", "J1:J1")[0] != cls.today:
+            # 插入3列 J1:L1,并写入日期和时间数据
+            values = [[datetime.datetime.now().strftime("%Y-%m-%d")], ["10:00", "15:00", "20:00"]]
+            Feishu.insert_columns("k2rKkv", "COLUMNS", 9, 12)
+            Feishu.update_hour_list_values("k2rKkv", "J1:L2", values)
+            Feishu.merge_cells("k2rKkv", "J1:L1")
+            Common.logger().info("插入今天日期成功")
+        else:
+            Common.logger().info("今日上升榜日期已存在")
+
+    # 清除空行
+    @classmethod
+    def del_null_rows(cls):
+        for i in range(3, len(Feishu.get_values_batch("k2rKkv")) + 1):
+            time.sleep(0.5)
+            Common.logger().info("正在检查第:{}行", i)
+            # 删除空行
+            if Feishu.get_range_value("k2rKkv", "A" + str(i) + ":" + "A" + str(i))[0] is None:
+                Common.logger().info("当前第{}行为空行,删除", i)
+                Feishu.dimension_range("k2rKkv", "ROWS", i, i)
+        Common.logger().info("删除空行完成")
+
+    # 更新小时榜数据
+    @classmethod
+    def update_hour_list_data(cls):
+        """
+        更新小时榜数据
+        """
+        try:
+            if len(Feishu.get_values_batch("k2rKkv")) == 2:
+                Common.logger().info("当前工作表无数据")
+            else:
+                for i in range(3, len(Feishu.get_values_batch("k2rKkv"))+1):
+                    time.sleep(0.5)
+                    Common.logger().info("更新第:{}条视频信息", i-2)
+                    # 视频标题
+                    v_title = Feishu.get_range_value("k2rKkv", "D" + str(i) + ":" + "D" + str(i))[0]
+                    Common.logger().info("视频详情,video_title:{},{}", v_title, type(v_title))
+                    # time.sleep(0.5)
+
+                    # 视频 ID
+                    v_id = Feishu.get_range_value("k2rKkv", "C" + str(i) + ":" + "C" + str(i))[0]
+                    Common.logger().info("视频详情,video_id:{},{}", v_id, type(v_id))
+                    # time.sleep(0.5)
+
+                    # profile_id,用户 ID
+                    p_id = Feishu.get_range_value("k2rKkv", "A" + str(i) + ":" + "A" + str(i))[0]
+                    Common.logger().info("视频详情,profile_id:{},{}", p_id, type(p_id))
+                    # time.sleep(0.5)
+
+                    # profile_mid
+                    p_mid = Feishu.get_range_value("k2rKkv", "B" + str(i) + ":" + "B" + str(i))[0]
+                    Common.logger().info("视频详情,profile_mid:{},{}", p_mid, type(p_mid))
+                    # time.sleep(0.5)
+
+                    # 抓取时的播放量
+                    v_play_cnt = Feishu.get_range_value("k2rKkv", "I" + str(i) + ":" + "I" + str(i))[0]
+                    Common.logger().info("视频详情,video_play_cnt:{},{}", v_play_cnt, type(v_play_cnt))
+                    # time.sleep(0.5)
+
+                    # 抓取时间
+                    v_upload_time = Feishu.get_range_value("k2rKkv", "H" + str(i) + ":" + "H" + str(i))[0]
+                    Common.logger().info("视频详情,video_send_time:{},{}", v_upload_time, type(v_upload_time))
+                    # time.sleep(0.5)
+
+                    # 上传时间
+                    upload_hour = v_upload_time.split(" ")[-1].split(":")[0]
+
+                    url = "https://kapi.xiaoniangao.cn/profile/get_profile_by_id"
+                    headers = {
+                        "x-b3-traceid": "b8cd153630f11",
+                        "X-Token-Id": "af9c47bb6c942236ff35ee10d355f3b0-1164637358",
+                        "uid": "3d460a1b-ab85-426b-bd80-62029acaa2c0",
+                        "content-type": "application/json",
+                        "Accept-Encoding": "gzip,compress,br,deflate",
+                        "User-Agent": 'Mozilla/5.0 (iPhone; CPU iPhone OS 14_7_1 like Mac OS X)'
+                                      ' AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 '
+                                      'MicroMessenger/8.0.20(0x18001432) NetType/WIFI Language/zh_CN',
+                        "Referer": "https://servicewechat.com/wxd7911e4c177690e4/617/page-frame.html"
+                    }
+                    data = {
+                        "play_src": "1",
+                        "profile_id": int(p_id),
+                        "profile_mid": int(p_mid),
+                        "qs": "imageMogr2/gravity/center/rotate/$/thumbnail/"
+                              "!400x400r/crop/400x400/interlace/1/format/jpg",
+                        "h_qs": "imageMogr2/gravity/center/rotate/$/thumbnail"
+                                "/!80x80r/crop/80x80/interlace/1/format/jpg",
+                        "share_width": 625,
+                        "share_height": 500,
+                        "no_comments": True,
+                        "no_follow": True,
+                        "vid": v_id,
+                        "hot_l1_comment": True,
+                        "token": "451273638af2c8bb90266bcfaf601a68",
+                        "uid": "3d460a1b-ab85-426b-bd80-62029acaa2c0",
+                        "proj": "ma",
+                        "wx_ver": "8.0.20",
+                        "code_ver": "3.62.0",
+                        "log_common_params": {
+                            "e": [{
+                                "data": {
+                                    "page": "dynamicSharePage"
+                                }
+                            }],
+                            "ext": {
+                                "brand": "iPhone",
+                                "device": "iPhone 11",
+                                "os": "iOS 14.7.1",
+                                "weixinver": "8.0.20",
+                                "srcver": "2.24.3",
+                                "net": "wifi",
+                                "scene": "1089"
+                            },
+                            "pj": "1",
+                            "pf": "2",
+                            "session_id": "c0a5d52b-8f09-48ee-99ab-0feb4f881fe8"
+                        }
+                    }
+                    try:
+                        urllib3.disable_warnings()
+                        r = requests.post(headers=headers, url=url, json=data, proxies=proxies, verify=False)
+                        hour_play_cnt = r.json()["data"]["play_pv"]
+                        Common.logger().info("视频详情,当前播放量:{}", hour_play_cnt)
+                        # 固定时间获取符合规则的视频,写入云文档:https://w42nne6hzg.feishu.cn/sheets/shtcngRPoDYAi24x52j2nDuHMih?sheet=k2rKkv
+                        update_hour = datetime.datetime.now()
+                        if update_hour.hour == 10 and int(upload_hour) <= 10:
+                            Common.logger().info("满足条件: update_hour == 10 and int(upload_hour) < 10")
+                            # 当天 10:00 视频播放量
+                            ten_hour_play_cnt = hour_play_cnt
+                            Common.logger().info("当天 10:00 视频播放量:{}", ten_hour_play_cnt)
+                            # 10:00 的上升榜写入数据
+                            values = int(ten_hour_play_cnt) - int(v_play_cnt)
+                            time.sleep(1)
+                            Feishu.update_hour_list_values("k2rKkv", "J"+str(i) + ":" + "J"+str(i), [[values]])
+                            Common.logger().info("10:00数据更新成功:{}", values)
+                        elif update_hour.hour == 15 and int(upload_hour) <= 10:
+                            Common.logger().info("满足条件: update_hour == 15 and int(upload_hour) <= 10")
+                            # 当天 15:00 视频播放量
+                            fifteen_hour_play_cnt = hour_play_cnt
+                            Common.logger().info("当天 15:00 视频播放量:{}", fifteen_hour_play_cnt)
+                            # 当天 10:00 上升的数据
+                            if Feishu.get_range_value("k2rKkv", "J"+str(i) + ":" + "J"+str(i))[0] is None:
+                                ten_up_cnt = 0
+                            else:
+                                ten_up_cnt = Feishu.get_range_value("k2rKkv", "J"+str(i) + ":" + "J"+str(i))[0]
+                            # 15:00 的上升榜写入数据
+                            values = int(fifteen_hour_play_cnt) - (int(v_play_cnt) + int(ten_up_cnt))
+                            time.sleep(1)
+                            Feishu.update_hour_list_values("k2rKkv", "K" + str(i) + ":" + "K" + str(i), [[values]])
+                            Common.logger().info("15:00数据更新成功:{}", values)
+                        elif update_hour.hour == 15 and 10 < int(upload_hour) <= 15:
+                            Common.logger().info("满足条件: update_hour == 15 and 10 < int(upload_hour) < 15")
+                            # 当天 15:00 视频播放量
+                            fifteen_hour_play_cnt = hour_play_cnt
+                            # 15:00 的上升榜写入数据
+                            values = int(fifteen_hour_play_cnt) - int(v_play_cnt)
+                            time.sleep(1)
+                            Feishu.update_hour_list_values("k2rKkv", "K" + str(i) + ":" + "K" + str(i), [[values]])
+                            Common.logger().info("15:00数据更新成功:{}", values)
+                        elif update_hour.hour == 20 and int(upload_hour) <= 10:
+                            Common.logger().info("满足条件: update_hour == 20 and int(upload_hour) <= 10")
+                            # 当天 20:00 视频播放量
+                            twenty_hour_play_cnt = hour_play_cnt
+                            # 当天 10:00 上升的数据
+                            if Feishu.get_range_value("k2rKkv", "J" + str(i) + ":" + "J" + str(i))[0] is None:
+                                ten_up_cnt = 0
+                            else:
+                                ten_up_cnt = Feishu.get_range_value("k2rKkv", "J" + str(i) + ":" + "J" + str(i))[0]
+                            # 当天 15:00 上升的数据
+                            if Feishu.get_range_value("k2rKkv", "K" + str(i) + ":" + "K" + str(i))[0] is None:
+                                fifteen_up_cnt = 0
+                            else:
+                                fifteen_up_cnt = Feishu.get_range_value("k2rKkv", "K" + str(i) + ":" + "K" + str(i))[0]
+                            # 20:00 的上升榜写入数据
+                            values = int(twenty_hour_play_cnt) - (
+                                    int(v_play_cnt) + int(ten_up_cnt) + int(fifteen_up_cnt))
+                            time.sleep(1)
+                            Feishu.update_hour_list_values("k2rKkv", "L" + str(i) + ":" + "L" + str(i), [[values]])
+                            Common.logger().info("20:00数据更新成功:{}", values)
+                        elif update_hour.hour == 20 and 10 < int(upload_hour) <= 15:
+                            Common.logger().info("满足条件: update_hour == 20 and 10 < int(upload_hour) < 15")
+                            # 当天 20:00 视频播放量
+                            twenty_hour_play_cnt = hour_play_cnt
+                            # 当天 15:00 上升的数据
+                            if Feishu.get_range_value("k2rKkv", "K" + str(i) + ":" + "K" + str(i))[0] is None:
+                                fifteen_up_cnt = 0
+                            else:
+                                fifteen_up_cnt = Feishu.get_range_value("k2rKkv", "K" + str(i) + ":" + "K" + str(i))[0]
+                            # 20:00 的上升榜写入数据
+                            values = int(twenty_hour_play_cnt) - (int(v_play_cnt) + int(fifteen_up_cnt))
+                            time.sleep(1)
+                            Feishu.update_hour_list_values("k2rKkv", "L" + str(i) + ":" + "L" + str(i), [[values]])
+                            Common.logger().info("20:00数据更新成功:{}", values)
+                        elif update_hour.hour == 20 and 15 < int(upload_hour) <= 20:
+                            Common.logger().info("满足条件: update_hour == 20 and 15 < int(upload_hour) < 20")
+                            # 当天 20:00 视频播放量
+                            twenty_hour_play_cnt = hour_play_cnt
+                            # 20:00 的上升榜写入数据
+                            values = int(twenty_hour_play_cnt) - int(v_play_cnt)
+                            time.sleep(1)
+                            Feishu.update_hour_list_values("k2rKkv", "L" + str(i) + ":" + "L" + str(i), [[values]])
+                            Common.logger().info("20:00数据更新成功:{}", values)
+                    except Exception as e:
+                        Common.logger().error("视频详情:{},异常:{}", v_title, e)
+
+        except Exception as e:
+            Common.logger().error("获取小时榜数据异常:{}", e)
+
+
+if __name__ == "__main__":
+    hour_list = HourList()
+    # hour_list.get_hour_list_feeds()
+    hour_list.del_null_rows()
+    hour_list.update_hour_list_data()

+ 31 - 1
main/run.py

@@ -10,6 +10,7 @@ sys.path.append(os.getcwd())
 from main.common import Common
 from main.download import Download
 from main.get_feeds import get_feeds
+from main.hour_list import HourList
 
 
 def xiaoniangao_prod_job():
@@ -49,5 +50,34 @@ def main_prod():
                 break
 
 
+def main_hour_list():
+    while True:
+        HourList.get_hour_list_feeds()
+        time.sleep(0.5)
+        hour_list_time = datetime.datetime.now()
+        if hour_list_time.hour == 10 and 5 >= hour_list_time.minute >= 0:
+            Common.logger().info("检查今日上升榜日期是否存在")
+            HourList.check_hour_list_data()
+            # Common.logger().info("开始清除空行")
+            # HourList.del_null_rows()
+            Common.logger().info("开始更新上升榜")
+            HourList.update_hour_list_data()
+        if hour_list_time.hour == 15 and 5 >= hour_list_time.minute >= 0:
+            Common.logger().info("检查今日上升榜日期是否存在")
+            HourList.check_hour_list_data()
+            # Common.logger().info("开始清除空行")
+            # HourList.del_null_rows()
+            Common.logger().info("开始更新上升榜")
+            HourList.update_hour_list_data()
+        if hour_list_time.hour == 20 and 5 >= hour_list_time.minute >= 0:
+            Common.logger().info("检查今日上升榜日期是否存在")
+            HourList.check_hour_list_data()
+            # Common.logger().info("开始清除空行")
+            # HourList.del_null_rows()
+            Common.logger().info("开始更新上升榜")
+            HourList.update_hour_list_data()
+
+
 if __name__ == "__main__":
-    main_prod()
+    # main_prod()
+    main_hour_list()