|
@@ -319,7 +319,7 @@ class HourList:
|
|
time.sleep(1)
|
|
time.sleep(1)
|
|
|
|
|
|
# 从云文档去重:https://w42nne6hzg.feishu.cn/sheets/shtcnYxiyQ1wLklo1W5Kdqc9cGh?sheet=ba0da4
|
|
# 从云文档去重:https://w42nne6hzg.feishu.cn/sheets/shtcnYxiyQ1wLklo1W5Kdqc9cGh?sheet=ba0da4
|
|
- elif video_id in [j for i in cls.hour_sheet for j in i]:
|
|
|
|
|
|
+ elif video_id in [j for i in Feishu.get_values_batch("hour", "xiaoniangao", "ba0da4") for j in i]:
|
|
Common.logger(log_type).info("该视频已保存过:{}", video_title)
|
|
Common.logger(log_type).info("该视频已保存过:{}", video_title)
|
|
time.sleep(1)
|
|
time.sleep(1)
|
|
else:
|
|
else:
|
|
@@ -356,41 +356,41 @@ class HourList:
|
|
更新小时榜数据
|
|
更新小时榜数据
|
|
"""
|
|
"""
|
|
try:
|
|
try:
|
|
- time.sleep(1)
|
|
|
|
- if len(cls.hour_sheet) == 2:
|
|
|
|
|
|
+ update_hour_sheet = Feishu.get_values_batch("hour", "xiaoniangao", "ba0da4")
|
|
|
|
+ if len(update_hour_sheet) == 2:
|
|
Common.logger(log_type).info("当前工作表无数据")
|
|
Common.logger(log_type).info("当前工作表无数据")
|
|
else:
|
|
else:
|
|
time.sleep(1)
|
|
time.sleep(1)
|
|
- for i in range(3, len(cls.hour_sheet)+1):
|
|
|
|
|
|
+ for i in range(3, len(update_hour_sheet)+1):
|
|
time.sleep(1)
|
|
time.sleep(1)
|
|
Common.logger(log_type).info("更新第:{}行视频信息", i)
|
|
Common.logger(log_type).info("更新第:{}行视频信息", i)
|
|
|
|
|
|
# 略过空行
|
|
# 略过空行
|
|
- if cls.hour_sheet[i][0] is None or cls.hour_sheet[i][1] is None or cls.hour_sheet[i][2] is None:
|
|
|
|
|
|
+ if update_hour_sheet[i][0] is None or update_hour_sheet[i][1] is None or update_hour_sheet[i][2] is None:
|
|
Common.logger(log_type).info("空行,略过")
|
|
Common.logger(log_type).info("空行,略过")
|
|
else:
|
|
else:
|
|
# 视频标题
|
|
# 视频标题
|
|
- v_title = cls.hour_sheet[i][3]
|
|
|
|
|
|
+ v_title = update_hour_sheet[i][3]
|
|
Common.logger(log_type).info("video_title:{}", v_title)
|
|
Common.logger(log_type).info("video_title:{}", v_title)
|
|
|
|
|
|
# 视频 ID
|
|
# 视频 ID
|
|
- v_id = cls.hour_sheet[i][2]
|
|
|
|
|
|
+ v_id = update_hour_sheet[i][2]
|
|
Common.logger(log_type).info("video_id:{}", v_id)
|
|
Common.logger(log_type).info("video_id:{}", v_id)
|
|
|
|
|
|
# profile_id,用户 ID
|
|
# profile_id,用户 ID
|
|
- p_id = cls.hour_sheet[i][0]
|
|
|
|
|
|
+ p_id = update_hour_sheet[i][0]
|
|
Common.logger(log_type).info("profile_id:{}", p_id)
|
|
Common.logger(log_type).info("profile_id:{}", p_id)
|
|
|
|
|
|
# profile_mid
|
|
# profile_mid
|
|
- p_mid = cls.hour_sheet[i][1]
|
|
|
|
|
|
+ p_mid = update_hour_sheet[i][1]
|
|
Common.logger(log_type).info("profile_mid:{}", p_mid)
|
|
Common.logger(log_type).info("profile_mid:{}", p_mid)
|
|
|
|
|
|
# 抓取时的播放量
|
|
# 抓取时的播放量
|
|
- v_play_cnt = cls.hour_sheet[i][10]
|
|
|
|
|
|
+ v_play_cnt = update_hour_sheet[i][10]
|
|
Common.logger(log_type).info("video_play_cnt:{}", v_play_cnt)
|
|
Common.logger(log_type).info("video_play_cnt:{}", v_play_cnt)
|
|
|
|
|
|
# 抓取时间
|
|
# 抓取时间
|
|
- v_upload_time = cls.hour_sheet[i][9]
|
|
|
|
|
|
+ v_upload_time = update_hour_sheet[i][9]
|
|
Common.logger(log_type).info("video_send_time:{}", v_upload_time)
|
|
Common.logger(log_type).info("video_send_time:{}", v_upload_time)
|
|
# 抓取时间的时间戳格式(秒为单位)
|
|
# 抓取时间的时间戳格式(秒为单位)
|
|
v_time = int(time.mktime(time.strptime(v_upload_time, "%Y-%m-%d %H:%M:%S")))
|
|
v_time = int(time.mktime(time.strptime(v_upload_time, "%Y-%m-%d %H:%M:%S")))
|
|
@@ -483,10 +483,10 @@ class HourList:
|
|
Common.logger(log_type).info("当天 15:00 视频播放量:{}", fifteen_hour_play_cnt)
|
|
Common.logger(log_type).info("当天 15:00 视频播放量:{}", fifteen_hour_play_cnt)
|
|
|
|
|
|
# 当天 10:00 上升的数据
|
|
# 当天 10:00 上升的数据
|
|
- if cls.hour_sheet[i][11] is None:
|
|
|
|
|
|
+ if update_hour_sheet[i][11] is None:
|
|
ten_up_cnt = 0
|
|
ten_up_cnt = 0
|
|
else:
|
|
else:
|
|
- ten_up_cnt = cls.hour_sheet[i][11]
|
|
|
|
|
|
+ ten_up_cnt = update_hour_sheet[i][11]
|
|
|
|
|
|
# 15:00 的上升榜写入数据
|
|
# 15:00 的上升榜写入数据
|
|
values = int(fifteen_hour_play_cnt) - (int(v_play_cnt) + int(ten_up_cnt))
|
|
values = int(fifteen_hour_play_cnt) - (int(v_play_cnt) + int(ten_up_cnt))
|
|
@@ -517,18 +517,16 @@ class HourList:
|
|
Common.logger(log_type).info("当天 20:00 视频播放量:{}", twenty_hour_play_cnt)
|
|
Common.logger(log_type).info("当天 20:00 视频播放量:{}", twenty_hour_play_cnt)
|
|
|
|
|
|
# 当天 10:00 上升的数据
|
|
# 当天 10:00 上升的数据
|
|
- time.sleep(1)
|
|
|
|
- if cls.hour_sheet[i][11] is None:
|
|
|
|
|
|
+ if update_hour_sheet[i][11] is None:
|
|
ten_up_cnt = 0
|
|
ten_up_cnt = 0
|
|
else:
|
|
else:
|
|
- ten_up_cnt = cls.hour_sheet[i][11]
|
|
|
|
|
|
+ ten_up_cnt = update_hour_sheet[i][11]
|
|
|
|
|
|
# 当天 15:00 上升的数据
|
|
# 当天 15:00 上升的数据
|
|
- time.sleep(1)
|
|
|
|
- if cls.hour_sheet[i][12] is None:
|
|
|
|
|
|
+ if update_hour_sheet[i][12] is None:
|
|
fifteen_up_cnt = 0
|
|
fifteen_up_cnt = 0
|
|
else:
|
|
else:
|
|
- fifteen_up_cnt = cls.hour_sheet[i][12]
|
|
|
|
|
|
+ fifteen_up_cnt = update_hour_sheet[i][12]
|
|
|
|
|
|
# 20:00 的上升榜写入数据
|
|
# 20:00 的上升榜写入数据
|
|
values = int(twenty_hour_play_cnt) - (
|
|
values = int(twenty_hour_play_cnt) - (
|
|
@@ -546,11 +544,10 @@ class HourList:
|
|
Common.logger(log_type).info("当天 20:00 视频播放量:{}", twenty_hour_play_cnt)
|
|
Common.logger(log_type).info("当天 20:00 视频播放量:{}", twenty_hour_play_cnt)
|
|
|
|
|
|
# 当天 15:00 上升的数据
|
|
# 当天 15:00 上升的数据
|
|
- time.sleep(1)
|
|
|
|
- if cls.hour_sheet[i][12] is None:
|
|
|
|
|
|
+ if update_hour_sheet[i][12] is None:
|
|
fifteen_up_cnt = 0
|
|
fifteen_up_cnt = 0
|
|
else:
|
|
else:
|
|
- fifteen_up_cnt = cls.hour_sheet[i][12]
|
|
|
|
|
|
+ fifteen_up_cnt = update_hour_sheet[i][12]
|
|
|
|
|
|
# 20:00 的上升榜写入数据
|
|
# 20:00 的上升榜写入数据
|
|
values = int(twenty_hour_play_cnt) - (int(v_play_cnt) + int(fifteen_up_cnt))
|
|
values = int(twenty_hour_play_cnt) - (int(v_play_cnt) + int(fifteen_up_cnt))
|
|
@@ -597,11 +594,10 @@ class HourList:
|
|
Common.logger(log_type).info("当天 15:00 视频播放量:{}", fifteen_hour_play_cnt)
|
|
Common.logger(log_type).info("当天 15:00 视频播放量:{}", fifteen_hour_play_cnt)
|
|
|
|
|
|
# 当天 10:00 上升的数据
|
|
# 当天 10:00 上升的数据
|
|
- time.sleep(1)
|
|
|
|
- if cls.hour_sheet[i][11] is None:
|
|
|
|
|
|
+ if update_hour_sheet[i][11] is None:
|
|
ten_up_cnt = 0
|
|
ten_up_cnt = 0
|
|
else:
|
|
else:
|
|
- ten_up_cnt = cls.hour_sheet[i][11]
|
|
|
|
|
|
+ ten_up_cnt = update_hour_sheet[i][11]
|
|
|
|
|
|
# 15:00 的上升榜写入数据
|
|
# 15:00 的上升榜写入数据
|
|
values = int(fifteen_hour_play_cnt) - (int(v_play_cnt) + int(ten_up_cnt))
|
|
values = int(fifteen_hour_play_cnt) - (int(v_play_cnt) + int(ten_up_cnt))
|
|
@@ -619,18 +615,16 @@ class HourList:
|
|
Common.logger(log_type).info("当天 20:00 视频播放量:{}", twenty_hour_play_cnt)
|
|
Common.logger(log_type).info("当天 20:00 视频播放量:{}", twenty_hour_play_cnt)
|
|
|
|
|
|
# 当天 10:00 上升的数据
|
|
# 当天 10:00 上升的数据
|
|
- time.sleep(1)
|
|
|
|
- if cls.hour_sheet[i][11] is None:
|
|
|
|
|
|
+ if update_hour_sheet[i][11] is None:
|
|
ten_up_cnt = 0
|
|
ten_up_cnt = 0
|
|
else:
|
|
else:
|
|
- ten_up_cnt = cls.hour_sheet[i][11]
|
|
|
|
|
|
+ ten_up_cnt = update_hour_sheet[i][11]
|
|
|
|
|
|
# 当天 15:00 上升的数据
|
|
# 当天 15:00 上升的数据
|
|
- time.sleep(1)
|
|
|
|
- if cls.hour_sheet[i][12] is None:
|
|
|
|
|
|
+ if update_hour_sheet[i][12] is None:
|
|
fifteen_up_cnt = 0
|
|
fifteen_up_cnt = 0
|
|
else:
|
|
else:
|
|
- fifteen_up_cnt = cls.hour_sheet[i][12]
|
|
|
|
|
|
+ fifteen_up_cnt = update_hour_sheet[i][12]
|
|
|
|
|
|
# 20:00 的上升榜写入数据
|
|
# 20:00 的上升榜写入数据
|
|
values = int(twenty_hour_play_cnt) - (
|
|
values = int(twenty_hour_play_cnt) - (
|
|
@@ -658,67 +652,62 @@ class HourList:
|
|
3.上传
|
|
3.上传
|
|
"""
|
|
"""
|
|
try:
|
|
try:
|
|
- time.sleep(1)
|
|
|
|
- if len(cls.hour_sheet) == 2:
|
|
|
|
|
|
+ download_hour_sheet = Feishu.get_values_batch("hour", "xiaoniangao", "ba0da4")
|
|
|
|
+ if len(download_hour_sheet) == 2:
|
|
Common.logger(log_type).info("当前工作表无数据")
|
|
Common.logger(log_type).info("当前工作表无数据")
|
|
else:
|
|
else:
|
|
time.sleep(1)
|
|
time.sleep(1)
|
|
- for i in range(3, len(cls.hour_sheet)+1):
|
|
|
|
|
|
+ for i in range(3, len(download_hour_sheet)+1):
|
|
time.sleep(1)
|
|
time.sleep(1)
|
|
Common.logger(log_type).info("分析第:{}行视频信息是否符合下载规则", i)
|
|
Common.logger(log_type).info("分析第:{}行视频信息是否符合下载规则", i)
|
|
|
|
|
|
# 略过空行
|
|
# 略过空行
|
|
- if cls.hour_sheet[i][0] is None or cls.hour_sheet[i][1] is None or cls.hour_sheet[i][2] is None:
|
|
|
|
|
|
+ if download_hour_sheet[i][0] is None or download_hour_sheet[i][1] is None or download_hour_sheet[i][2] is None:
|
|
Common.logger(log_type).info("空行,略过")
|
|
Common.logger(log_type).info("空行,略过")
|
|
else:
|
|
else:
|
|
# 今日 10:00 数据上升量
|
|
# 今日 10:00 数据上升量
|
|
- time.sleep(1)
|
|
|
|
- if cls.hour_sheet[i][11] is None:
|
|
|
|
|
|
+ if download_hour_sheet[i][11] is None:
|
|
ten_cnt = 0
|
|
ten_cnt = 0
|
|
else:
|
|
else:
|
|
- ten_cnt = cls.hour_sheet[i][11]
|
|
|
|
|
|
+ ten_cnt = download_hour_sheet[i][11]
|
|
# 今日 15:00 数据上升量
|
|
# 今日 15:00 数据上升量
|
|
- time.sleep(1)
|
|
|
|
- if cls.hour_sheet[i][12] is None:
|
|
|
|
|
|
+ if download_hour_sheet[i][12] is None:
|
|
fifteen_cnt = 0
|
|
fifteen_cnt = 0
|
|
else:
|
|
else:
|
|
- fifteen_cnt = cls.hour_sheet[i][12]
|
|
|
|
|
|
+ fifteen_cnt = download_hour_sheet[i][12]
|
|
# 今日 20:00 数据上升量
|
|
# 今日 20:00 数据上升量
|
|
- time.sleep(1)
|
|
|
|
- if cls.hour_sheet[i][13] is None:
|
|
|
|
|
|
+ if download_hour_sheet[i][13] is None:
|
|
twenty_cnt = 0
|
|
twenty_cnt = 0
|
|
else:
|
|
else:
|
|
- twenty_cnt = cls.hour_sheet[i][13]
|
|
|
|
|
|
+ twenty_cnt = download_hour_sheet[i][13]
|
|
# 昨日 20:00 数据上升量
|
|
# 昨日 20:00 数据上升量
|
|
- time.sleep(1)
|
|
|
|
- if cls.hour_sheet[i][16] is None:
|
|
|
|
|
|
+ if download_hour_sheet[i][16] is None:
|
|
yesterday_twenty_cnt = 0
|
|
yesterday_twenty_cnt = 0
|
|
else:
|
|
else:
|
|
- yesterday_twenty_cnt = cls.hour_sheet[i][16]
|
|
|
|
|
|
+ yesterday_twenty_cnt = download_hour_sheet[i][16]
|
|
|
|
|
|
# 视频标题
|
|
# 视频标题
|
|
- v_title = cls.hour_sheet[i][3]
|
|
|
|
|
|
+ v_title = download_hour_sheet[i][3]
|
|
Common.logger(log_type).info("video_title:{}", v_title)
|
|
Common.logger(log_type).info("video_title:{}", v_title)
|
|
|
|
|
|
# 视频 ID
|
|
# 视频 ID
|
|
- v_id = cls.hour_sheet[i][2]
|
|
|
|
|
|
+ v_id = download_hour_sheet[i][2]
|
|
Common.logger(log_type).info("video_id:{}", v_id)
|
|
Common.logger(log_type).info("video_id:{}", v_id)
|
|
|
|
|
|
# profile_id,用户 ID
|
|
# profile_id,用户 ID
|
|
- p_id = cls.hour_sheet[i][0]
|
|
|
|
|
|
+ p_id = download_hour_sheet[i][0]
|
|
|
|
|
|
# 视频时长
|
|
# 视频时长
|
|
- v_duration = cls.hour_sheet[i][5]
|
|
|
|
|
|
+ v_duration = download_hour_sheet[i][5]
|
|
|
|
|
|
# profile_mid
|
|
# profile_mid
|
|
- p_mid = cls.hour_sheet[i][1]
|
|
|
|
|
|
+ p_mid = download_hour_sheet[i][1]
|
|
|
|
|
|
Common.logger(log_type).info("10:00 / 15:00 / 20:00 上升量: {} / {} / {}",
|
|
Common.logger(log_type).info("10:00 / 15:00 / 20:00 上升量: {} / {} / {}",
|
|
ten_cnt, fifteen_cnt, twenty_cnt)
|
|
ten_cnt, fifteen_cnt, twenty_cnt)
|
|
|
|
|
|
# 发布时间
|
|
# 发布时间
|
|
- time.sleep(1)
|
|
|
|
- v_upload_time = cls.hour_sheet[i][8]
|
|
|
|
|
|
+ v_upload_time = download_hour_sheet[i][8]
|
|
v_send_time = int(time.mktime(time.strptime(v_upload_time, "%Y-%m-%d %H:%M:%S")))
|
|
v_send_time = int(time.mktime(time.strptime(v_upload_time, "%Y-%m-%d %H:%M:%S")))
|
|
|
|
|
|
# # 判断视频 ID 长度,不大于 13 位
|
|
# # 判断视频 ID 长度,不大于 13 位
|
|
@@ -1374,4 +1363,5 @@ if __name__ == "__main__":
|
|
# today=datetime.datetime.now().strftime("%Y-%m-%d"),
|
|
# today=datetime.datetime.now().strftime("%Y-%m-%d"),
|
|
# yesterday=(datetime.date.today() + datetime.timedelta(days=-1)).strftime("%Y-%m-%d"),
|
|
# yesterday=(datetime.date.today() + datetime.timedelta(days=-1)).strftime("%Y-%m-%d"),
|
|
# before_yesterday=(datetime.date.today() + datetime.timedelta(days=-2)).strftime("%Y-%m-%d"))
|
|
# before_yesterday=(datetime.date.today() + datetime.timedelta(days=-2)).strftime("%Y-%m-%d"))
|
|
- hour_list.download_and_publish("hour")
|
|
|
|
|
|
+ # hour_list.download_and_publish("hour")
|
|
|
|
+ hour_list.update_hour_list_data("hour", "2022-07-01", "2022-06-30", "2022-06-29")
|