wangkun vor 2 Jahren
Ursprung
Commit
44e94a9996
2 geänderte Dateien mit 113 neuen und 11 gelöschten Zeilen
  1. 105 5
      main/demo.py
  2. 8 6
      main/xigua_follow.py

+ 105 - 5
main/demo.py

@@ -16,7 +16,7 @@ proxies = {'http:': None, 'https': None}
 class Demo:
     @classmethod
     def base64_decode(cls):
-        s = 'aHR0cDovL3Y5LXhnLXdlYi1wYy5peGlndWEuY29tLzgzNGU4ODYxZDU4ODZiN2I2MWU0NjlkNzdiY2M4MTgxLzYzMDRjZGExL3ZpZGVvL3Rvcy9jbi90b3MtY24tby0wMDA0L2Y2MTBmMjNjZDBiMzRlZmQ4OTNlMTdmM2MwYzIxYTViL21lZGlhLXZpZGVvLWF2YzEvP2E9MTc2OCZjaD0wJmNyPTAmZHI9MCZlcj0wJmNkPTAlN0MwJTdDMCU3QzAmY3Y9MSZicj0yNDEzJmJ0PTI0MTMmY3M9MCZkcz00Jm1pbWVfdHlwZT12aWRlb19tcDQmcXM9MCZyYz1PVGRtTnpzMVptVmxaencwWjJZN00wQnBhbXM4Y1dVNlptUThaak16TkRjek0wQmZNakF5WGpSZVhpOHhNQzh1WHpRdVlTTnhObkl5Y2pSbk5pMWdMUzFrTFM5emN3JTNEJTNEJmw9MjAyMjA4MjMxOTQxNDYwMTAxNTgwMjgyMjAwMTk2MEJGQQ=='
+        s = 'aHR0cDovL3Y5LXhnLXdlYi1wYy5peGlndWEuY29tLzYzMDJhOWQzNzU1Njc3MWJhN2UyNDdkZGMwM2E0Y2QyLzYzNDI3ZGE5L3ZpZGVvL3Rvcy9jbi90b3MtY24tdmUtNGMwMDEtYWxpbmMyL2ZkNzIwZTc3MWI4NDRlZTZhZDA4MDM5ZmUyYTZiZTI5Lz9hPTE3NjgmY2g9MCZjcj0wJmRyPTAmZXI9MCZjZD0wJTdDMCU3QzAlN0MwJmN2PTEmYnI9NDU3NCZidD00NTc0JmNzPTAmZHM9NCZmdD1XZzNFbE5ONlZVNndKa01acThkekpMZU9ZWmxjem9qLmQyYkxRQWFCdGlabSZtaW1lX3R5cGU9dmlkZW9fbXA0JnFzPTAmcmM9T1RnemFXVTRPVGhrTmpRNGFHVTBhRUJwYW1Sa09UYzZaalpyWmpNek5EY3pNMEJnTFRVMk1pNWZYbDR4TUROaE1TMHlZU011WnpFemNqUXdjbkpnTFMxa0xTOXpjdyUzRCUzRCZsPTIwMjIxMDA5MTQ0ODA0MDEwMjEyMDc0MDgyMDc1QkFEOEU='
         base64_url = base64.b64decode(s).decode('utf8')
         print(base64_url)
 
@@ -138,7 +138,6 @@ class Demo:
                     video_width = 0
                     video_height = 0
 
-
             print(f'video_url:{video_url}')
             print(f'audio_url:{audio_url}')
             print(f'video_width:{video_width}')
@@ -160,15 +159,116 @@ class Demo:
 
     @classmethod
     def get_logs(cls):
