Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
3a6cc1e44f
|
|||
|
7664b5f0ff
|
|||
|
ec5d236cad
|
|||
|
d6b7a255d0
|
|||
|
22bc7324db
|
|||
|
48e8f271e7
|
|||
|
9a0ad6070b
|
|||
|
6039589f24
|
|||
|
d4cba7eb6c
|
|||
|
70cb453280
|
|||
|
7a106331e7
|
|||
|
8775e131af
|
@@ -151,7 +151,7 @@ For coding guidelines and an overview of the software architecture, see the [HAC
|
|||||||
|
|
||||||
yt-local is not made to work in public mode, however there is an instance of yt-local in public mode but with less features
|
yt-local is not made to work in public mode, however there is an instance of yt-local in public mode but with less features
|
||||||
|
|
||||||
- <https://1cd1-93-95-230-133.ngrok-free.app/https://youtube.com>
|
- <https://m.fridu.us/https://youtube.com>
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
|
|||||||
@@ -256,7 +256,8 @@ hr {
|
|||||||
padding-top: 6px;
|
padding-top: 6px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
border: none;
|
border: 1px solid;
|
||||||
|
border-color: var(--button-border);
|
||||||
border-radius: 0.2rem;
|
border-radius: 0.2rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,20 +1,22 @@
|
|||||||
:root {
|
:root {
|
||||||
--background: #212121;
|
--background: #121113;
|
||||||
--text: #FFFFFF;
|
--text: #FFFFFF;
|
||||||
--secondary-hover: #73828c;
|
--secondary-hover: #222222;
|
||||||
--secondary-focus: #303030;
|
--secondary-focus: #121113;
|
||||||
--secondary-inverse: #FFF;
|
--secondary-inverse: #FFFFFF;
|
||||||
--primary-background: #242424;
|
--primary-background: #242424;
|
||||||
--secondary-background: #424242;
|
--secondary-background: #222222;
|
||||||
--thumb-background: #757575;
|
--thumb-background: #222222;
|
||||||
--link: #00B0FF;
|
--link: #00B0FF;
|
||||||
--link-visited: #40C4FF;
|
--link-visited: #40C4FF;
|
||||||
--border-bg: #FFFFFF;
|
--border-bg: #222222;
|
||||||
--buttom: #dcdcdb;
|
--border-bg-settings: #000000;
|
||||||
--buttom-text: #415462;
|
--border-bg-license: #000000;
|
||||||
--button-border: #91918c;
|
--buttom: #121113;
|
||||||
--buttom-hover: #BBB;
|
--buttom-text: #FFFFFF;
|
||||||
--search-text: #FFF;
|
--button-border: #222222;
|
||||||
--time-background: #212121;
|
--buttom-hover: #222222;
|
||||||
--time-text: #FFF;
|
--search-text: #FFFFFF;
|
||||||
|
--time-background: #121113;
|
||||||
|
--time-text: #FFFFFF;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,19 +1,21 @@
|
|||||||
:root {
|
:root {
|
||||||
--background: #2d3743;
|
--background: #2D3743;
|
||||||
--text: #FFFFFF;
|
--text: #FFFFFF;
|
||||||
--secondary-hover: #73828c;
|
--secondary-hover: #73828C;
|
||||||
--secondary-focus: rgba(115, 130, 140, 0.125);
|
--secondary-focus: rgba(115, 130, 140, 0.125);
|
||||||
--secondary-inverse: #FFFFFF;
|
--secondary-inverse: #FFFFFF;
|
||||||
--primary-background: #2d3743;
|
--primary-background: #2D3743;
|
||||||
--secondary-background: #102027;
|
--secondary-background: #102027;
|
||||||
--thumb-background: #35404D;
|
--thumb-background: #35404D;
|
||||||
--link: #22aaff;
|
--link: #22AAFF;
|
||||||
--link-visited: #7755ff;
|
--link-visited: #7755FF;
|
||||||
--border-bg: #FFFFFF;
|
--border-bg: #FFFFFF;
|
||||||
--buttom: #DCDCDC;
|
--border-bg-settings: #FFFFFF;
|
||||||
--buttom-text: #415462;
|
--border-bg-license: #FFFFFF;
|
||||||
--button-border: #91918c;
|
--buttom: #2D3743;
|
||||||
--buttom-hover: #BBBBBB;
|
--buttom-text: #FFFFFF;
|
||||||
|
--button-border: #102027;
|
||||||
|
--buttom-hover: #102027;
|
||||||
--search-text: #FFFFFF;
|
--search-text: #FFFFFF;
|
||||||
--time-background: #212121;
|
--time-background: #212121;
|
||||||
--time-text: #FFFFFF;
|
--time-text: #FFFFFF;
|
||||||
|
|||||||
@@ -181,7 +181,7 @@ label[for=options-toggle-cbox] {
|
|||||||
|
|
||||||
.table td,.table th {
|
.table td,.table th {
|
||||||
padding: 10px 10px;
|
padding: 10px 10px;
|
||||||
border: 1px solid var(--secondary-background);
|
border: 1px solid var(--border-bg-license);
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,9 +10,11 @@
|
|||||||
--link: #212121;
|
--link: #212121;
|
||||||
--link-visited: #808080;
|
--link-visited: #808080;
|
||||||
--border-bg: #212121;
|
--border-bg: #212121;
|
||||||
--buttom: #DCDCDC;
|
--border-bg-settings: #91918C;
|
||||||
|
--border-bg-license: #91918C;
|
||||||
|
--buttom: #FFFFFF;
|
||||||
--buttom-text: #212121;
|
--buttom-text: #212121;
|
||||||
--button-border: #91918c;
|
--button-border: #91918C;
|
||||||
--buttom-hover: #BBBBBB;
|
--buttom-hover: #BBBBBB;
|
||||||
--search-text: #212121;
|
--search-text: #212121;
|
||||||
--time-background: #212121;
|
--time-background: #212121;
|
||||||
|
|||||||
@@ -155,7 +155,7 @@ label[for=options-toggle-cbox] {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.settings-form > h2 {
|
.settings-form > h2 {
|
||||||
border-bottom: 2px solid var(--border-bg);
|
border-bottom: 2px solid var(--border-bg-settings);
|
||||||
padding-bottom: 0.5rem;
|
padding-bottom: 0.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -667,6 +667,25 @@ def to_valid_filename(name):
|
|||||||
|
|
||||||
# https://github.com/yt-dlp/yt-dlp/blob/master/yt_dlp/extractor/youtube.py#L72
|
# https://github.com/yt-dlp/yt-dlp/blob/master/yt_dlp/extractor/youtube.py#L72
|
||||||
INNERTUBE_CLIENTS = {
|
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': {
|
'android': {
|
||||||
'INNERTUBE_API_KEY': 'AIzaSyA8eiZmM1FaDVjRy-df2KTyQ_vz_yYM39w',
|
'INNERTUBE_API_KEY': 'AIzaSyA8eiZmM1FaDVjRy-df2KTyQ_vz_yYM39w',
|
||||||
'INNERTUBE_CONTEXT': {
|
'INNERTUBE_CONTEXT': {
|
||||||
@@ -679,17 +698,29 @@ INNERTUBE_CLIENTS = {
|
|||||||
'osVersion': '14',
|
'osVersion': '14',
|
||||||
'androidSdkVersion': 34,
|
'androidSdkVersion': 34,
|
||||||
'platform': 'MOBILE',
|
'platform': 'MOBILE',
|
||||||
'userAgent': 'com.google.android.youtube/19.12.36 (Linux; U; Android 14; US) gzip'
|
'userAgent': 'com.google.android.youtube/19.13.36 (Linux; U; Android 14; en_US; Google Pixel 6 Pro) 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,
|
'INNERTUBE_CONTEXT_CLIENT_NAME': 3,
|
||||||
'REQUIRE_JS_PLAYER': False,
|
'REQUIRE_JS_PLAYER': False,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
'ios': {
|
||||||
|
'INNERTUBE_API_KEY': 'AIzaSyB-63vPrdThhKuerbB2N_l7Kwwcxj6yUAc',
|
||||||
|
'INNERTUBE_CONTEXT': {
|
||||||
|
'client': {
|
||||||
|
'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)'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
'INNERTUBE_CONTEXT_CLIENT_NAME': 5,
|
||||||
|
'REQUIRE_JS_PLAYER': False
|
||||||
|
},
|
||||||
|
|
||||||
# This client can access age restricted videos (unless the uploader has disabled the 'allow embedding' option)
|
# This client can access age restricted videos (unless the uploader has disabled the 'allow embedding' option)
|
||||||
# See: https://github.com/zerodytrash/YouTube-Internal-Clients
|
# See: https://github.com/zerodytrash/YouTube-Internal-Clients
|
||||||
'tv_embedded': {
|
'tv_embedded': {
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
__version__ = '0.2.11'
|
__version__ = '0.2.15'
|
||||||
|
|||||||
@@ -343,7 +343,7 @@ def _add_to_error(info, key, additional_message):
|
|||||||
def fetch_player_response(client, video_id):
|
def fetch_player_response(client, video_id):
|
||||||
return util.call_youtube_api(client, 'player', {
|
return util.call_youtube_api(client, 'player', {
|
||||||
'videoId': video_id,
|
'videoId': video_id,
|
||||||
'params': 'CgIQBg',
|
'params': 'CgIIAQ==',
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
@@ -372,16 +372,6 @@ def extract_info(video_id, use_invidious, playlist_id=None, index=None):
|
|||||||
tasks = (
|
tasks = (
|
||||||
# Get video metadata from here
|
# Get video metadata from here
|
||||||
gevent.spawn(fetch_watch_page_info, video_id, playlist_id, index),
|
gevent.spawn(fetch_watch_page_info, video_id, playlist_id, index),
|
||||||
|
|
||||||
# Get video URLs by spoofing as android client because its urls don't
|
|
||||||
# require decryption
|
|
||||||
# The URLs returned with WEB for videos requiring decryption
|
|
||||||
# couldn't be decrypted with the base.js from the web page for some
|
|
||||||
# reason
|
|
||||||
# https://github.com/yt-dlp/yt-dlp/issues/574#issuecomment-887171136
|
|
||||||
|
|
||||||
# Update 4/26/23, these URLs will randomly start returning 403
|
|
||||||
# mid-playback and I'm not sure why
|
|
||||||
gevent.spawn(fetch_player_response, 'android', video_id)
|
gevent.spawn(fetch_player_response, 'android', video_id)
|
||||||
)
|
)
|
||||||
gevent.joinall(tasks)
|
gevent.joinall(tasks)
|
||||||
|
|||||||
Reference in New Issue
Block a user