Release v0.2.17

set ios client
update version 0.2.16
2024-04-29 01:00:13 +08:00 · 2024-04-27 09:54:42 +08:00 · 2024-04-21 13:16:18 +08:00 · 2024-04-21 13:14:08 +08:00 · 2024-04-21 13:13:19 +08:00 · 2024-04-21 11:21:35 +08:00
9 changed files with 166 additions and 167 deletions
--- a/youtube/static/channel.css
+++ b/youtube/static/channel.css
@@ -256,7 +256,8 @@ hr {
    padding-top: 6px;
    text-align: center;
    white-space: nowrap;
-    border: none;
+    border: 1px solid;
+    border-color: var(--button-border);
    border-radius: 0.2rem;
 }

--- a/youtube/static/dark_theme.css
+++ b/youtube/static/dark_theme.css
@@ -1,20 +1,22 @@
 :root {
-    --background:           #212121;
+    --background:           #121113;
    --text:                 #FFFFFF;
-    --secondary-hover:      #73828c;
-    --secondary-focus:      #303030;
-    --secondary-inverse:    #FFF;
+    --secondary-hover:      #222222;
+    --secondary-focus:      #121113;
+    --secondary-inverse:    #FFFFFF;
    --primary-background:   #242424;
-    --secondary-background: #424242;
-    --thumb-background:     #757575;
+    --secondary-background: #222222;
+    --thumb-background:     #222222;
    --link:                 #00B0FF;
    --link-visited:         #40C4FF;
-    --border-bg:            #FFFFFF;
-    --buttom:               #dcdcdb;
-    --buttom-text:          #415462;
-    --button-border:        #91918c;
-    --buttom-hover:         #BBB;
-    --search-text:          #FFF;
-    --time-background:      #212121;
-    --time-text:            #FFF;
+    --border-bg:            #222222;
+    --border-bg-settings:   #000000;
+    --border-bg-license:    #000000;
+    --buttom:               #121113;
+    --buttom-text:          #FFFFFF;
+    --button-border:        #222222;
+    --buttom-hover:         #222222;
+    --search-text:          #FFFFFF;
+    --time-background:      #121113;
+    --time-text:            #FFFFFF;
 }
