version 0.2.11

Update user-agents and update android client parameters to fix blockage
README.md: update
2024-03-30 10:14:08 +08:00 · 2024-03-30 10:10:35 +08:00 · 2024-03-11 10:30:09 +08:00 · 2024-03-11 09:55:09 +08:00 · 2024-03-11 09:53:55 +08:00 · 2024-03-11 09:47:35 +08:00
13 changed files with 98 additions and 85 deletions
--- a/README.md
+++ b/README.md
@@ -1,5 +1,3 @@
-[![Build Status](https://drone.hgit.ga/api/badges/heckyel/yt-local/status.svg)](https://drone.hgit.ga/heckyel/yt-local)
-
 # yt-local

 Fork of [youtube-local](https://github.com/user234683/youtube-local)
--- a/generate_release.py
+++ b/generate_release.py
@@ -114,10 +114,12 @@ if bitness == '32':
    visual_c_runtime_url = 'https://github.com/yuempek/vc-archive/raw/master/archives/vc15_(14.10.25017.0)_2017_x86.7z'
    visual_c_runtime_sha256 = '2549eb4d2ce4cf3a87425ea01940f74368bf1cda378ef8a8a1f1a12ed59f1547'
    visual_c_name = 'vc15_(14.10.25017.0)_2017_x86.7z'
+    visual_c_path_to_dlls = 'runtime_minimum/System'
 else:
    visual_c_runtime_url = 'https://github.com/yuempek/vc-archive/raw/master/archives/vc15_(14.10.25017.0)_2017_x64.7z'
    visual_c_runtime_sha256 = '4f00b824c37e1017a93fccbd5775e6ee54f824b6786f5730d257a87a3d9ce921'
    visual_c_name = 'vc15_(14.10.25017.0)_2017_x64.7z'
+    visual_c_path_to_dlls = 'runtime_minimum/System64'

 download_if_not_exists('get-pip.py', get_pip_url)

@@ -198,7 +200,7 @@ with open('./python/python3' + major_release + '._pth', 'a', encoding='utf-8') a
    f.write('..\n')'''

 log('Inserting Microsoft C Runtime')
-check_subp(subprocess.run([r'7z', '-y', 'e', '-opython', 'vc15_(14.10.25017.0)_2017_x86.7z', 'runtime_minimum/System']))
+check_subp(subprocess.run([r'7z', '-y', 'e', '-opython', visual_c_name, visual_c_path_to_dlls]))

 log('Installing dependencies')
 wine_run(['./python/python.exe', '-I', '-m', 'pip', 'install', '--no-compile', '-r', './requirements.txt'])
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,28 +1,21 @@
-attrs==22.1.0
-Brotli==1.0.9
-cachetools==4.2.4
-click==8.0.4
-dataclasses==0.6
+blinker==1.7.0
+Brotli==1.1.0
+cachetools==5.3.3
+click==8.1.7
 defusedxml==0.7.1
-Flask==2.0.1
-gevent==22.10.2
-greenlet==2.0.1
-importlib-metadata==4.6.4
-iniconfig==1.1.1
-itsdangerous==2.0.1
-Jinja2==3.0.3
-MarkupSafe==2.0.1
-packaging==20.9
-pluggy>=0.13.1
-py==1.10.0
-pyparsing==2.4.7
+Flask==3.0.2
+gevent==24.2.1
+greenlet==3.0.3
+iniconfig==2.0.0
+itsdangerous==2.1.2
+Jinja2==3.1.3
+MarkupSafe==2.1.5
+packaging==24.0
+pluggy==1.4.0
 PySocks==1.7.1
-pytest==6.2.5
-stem==1.8.0
-toml==0.10.2
-typing-extensions==3.10.0.2
-urllib3==1.26.11
-Werkzeug==2.1.1
-zipp==3.5.1
-zope.event==4.5.0
-zope.interface==5.4.0
+pytest==8.1.1
+stem==1.8.2
+urllib3==2.2.1
+Werkzeug==3.0.1
+zope.event==5.0
+zope.interface==6.2
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,20 +1,17 @@
-Brotli==1.0.9
-cachetools==4.2.4
-click==8.0.4
-dataclasses==0.6
+blinker==1.7.0
+Brotli==1.1.0
+cachetools==5.3.3
+click==8.1.7
 defusedxml==0.7.1
-Flask==2.0.1
-gevent==22.10.2
-greenlet==2.0.1
-importlib-metadata==4.6.4
-itsdangerous==2.0.1
-Jinja2==3.0.3
-MarkupSafe==2.0.1
+Flask==3.0.2
+gevent==24.2.1
+greenlet==3.0.3
+itsdangerous==2.1.2
+Jinja2==3.1.3
+MarkupSafe==2.1.5
 PySocks==1.7.1
-stem==1.8.0
-typing-extensions==3.10.0.2
-urllib3==1.26.11
-Werkzeug==2.1.1
-zipp==3.5.1
-zope.event==4.5.0
-zope.interface==5.4.0
+stem==1.8.2
+urllib3==2.2.1
+Werkzeug==3.0.1
+zope.event==5.0
+zope.interface==6.2
--- a/server.py
+++ b/server.py
@@ -84,7 +84,7 @@ def proxy_site(env, start_response, video=False):
        else:
            response, cleanup_func = util.fetch_url_response(url, send_headers)

-        response_headers = response.getheaders()
+        response_headers = response.headers
        if isinstance(response_headers, urllib3._collections.HTTPHeaderDict):
            response_headers = response_headers.items()
        if video:
--- a/youtube/channel.py
+++ b/youtube/channel.py
@@ -264,7 +264,7 @@ def get_channel_tab(channel_id, page="1", sort=3, tab='videos', view=1,
                'hl': 'en',
                'gl': 'US',
                'clientName': 'WEB',
-                'clientVersion': '2.20180830',
+                'clientVersion': '2.20240327.00.00',
            },
        },
        'continuation': ctoken,
@@ -371,7 +371,7 @@ def get_channel_search_json(channel_id, query, page):
                'hl': 'en',
                'gl': 'US',
                'clientName': 'WEB',
-                'clientVersion': '2.20180830',
+                'clientVersion': '2.20240327.00.00',
            },
        },
        'continuation': ctoken,
@@ -389,6 +389,7 @@ def post_process_channel_info(info):
    info['avatar'] = util.prefix_url(info['avatar'])
    info['channel_url'] = util.prefix_url(info['channel_url'])
    for item in info['items']:
+        item['thumbnail'] = "https://i.ytimg.com/vi/{}/hqdefault.jpg".format(item['id'])
        util.prefix_urls(item)
        util.add_extra_html_info(item)
    if info['current_tab'] == 'about':
--- a/youtube/comments.py
+++ b/youtube/comments.py
@@ -53,7 +53,7 @@ def request_comments(ctoken, replies=False):
                'hl': 'en',
                'gl': 'US',
                'clientName': 'MWEB',
-                'clientVersion': '2.20210804.02.00',
+                'clientVersion': '2.20240328.08.00',
            },
        },
        'continuation': ctoken.replace('=', '%3D'),
--- a/youtube/static/js/av-merge.js
+++ b/youtube/static/js/av-merge.js
@@ -569,7 +569,8 @@ function fetchRange(url, start, end, debugInfo) {
            onFailure(e, 'Network error');
        };
        xhr.ontimeout = function (event){
-            onFailure(null, 'Timeout (15s)', maxRetries=1);
+            xhr.timeout += 5000;
+            onFailure(null, 'Timeout (15s)', maxRetries=5);
        };
        xhr.send();
    });
--- a/youtube/static/modules/plyr/custom_plyr.css
+++ b/youtube/static/modules/plyr/custom_plyr.css
@@ -0,0 +1,39 @@
+/* Prevent this div from blocking right-click menu for video
+e.g. Firefox playback speed options */
+.plyr__poster {
+    display: none;
+}
+
+/* plyr fix */
+.plyr:-moz-full-screen video {
+    max-height: initial;
+}
+
+.plyr:-webkit-full-screen video {
+    max-height: initial;
+}
+
+.plyr:-ms-fullscreen video {
+    max-height: initial;
+}
+
+.plyr:fullscreen video {
+    max-height: initial;
+}
+
+.plyr__preview-thumb__image-container {
+    width: 158px;
+    height: 90px;
+}
+
+.plyr__preview-thumb {
+    bottom: 100%;
+}
+
+.plyr__menu__container [role="menu"],
+.plyr__menu__container [role="menucaptions"] {
+    /* Set vertical scroll */
+    /* issue https://github.com/sampotts/plyr/issues/1420 */
+    max-height: 320px;
+    overflow-y: auto;
+}
--- a/youtube/static/watch.css
+++ b/youtube/static/watch.css
@@ -24,20 +24,6 @@ video {
    max-height: calc(100vh/1.5);
 }

-/* plyr fix */
-.plyr:-moz-full-screen video {
-    max-height: initial;
-}
-.plyr:-webkit-full-screen video {
-    max-height: initial;
-}
-.plyr:-ms-fullscreen video {
-    max-height: initial;
-}
-.plyr:fullscreen video {
-    max-height: initial;
-}
-
 a:link {
    color: var(--link);
 }
--- a/youtube/templates/watch.html
+++ b/youtube/templates/watch.html
@@ -8,14 +8,8 @@
    {% if settings.use_video_player == 2 %}
        <!-- plyr -->
        <link href="/youtube.com/static/modules/plyr/plyr.css" rel="stylesheet">
+        <link href="/youtube.com/static/modules/plyr/custom_plyr.css" rel="stylesheet">
        <!--/ plyr -->
-        <style>
-         /* Prevent this div from blocking right-click menu for video
-         e.g. Firefox playback speed options */
-         .plyr__poster {
-             display: none !important;
-         }
-        </style>
    {% endif %}
 {% endblock style %}

--- a/youtube/util.py
+++ b/youtube/util.py
@@ -336,7 +336,7 @@ def fetch_url(url, headers=(), timeout=15, report_text=None, data=None,
                   )
            )
        ):
-            print(response.status, response.reason, response.getheaders())
+            print(response.status, response.reason, response.headers)
            ip = re.search(
                br'IP address: ((?:[\da-f]*:)+[\da-f]+|(?:\d+\.)+\d+)',
                content)
@@ -395,22 +395,22 @@ def head(url, use_tor=False, report_text=None, max_redirects=10):
    return response


-mobile_user_agent = 'Mozilla/5.0 (Linux; Android 7.0; Redmi Note 4 Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Mobile Safari/537.36'
+mobile_user_agent = 'Mozilla/5.0 (Linux; Android 14) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.6312.80 Mobile Safari/537.36'
 mobile_ua = (('User-Agent', mobile_user_agent),)
-desktop_user_agent = 'Mozilla/5.0 (Windows NT 6.1; rv:52.0) Gecko/20100101 Firefox/52.0'
+desktop_user_agent = 'Mozilla/5.0 (Windows NT 10.0; rv:124.0) Gecko/20100101 Firefox/124.0'
 desktop_ua = (('User-Agent', desktop_user_agent),)
 json_header = (('Content-Type', 'application/json'),)
 desktop_xhr_headers = (
    ('Accept', '*/*'),
    ('Accept-Language', 'en-US,en;q=0.5'),
    ('X-YouTube-Client-Name', '1'),
-    ('X-YouTube-Client-Version', '2.20180830'),
+    ('X-YouTube-Client-Version', '2.20240327.00.00'),
 ) + desktop_ua
 mobile_xhr_headers = (
    ('Accept', '*/*'),
    ('Accept-Language', 'en-US,en;q=0.5'),
-    ('X-YouTube-Client-Name', '2'),
-    ('X-YouTube-Client-Version', '2.20180830'),
+    ('X-YouTube-Client-Name', '1'),
+    ('X-YouTube-Client-Version', '2.20240328.08.00'),
 ) + mobile_ua


@@ -674,11 +674,12 @@ INNERTUBE_CLIENTS = {
                'hl': 'en',
                'gl': 'US',
                'clientName': 'ANDROID',
-                'clientVersion': '17.31.35',
+                'clientVersion': '19.12.36',
                'osName': 'Android',
-                'osVersion': '12',
-                'androidSdkVersion': 31,
-                'userAgent': 'com.google.android.youtube/17.31.35 (Linux; U; Android 12) gzip'
+                'osVersion': '14',
+                'androidSdkVersion': 34,
+                'platform': 'MOBILE',
+                'userAgent': 'com.google.android.youtube/19.12.36 (Linux; U; Android 14; US) gzip'
            },
            # https://github.com/yt-dlp/yt-dlp/pull/575#issuecomment-887739287
            #'thirdParty': {
@@ -699,6 +700,7 @@ INNERTUBE_CLIENTS = {
                'gl': 'US',
                'clientName': 'TVHTML5_SIMPLY_EMBEDDED_PLAYER',
                'clientVersion': '2.0',
+                'clientScreen': 'EMBED',
            },
            # https://github.com/yt-dlp/yt-dlp/pull/575#issuecomment-887739287
            'thirdParty': {
@@ -715,7 +717,7 @@ INNERTUBE_CLIENTS = {
        'INNERTUBE_CONTEXT': {
            'client': {
                'clientName': 'WEB',
-                'clientVersion': '2.20220801.00.00',
+                'clientVersion': '2.20240327.00.00',
                'userAgent': desktop_user_agent,
            }
        },
--- a/youtube/version.py
+++ b/youtube/version.py
@@ -1,3 +1,3 @@
 from __future__ import unicode_literals

-__version__ = '0.2.7'
+__version__ = '0.2.11'
Author	SHA1	Message	Date
Astound	1f16f7cb62	version 0.2.11	2024-03-30 10:14:08 +08:00
Astound	80b7f3cd00	Update user-agents and update android client parameters to fix blockage	2024-03-30 10:10:35 +08:00
Astound	8b79e067bc	README.md: update	2024-03-11 10:30:09 +08:00
Astound	cda0627d5a	version 0.2.10	2024-03-11 09:55:09 +08:00
Astound	ad40dd6d6b	update requirements	2024-03-11 09:53:55 +08:00
Astound	b91d53dc6f	Use response.headers instead of response.getheaders() response.getheaders() will be deprecated by urllib3.	2024-03-11 09:47:35 +08:00
Astound	cda4fd1f26	version 0.2.9	2024-03-10 02:13:29 +08:00
Astound	ff2a2edaa5	generate_release: Fix wrong (32bit) MSVCR included for 64 bitInsert the 64 bit microsoft visual C runtime for 64 bit releases	2024-03-10 02:11:09 +08:00
Astound	38d8d5d4c5	av-merge: Retry more than once for timeouts	2024-03-10 02:08:23 +08:00
Astound	f010452abf	Update android client version to fix 400 Bad Request	2024-03-10 02:02:42 +08:00
Astound	ab93f8242b	bump v0.2.8	2024-01-29 06:10:14 +08:00
Astound	1505414a1a	Update Plyr custom styles for menu container Specifically, set a maximum height and added vertical scrolling to address an issue related to Plyr's menu height. Improve the overall usability and visual appearance of the menu in video player.	2024-01-29 06:06:18 +08:00
Astound	c04d7c9a24	Adjust Plyr custom styles for video preview thumbnail In custom_plyr.css, made adjustments to styles for video preview thumbnail in Plyr Specific changes: - Modified the size and positioning of the thumbnail container to improve the visual presentation. - Enchance the user experience when interacting with video previews.	2024-01-29 05:08:18 +08:00
Astound	3ee2df7faa	Refactor styles on video playback page Made changes to the styles on the video playback page to enhance visibility and address issues with the video player. Added a new custom style file for Plyr, and removed redundant and unused styles in watch.css. Specific changes: - Added custom_plyr.css for Plyr styles. - Removed redundant styles related to playback issues in watch.css	2024-01-29 05:06:38 +08:00
Astound	d2c883c211	fix thumbnail into channel	2024-01-28 13:21:54 +08:00