Release 2021.01.16

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7a40a732c98ea9c8ff3dce11691a35b905682e65..d312bd3c83178c64619def4f9230c0955b556d8b 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,7 +37,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         tag_name: ${{ steps.bump_version.outputs.ytdlc_version }}
-        release_name: youtube-dlc ${{ steps.bump_version.outputs.ytdlc_version }}
+        release_name: yt-dlp ${{ steps.bump_version.outputs.ytdlc_version }}
         body: |
           Changelog:
           PLACEHOLDER

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a01adb15f82085e3153bc405ae6c881e16c8f482..260d07ff252068b46d62820155c6ec2b5eb9d920 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,5 +1,5 @@
 name: Full Test
-on: [push]
+on: [push, pull_request]
 jobs:
   tests:
     name: Tests

diff --git a/.github/workflows/quick-test.yml b/.github/workflows/quick-test.yml
index 564b9daf45cee169485fab787e744c29ebc6891e..883679a144cacef13df2b24ff269ced3fefdc612 100644 (file)
--- a/.github/workflows/quick-test.yml
+++ b/.github/workflows/quick-test.yml
@@ -1,5 +1,5 @@
 name: Core Test
-on: [push]
+on: [push, pull_request]
 jobs:
   tests:
     name: Core Tests

diff --git a/Changelog.md b/Changelog.md
index 3b0fadc4a71c3b833acc023c2e631c860ff7050f..c644f9af74f2b39849c91867ebe2518a0b19b071 100644 (file)
--- a/Changelog.md
+++ b/Changelog.md
@@ -15,9 +15,16 @@ # Instuctions for creating release
 -->
 
 
