aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--CONTRIBUTORS2
-rw-r--r--Changelog.md43
-rw-r--r--docs/supportedsites.md8
-rw-r--r--youtube_dlc/YoutubeDL.py6
-rw-r--r--ytdlp_plugins/extractor/sample.py4
6 files changed, 53 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index 756203294..3d5393432 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@ README.txt
# Binary
youtube-dl
youtube-dlc
+youtube-dlc.zip
*.exe
# Downloaded
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 2c01ccfad..83cb7f8fd 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -20,4 +20,4 @@ nao20010128nao
shirt-dev
kurumigi
tsukumi
-bbepis \ No newline at end of file
+bbepis
diff --git a/Changelog.md b/Changelog.md
index cb83c387b..9114f4cd2 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -17,25 +17,50 @@
-->
+### 2021.02.19
+* **Merge youtube-dl:** Upto [commit/cf2dbec](https://github.com/ytdl-org/youtube-dl/commit/cf2dbec6301177a1fddf72862de05fa912d9869d) (except kakao)
+* [viki] Fix extractor
+* [niconico] Extract `channel` and `channel_id` by [kurumigi](https://github.com/kurumigi)
+* [youtube] Multiple page support for hashtag URLs
+* [youtube] Add more invidious instances
+* [youtube] Fix comment extraction when comment text is empty
+* Option `--windows-filenames` to force use of windows compatible filenames
+* [ExtractAudio] Bugfix
+* Don't raise `parser.error` when exiting for update
+* [MoveFiles] Fix for when merger can't run
+* Changed `--trim-file-name` to `--trim-filenames` to be similar to related options
+* Format Sort improvements:
+ * Prefer `vp9.2` more than other `vp9` codecs
+ * Remove forced priority of `quality`
+ * Remove unnecessary `field_preference` and misuse of `preference` from extractors
+* Build improvements:
+ * Fix hash output by [shirt](https://github.com/shirt-dev)
+ * Lock python package versions for x86 and use `wheels` by [shirt](https://github.com/shirt-dev)
+ * Exclude `vcruntime140.dll` from UPX by [jbruchon](https://github.com/jbruchon)
+ * Set version number based on UTC time, not local time
+ * Publish on PyPi only if token is set
+* [documentation] Better document `--prefer-free-formats` and add `--no-prefer-free-format`
+
+
### 2021.02.15
* **Merge youtube-dl:** Upto [2021.02.10](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.02.10) (except archive.org)
-* [niconico] Improved extraction and support encrypted/SMILE movies
-* Fix HLS AES-128 with multiple keys in external downloaders
-* [youtube_live_chat] Fix by using POST API
+* [niconico] Improved extraction and support encrypted/SMILE movies by [kurumigi](https://github.com/kurumigi), [tsukumi](https://github.com/tsukumi), [bbepis](https://github.com/bbepis), [pukkandan](https://github.com/pukkandan)
+* Fix HLS AES-128 with multiple keys in external downloaders by [shirt](https://github.com/shirt-dev)
+* [youtube_live_chat] Fix by using POST API by [siikamiika](https://github.com/siikamiika)
* [rumble] Add support for video page
-* Option to allow downloading unplayable video formats (`--allow-unplayable-formats`)
+* Option `--allow-unplayable-formats` to allow downloading unplayable video formats
* [ExtractAudio] Don't re-encode when file is already in a common audio format
-* Change optional dependency to `pycryptodome`
* [youtube] Fix search continuations
* [youtube] Fix for new accounts
-* Improve build/updater:
+* Improve build/updater: by [pukkandan](https://github.com/pukkandan) and [shirt](https://github.com/shirt-dev)
* Fix SHA256 calculation in build and implement hash checking for updater
* Exit immediately in windows once the update process starts
* Fix updater for `x86.exe`
* Updater looks for both `yt-dlp` and `youtube-dlc` in releases for future-proofing
-* Fix issue with unicode filenames in aria2c
+ * Change optional dependency to `pycryptodome`
+* Fix issue with unicode filenames in aria2c by [shirt](https://github.com/shirt-dev)
* Fix `allow_playlist_files` not being correctly passed through
-* Fix for empty HTTP head requests
+* Fix for empty HTTP head requests by [shirt](https://github.com/shirt-dev)
* Fix `get_executable_path` in UNIX
* [sponskrub] Print ffmpeg output and errors to terminal
* `__real_download` should be false when ffmpeg unavailable and no download
@@ -82,7 +107,7 @@
### 2021.01.29
-* **Features from [animelover1984/youtube-dl](https://github.com/animelover1984/youtube-dl)**: Co-authored by [animelover1984](https://github.com/animelover1984) and [bbepis](https://github.com/bbepis)
+* **Features from [animelover1984/youtube-dl](https://github.com/animelover1984/youtube-dl)**: by [animelover1984](https://github.com/animelover1984) and [bbepis](https://github.com/bbepis)
* Add `--get-comments`
* [youtube] Extract comments
* [billibilli] Added BiliBiliSearchIE, BilibiliChannelIE
diff --git a/docs/supportedsites.md b/docs/supportedsites.md
index a8c73e97c..a43fdc11b 100644
--- a/docs/supportedsites.md
+++ b/docs/supportedsites.md
@@ -5,6 +5,7 @@
- **23video**
- **24video**
- **3qsdn**: 3Q SDN
+ - **3sat**
- **4tube**
- **56.com**
- **5min**
@@ -222,6 +223,7 @@
- **curiositystream**
- **curiositystream:collection**
- **CWTV**
+ - **DagelijkseKost**: dagelijksekost.een.be
- **DailyMail**
- **dailymotion**
- **dailymotion:playlist**
@@ -244,6 +246,7 @@
- **DiscoveryGo**
- **DiscoveryGoPlaylist**
- **DiscoveryNetworksDe**
+ - **DiscoveryPlus**
- **DiscoveryVR**
- **Disney**
- **dlive:stream**
@@ -370,6 +373,7 @@
- **HentaiStigma**
- **hetklokhuis**
- **hgtv.com:show**
+ - **HGTVDe**
- **HiDive**
- **HistoricFilms**
- **history:player**
@@ -854,6 +858,9 @@
- **ShahidShow**
- **Shared**: shared.sx
- **ShowRoomLive**
+ - **simplecast**
+ - **simplecast:episode**
+ - **simplecast:podcast**
- **Sina**
- **sky.it**
- **sky:news**
@@ -1231,6 +1238,7 @@
- **ZattooLive**
- **ZDF-3sat**
- **ZDFChannel**
+ - **Zhihu**
- **zingmp3**: mp3.zing.vn
- **zoom**
- **Zype**
diff --git a/youtube_dlc/YoutubeDL.py b/youtube_dlc/YoutubeDL.py
index ac892b837..54b48750d 100644
--- a/youtube_dlc/YoutubeDL.py
+++ b/youtube_dlc/YoutubeDL.py
@@ -189,11 +189,15 @@ class YoutubeDL(object):
into a single file
allow_multiple_audio_streams: Allow multiple audio streams to be merged
into a single file
+ paths: Dictionary of output paths. The allowed keys are 'home'
+ 'temp' and the keys of OUTTMPL_TYPES (in utils.py)
outtmpl: Dictionary of templates for output names. Allowed keys
- are 'default' and the keys of OUTTMPL_TYPES (in utils.py)
+ are 'default' and the keys of OUTTMPL_TYPES (in utils.py).
+ A string a also accepted for backward compatibility
outtmpl_na_placeholder: Placeholder for unavailable meta fields.
restrictfilenames: Do not allow "&" and spaces in file names
trim_file_name: Limit length of filename (extension excluded)
+ windowsfilenames: Force the filenames to be windows compatible
ignoreerrors: Do not stop on download errors
(Default True when running youtube-dlc,
but False when directly accessing YoutubeDL class)
diff --git a/ytdlp_plugins/extractor/sample.py b/ytdlp_plugins/extractor/sample.py
index 41954b6be..321f3fed1 100644
--- a/ytdlp_plugins/extractor/sample.py
+++ b/ytdlp_plugins/extractor/sample.py
@@ -1,8 +1,12 @@
from __future__ import unicode_literals
+# Don't use relative imports
from youtube_dlc.extractor.common import InfoExtractor
+# See https://github.com/ytdl-org/youtube-dl#adding-support-for-a-new-site
+# for instuctions on making extractors
+
class SamplePluginIE(InfoExtractor):
_WORKING = False
IE_DESC = False