version 0.2.19

Revert "Refactoring code and reuse INNERTUBE_CLIENTS"
This reverts commit 8af98968dd.
2024-10-11 11:25:12 +08:00 · 2024-10-11 11:22:36 +08:00 · 2024-08-05 09:23:38 +08:00 · 2024-08-05 05:27:58 +08:00 · 2024-07-15 10:39:00 +08:00 · 2024-07-09 13:10:10 +08:00
13 changed files with 121 additions and 61 deletions
--- a/.gitea/workflows/ci.yaml
+++ b/.gitea/workflows/ci.yaml
@@ -0,0 +1,23 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.11
+
+      - name: Install dependencies
+        run: |
+          pip install --upgrade pip
+          pip install -r requirements-dev.txt
+
+      - name: Run tests
+        run: pytest
--- a/.gitea/workflows/git-sync.yaml
+++ b/.gitea/workflows/git-sync.yaml
@@ -0,0 +1,40 @@
+name: git-sync-with-mirror
+
+on:
+  push:
+    branches: [ master ]
+  workflow_dispatch:
+
+jobs:
+  git-sync:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: git-sync
+        env:
+          git_sync_source_repo: git@git.fridu.us:heckyel/yt-local.git
+          git_sync_destination_repo: ssh://git@c.fridu.us/software/yt-local.git
+        if: env.git_sync_source_repo && env.git_sync_destination_repo
+        uses: astounds/git-sync@v1
+        with:
+          source_repo: git@git.fridu.us:heckyel/yt-local.git
+          source_branch: "master"
+          destination_repo: ssh://git@c.fridu.us/software/yt-local.git
+          destination_branch: "master"
+          source_ssh_private_key: ${{ secrets.GIT_SYNC_SOURCE_SSH_PRIVATE_KEY }}
+          destination_ssh_private_key:  ${{ secrets.GIT_SYNC_DESTINATION_SSH_PRIVATE_KEY }}
+
+      - name: git-sync-sourcehut
+        env:
+          git_sync_source_repo: git@git.fridu.us:heckyel/yt-local.git
+          git_sync_destination_repo: git@git.sr.ht:~heckyel/yt-local
+        if: env.git_sync_source_repo && env.git_sync_destination_repo
+        uses: astounds/git-sync@v1
+        with:
+          source_repo: git@git.fridu.us:heckyel/yt-local.git
+          source_branch: "master"
+          destination_repo: git@git.sr.ht:~heckyel/yt-local
+          destination_branch: "master"
+          source_ssh_private_key: ${{ secrets.GIT_SYNC_SOURCE_SSH_PRIVATE_KEY }}
+          destination_ssh_private_key:  ${{ secrets.GIT_SYNC_DESTINATION_SSH_PRIVATE_KEY }}
+        continue-on-error: true
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -8,14 +8,14 @@ gevent==24.2.1
 greenlet==3.0.3
 iniconfig==2.0.0
 itsdangerous==2.1.2
-Jinja2==3.1.3
+Jinja2==3.1.4
 MarkupSafe==2.1.5
 packaging==24.0
 pluggy==1.4.0
 PySocks==1.7.1
 pytest==8.1.1
 stem==1.8.2
-urllib3==2.2.1
-Werkzeug==3.0.1
+urllib3==2.2.2
+Werkzeug==3.0.3
 zope.event==5.0
 zope.interface==6.2
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,11 +7,11 @@ Flask==3.0.2
 gevent==24.2.1
 greenlet==3.0.3
 itsdangerous==2.1.2
-Jinja2==3.1.3
+Jinja2==3.1.4
 MarkupSafe==2.1.5
 PySocks==1.7.1
 stem==1.8.2
-urllib3==2.2.1
-Werkzeug==3.0.1
+urllib3==2.2.2
+Werkzeug==3.0.3
 zope.event==5.0
 zope.interface==6.2
--- 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
@@ -667,25 +667,16 @@ 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',
+    'web_creator': {
+        'INNERTUBE_API_KEY': 'AIzaSyBUPetSUmoZL-OhlxA7wSac5XinrygCqMo',
        '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'
-            }
+                'clientName': 'WEB_CREATOR',
+                'clientVersion': '1.20240723.03.00',
            },
-        'INNERTUBE_CONTEXT_CLIENT_NAME': 21,
-        'REQUIRE_JS_PLAYER': False
        },
-
+        'INNERTUBE_CONTEXT_CLIENT_NAME': 62,
+    },
    'android': {
        'INNERTUBE_API_KEY': 'AIzaSyA8eiZmM1FaDVjRy-df2KTyQ_vz_yYM39w',
        'INNERTUBE_CONTEXT': {
@@ -693,17 +684,13 @@ INNERTUBE_CLIENTS = {
                'hl': 'en',
                'gl': 'US',
                'clientName': 'ANDROID',
-                'clientVersion': '19.12.36',
+                'clientVersion': '19.15.35',
                '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
-            #}
+                '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,
@@ -716,9 +703,12 @@ INNERTUBE_CLIENTS = {
                'hl': 'en',
                'gl': 'US',
                'clientName': 'IOS',
-                'clientVersion': '19.12.3',
-                'deviceModel': 'iPhone14,3',
-                'userAgent': 'com.google.ios.youtube/19.12.3 (iPhone14,3; U; CPU iOS 15_6 like Mac OS X)'
+                'clientVersion': '19.29.1',
+                'deviceMake': 'Apple',
+                'deviceModel': 'iPhone16,2',
+                'userAgent': 'com.google.ios.youtube/19.29.1 (iPhone16,2; U; CPU iOS 17_5_1 like Mac OS X;)',
+                'osName': 'iPhone',
+                'osVersion': '17.5.1.21F90',
            }
        },
        'INNERTUBE_CONTEXT_CLIENT_NAME': 5,
--- a/youtube/version.py
+++ b/youtube/version.py
@@ -1,3 +1,3 @@
 from __future__ import unicode_literals

-__version__ = '0.2.12'
+__version__ = '0.2.19'
--- a/youtube/watch.py
+++ b/youtube/watch.py
@@ -343,7 +343,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==',
    })
Author	SHA1	Message	Date
Jesus	4ef7dda14a	version 0.2.19	2024-10-11 11:25:12 +08:00
Jesus	ee31cedae0	Revert "Refactoring code and reuse INNERTUBE_CLIENTS" This reverts commit `8af98968dd`.	2024-10-11 11:22:36 +08:00
Astound	d3b0cb5e13	workflows: update git sync actions	2024-08-05 09:23:38 +08:00
Astound	0a79974d11	Add sync to c.fridu.us and sourcehut	2024-08-05 05:27:58 +08:00
Astound	4e327944a0	Add CI	2024-07-15 10:39:00 +08:00
Astound	09a437f7fb	v0.2.18	2024-07-09 13:10:10 +08:00
Astound	3cbe18aac0	Fix cves CVE-2024-34064 CVE-2024-34069 CVE-2024-37891	2024-07-09 13:03:36 +08:00
Jesus	62418f8e95	Switch to android test suite client by default Invidious' solution to the destruction of the android client: https://github.com/iv-org/invidious/pull/4650 Fixes #207	2024-06-11 10:46:25 +08:00
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