ソースを参照

update 快手翻页取消

lierqiang 2 年 前
コミット
2fb1866f65
1 ファイル変更249 行追加252 行削除
  1. 249 252
      kuaishou/kuaishou_follow/kuaishou_follow.py

+ 249 - 252
kuaishou/kuaishou_follow/kuaishou_follow.py

@@ -372,247 +372,247 @@ class Follow:
                 else:
                     break
 
-            while True:
-                try:
-                    if download_cnt_1 >= int(
-                            rule_dict_1['download_cnt'].replace("=", "")[-1].replace("<", "")[-1].replace(">", "")[
-                                -1]) and download_cnt_2 >= int(
-                            rule_dict_2['download_cnt'].replace("=", "")[-1].replace("<", "")[-1].replace(">", "")[-1]):
-                        Common.logger(log_type, crawler).info(
-                            f"规则1已下载{download_cnt_1}条视频,规则2已下载{download_cnt_2}条视频\n")
-                        return
-
-                    url = "https://www.kuaishou.com/graphql"
-                    payload = json.dumps({
-                        "operationName": "visionProfilePhotoList",
-                        "variables": {
-                            "userId": out_uid,
-                            "pcursor": pcursor,
-                            "page": "profile"
-                        },
-                        "query": "fragment photoContent on PhotoEntity {\n  id\n  duration\n  caption\n  originCaption\n  likeCount\n  viewCount\n  realLikeCount\n  coverUrl\n  photoUrl\n  photoH265Url\n  manifest\n  manifestH265\n  videoResource\n  coverUrls {\n    url\n    __typename\n  }\n  timestamp\n  expTag\n  animatedCoverUrl\n  distance\n  videoRatio\n  liked\n  stereoType\n  profileUserTopPhoto\n  musicBlocked\n  __typename\n}\n\nfragment feedContent on Feed {\n  type\n  author {\n    id\n    name\n    headerUrl\n    following\n    headerUrls {\n      url\n      __typename\n    }\n    __typename\n  }\n  photo {\n    ...photoContent\n    __typename\n  }\n  canAddComment\n  llsid\n  status\n  currentPcursor\n  tags {\n    type\n    name\n    __typename\n  }\n  __typename\n}\n\nquery visionProfilePhotoList($pcursor: String, $userId: String, $page: String, $webPageArea: String) {\n  visionProfilePhotoList(pcursor: $pcursor, userId: $userId, page: $page, webPageArea: $webPageArea) {\n    result\n    llsid\n    webPageArea\n    feeds {\n      ...feedContent\n      __typename\n    }\n    hostName\n    pcursor\n    __typename\n  }\n}\n"
-                    })
-
-                    headers = {
-                        'Cookie': 'kpf=PC_WEB; clientid=3; did=web_8832834f71f4c6ed405b5a35e95abc6d; kpn=KUAISHOU_VISION',
-                        'Referer': f'https://www.kuaishou.com/profile/{out_uid}',
-                        'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36 Edg/110.0.1587.41',
-                        'content-type': 'application/json',
+            try:
+                if download_cnt_1 >= int(
+                        rule_dict_1['download_cnt'].replace("=", "")[-1].replace("<", "")[-1].replace(">", "")[
+                            -1]) and download_cnt_2 >= int(
+                        rule_dict_2['download_cnt'].replace("=", "")[-1].replace("<", "")[-1].replace(">", "")[-1]):
+                    Common.logger(log_type, crawler).info(
+                        f"规则1已下载{download_cnt_1}条视频,规则2已下载{download_cnt_2}条视频\n")
+                    return
+
+                url = "https://www.kuaishou.com/graphql"
+                payload = json.dumps({
+                    "operationName": "visionProfilePhotoList",
+                    "variables": {
+                        "userId": out_uid,
+                        "pcursor": pcursor,
+                        "page": "profile"
+                    },
+                    "query": "fragment photoContent on PhotoEntity {\n  id\n  duration\n  caption\n  originCaption\n  likeCount\n  viewCount\n  realLikeCount\n  coverUrl\n  photoUrl\n  photoH265Url\n  manifest\n  manifestH265\n  videoResource\n  coverUrls {\n    url\n    __typename\n  }\n  timestamp\n  expTag\n  animatedCoverUrl\n  distance\n  videoRatio\n  liked\n  stereoType\n  profileUserTopPhoto\n  musicBlocked\n  __typename\n}\n\nfragment feedContent on Feed {\n  type\n  author {\n    id\n    name\n    headerUrl\n    following\n    headerUrls {\n      url\n      __typename\n    }\n    __typename\n  }\n  photo {\n    ...photoContent\n    __typename\n  }\n  canAddComment\n  llsid\n  status\n  currentPcursor\n  tags {\n    type\n    name\n    __typename\n  }\n  __typename\n}\n\nquery visionProfilePhotoList($pcursor: String, $userId: String, $page: String, $webPageArea: String) {\n  visionProfilePhotoList(pcursor: $pcursor, userId: $userId, page: $page, webPageArea: $webPageArea) {\n    result\n    llsid\n    webPageArea\n    feeds {\n      ...feedContent\n      __typename\n    }\n    hostName\n    pcursor\n    __typename\n  }\n}\n"
+                })
+
+                headers = {
+                    'Cookie': 'kpf=PC_WEB; clientid=3; did=web_8832834f71f4c6ed405b5a35e95abc6d; kpn=KUAISHOU_VISION',
+                    'Referer': f'https://www.kuaishou.com/profile/{out_uid}',
+                    'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36 Edg/110.0.1587.41',
+                    'content-type': 'application/json',
 
-                    }
-                    urllib3.disable_warnings()
-                    s = requests.session()
-                    # max_retries=3 重试3次
-                    s.mount('http://', HTTPAdapter(max_retries=3))
-                    s.mount('https://', HTTPAdapter(max_retries=3))
-                    response = s.post(url=url, headers=headers, data=payload, proxies=Common.tunnel_proxies(), verify=False,
-                                      timeout=10)
-                    response.close()
-                    # Common.logger(log_type, crawler).info(f"get_videoList:{response.text}\n")
-                    if response.status_code != 200:
-                        Common.logger(log_type, crawler).warning(f"get_videoList_response:{response.text}\n")
-                        return
-                    elif 'data' not in response.json():
-                        Common.logger(log_type, crawler).warning(f"get_videoList_response:{response.json()}\n")
-                        return
-                    elif 'visionProfilePhotoList' not in response.json()['data']:
-                        Common.logger(log_type, crawler).warning(f"get_videoList_response:{response.json()['data']}\n")
-                        return
-                    elif 'feeds' not in response.json()['data']['visionProfilePhotoList']:
-                        Common.logger(log_type, crawler).warning(
-                            f"get_videoList_response:{response.json()['data']['visionProfilePhotoList']}\n")
-                        return
-                    elif len(response.json()['data']['visionProfilePhotoList']['feeds']) == 0:
-                        Common.logger(log_type, crawler).info("没有更多视频啦 ~\n")
-                        return
-                    else:
-                        feeds = response.json()['data']['visionProfilePhotoList']['feeds']
-                        pcursor = response.json()['data']['visionProfilePhotoList']['pcursor']
-                        # Common.logger(log_type, crawler).info(f"feeds0: {feeds}\n")
-                        for i in range(len(feeds)):
-                            if 'photo' not in feeds[i]:
-                                Common.logger(log_type, crawler).warning(f"get_videoList:{feeds[i]}\n")
-                                break
-
-                            # video_title
-                            if 'caption' not in feeds[i]['photo']:
-                                video_title = cls.random_title(log_type, crawler)
-                            elif feeds[i]['photo']['caption'].strip() == "":
-                                video_title = cls.random_title(log_type, crawler)
-                            else:
-                                video_title = cls.video_title(log_type, crawler, feeds[i]['photo']['caption'])
-
-                            if 'videoResource' not in feeds[i]['photo'] \
-                                    and 'manifest' not in feeds[i]['photo'] \
-                                    and 'manifestH265' not in feeds[i]['photo']:
-                                Common.logger(log_type, crawler).warning(f"get_videoList:{feeds[i]['photo']}\n")
-                                break
-                            videoResource = feeds[i]['photo']['videoResource']
-
-                            if 'h264' not in videoResource and 'hevc' not in videoResource:
-                                Common.logger(log_type, crawler).warning(f"get_videoList:{videoResource}\n")
-                                break
-
-                            # video_id
-                            if 'h264' in videoResource and 'videoId' in videoResource['h264']:
-                                video_id = videoResource['h264']['videoId']
-                            elif 'hevc' in videoResource and 'videoId' in videoResource['hevc']:
-                                video_id = videoResource['hevc']['videoId']
-                            else:
-                                video_id = ""
-
-                            # play_cnt
-                            if 'viewCount' not in feeds[i]['photo']:
-                                play_cnt = 0
-                            else:
-                                play_cnt = int(feeds[i]['photo']['viewCount'])
-
-                            # like_cnt
-                            if 'realLikeCount' not in feeds[i]['photo']:
-                                like_cnt = 0
-                            else:
-                                like_cnt = feeds[i]['photo']['realLikeCount']
-
-                            # publish_time
-                            if 'timestamp' not in feeds[i]['photo']:
-                                publish_time_stamp = 0
-                                publish_time_str = ''
-                                publish_time = 0
-                            else:
-                                publish_time_stamp = int(int(feeds[i]['photo']['timestamp']) / 1000)
-                                publish_time_str = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(publish_time_stamp))
-                                publish_time = int((int(time.time()) - publish_time_stamp) / (3600 * 24))
-
-                            # duration
-                            if 'duration' not in feeds[i]['photo']:
-                                duration = 0
-                            else:
-                                duration = int(int(feeds[i]['photo']['duration']) / 1000)
-
-                            # video_width / video_height / video_url
-                            mapping = {}
-                            for item in ['width', 'height', 'url']:
-                                try:
-                                    val = str(videoResource['h264']['adaptationSet'][0]['representation'][0][item])
-                                except Exception:
-                                    val = str(videoResource['hevc']['adaptationSet'][0]['representation'][0][item])
-                                except:
-                                    val = ''
-                                mapping[item] = val
-                            video_width = int(mapping['width']) if mapping['width'] != '' else 0
-                            video_height = int(mapping['height']) if mapping['height'] != '' else 0
-                            video_url = mapping['url']
-
-                            # cover_url
-                            if 'coverUrl' not in feeds[i]['photo']:
-                                cover_url = ""
-                            else:
-                                cover_url = feeds[i]['photo']['coverUrl']
-
-                            # user_name / avatar_url
+                }
+                urllib3.disable_warnings()
+                s = requests.session()
+                # max_retries=3 重试3次
+                s.mount('http://', HTTPAdapter(max_retries=3))
+                s.mount('https://', HTTPAdapter(max_retries=3))
+                response = s.post(url=url, headers=headers, data=payload, proxies=Common.tunnel_proxies(), verify=False,
+                                  timeout=10)
+                response.close()
+                # Common.logger(log_type, crawler).info(f"get_videoList:{response.text}\n")
+                if response.status_code != 200:
+                    Common.logger(log_type, crawler).warning(f"get_videoList_response:{response.text}\n")
+                    return
+                elif 'data' not in response.json():
+                    Common.logger(log_type, crawler).warning(f"get_videoList_response:{response.json()}\n")
+                    return
+                elif 'visionProfilePhotoList' not in response.json()['data']:
+                    Common.logger(log_type, crawler).warning(f"get_videoList_response:{response.json()['data']}\n")
+                    return
+                elif 'feeds' not in response.json()['data']['visionProfilePhotoList']:
+                    Common.logger(log_type, crawler).warning(
+                        f"get_videoList_response:{response.json()['data']['visionProfilePhotoList']}\n")
+                    return
+                elif len(response.json()['data']['visionProfilePhotoList']['feeds']) == 0:
+                    Common.logger(log_type, crawler).info("没有更多视频啦 ~\n")
+                    return
+                else:
+                    feeds = response.json()['data']['visionProfilePhotoList']['feeds']
+                    pcursor = response.json()['data']['visionProfilePhotoList']['pcursor']
+                    # Common.logger(log_type, crawler).info(f"feeds0: {feeds}\n")
+                    for i in range(len(feeds)):
+                        if 'photo' not in feeds[i]:
+                            Common.logger(log_type, crawler).warning(f"get_videoList:{feeds[i]}\n")
+                            break
+
+                        # video_title
+                        if 'caption' not in feeds[i]['photo']:
+                            video_title = cls.random_title(log_type, crawler)
+                        elif feeds[i]['photo']['caption'].strip() == "":
+                            video_title = cls.random_title(log_type, crawler)
+                        else:
+                            video_title = cls.video_title(log_type, crawler, feeds[i]['photo']['caption'])
+
+                        if 'videoResource' not in feeds[i]['photo'] \
+                                and 'manifest' not in feeds[i]['photo'] \
+                                and 'manifestH265' not in feeds[i]['photo']:
+                            Common.logger(log_type, crawler).warning(f"get_videoList:{feeds[i]['photo']}\n")
+                            break
+                        videoResource = feeds[i]['photo']['videoResource']
+
+                        if 'h264' not in videoResource and 'hevc' not in videoResource:
+                            Common.logger(log_type, crawler).warning(f"get_videoList:{videoResource}\n")
+                            break
+
+                        # video_id
+                        if 'h264' in videoResource and 'videoId' in videoResource['h264']:
+                            video_id = videoResource['h264']['videoId']
+                        elif 'hevc' in videoResource and 'videoId' in videoResource['hevc']:
+                            video_id = videoResource['hevc']['videoId']
+                        else:
+                            video_id = ""
+
+                        # play_cnt
+                        if 'viewCount' not in feeds[i]['photo']:
+                            play_cnt = 0
+                        else:
+                            play_cnt = int(feeds[i]['photo']['viewCount'])
+
+                        # like_cnt
+                        if 'realLikeCount' not in feeds[i]['photo']:
+                            like_cnt = 0
+                        else:
+                            like_cnt = feeds[i]['photo']['realLikeCount']
+
+                        # publish_time
+                        if 'timestamp' not in feeds[i]['photo']:
+                            publish_time_stamp = 0
+                            publish_time_str = ''
+                            publish_time = 0
+                        else:
+                            publish_time_stamp = int(int(feeds[i]['photo']['timestamp']) / 1000)
+                            publish_time_str = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(publish_time_stamp))
+                            publish_time = int((int(time.time()) - publish_time_stamp) / (3600 * 24))
+
+                        # duration
+                        if 'duration' not in feeds[i]['photo']:
+                            duration = 0
+                        else:
+                            duration = int(int(feeds[i]['photo']['duration']) / 1000)
+
+                        # video_width / video_height / video_url
+                        mapping = {}
+                        for item in ['width', 'height', 'url']:
                             try:
