aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUnknown <blackjack4494@web.de>2020-09-29 01:42:36 +0200
committerUnknown <blackjack4494@web.de>2020-09-29 01:42:36 +0200
commit88bdacf33cb68d14a96fe807e988cc2114310d0f (patch)
tree68990063137266a52fe98c6a6638739765ea9f12
parent8219ef642760c1f2db66c95c764879c5ef5f63c1 (diff)
parentbd88d90f22bd15fcce2f128cc8563407a0734c57 (diff)
downloadhypervideo-pre-88bdacf33cb68d14a96fe807e988cc2114310d0f.tar.lz
hypervideo-pre-88bdacf33cb68d14a96fe807e988cc2114310d0f.tar.xz
hypervideo-pre-88bdacf33cb68d14a96fe807e988cc2114310d0f.zip
Merge remote-tracking branch 'origin/master'
-rw-r--r--README.md5
-rw-r--r--youtube_dlc/extractor/go.py6
2 files changed, 9 insertions, 2 deletions
diff --git a/README.md b/README.md
index 701c90c5b..2a0cf3a48 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ Using curl:
**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**
-To build the Windows executable yourself
+To build the Windows executable yourself (without version info!)
python -m pip install --upgrade pyinstaller
pyinstaller.exe youtube_dlc\__main__.py --onefile --name youtube-dlc
@@ -58,6 +58,9 @@ To build the Windows executable yourself
Or simply execute the `make_win.bat` if pyinstaller is installed.
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:
You will need the required build tools
python, make (GNU), pandoc, zip, nosetests
diff --git a/youtube_dlc/extractor/go.py b/youtube_dlc/extractor/go.py
index 03cfba91f..7a75dfa49 100644
--- a/youtube_dlc/extractor/go.py
+++ b/youtube_dlc/extractor/go.py
@@ -137,7 +137,11 @@ class GoIE(AdobePassIE):
# 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
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+)'
), webpage, 'video id', default=video_id)
if not site_info: