From 76e56f3673e0bf7248d0ffdec9b0f120a18ef8b2 Mon Sep 17 00:00:00 2001 From: ihmily <114978440+ihmily@users.noreply.github.com> Date: Sat, 19 Oct 2024 21:16:36 +0800 Subject: [PATCH] feat: add 6 room live record --- config/config.ini | 1 + demo.py | 6 +++++- douyinliverecorder/spider.py | 42 ++++++++++++++++++++++++++++++++++++ main.py | 27 +++++++++++++++-------- 4 files changed, 66 insertions(+), 10 deletions(-) diff --git a/config/config.ini b/config/config.ini index 42fd3a4..6acc0e5 100644 --- a/config/config.ini +++ b/config/config.ini @@ -82,6 +82,7 @@ vvxqiu_cookie = 17live_cookie = langlive_cookie = pplive_cookie = +6room_cookie = [Authorization] popkontv_token = diff --git a/demo.py b/demo.py index abf596c..a9703bf 100644 --- a/demo.py +++ b/demo.py @@ -164,6 +164,10 @@ LIVE_STREAM_CONFIG = { "pplive": { "url": "https://m.pp.weimipopo.com/live/preview.html?uid=91648673&anchorUid=91625862&app=plpl", "func": spider.get_pplive_stream_url, + }, + "6room": { + "url": "https://v.6.cn/634435", + "func": spider.get_6room_stream_url, } } @@ -182,4 +186,4 @@ def test_live_stream(platform_name: str, proxy_addr=None) -> None: if __name__ == "__main__": platform = "douyin" - test_live_stream(platform) + test_live_stream(platform) \ No newline at end of file diff --git a/douyinliverecorder/spider.py b/douyinliverecorder/spider.py index 87cfdfa..925aedd 100644 --- a/douyinliverecorder/spider.py +++ b/douyinliverecorder/spider.py @@ -2745,4 +2745,46 @@ def get_pplive_stream_url(url: str, proxy_addr: Union[str, None] = None, cookies result["is_live"] = True result['m3u8_url'] = live_info['pullUrl'] result['record_url'] = live_info['pullUrl'] + return result + + +@trace_error_decorator +def get_6room_stream_url(url: str, proxy_addr: Union[str, None] = None, cookies: Union[str, None] = None) -> \ + Dict[str, Any]: + headers = { + 'accept-language': 'zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6', + 'referer': 'https://ios.6.cn/?ver=8.0.3&build=4', + 'user-agent': 'ios/7.830 (ios 17.0; ; iPhone 15 (A2846/A3089/A3090/A3092))', + } + + if cookies: + headers['Cookie'] = cookies + + room_id = url.split('?')[0].rsplit('/', maxsplit=1)[1] + html_str = get_req(f'https://v.6.cn/{room_id}', proxy_addr=proxy_addr, headers=headers) + room_id = re.search('rid: \'(.*?)\',\n\s+roomid', html_str).group(1) + data = { + 'av': '3.1', + 'encpass': '', + 'logiuid': '', + 'project': 'v6iphone', + 'rate': '1', + 'rid': '', + 'ruid': room_id, + } + + api = 'https://v.6.cn/coop/mobile/index.php?padapi=coop-mobile-inroom.php' + json_str = get_req(api, data=data, proxy_addr=proxy_addr, headers=headers) + json_data = json.loads(json_str) + flv_title = json_data['content']['liveinfo']['flvtitle'] + anchor_name = json_data['content']['roominfo']['alias'] + result = { + "anchor_name": anchor_name, + "is_live": False, + } + if flv_title: + result["is_live"] = True + flv_url = f'https://wlive.6rooms.com/httpflv/{flv_title}.flv' + result['flv_url'] = flv_url + result['record_url'] = get_req(flv_url, proxy_addr=proxy_addr, headers=headers, redirect_url=True) return result \ No newline at end of file diff --git a/main.py b/main.py index d2dea5c..dd78368 100644 --- a/main.py +++ b/main.py @@ -37,7 +37,7 @@ from msg_push import ( version = "v3.0.9" platforms = ("\n国内站点：抖音|快手|虎牙|斗鱼|YY|B站|小红书|bigo|blued|网易CC|千度热播|猫耳FM|Look|TwitCasting|百度|微博|" - "酷狗|花椒|流星|Acfun|时光|映客|音播|知乎|嗨秀|VV星球|17Live|漂漂" + "酷狗|花椒|流星|Acfun|时光|映客|音播|知乎|嗨秀|VV星球|17Live|漂漂|六间房" "\n海外站点：TikTok|SOOP[AfreecaTV]|PandaTV|WinkTV|FlexTV|PopkonTV|TwitchTV|LiveMe|ShowRoom|CHZZK|浪Live") recording = set() @@ -65,7 +65,7 @@ config_file = f'{script_path}/config/config.ini' url_config_file = f'{script_path}/config/URL_config.ini' backup_dir = f'{script_path}/backup_config' text_encoding = 'utf-8-sig' -rstr = r"[\/\\\:\*\?\"\<\>\|&#.。,， ]" +rstr = r"[\/\\\:\*\?\"\<\>\|&#.。,， ~]" ffmpeg_path = f"{script_path}/ffmpeg.exe" default_path = f'{script_path}/downloads' os.makedirs(default_path, exist_ok=True) @@ -724,6 +724,12 @@ def start_record(url_data: tuple, count_variable: int = -1): port_info = spider.get_pplive_stream_url( url=record_url, proxy_addr=proxy_address, cookies=pplive_cookie) + elif record_url.find(".6.cn/") > -1: + platform = '六间房直播' + with semaphore: + port_info = spider.get_6room_stream_url( + url=record_url, proxy_addr=proxy_address, cookies=six_room_cookie) + else: logger.error(f'{record_url} {platform}直播地址') return @@ -1456,6 +1462,7 @@ while True: yiqilive_cookie = read_config_value(config, 'Cookie', '17live_cookie', '') langlive_cookie = read_config_value(config, 'Cookie', 'langlive_cookie', '') pplive_cookie = read_config_value(config, 'Cookie', 'pplive_cookie', '') + six_room_cookie = read_config_value(config, 'Cookie', '6room_cookie', '') video_save_type_list = ("FLV", "MKV", "TS", "MP4", "MP3音频", "M4A音频") if video_save_type and video_save_type.upper() in video_save_type_list: @@ -1463,10 +1470,8 @@ while True: else: video_save_type = "TS" - def contains_url(string: str) -> bool: - pattern = (r"(http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/)?[a-zA-Z0-9][a-zA-Z0-9\-]+(\.[" - r"a-zA-Z0-9\-]+)*\.[a-zA-Z]{2,10}(:[0-9]{1,5})?(\/.*)?$") + pattern = r"(https?://)?(www\.)?[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+(:\d+)?(/.*)?" return re.search(pattern, string) is not None try: @@ -1507,8 +1512,8 @@ while True: quality = '原画' url = 'https://' + url if '://' not in url else url - url_host = url.split('/')[2] + platform_host = [ 'live.douyin.com', 'v.douyin.com', @@ -1548,7 +1553,9 @@ while True: 'www.haixiutv.com', "h5webcdn-pro.vvxqiu.com", "17.live", - "m.pp.weimipopo.com" + "m.pp.weimipopo.com", + "v.6.cn", + "m.6.cn" ] overseas_platform_host = [ 'www.tiktok.com', @@ -1577,7 +1584,9 @@ while True: "www.huya.com", "chzzk.naver.com", "www.liveme.com", - "www.haixiutv.com" + "www.haixiutv.com", + "v.6.cn", + "m.6.cn" ) if url_host in platform_host: @@ -1593,7 +1602,7 @@ while True: else: if not origin_line.startswith('#'): print(f"\r{origin_line} 本行包含未知链接.此条跳过") - update_file(url_config_file, url, url, start_str='#') + update_file(url_config_file, origin_line, origin_line, start_str='#') while len(need_update_line_list): a = need_update_line_list.pop()