-                                user_name = feeds[i]['author']['name']
-                                avatar_url = feeds[i]['author']['headerUrl']
+                                val = str(videoResource['h264']['adaptationSet'][0]['representation'][0][item])
                             except Exception:
-                                user_name = ''
-                                avatar_url = ''
-
-                            video_dict = {'video_title': video_title,
-                                          'video_id': video_id,
-                                          'play_cnt': play_cnt,
-                                          'comment_cnt': 0,
-                                          'like_cnt': like_cnt,
-                                          'share_cnt': 0,
-                                          'video_width': video_width,
-                                          'video_height': video_height,
-                                          'duration': duration,
-                                          'publish_time': publish_time,
-                                          'publish_time_stamp': publish_time_stamp,
-                                          'publish_time_str': publish_time_str,
-                                          'user_name': user_name,
-                                          'user_id': out_uid,
-                                          'avatar_url': avatar_url,
-                                          'cover_url': cover_url,
-                                          'video_url': video_url,
-                                          'session': f"kuaishou{int(time.time())}"}
-
-                            rule_1 = cls.download_rule(video_dict, rule_dict_1)
-                            Common.logger(log_type, crawler).info(f"video_title:{video_title}")
-                            Common.logger(log_type, crawler).info(f"video_id:{video_id}\n")
-
-                            Common.logger(log_type, crawler).info(
-                                f"play_cnt:{video_dict['play_cnt']}{rule_dict_1['play_cnt']}, {eval(str(video_dict['play_cnt']) + str(rule_dict_1['play_cnt']))}")
-                            Common.logger(log_type, crawler).info(
-                                f"like_cnt:{video_dict['like_cnt']}{rule_dict_1['like_cnt']}, {eval(str(video_dict['like_cnt']) + str(rule_dict_1['like_cnt']))}")
-                            Common.logger(log_type, crawler).info(
-                                f"video_width:{video_dict['video_width']}{rule_dict_1['video_width']}, {eval(str(video_dict['video_width']) + str(rule_dict_1['video_width']))}")
-                            Common.logger(log_type, crawler).info(
-                                f"video_height:{video_dict['video_height']}{rule_dict_1['video_height']}, {eval(str(video_dict['video_height']) + str(rule_dict_1['video_height']))}")
-                            Common.logger(log_type, crawler).info(
-                                f"duration:{video_dict['duration']}{rule_dict_1['duration']}, {eval(str(video_dict['duration']) + str(rule_dict_1['duration']))}")
-                            Common.logger(log_type, crawler).info(
-                                f"publish_time:{video_dict['publish_time']}{rule_dict_1['publish_time']}, {eval(str(video_dict['publish_time']) + str(rule_dict_1['publish_time']))}")
-                            Common.logger(log_type, crawler).info(f"rule_1:{rule_1}\n")
-
-                            rule_2 = cls.download_rule(video_dict, rule_dict_2)
-                            Common.logger(log_type, crawler).info(
-                                f"play_cnt:{video_dict['play_cnt']}{rule_dict_2['play_cnt']}, {eval(str(video_dict['play_cnt']) + str(rule_dict_2['play_cnt']))}")
-                            Common.logger(log_type, crawler).info(
-                                f"like_cnt:{video_dict['like_cnt']}{rule_dict_2['like_cnt']}, {eval(str(video_dict['like_cnt']) + str(rule_dict_2['like_cnt']))}")
-                            Common.logger(log_type, crawler).info(
-                                f"video_width:{video_dict['video_width']}{rule_dict_2['video_width']}, {eval(str(video_dict['video_width']) + str(rule_dict_2['video_width']))}")
-                            Common.logger(log_type, crawler).info(
-                                f"video_height:{video_dict['video_height']}{rule_dict_2['video_height']}, {eval(str(video_dict['video_height']) + str(rule_dict_2['video_height']))}")
-                            Common.logger(log_type, crawler).info(
-                                f"duration:{video_dict['duration']}{rule_dict_2['duration']}, {eval(str(video_dict['duration']) + str(rule_dict_2['duration']))}")
-                            Common.logger(log_type, crawler).info(
-                                f"publish_time:{video_dict['publish_time']}{rule_dict_2['publish_time']}, {eval(str(video_dict['publish_time']) + str(rule_dict_2['publish_time']))}")
-                            Common.logger(log_type, crawler).info(f"rule_2:{rule_2}\n")
-
-                            if video_title == "" or video_url == "":
-                                Common.logger(log_type, crawler).info("无效视频\n")
-                                break
-                            elif rule_1 is True:
-                                if download_cnt_1 < int(
-                                        rule_dict_1['download_cnt'].replace("=", "")[-1].replace("<", "")[-1].replace(">",
-                                                                                                                      "")[
-                                            -1]):
-                                    download_finished = cls.download_publish(log_type=log_type,
-                                                                             crawler=crawler,
-                                                                             strategy=strategy,
-                                                                             video_dict=video_dict,
-                                                                             rule_dict=rule_dict_1,
-                                                                             our_uid=our_uid,
-                                                                             oss_endpoint=oss_endpoint,
-                                                                             env=env,
-                                                                             machine=machine)
-                                    if download_finished is True:
-                                        download_cnt_1 += 1
-                            elif rule_2 is True:
-                                if download_cnt_2 < int(
-                                        rule_dict_2['download_cnt'].replace("=", "")[-1].replace("<", "")[-1].replace(">",
-                                                                                                                      "")[
-                                            -1]):
-                                    download_finished = cls.download_publish(log_type=log_type,
-                                                                             crawler=crawler,
-                                                                             strategy=strategy,
-                                                                             video_dict=video_dict,
-                                                                             rule_dict=rule_dict_2,
-                                                                             our_uid=our_uid,
-                                                                             oss_endpoint=oss_endpoint,
-                                                                             env=env,
-                                                                             machine=machine)
-                                    if download_finished is True:
-                                        download_cnt_2 += 1
-                            else:
-                                Common.logger(log_type, crawler).info("不满足下载规则\n")
-                                # Common.logger(log_type, crawler).info(f"feeds: {feeds}\n")
-
-                        if pcursor == "no_more":
-                            Common.logger(log_type, crawler).info("已经到底了,没有更多内容了\n")
-                            return
-                except Exception as e:
-                    Common.logger(log_type, crawler).error(f"get_videoList:{e}\n")
+                                val = str(videoResource['hevc']['adaptationSet'][0]['representation'][0][item])
+                            except:
+                                val = ''
+                            mapping[item] = val
+                        video_width = int(mapping['width']) if mapping['width'] != '' else 0
+                        video_height = int(mapping['height']) if mapping['height'] != '' else 0
+                        video_url = mapping['url']
+
+                        # cover_url
+                        if 'coverUrl' not in feeds[i]['photo']:
+                            cover_url = ""
+                        else:
+                            cover_url = feeds[i]['photo']['coverUrl']
+
+                        # user_name / avatar_url
+                        try:
+                            user_name = feeds[i]['author']['name']
+                            avatar_url = feeds[i]['author']['headerUrl']
+                        except Exception:
+                            user_name = ''
+                            avatar_url = ''
+
+                        video_dict = {'video_title': video_title,
+                                      'video_id': video_id,
+                                      'play_cnt': play_cnt,
+                                      'comment_cnt': 0,
+                                      'like_cnt': like_cnt,
+                                      'share_cnt': 0,
+                                      'video_width': video_width,
+                                      'video_height': video_height,
+                                      'duration': duration,
+                                      'publish_time': publish_time,
+                                      'publish_time_stamp': publish_time_stamp,
+                                      'publish_time_str': publish_time_str,
+                                      'user_name': user_name,
+                                      'user_id': out_uid,
+                                      'avatar_url': avatar_url,
+                                      'cover_url': cover_url,
+                                      'video_url': video_url,
+                                      'session': f"kuaishou{int(time.time())}"}
+
+                        rule_1 = cls.download_rule(video_dict, rule_dict_1)
+                        Common.logger(log_type, crawler).info(f"video_title:{video_title}")
+                        Common.logger(log_type, crawler).info(f"video_id:{video_id}\n")
+
+                        Common.logger(log_type, crawler).info(
+                            f"play_cnt:{video_dict['play_cnt']}{rule_dict_1['play_cnt']}, {eval(str(video_dict['play_cnt']) + str(rule_dict_1['play_cnt']))}")
+                        Common.logger(log_type, crawler).info(
+                            f"like_cnt:{video_dict['like_cnt']}{rule_dict_1['like_cnt']}, {eval(str(video_dict['like_cnt']) + str(rule_dict_1['like_cnt']))}")
+                        Common.logger(log_type, crawler).info(
+                            f"video_width:{video_dict['video_width']}{rule_dict_1['video_width']}, {eval(str(video_dict['video_width']) + str(rule_dict_1['video_width']))}")
+                        Common.logger(log_type, crawler).info(
+                            f"video_height:{video_dict['video_height']}{rule_dict_1['video_height']}, {eval(str(video_dict['video_height']) + str(rule_dict_1['video_height']))}")
+                        Common.logger(log_type, crawler).info(
+                            f"duration:{video_dict['duration']}{rule_dict_1['duration']}, {eval(str(video_dict['duration']) + str(rule_dict_1['duration']))}")
+                        Common.logger(log_type, crawler).info(
+                            f"publish_time:{video_dict['publish_time']}{rule_dict_1['publish_time']}, {eval(str(video_dict['publish_time']) + str(rule_dict_1['publish_time']))}")
+                        Common.logger(log_type, crawler).info(f"rule_1:{rule_1}\n")
+
+                        rule_2 = cls.download_rule(video_dict, rule_dict_2)
+                        Common.logger(log_type, crawler).info(
+                            f"play_cnt:{video_dict['play_cnt']}{rule_dict_2['play_cnt']}, {eval(str(video_dict['play_cnt']) + str(rule_dict_2['play_cnt']))}")
+                        Common.logger(log_type, crawler).info(
+                            f"like_cnt:{video_dict['like_cnt']}{rule_dict_2['like_cnt']}, {eval(str(video_dict['like_cnt']) + str(rule_dict_2['like_cnt']))}")
+                        Common.logger(log_type, crawler).info(
+                            f"video_width:{video_dict['video_width']}{rule_dict_2['video_width']}, {eval(str(video_dict['video_width']) + str(rule_dict_2['video_width']))}")
+                        Common.logger(log_type, crawler).info(
+                            f"video_height:{video_dict['video_height']}{rule_dict_2['video_height']}, {eval(str(video_dict['video_height']) + str(rule_dict_2['video_height']))}")
+                        Common.logger(log_type, crawler).info(
+                            f"duration:{video_dict['duration']}{rule_dict_2['duration']}, {eval(str(video_dict['duration']) + str(rule_dict_2['duration']))}")
+                        Common.logger(log_type, crawler).info(
+                            f"publish_time:{video_dict['publish_time']}{rule_dict_2['publish_time']}, {eval(str(video_dict['publish_time']) + str(rule_dict_2['publish_time']))}")
+                        Common.logger(log_type, crawler).info(f"rule_2:{rule_2}\n")
+
+                        if video_title == "" or video_url == "":
+                            Common.logger(log_type, crawler).info("无效视频\n")
+                            break
+                        elif rule_1 is True:
+                            if download_cnt_1 < int(
+                                    rule_dict_1['download_cnt'].replace("=", "")[-1].replace("<", "")[-1].replace(">",
+                                                                                                                  "")[
+                                        -1]):
+                                download_finished = cls.download_publish(log_type=log_type,
+                                                                         crawler=crawler,
+                                                                         strategy=strategy,
+                                                                         video_dict=video_dict,
+                                                                         rule_dict=rule_dict_1,
+                                                                         our_uid=our_uid,
+                                                                         oss_endpoint=oss_endpoint,
+                                                                         env=env,
+                                                                         machine=machine)
+                                if download_finished is True:
+                                    download_cnt_1 += 1
+                        elif rule_2 is True:
+                            if download_cnt_2 < int(
+                                    rule_dict_2['download_cnt'].replace("=", "")[-1].replace("<", "")[-1].replace(">",
+                                                                                                                  "")[
+                                        -1]):
+                                download_finished = cls.download_publish(log_type=log_type,
+                                                                         crawler=crawler,
+                                                                         strategy=strategy,
+                                                                         video_dict=video_dict,
+                                                                         rule_dict=rule_dict_2,
+                                                                         our_uid=our_uid,
+                                                                         oss_endpoint=oss_endpoint,
+                                                                         env=env,
+                                                                         machine=machine)
+                                if download_finished is True:
+                                    download_cnt_2 += 1
+                        else:
+                            Common.logger(log_type, crawler).info("不满足下载规则\n")
+                            # Common.logger(log_type, crawler).info(f"feeds: {feeds}\n")
+
+                    # if pcursor == "no_more":
+                    #     Common.logger(log_type, crawler).info("已经到底了,没有更多内容了\n")
+                    #     return
+                Common.logger(log_type, crawler).info(f"作者:{out_uid},第一页抓取完毕,退出\n")
+            except Exception as e:
+                Common.logger(log_type, crawler).error(f"get_videoList:{e}\n")
 
     @classmethod
     def repeat_video(cls, log_type, crawler, video_id, video_title, publish_time, env, machine):
