不启用删除空行功能

main/hour_list.py

@@ -325,177 +325,177 @@ class HourList:
                 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": "158f6ce5d71337",
-                        "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": "1a20f033-3511-4e7b-9b2a-95e5c542461f"
+                    # 略过空行
+                    if Feishu.get_range_value("k2rKkv", "D" + str(i) + ":" + "D" + str(i))[0] is None\
+                            or Feishu.get_range_value("k2rKkv", "C" + str(i) + ":" + "C" + str(i))[0] is None\
+                            or Feishu.get_range_value("k2rKkv", "A" + str(i) + ":" + "A" + str(i))[0] is None:
+                        Common.logger().info("空行，略过")
+                    else:
+                        # 视频标题
+                        v_title = Feishu.get_range_value("k2rKkv", "D" + str(i) + ":" + "D" + str(i))[0]
+                        Common.logger().info("视频详情，video_title:{}，{}", v_title, type(v_title))
+
+                        # 视频 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))
+
+                        # 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))
+
+                        # 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))
+
+                        # 抓取时的播放量
+                        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))
+
+                        # 抓取时间
+                        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))
+
+                        # 上传时间
+                        upload_hour = v_upload_time.split(" ")[-1].split(":")[0]
+
+                        url = "https://kapi.xiaoniangao.cn/profile/get_profile_by_id"
+                        headers = {
+                            "x-b3-traceid": "158f6ce5d71337",
+                            "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"
                         }
-                    }
-                    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)
-
+                        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": "1a20f033-3511-4e7b-9b2a-95e5c542461f"
+                            }
+                        }
+                        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)
 

main/run.py

@@ -58,22 +58,22 @@ def main_hour_list():
         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.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.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.del_null_rows()
             Common.logger().info("开始更新上升榜")
             HourList.update_hour_list_data()