-        logs = ''
+        logs = {'status': 10,
+                'message': 'success',
+                'enable_ssl': True,
+                'auto_definition': '360p',
+                'enable_adaptive': True,
+                'video_id': 'v02004g10000ccuhu33c77u4664aja1g',
+                'video_duration': 245.1,
+                'media_type': 'video',
+                'big_thumbs': [{'img_num': 245,
+                                'uri': 'tos-cn-p-0004/b09ccb86fc744283a46dfeaa427e61f5_1664950300',
+                                'img_url': 'http://p9-sign.douyinpic.com/tos-cn-p-0004/b09ccb86fc744283a46dfeaa427e61f5_1664950300~tplv-noop.image?x-expires=1665301929&x-signature=vVqnvZvxz%2F1GCDJG6uKcuvS7Poc%3D',
+                                'img_urls': [
+                                    'http://p9-sign.douyinpic.com/tos-cn-p-0004/b09ccb86fc744283a46dfeaa427e61f5_1664950300~tplv-noop.image?x-expires=1665301929&x-signature=vVqnvZvxz%2F1GCDJG6uKcuvS7Poc%3D',
+                                    'http://p9-sign.douyinpic.com/tos-cn-p-0004/1c1e5c604d564d41ab351885359e60bb_1664950300~tplv-noop.image?x-expires=1665301929&x-signature=fi%2BzDyDooWrRzLZsMTH4DJmHijU%3D',
+                                    'http://p9-sign.douyinpic.com/tos-cn-p-0004/f26e5afc8fad4297a53485d14771b49e_1664950300~tplv-noop.image?x-expires=1665301929&x-signature=wv6FCWkC1X3E7KlrATKvwxyq1nQ%3D',
+                                    'http://p9-sign.douyinpic.com/tos-cn-p-0004/4b5856dae1924b3da3727fac8598687f_1664950300~tplv-noop.image?x-expires=1665301929&x-signature=XNpi5nD8YkgPKYyPs9QnTSE%2FD6g%3D',
+                                    'http://p9-sign.douyinpic.com/tos-cn-p-0004/04954672fc5a4008adeb02ff31747c0d_1664950300~tplv-noop.image?x-expires=1665301929&x-signature=cfwHC9Z%2Fe%2FhrUHNkgH8J7%2F%2FqmD8%3D',
+                                    'http://p9-sign.douyinpic.com/tos-cn-p-0004/fef653fa497749c497b0f72aabdbf4c1_1664950300~tplv-noop.image?x-expires=1665301929&x-signature=I7p4DT5NysbCN84KXzv4mhnUfNY%3D',
+                                    'http://p9-sign.douyinpic.com/tos-cn-p-0004/f864ee61d88a4618a0e40672562b072d_1664950300~tplv-noop.image?x-expires=1665301929&x-signature=KPL4ibE1KL9x6GQ52PXozpaBUJk%3D',
+                                    'http://p9-sign.douyinpic.com/tos-cn-p-0004/4ef78bed7e684489b6cd20c86e5d7f3d_1664950300~tplv-noop.image?x-expires=1665301929&x-signature=6rP%2F2wSIjeP1nFo8Bb3LOqG4fV0%3D',
+                                    'http://p9-sign.douyinpic.com/tos-cn-p-0004/70a9232da46645609a2a4a0ba94faad3_1664950300~tplv-noop.image?x-expires=1665301929&x-signature=9%2BEqqsSi6eFoj4UllaD4V8PsYSA%3D',
+                                    'http://p9-sign.douyinpic.com/tos-cn-p-0004/1b7bf96e61654b088f5191d3366496ac_1664950300~tplv-noop.image?x-expires=1665301929&x-signature=c1gpR0rIXzb4m8dUGPqazvKdRoE%3D'],
+                                'img_x_size': 240,
+                                'img_y_size': 136,
+                                'img_x_len': 5,
+                                'img_y_len': 5,
+                                'duration': 245.1,
+                                'interval': 1,
+                                'fext': 'jpg'}],
+                'video_list': {
+                    'video_2': {
+                        'definition': '480p',
+                        'quality': 'normal',
+                        'vtype': 'mp4',
+                        'vwidth': 854,
+                        'vheight': 480,
+                        'bitrate': 1046486,
+                        'real_bitrate': 1046486,
+                        'fps': 30,
+                        'codec_type': 'h264',
+                        'size': 32061722,
+                        'main_url': 'aHR0cDovL3Y5LXhnLXdlYi1wYy5peGlndWEuY29tL2IwYzM1N2Q2OTExYzI1OGE2Yzg0YjFkMTU3ODk1YzA5LzYzNDI3ZGE5L3ZpZGVvL3Rvcy9jbi90b3MtY24tdmUtNGMwMDEtYWxpbmMyLzNmZThkZGM1MjI2ZTRmNDBhOWU3YzUwMTBmZjA3MmFhLz9hPTE3NjgmY2g9MCZjcj0wJmRyPTAmZXI9MCZjZD0wJTdDMCU3QzAlN0MwJmN2PTEmYnI9MTAyMSZidD0xMDIxJmNzPTAmZHM9MiZmdD1XZzNFbE5ONlZVNndKa01acThkekpMZU9ZWmxjem9qLmQyYkxRQWFCdGlabSZtaW1lX3R5cGU9dmlkZW9fbXA0JnFzPTAmcmM9WldRMWFUeGxhR2M1YVdWa09HVTVPVUJwYW1Sa09UYzZaalpyWmpNek5EY3pNMEJlTFdJME5TODBYMk14TkM4MkxURmpZU011WnpFemNqUXdjbkpnTFMxa0xTOXpjdyUzRCUzRCZsPTIwMjIxMDA5MTQ0ODA0MDEwMjEyMDc0MDgyMDc1QkFEOEU=',
+                        'backup_url_1': 'aHR0cDovL3YzLXhnLXdlYi1wYy5peGlndWEuY29tLzg1NzZkODY4NmZlYWIyYTlmZTk0NTBjZWU0YTI0MWRjLzYzNDI3ZGE5L3ZpZGVvL3Rvcy9jbi90b3MtY24tdmUtNGMwMDEtYWxpbmMyLzNmZThkZGM1MjI2ZTRmNDBhOWU3YzUwMTBmZjA3MmFhLz9hPTE3NjgmY2g9MCZjcj0wJmRyPTAmZXI9MCZjZD0wJTdDMCU3QzAlN0MwJmN2PTEmYnI9MTAyMSZidD0xMDIxJmNzPTAmZHM9MiZmdD1XZzNFbE5ONlZVNndKa01acThkekpMZU9ZWmxjem9qLmQyYkxRQWFCdGlabSZtaW1lX3R5cGU9dmlkZW9fbXA0JnFzPTAmcmM9WldRMWFUeGxhR2M1YVdWa09HVTVPVUJwYW1Sa09UYzZaalpyWmpNek5EY3pNMEJlTFdJME5TODBYMk14TkM4MkxURmpZU011WnpFemNqUXdjbkpnTFMxa0xTOXpjdyUzRCUzRCZsPTIwMjIxMDA5MTQ0ODA0MDEwMjEyMDc0MDgyMDc1QkFEOEU=',
+                        'file_id': 'f6460b952a7b4ff6bd7e2b897fe20aab', 'volume': {'loudness': -11.8, 'peak': 1},
+                        'quality_type': 30, 'encryption_method': '', 'audio_channels': '2.0', 'audio_layout': 'L R',
+                        'url_expire': 1665301929, 'preload_size': 327680, 'preload_interval': 60,
+                        'preload_min_step': 5, 'preload_max_step': 10,
+                        'file_hash': '28fd2c05a84577b2a4f2cd7e5076a0cf',
+                        'p2p_verify_url': 'aHR0cDovL3Y5LXhnLXdlYi1wYy5peGlndWEuY29tL2VmZjk1NDBiYzU3NDQxMWFhNmY5ZTk1YWE2N2ExNDc5LzYzNDI3ZGE5L3ZpZGVvL3Rvcy9jbi90b3MtY24tdmUtNGMwMDEtYWxpbmMyLzRlNzJlZjI4ZTc1MjQ4ZjQ4ODRkODdhMjg1MTBjMmQyLw=='},
+                    'video_3': {'definition': '720p', 'quality': 'normal', 'vtype': 'mp4', 'vwidth': 1280,
+                                'vheight': 720,
+                                'bitrate': 2107112, 'real_bitrate': 2107112, 'fps': 30, 'codec_type': 'h264',
+                                'size': 64556659,
+                                'main_url': 'aHR0cDovL3Y5LXhnLXdlYi1wYy5peGlndWEuY29tLzBlNjBhOWUwNTM2M2RkMDU1ZTYzMGUzYzU4ZGE0NDYyLzYzNDI3ZGE5L3ZpZGVvL3Rvcy9jbi90b3MtY24tdmUtNGMwMDEtYWxpbmMyL2IzOTY3YTJlN2U4YzQyN2Y4MjliNWExZDgxMjJiNjU5Lz9hPTE3NjgmY2g9MCZjcj0wJmRyPTAmZXI9MCZjZD0wJTdDMCU3QzAlN0MwJmN2PTEmYnI9MjA1NyZidD0yMDU3JmNzPTAmZHM9MyZmdD1XZzNFbE5ONlZVNndKa01acThkekpMZU9ZWmxjem9qLmQyYkxRQWFCdGlabSZtaW1lX3R5cGU9dmlkZW9fbXA0JnFzPTAmcmM9YVRrMk0yVTBaMlU3WlRzMlBEeHBhVUJwYW1Sa09UYzZaalpyWmpNek5EY3pNMEJoTWpReU1UVXhOVEF4WVMweVgxNHVZU011WnpFemNqUXdjbkpnTFMxa0xTOXpjdyUzRCUzRCZsPTIwMjIxMDA5MTQ0ODA0MDEwMjEyMDc0MDgyMDc1QkFEOEU=',
+                                'backup_url_1': 'aHR0cDovL3YzLXhnLXdlYi1wYy5peGlndWEuY29tLzQwOWY3NjNhYmFkNThkYmE5OGI5NDhjZDM0Y2Y2ZGU3LzYzNDI3ZGE5L3ZpZGVvL3Rvcy9jbi90b3MtY24tdmUtNGMwMDEtYWxpbmMyL2IzOTY3YTJlN2U4YzQyN2Y4MjliNWExZDgxMjJiNjU5Lz9hPTE3NjgmY2g9MCZjcj0wJmRyPTAmZXI9MCZjZD0wJTdDMCU3QzAlN0MwJmN2PTEmYnI9MjA1NyZidD0yMDU3JmNzPTAmZHM9MyZmdD1XZzNFbE5ONlZVNndKa01acThkekpMZU9ZWmxjem9qLmQyYkxRQWFCdGlabSZtaW1lX3R5cGU9dmlkZW9fbXA0JnFzPTAmcmM9YVRrMk0yVTBaMlU3WlRzMlBEeHBhVUJwYW1Sa09UYzZaalpyWmpNek5EY3pNMEJoTWpReU1UVXhOVEF4WVMweVgxNHVZU011WnpFemNqUXdjbkpnTFMxa0xTOXpjdyUzRCUzRCZsPTIwMjIxMDA5MTQ0ODA0MDEwMjEyMDc0MDgyMDc1QkFEOEU=',
+                                'file_id': '1fafb95903d84b388b4d814b507356df', 'volume': {'loudness': -11.8, 'peak': 1},
+                                'quality_type': 10, 'encryption_method': '', 'audio_channels': '2.0',
+                                'audio_layout': 'L R',
+                                'url_expire': 1665301929, 'preload_size': 327680, 'preload_interval': 60,
+                                'preload_min_step': 5, 'preload_max_step': 10,
+                                'file_hash': '85a612adffe0b0e377f698768605250b',
+                                'p2p_verify_url': 'aHR0cDovL3Y5LXhnLXdlYi1wYy5peGlndWEuY29tL2VjMGQ1M2FiOWQzYmNkZjA3OTA4ZjU2ZmExZDc1ZWMxLzYzNDI3ZGE5L3ZpZGVvL3Rvcy9jbi90b3MtY24tdmUtNGMwMDEtYWxpbmMyLzJiMjNiNmU2NDFmMTQ2NGU5ZGI3MWNjMTUzNjA5YjhhLw=='},
+                    'video_4': {'definition': '1080p', 'quality': 'normal', 'vtype': 'mp4', 'vwidth': 1920,
+                                'vheight': 1080,
+                                'bitrate': 4684078, 'real_bitrate': 4684078, 'fps': 30, 'codec_type': 'h264',
+                                'size': 143508446,
+                                'main_url': 'aHR0cDovL3Y5LXhnLXdlYi1wYy5peGlndWEuY29tLzYzMDJhOWQzNzU1Njc3MWJhN2UyNDdkZGMwM2E0Y2QyLzYzNDI3ZGE5L3ZpZGVvL3Rvcy9jbi90b3MtY24tdmUtNGMwMDEtYWxpbmMyL2ZkNzIwZTc3MWI4NDRlZTZhZDA4MDM5ZmUyYTZiZTI5Lz9hPTE3NjgmY2g9MCZjcj0wJmRyPTAmZXI9MCZjZD0wJTdDMCU3QzAlN0MwJmN2PTEmYnI9NDU3NCZidD00NTc0JmNzPTAmZHM9NCZmdD1XZzNFbE5ONlZVNndKa01acThkekpMZU9ZWmxjem9qLmQyYkxRQWFCdGlabSZtaW1lX3R5cGU9dmlkZW9fbXA0JnFzPTAmcmM9T1RnemFXVTRPVGhrTmpRNGFHVTBhRUJwYW1Sa09UYzZaalpyWmpNek5EY3pNMEJnTFRVMk1pNWZYbDR4TUROaE1TMHlZU011WnpFemNqUXdjbkpnTFMxa0xTOXpjdyUzRCUzRCZsPTIwMjIxMDA5MTQ0ODA0MDEwMjEyMDc0MDgyMDc1QkFEOEU=',
+                                'backup_url_1': 'aHR0cDovL3YzLXhnLXdlYi1wYy5peGlndWEuY29tL2I1NTBkYmZiNmMwMTAzNTBkMWI3NTc1ODI3NWQ2NGYxLzYzNDI3ZGE5L3ZpZGVvL3Rvcy9jbi90b3MtY24tdmUtNGMwMDEtYWxpbmMyL2ZkNzIwZTc3MWI4NDRlZTZhZDA4MDM5ZmUyYTZiZTI5Lz9hPTE3NjgmY2g9MCZjcj0wJmRyPTAmZXI9MCZjZD0wJTdDMCU3QzAlN0MwJmN2PTEmYnI9NDU3NCZidD00NTc0JmNzPTAmZHM9NCZmdD1XZzNFbE5ONlZVNndKa01acThkekpMZU9ZWmxjem9qLmQyYkxRQWFCdGlabSZtaW1lX3R5cGU9dmlkZW9fbXA0JnFzPTAmcmM9T1RnemFXVTRPVGhrTmpRNGFHVTBhRUJwYW1Sa09UYzZaalpyWmpNek5EY3pNMEJnTFRVMk1pNWZYbDR4TUROaE1TMHlZU011WnpFemNqUXdjbkpnTFMxa0xTOXpjdyUzRCUzRCZsPTIwMjIxMDA5MTQ0ODA0MDEwMjEyMDc0MDgyMDc1QkFEOEU=',
+                                'file_id': '5e014bde653143aaa5b6155b9f8005c6', 'quality_type': 0,
+                                'encryption_method': '',
+                                'audio_channels': '2.0', 'audio_layout': 'L R', 'url_expire': 1665301929,
+                                'preload_size': 327680, 'preload_interval': 60, 'preload_min_step': 5,
+                                'preload_max_step': 10, 'file_hash': '6fce2a4001fa60ade6cd3a450d5453bc',
+                                'p2p_verify_url': 'aHR0cDovL3Y5LXhnLXdlYi1wYy5peGlndWEuY29tL2Q2ZTMzNTIxYzM3YTczNmU0Y2EyODQxYThkMGUyMGZkLzYzNDI3ZGE5L3ZpZGVvL3Rvcy9jbi90b3MtY24tdmUtNGMwMDEtYWxpbmMyL2JkYTk5NjZiMzlmODRmMGI4NDAzYTE1ZTZiNmEzNmFlLw=='},
+                    'video_1': {'definition': '360p', 'quality': 'normal', 'vtype': 'mp4', 'vwidth': 640,
+                                'vheight': 360,
+                                'bitrate': 672859, 'real_bitrate': 672859, 'fps': 30, 'codec_type': 'h264',
+                                'size': 20614718,
+                                'main_url': 'aHR0cDovL3Y5LXhnLXdlYi1wYy5peGlndWEuY29tL2Q0YTNjYTAwZDcyMDZhMzU0MTkyNGQ1Y2EwZDMzOWY5LzYzNDI3ZGE5L3ZpZGVvL3Rvcy9jbi90b3MtY24tdmUtNGMwMDEtYWxpbmMyLzJjYzBmOWJjNmU5MDRlZTY4ZThmYjYxNTE3ZTRmNDNhLz9hPTE3NjgmY2g9MCZjcj0wJmRyPTAmZXI9MCZjZD0wJTdDMCU3QzAlN0MwJmN2PTEmYnI9NjU3JmJ0PTY1NyZjcz0wJmRzPTEmZnQ9V2czRWxOTjZWVTZ3SmtNWnE4ZHpKTGVPWVpsY3pvai5kMmJMUUFhQnRpWm0mbWltZV90eXBlPXZpZGVvX21wNCZxcz0wJnJjPVpUZG1OV1kwWnpjek9XazJPR1UxWmtCcGFtUmtPVGM2WmpaclpqTXpORGN6TTBBdk0yQXdOaTlpTlRFeFhpMHhMelpqWVNNdVp6RXpjalF3Y25KZ0xTMWtMUzl6Y3clM0QlM0QmbD0yMDIyMTAwOTE0NDgwNDAxMDIxMjA3NDA4MjA3NUJBRDhF',
+                                'backup_url_1': 'aHR0cDovL3YzLXhnLXdlYi1wYy5peGlndWEuY29tL2M3ZmVmNDk2NDE1MWE3OWUxMjgyMmZjZWJlOTM4NWRmLzYzNDI3ZGE5L3ZpZGVvL3Rvcy9jbi90b3MtY24tdmUtNGMwMDEtYWxpbmMyLzJjYzBmOWJjNmU5MDRlZTY4ZThmYjYxNTE3ZTRmNDNhLz9hPTE3NjgmY2g9MCZjcj0wJmRyPTAmZXI9MCZjZD0wJTdDMCU3QzAlN0MwJmN2PTEmYnI9NjU3JmJ0PTY1NyZjcz0wJmRzPTEmZnQ9V2czRWxOTjZWVTZ3SmtNWnE4ZHpKTGVPWVpsY3pvai5kMmJMUUFhQnRpWm0mbWltZV90eXBlPXZpZGVvX21wNCZxcz0wJnJjPVpUZG1OV1kwWnpjek9XazJPR1UxWmtCcGFtUmtPVGM2WmpaclpqTXpORGN6TTBBdk0yQXdOaTlpTlRFeFhpMHhMelpqWVNNdVp6RXpjalF3Y25KZ0xTMWtMUzl6Y3clM0QlM0QmbD0yMDIyMTAwOTE0NDgwNDAxMDIxMjA3NDA4MjA3NUJBRDhF',
+                                'file_id': 'fc922b4503af464084ed219c32cc642b', 'volume': {'loudness': -11.8, 'peak': 1},
+                                'quality_type': 40, 'encryption_method': '', 'audio_channels': '2.0',
+                                'audio_layout': 'L R',
+                                'url_expire': 1665301929, 'preload_size': 327680, 'preload_interval': 60,
+                                'preload_min_step': 5, 'preload_max_step': 10,
+                                'file_hash': 'd63772b8b622cb69d0e7523898d86c2a',
+                                'p2p_verify_url': 'aHR0cDovL3Y5LXhnLXdlYi1wYy5peGlndWEuY29tL2EyZjAxMmQ5YjAzYjViNGIyMzg2YmI1N2Y1YTU5NmNjLzYzNDI3ZGE5L3ZpZGVvL3Rvcy9jbi90b3MtY24tdmUtNGMwMDEtYWxpbmMyLzdjMDJlODhhZWE5MTQxNzJiZmQ1OWE4NjNiNjUwYTQ4Lw=='}},
+                'volume': {'loudness': -10.7, 'peak': 1},
+                'popularity_level': 0,
+                'subtitle_langs': [1],
+                'subtitle_infos': [
+                    {'sub_id': 91724328, 'language_id': 1, 'format': 'webvtt', 'version': 'ASR', 'size': 7123}],
+                'has_embedded_subtitle': True,
+                'poster_url': 'http://p9-sign.douyinpic.com/tos-cn-o-0004/4c5f13ba2ef240c480fa913b92d69a1c~tplv-noop.image?x-expires=1665301929&x-signature=mB9JD%2F99mWCj9DuL3US0O%2BhTiu8%3D',
+                'extraInfos': {'Status': '10', 'Message': 'success', 'LogoType': '', 'VideoModelVersion': 1,
+                               'HelpInfoURL': '', 'LengthOfVideoList': '4', 'IsDynamicVideo': False,
+                               'UserAction': 'VL0', 'AccountName': 'pgc',
+                               'DeniedVideoModelV1JSON': '{"status":2002,"message":"video_play acl deny","enable_ssl":false,"auto_definition":"","enable_adaptive":false,"video_id":"v02004g10000ccuhu33c77u4664aja1g","video_duration":0,"media_type":"","popularity_level":0,"has_embedded_subtitle":false}',
+                               'ResTag': '', 'EncodeUserTag': ''},
+                'refreshToken': '51d37647ee443babec3017d7d7808dfcd2fcc3bde6b5c48b35e60f95bdb542d394989351053162fc676a4793d721358f264ae4cb60268320de62b0ba3d2334b8cf4f17336c523f3fddf7ae8e184ebd52299629a7aa3253419e985d6d01c03478f7b299b7c049fea87de9bcc961bd9696_94799a2f6130a20b29f5f31218865db4_76127ed65818729ce27028ecf322e961da1bb4518d6a1e05d3ddf6a6664d0c3f',
+                'interfaceInfo': {'code': 10, 'message': 'success', 'logid': '20221009144804010212074082075BAD8E',
+                                  'api_str': 'isLVideo=false&isDash=true', 'timestamep': 1665298084922}}
 
 
 if __name__ == '__main__':
