1
0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-07 11:42:43 +01:00

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Unknown 2020-09-29 01:42:36 +02:00
commit 88bdacf33c
2 changed files with 9 additions and 2 deletions

View File

@ -50,7 +50,7 @@ # INSTALLATION
**Windows** users can download [youtube-dlc.exe](https://github.com/blackjack4494/youtube-dlc/releases/latest/download/youtube-dlc.exe) (**do not** put in `C:\Windows\System32`!). **Windows** users can download [youtube-dlc.exe](https://github.com/blackjack4494/youtube-dlc/releases/latest/download/youtube-dlc.exe) (**do not** put in `C:\Windows\System32`!).
**Compile** **Compile**
To build the Windows executable yourself To build the Windows executable yourself (without version info!)
python -m pip install --upgrade pyinstaller python -m pip install --upgrade pyinstaller
pyinstaller.exe youtube_dlc\__main__.py --onefile --name youtube-dlc pyinstaller.exe youtube_dlc\__main__.py --onefile --name youtube-dlc
@ -58,6 +58,9 @@ # INSTALLATION
Or simply execute the `make_win.bat` if pyinstaller is installed. Or simply execute the `make_win.bat` if pyinstaller is installed.
There will be a `youtube-dlc.exe` in `/dist` There will be a `youtube-dlc.exe` in `/dist`
New way to build Windows is to use `python pyinst.py` (please use python3 64Bit)
For 32Bit Version use a 32Bit Version of python (3 preferred here as well) and run `python pyinst32.py`
For Unix: For Unix:
You will need the required build tools You will need the required build tools
python, make (GNU), pandoc, zip, nosetests python, make (GNU), pandoc, zip, nosetests

View File

@ -137,7 +137,11 @@ def _real_extract(self, url):
# There may be inner quotes, e.g. data-video-id="'VDKA3609139'" # There may be inner quotes, e.g. data-video-id="'VDKA3609139'"
# from http://freeform.go.com/shows/shadowhunters/episodes/season-2/1-this-guilty-blood # from http://freeform.go.com/shows/shadowhunters/episodes/season-2/1-this-guilty-blood
r'data-video-id=["\']*(VDKA\w+)', r'data-video-id=["\']*(VDKA\w+)',
# https://abc.com/shows/the-rookie/episode-guide/season-02/03-the-bet # https://github.com/ytdl-org/youtube-dl/pull/25216/files
# The following is based on the pull request on the line above. Changed the ABC.com URL to a show available now.
# https://abc.com/shows/the-rookie/episode-guide/season-02/19-the-q-word
r'\bvideoIdCode["\']\s*:\s*["\'](vdka\w+)',
# Deprecated fallback pattern
r'\b(?:video)?id["\']\s*:\s*["\'](VDKA\w+)' r'\b(?:video)?id["\']\s*:\s*["\'](VDKA\w+)'
), webpage, 'video id', default=video_id) ), webpage, 'video id', default=video_id)
if not site_info: if not site_info: