From 6fd35a110138b027113d5dfedc96ae5d3cfc3dae Mon Sep 17 00:00:00 2001 From: pukkandan Date: Sat, 9 Jan 2021 17:57:36 +0530 Subject: [PATCH] Release 2021.01.09 --- .github/ISSUE_TEMPLATE/1_broken_site.md | 6 ++--- .../ISSUE_TEMPLATE/2_site_support_request.md | 4 +-- .../ISSUE_TEMPLATE/3_site_feature_request.md | 4 +-- .github/ISSUE_TEMPLATE/4_bug_report.md | 6 ++--- .github/ISSUE_TEMPLATE/5_feature_request.md | 4 +-- README.md | 27 ++++++++++--------- youtube_dlc/options.py | 2 +- 7 files changed, 27 insertions(+), 26 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/1_broken_site.md b/.github/ISSUE_TEMPLATE/1_broken_site.md index 63ea413d0..5ed0f46da 100644 --- a/.github/ISSUE_TEMPLATE/1_broken_site.md +++ b/.github/ISSUE_TEMPLATE/1_broken_site.md @@ -21,7 +21,7 @@ assignees: '' - [ ] I'm reporting a broken site support -- [ ] I've verified that I'm running youtube-dlc version **2021.01.07-1** +- [ ] I've verified that I'm running youtube-dlc version **2021.01.08** - [ ] I've checked that all provided URLs are alive and playable in a browser - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped - [ ] I've searched the bugtracker for similar issues including closed ones @@ -44,7 +44,7 @@ Add the `-v` flag to your command line you run youtube-dlc with (`youtube-dlc -v [debug] User config: [] [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj'] [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251 - [debug] youtube-dlc version 2021.01.07-1 + [debug] youtube-dlc version 2021.01.08 [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2 [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4 [debug] Proxy map: {} diff --git a/.github/ISSUE_TEMPLATE/2_site_support_request.md b/.github/ISSUE_TEMPLATE/2_site_support_request.md index ca50078fe..4d07adbfd 100644 --- a/.github/ISSUE_TEMPLATE/2_site_support_request.md +++ b/.github/ISSUE_TEMPLATE/2_site_support_request.md @@ -21,7 +21,7 @@ assignees: '' - [ ] I'm reporting a new site support request -- [ ] I've verified that I'm running youtube-dlc version **2021.01.07-1** +- [ ] I've verified that I'm running youtube-dlc version **2021.01.08** - [ ] I've checked that all provided URLs are alive and playable in a browser - [ ] I've checked that none of provided URLs violate any copyrights - [ ] I've searched the bugtracker for similar site support requests including closed ones diff --git a/.github/ISSUE_TEMPLATE/3_site_feature_request.md b/.github/ISSUE_TEMPLATE/3_site_feature_request.md index 285d091d2..da119bb8b 100644 --- a/.github/ISSUE_TEMPLATE/3_site_feature_request.md +++ b/.github/ISSUE_TEMPLATE/3_site_feature_request.md @@ -21,13 +21,13 @@ assignees: '' - [ ] I'm reporting a site feature request -- [ ] I've verified that I'm running youtube-dlc version **2021.01.07-1** +- [ ] I've verified that I'm running youtube-dlc version **2021.01.08** - [ ] I've searched the bugtracker for similar site feature requests including closed ones diff --git a/.github/ISSUE_TEMPLATE/4_bug_report.md b/.github/ISSUE_TEMPLATE/4_bug_report.md index bd535d672..e53bb15dd 100644 --- a/.github/ISSUE_TEMPLATE/4_bug_report.md +++ b/.github/ISSUE_TEMPLATE/4_bug_report.md @@ -21,7 +21,7 @@ assignees: '' - [ ] I'm reporting a broken site support issue -- [ ] I've verified that I'm running youtube-dlc version **2021.01.07-1** +- [ ] I've verified that I'm running youtube-dlc version **2021.01.08** - [ ] I've checked that all provided URLs are alive and playable in a browser - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped - [ ] I've searched the bugtracker for similar bug reports including closed ones @@ -46,7 +46,7 @@ Add the `-v` flag to your command line you run youtube-dlc with (`youtube-dlc -v [debug] User config: [] [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj'] [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251 - [debug] youtube-dlc version 2021.01.07-1 + [debug] youtube-dlc version 2021.01.08 [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2 [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4 [debug] Proxy map: {} diff --git a/.github/ISSUE_TEMPLATE/5_feature_request.md b/.github/ISSUE_TEMPLATE/5_feature_request.md index 7b2c9f46c..1b3357576 100644 --- a/.github/ISSUE_TEMPLATE/5_feature_request.md +++ b/.github/ISSUE_TEMPLATE/5_feature_request.md @@ -21,13 +21,13 @@ assignees: '' - [ ] I'm reporting a feature request -- [ ] I've verified that I'm running youtube-dlc version **2021.01.07-1** +- [ ] I've verified that I'm running youtube-dlc version **2021.01.08** - [ ] I've searched the bugtracker for similar feature requests including closed ones diff --git a/README.md b/README.md index c79595000..1bd9c4d49 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Release Version](https://img.shields.io/badge/Release-2021.01.08-brightgreen)](https://github.com/pukkandan/yt-dlc/releases/latest) +[![Release Version](https://img.shields.io/badge/Release-2021.01.09-brightgreen)](https://github.com/pukkandan/yt-dlc/releases/latest) [![License: Unlicense](https://img.shields.io/badge/License-Unlicense-blue.svg)](https://github.com/pukkandan/yt-dlc/blob/master/LICENSE) [![Core Status](https://github.com/pukkandan/yt-dlc/workflows/Core%20Test/badge.svg?branch=master)](https://github.com/pukkandan/yt-dlc/actions?query=workflow%3ACore) [![CI Status](https://github.com/pukkandan/yt-dlc/workflows/Full%20Test/badge.svg?branch=master)](https://github.com/pukkandan/yt-dlc/actions?query=workflow%3AFull) @@ -48,13 +48,13 @@ The major new features are: * **[SponSkrub Integration](#sponSkrub-options-sponsorblock)** - You can use [SponSkrub](https://github.com/faissaloo/SponSkrub) to mark/remove sponsor sections in youtube videos by utilizing the [SponsorBlock](https://sponsor.ajay.app) API -* **[Format Sorting](#sorting-format)** - The default format sorting options have been changed so that higher resolution and better codecs will be now prefered instead of simply using larger bitrate. Furthermore, the user can now specify the sort order if they want. This allows for much easier format selection that what is possible by simply using `--format` ([examples](#format-selection-examples)) +* **[Format Sorting](#sorting-format)** - The default format sorting options have been changed so that higher resolution and better codecs will be now prefered instead of simply using larger bitrate. Furthermore, you can now specify the sort order using `-S`. This allows for much easier format selection that what is possible by simply using `--format` ([examples](#format-selection-examples)) * Merged with youtube-dl **v2020.01.08** - You get the new features and patches of [youtube-dl](https://github.com/ytdl-org/youtube-dl) in addition to all the features of [youtube-dlc](https://github.com/blackjack4494) * **New options** - `--list-formats-as-table`, `--write-link`, `--force-download-archive` etc -and many other features and patches. See [changelog](changelog.md) or [commits](https://github.com/pukkandan/yt-dlc/commits) for the full list of changes +and many other features and patches. See [changelog](Changelog.md) or [commits](https://github.com/pukkandan/yt-dlc/commits) for the full list of changes # INSTALLATION @@ -447,8 +447,8 @@ Then simply type this --no-audio-multistreams Only one audio stream is downloaded for each output file (default) --all-formats Download all available video formats - --prefer-free-formats Prefer free video formats unless a specific - one is requested + --prefer-free-formats Prefer free video formats over non-free + formats of same quality -F, --list-formats List all available formats of requested videos --list-formats-as-table Present the output of -F in a more tabular @@ -919,9 +919,17 @@ $ youtube-dlc -f 'bv*+ba/b' # Same as above $ youtube-dlc +# Download the best video-only format and the best audio-only format without merging them +# For this case, an output template should be used since +# by default, bestvideo and bestaudio will have the same file name. +$ youtube-dlc -f 'bv,ba' -o '%(title)s.f%(format_id)s.%(ext)s' -# Download the worst video available + +# The following examples show the old method (without -S) of format selection +# and how to use -S to achieve a similar but better result + +# Download the worst video available (old method) $ youtube-dlc -f 'wv*+wa/w' # Download the best video available but with the smallest resolution @@ -980,13 +988,6 @@ $ youtube-dlc -S 'protocol' -# Download the best video-only format and the best audio-only format without merging them -# For this case, an output template should be used since -# by default, bestvideo and bestaudio will have the same file name. -$ youtube-dlc -f 'bv,ba' -o '%(title)s.f%(format_id)s.%(ext)s' - - - # Download the best video with h264 codec, or the best video if there is no such video $ youtube-dlc -f '(bv*+ba/b)[vcodec^=avc1] / (bv*+ba/b)' diff --git a/youtube_dlc/options.py b/youtube_dlc/options.py index b00db519a..41ad8a579 100644 --- a/youtube_dlc/options.py +++ b/youtube_dlc/options.py @@ -466,7 +466,7 @@ def parseOpts(overrideArguments=None): video_format.add_option( '--prefer-free-formats', action='store_true', dest='prefer_free_formats', default=False, - help='Prefer free video formats unless a specific one is requested') + help='Prefer free video formats over non-free formats of same quality') video_format.add_option( '-F', '--list-formats', action='store_true', dest='listformats',