--- a/youtube/static/gray_theme.css
+++ b/youtube/static/gray_theme.css
@@ -1,19 +1,21 @@
 :root {
-    --background:            #2d3743;
+    --background:            #2D3743;
    --text:                  #FFFFFF;
-    --secondary-hover:       #73828c;
+    --secondary-hover:       #73828C;
    --secondary-focus:       rgba(115, 130, 140, 0.125);
    --secondary-inverse:     #FFFFFF;
-    --primary-background:    #2d3743;
+    --primary-background:    #2D3743;
    --secondary-background:  #102027;
    --thumb-background:      #35404D;
-    --link:                  #22aaff;
-    --link-visited:          #7755ff;
+    --link:                  #22AAFF;
+    --link-visited:          #7755FF;
    --border-bg:             #FFFFFF;
-    --buttom:                #DCDCDC;
-    --buttom-text:           #415462;
-    --button-border:         #91918c;
-    --buttom-hover:          #BBBBBB;
+    --border-bg-settings:    #FFFFFF;
+    --border-bg-license:     #FFFFFF;
+    --buttom:                #2D3743;
+    --buttom-text:           #FFFFFF;
+    --button-border:         #102027;
+    --buttom-hover:          #102027;
    --search-text:           #FFFFFF;
    --time-background:       #212121;
    --time-text:             #FFFFFF;
--- a/youtube/static/license.css
+++ b/youtube/static/license.css
@@ -181,7 +181,7 @@ label[for=options-toggle-cbox] {

 .table td,.table th {
    padding: 10px 10px;
-    border: 1px solid var(--secondary-background);
+    border: 1px solid var(--border-bg-license);
    text-align: center;
 }

--- a/youtube/static/light_theme.css
+++ b/youtube/static/light_theme.css
@@ -10,9 +10,11 @@
    --link:                 #212121;
    --link-visited:         #808080;
    --border-bg:            #212121;
-    --buttom:               #DCDCDC;
+    --border-bg-settings:   #91918C;
+    --border-bg-license:    #91918C;
+    --buttom:               #FFFFFF;
    --buttom-text:          #212121;
-    --button-border:        #91918c;
+    --button-border:        #91918C;
    --buttom-hover:         #BBBBBB;
    --search-text:          #212121;
    --time-background:      #212121;
--- a/youtube/static/settings.css
+++ b/youtube/static/settings.css
@@ -155,7 +155,7 @@ label[for=options-toggle-cbox] {
 }

 .settings-form > h2 {
-    border-bottom: 2px solid var(--border-bg);
+    border-bottom: 2px solid var(--border-bg-settings);
    padding-bottom: 0.5rem;
 }

--- a/youtube/util.py
+++ b/youtube/util.py
@@ -431,12 +431,9 @@ class RateLimitedQueue(gevent.queue.Queue):
        gevent.queue.Queue.__init__(self)

    def get(self):
-        self.lock.acquire()     # blocks if another greenlet currently has the lock
-        if self.count_since_last_wait >= self.subsequent_bursts and self.surpassed_initial:
-            gevent.sleep(self.waiting_period)
-            self.count_since_last_wait = 0
-
-        elif self.count_since_last_wait >= self.initial_burst and not self.surpassed_initial:
+        with self.lock:     # blocks if another greenlet currently has the lock
+            if ((self.count_since_last_wait >= self.subsequent_bursts and self.surpassed_initial) or
+                (self.count_since_last_wait >= self.initial_burst and not self.surpassed_initial)):
                self.surpassed_initial = True
                gevent.sleep(self.waiting_period)
                self.count_since_last_wait = 0
@@ -456,8 +453,6 @@ class RateLimitedQueue(gevent.queue.Queue):

                self.currently_empty = False

-        self.lock.release()
-
            return item


@@ -667,48 +662,6 @@ def to_valid_filename(name):

 # https://github.com/yt-dlp/yt-dlp/blob/master/yt_dlp/extractor/youtube.py#L72
 INNERTUBE_CLIENTS = {
-    'android_music': {
-        'INNERTUBE_API_KEY': 'AIzaSyAOghZGza2MQSZkY_zfZ370N-PUdXEo8AI',
-        'INNERTUBE_CONTEXT': {
-            'client': {
-                'hl': 'en',
-                'gl': 'US',
-                'clientName': 'ANDROID_MUSIC',
-                'clientVersion': '6.44.54',
-                'osName': 'Android',
-                'osVersion': '14',
-                'androidSdkVersion': 34,
-                'platform': 'MOBILE',
-                'userAgent': 'com.google.android.apps.youtube.music/6.44.54 (Linux; U; Android 14; US) gzip'
-            }
-        },
-        'INNERTUBE_CONTEXT_CLIENT_NAME': 21,
-        'REQUIRE_JS_PLAYER': False
-    },
-
-    'android': {
-        'INNERTUBE_API_KEY': 'AIzaSyA8eiZmM1FaDVjRy-df2KTyQ_vz_yYM39w',
-        'INNERTUBE_CONTEXT': {
-            'client': {
-                'hl': 'en',
-                'gl': 'US',
-                'clientName': 'ANDROID',
-                'clientVersion': '19.12.36',
-                'osName': 'Android',
-                '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': {
-            #    'embedUrl': 'https://google.com',  # Can be any valid URL
-            #}
-        },
-        'INNERTUBE_CONTEXT_CLIENT_NAME': 3,
-        'REQUIRE_JS_PLAYER': False,
-    },
-
    'ios': {
        'INNERTUBE_API_KEY': 'AIzaSyB-63vPrdThhKuerbB2N_l7Kwwcxj6yUAc',
        'INNERTUBE_CONTEXT': {
@@ -725,6 +678,44 @@ INNERTUBE_CLIENTS = {
        'REQUIRE_JS_PLAYER': False
    },

+    'android': {
+        'INNERTUBE_API_KEY': 'AIzaSyA8eiZmM1FaDVjRy-df2KTyQ_vz_yYM39w',
+        'INNERTUBE_CONTEXT': {
+            'client': {
+                'hl': 'en',
+                'gl': 'US',
+                'clientName': 'ANDROID',
+                'clientVersion': '19.15.35',
+                'osName': 'Android',
+                'osVersion': '14',
+                'androidSdkVersion': 34,
+                'platform': 'MOBILE',
+                'userAgent': 'com.google.android.youtube/19.15.35 (Linux; U; Android 14; en_US; Google Pixel 6 Pro) gzip'
+            }
+        },
+        'INNERTUBE_CONTEXT_CLIENT_NAME': 3,
+        'REQUIRE_JS_PLAYER': False,
+    },
+
+    'android_music': {
+        'INNERTUBE_API_KEY': 'AIzaSyAOghZGza2MQSZkY_zfZ370N-PUdXEo8AI',
+        'INNERTUBE_CONTEXT': {
+            'client': {
+                'hl': 'en',
+                'gl': 'US',
+                'clientName': 'ANDROID_MUSIC',
+                'clientVersion': '6.48.51',
+                'osName': 'Android',
+                'osVersion': '14',
+                'androidSdkVersion': 34,
+                'platform': 'MOBILE',
+                'userAgent': 'com.google.android.apps.youtube.music/6.48.51 (Linux; U; Android 14; US) gzip'
+            }
+        },
+        'INNERTUBE_CONTEXT_CLIENT_NAME': 21,
+        'REQUIRE_JS_PLAYER': False
+    },
+
    # This client can access age restricted videos (unless the uploader has disabled the 'allow embedding' option)
    # See: https://github.com/zerodytrash/YouTube-Internal-Clients
    'tv_embedded': {
--- a/youtube/version.py
+++ b/youtube/version.py
@@ -1,3 +1,3 @@
 from __future__ import unicode_literals

-__version__ = '0.2.12'
+__version__ = '0.2.17'
--- a/youtube/watch.py
+++ b/youtube/watch.py
@@ -2,6 +2,7 @@ import youtube
 from youtube import yt_app
 from youtube import util, comments, local_playlist, yt_data_extract
 from youtube.util import time_utc_isoformat
+from youtube.util import INNERTUBE_CLIENTS
 import settings

 from flask import request
@@ -343,7 +344,7 @@ def _add_to_error(info, key, additional_message):
 def fetch_player_response(client, video_id):
    return util.call_youtube_api(client, 'player', {
        'videoId': video_id,
-        'params': 'CgIQBg',
+        'params': 'CgIIAdgDAQ==',
    })


@@ -369,10 +370,10 @@ def fetch_watch_page_info(video_id, playlist_id, index):
    return yt_data_extract.extract_watch_info_from_html(watch_page)

 def extract_info(video_id, use_invidious, playlist_id=None, index=None):
+    for client in INNERTUBE_CLIENTS:
        tasks = (
-        # Get video metadata from here
            gevent.spawn(fetch_watch_page_info, video_id, playlist_id, index),
-        gevent.spawn(fetch_player_response, 'ios', video_id)
+            gevent.spawn(fetch_player_response, client, video_id)  # Use client from INNERTUBE_CLIENTS
        )
        gevent.joinall(tasks)
        util.check_gevent_exceptions(*tasks)
Author	SHA1	Message	Date
Astound	bfd3760969	Release v0.2.17	2024-04-29 01:00:13 +08:00
Astound	efd89b2e64	set ios client	2024-04-27 09:54:42 +08:00
Astound	0dc1747178	update version 0.2.16	2024-04-21 13:16:18 +08:00
Astound	8577164785	update client params	2024-04-21 13:14:08 +08:00
Astound	8af98968dd	Refactoring code and reuse INNERTUBE_CLIENTS	2024-04-21 13:13:19 +08:00
Astound	8f00cbcdd6	update update android_music client	2024-04-21 11:21:35 +08:00
Astound	af75551bc2	update update android client	2024-04-21 11:18:42 +08:00
Astound	3a6cc1e44f	version 0.2.15	2024-04-08 07:25:50 +08:00
Astound	7664b5f0ff	normalize css	2024-04-08 07:12:03 +08:00
Astound	ec5d236cad	fix color dark theme	2024-04-08 07:10:03 +08:00
Astound	d6b7a255d0	v0.2.14	2024-04-07 11:52:53 +08:00
Astound	22bc7324db	css normalize	2024-04-07 11:50:53 +08:00
Astound	48e8f271e7	update styles to modern	2024-04-07 11:44:19 +08:00
Astound	9a0ad6070b	version 0.2.13	2024-04-06 22:12:21 +08:00
Astound	6039589f24	Update `android` params Discovered by LuanRT - https://github.com/LuanRT/YouTube.js/pull/624	2024-04-06 22:04:14 +08:00