diff options
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/quick-test.yml | 2 | ||||
| -rw-r--r-- | Changelog.md | 9 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | README.md | 21 | ||||
| -rw-r--r-- | docs/supportedsites.md | 3 | ||||
| -rw-r--r-- | youtube_dlc/options.py | 8 |
8 files changed, 32 insertions, 21 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7a40a732c..d312bd3c8 100644 --- 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 a01adb15f..260d07ff2 100644 --- 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 564b9daf4..883679a14 100644 --- 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 3b0fadc4a..c644f9af7 100644 --- a/Changelog.md +++ b/Changelog.md @@ -15,9 +15,16 @@ --> +### 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 @@ -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 @@ -41,7 +41,6 @@ This is a fork of [youtube-dlc](https://github.com/blackjack4494/yt-dlc) which i * [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 @@ Then simply type this 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 @@ You can configure youtube-dlc by placing any supported command line option to a 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 @@ For example, with the following configuration file youtube-dlc will always extra # 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 7eac6faf7..710d32e0f 100644 --- a/docs/supportedsites.md +++ b/docs/supportedsites.md @@ -431,7 +431,8 @@ - **Katsomo** - **KeezMovies** - **Ketnet** - - **KhanAcademy** + - **khanacademy** + - **khanacademy:unit** - **KickStarter** - **KinjaEmbed** - **KinoPoisk** diff --git a/youtube_dlc/options.py b/youtube_dlc/options.py index a26b04b4b..2e14c0483 100644 --- a/youtube_dlc/options.py +++ b/youtube_dlc/options.py @@ -166,10 +166,10 @@ def parseOpts(overrideArguments=None): '--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', |