+### 2021.01.16
+* Update to ytdl-2021.01.16
+* Portable configuration file: `./yt-dlp.conf`
+* Changes to configuration file paths. See [this](https://github.com/pukkandan/yt-dlp#configuration) for details
+* Add PyPI release
+
+
 ### 2021.01.14
 * Added option `--break-on-reject`
-* [roosterteeth.com] Fix for bonus episodes by changing API endpoint by @Zocker1999NET
+* [roosterteeth.com] Fix for bonus episodes by @Zocker1999NET
 * [tiktok] Fix for when share_info is empty
 * [EmbedThumbnail] Fix bug due to incorrect function name
 * [documentation] Changed sponskrub links to point to [pukkandan/sponskrub](https://github.com/pukkandan/SponSkrub) since I am now providing both linux and windows releases

diff --git a/Makefile b/Makefile
index 357e53fdbf0d15172c7f06247a55a545ada8bc8c..4dc5e517cf404eb77f401e5bea4d44f416d9e31e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,10 @@
-all: youtube-dlc README.md CONTRIBUTING.md README.txt issuetemplates youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish supportedsites
+all: youtube-dlc doc man
 doc: README.md CONTRIBUTING.md issuetemplates supportedsites
+man: README.txt youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish
+
 
 clean:
-       rm -rf youtube-dlc.1.temp.md youtube-dlc.1 youtube-dlc.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dlc.tar.gz youtube-dlc.zsh youtube-dlc.fish youtube_dlc/extractor/lazy_extractors.py *.dump *.part* *.ytdl *.info.json *.mp4 *.m4a *.flv *.mp3 *.avi *.mkv *.webm *.3gp *.wav *.ape *.swf *.jpg *.png CONTRIBUTING.md.tmp youtube-dlc youtube-dlc.exe
+       rm -rf youtube-dlc.1.temp.md youtube-dlc.1 youtube-dlc.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dlc.tar.gz youtube-dlc.zsh youtube-dlc.fish youtube_dlc/extractor/lazy_extractors.py *.dump *.part* *.ytdl *.info.json *.mp4 *.m4a *.flv *.mp3 *.avi *.mkv *.webm *.3gp *.wav *.ape *.swf *.jpg *.png *.spec CONTRIBUTING.md.tmp youtube-dlc youtube-dlc.exe
        find . -name "*.pyc" -delete
        find . -name "*.class" -delete
 

diff --git a/README.md b/README.md
index 0b309f4f1d066e8a60456320d4d972681c49ba21..24b9e7d09791a47bbaff5990ab97fe276de9de95 100644 (file)
--- a/README.md
+++ b/README.md
@@ -41,7 +41,6 @@ # YT-DLP
     * [Filtering Formats](#filtering-formats)
     * [Sorting Formats](#sorting-formats)
     * [Format Selection examples](#format-selection-examples)
-* [VIDEO SELECTION](#video-selection-1)
 * [MORE](#more)
 
 
@@ -142,12 +141,14 @@ ## General Options:
                                      an error. The default value "fixup_error"
                                      repairs broken URLs, but emits an error if
                                      this is not possible instead of searching.
-    --ignore-config, --no-config     Do not read configuration files. When given
-                                     in the global configuration file
-                                     /etc/youtube-dl.conf: Do not read the user
-                                     configuration in ~/.config/youtube-
-                                     dl/config (%APPDATA%/youtube-dl/config.txt
-                                     on Windows)
+    --ignore-config, --no-config     Disable loading any configuration files
+                                     except the one provided by --config-
+                                     location. When given inside a configuration
+                                     file, no further configuration files are
+                                     loaded. Additionally, (for backward
+                                     compatibility) if this option is found
+                                     inside the system configuration file, the
+                                     user configuration is not loaded.
     --config-location PATH           Location of the configuration file; either
                                      the path to the config or its containing
                                      directory.
@@ -648,7 +649,7 @@ # CONFIGURATION
     If none of these files are found, the search is performed again by replacing `yt-dlp` with `youtube-dlc`. Note that `~` points to `C:\Users\<user name>` on windows. Also, `%XDG_CONFIG_HOME%` defaults to `~/.config` if undefined
 1. **System Configuration**: `/etc/yt-dlp.conf` or `/etc/youtube-dlc.conf`
 
-For example, with the following configuration file youtube-dlc will always extract the audio, not copy the mtime, use a proxy and save all videos under `Movies` directory in your home directory:
+For example, with the following configuration file youtube-dlc will always extract the audio, not copy the mtime, use a proxy and save all videos under `YouTube` directory in your home directory:
 ```
 # Lines starting with # are comments
 
@@ -661,8 +662,8 @@ # Do not copy the mtime
 # Use this proxy
 --proxy 127.0.0.1:3128
 
-# Save all videos under Movies directory in your home directory
--o ~/Movies/%(title)s.%(ext)s
+# Save all videos under YouTube directory in your home directory
+-o ~/YouTube/%(title)s.%(ext)s
 ```
 
 Note that options in configuration file are just the same options aka switches used in regular command line calls; thus there **must be no whitespace** after `-` or `--`, e.g. `-o` or `--proxy` but not `- o` or `-- proxy`.

diff --git a/docs/supportedsites.md b/docs/supportedsites.md
index 7eac6faf7f75547d4ecadda95962b92c090216d4..710d32e0f1e5663fba06a6aa77bc5ddd05f8b47c 100644 (file)
--- a/docs/supportedsites.md
+++ b/docs/supportedsites.md
@@ -431,7 +431,8 @@ # Supported sites
  - **Katsomo**
  - **KeezMovies**
  - **Ketnet**
- - **KhanAcademy**
+ - **khanacademy**
+ - **khanacademy:unit**
  - **KickStarter**
  - **KinjaEmbed**
  - **KinoPoisk**

diff --git a/youtube_dlc/options.py b/youtube_dlc/options.py
index a26b04b4bca2f6b3b96b1ba33f87643a5d0ff3dc..2e14c0483eca567fd1565d344bb90afc79af0388 100644 (file)
--- a/youtube_dlc/options.py
+++ b/youtube_dlc/options.py
@@ -166,10 +166,10 @@ def _comma_separated_values_options_callback(option, opt_str, value, parser):
         '--ignore-config', '--no-config',
         action='store_true',
         help=(
-            'Do not read configuration files. '
-            'When given in the global configuration file /etc/youtube-dl.conf: '
-            'Do not read the user configuration in ~/.config/youtube-dl/config '
-            '(%APPDATA%/youtube-dl/config.txt on Windows)'))
+            'Disable loading any configuration files except the one provided by --config-location. '
+            'When given inside a configuration file, no further configuration files are loaded. '
+            'Additionally, (for backward compatibility) if this option is found inside the '
+            'system configuration file, the user configuration is not loaded.'))
     general.add_option(
         '--config-location',
         dest='config_location', metavar='PATH',