-    # Demo.base64_decode()
+    Demo.base64_decode()
     # Demo.ffmpeg()
     # Demo.sheet('xigua')
     # Demo.get_video_info('7133153239867851295')
     # Demo.get_signature()
-    Demo.get_logs()
+    # Demo.get_logs()
 
     pass

+ 8 - 6
main/xigua_follow.py

@@ -37,7 +37,7 @@ class Follow:
                     user_dict[user_name] = str(user_id)+','+str(our_id)
             return user_dict
         except Exception as e:
-            Common.logger(log_type).error('get_user_id_from_feishu异常:{}', e)
+            Common.logger(log_type).error('get_user_id_from_feishu异常:{}\n', e)
 
     # 下载规则
     @staticmethod
@@ -64,7 +64,7 @@ class Follow:
                         filter_words_list.append(y)
             return filter_words_list
         except Exception as e:
-            Common.logger(log_type).error('filter_words异常:{}', e)
+            Common.logger(log_type).error('filter_words异常:{}\n', e)
 
     # PC端:西瓜用户主页视频列表. 注意:参数_signature有效期时长只有一小时
     @classmethod
@@ -330,7 +330,9 @@ class Follow:
                     audio_url = 0
                     video_width = 0
                     video_height = 0
-                elif 'dash' in video_info['videoResource']:
+                elif 'dash' in video_info['videoResource'] \
+                        and 'dynamic_video' in video_info['videoResource']['dash']\
+                        and 'dynamic_video_list' in video_info['videoResource']['dash']['dynamic_video']:
                     video_url = video_info['videoResource']['dash']['dynamic_video']['dynamic_video_list'][-1][
                         'main_url']
                     audio_url = video_info['videoResource']['dash']['dynamic_video']['dynamic_audio_list'][-1][
@@ -385,7 +387,7 @@ class Follow:
                 return video_url, audio_url, video_width, video_height
 
         except Exception as e:
-            Common.logger(log_type).error('get_video_info异常:{}', e)
+            Common.logger(log_type).error('get_video_info异常:{}\n', e)
 
     # APP端:西瓜视频用户主页
     @classmethod
@@ -618,8 +620,8 @@ class Follow:
                     # cls.get_follow_feeds_by_app(log_type, v.split(',')[0])
                     cls.get_follow_feeds_by_pc(log_type, v.split(',')[0])
                     time.sleep(1)
-                    cls.run_download_publish(log_type, env, v.split(',')[-1])
-                    time.sleep(random.randint(30, 60))
+                    # cls.run_download_publish(log_type, env, v.split(',')[-1])
+                    # time.sleep(random.randint(30, 60))
                     cls.offset = 0
         except Exception as e:
             Common.logger(log_type).error('get_all_person_videos异常:{}\n', e)