@@ -759,17 +759,14 @@ class Follow:
 
 
 if __name__ == "__main__":
-    # Follow.get_videoList(log_type="follow",
-    #                      crawler="kuaishou",
-    #                      strategy="定向爬虫策略",
-    #                      our_uid="6282431",
-    #                      out_uid="3xws7ydsnmp5mgq",
-    #                      oss_endpoint="out",
-    #                      env="dev",
-    #                      machine="local")
-    # print(Follow.get_out_user_info("follow", "kuaishou", "3xgh4ja9be3wcaw"))
-    # print(Follow.get_out_user_info("follow", "kuaishou", "3x5wgjhfc7tx8ue"))
-    print(Follow.get_cookie("cookies", "kuaishou", "3xvp5w6twj77xeq", "local"))
-    print(Follow.get_cookie("cookies", "kuaishou", "3xgh4ja9be3wcaw", "local"))
-    print(Follow.get_cookie("cookies", "kuaishou", "3x5wgjhfc7tx8ue", "local"))
-    pass
+    Follow.get_videoList(log_type="follow",
+                         crawler="kuaishou",
+                         strategy="定向爬虫策略",
+                         our_uid="6282431",
+                         out_uid="3xws7ydsnmp5mgq",
+                         oss_endpoint="out",
+                         env="dev",
+                         machine="local")
+    print(Follow.get_out_user_info("follow", "kuaishou", "3xgh4ja9be3wcaw"))
+    print(Follow.get_out_user_info("follow", "kuaishou", "3x5wgjhfc7tx8ue"))
+