From 0fd1a2b0bf40afb41a3b0ad0c770f7f36f8467fd Mon Sep 17 00:00:00 2001 From: pukkandan Date: Fri, 5 Feb 2021 05:02:41 +0530 Subject: [PATCH] [version] update (and linter) --- .github/ISSUE_TEMPLATE/1_broken_site.md | 6 +++--- .github/ISSUE_TEMPLATE/2_site_support_request.md | 4 ++-- .github/ISSUE_TEMPLATE/3_site_feature_request.md | 4 ++-- .github/ISSUE_TEMPLATE/4_bug_report.md | 6 +++--- .github/ISSUE_TEMPLATE/5_feature_request.md | 4 ++-- Changelog.md | 7 ++++--- youtube_dlc/YoutubeDL.py | 2 +- youtube_dlc/__init__.py | 1 - youtube_dlc/version.py | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/1_broken_site.md b/.github/ISSUE_TEMPLATE/1_broken_site.md index 84c472ba3..f99b36a11 100644 --- a/.github/ISSUE_TEMPLATE/1_broken_site.md +++ b/.github/ISSUE_TEMPLATE/1_broken_site.md @@ -21,7 +21,7 @@ ## Checklist - [ ] I'm reporting a broken site support -- [ ] I've verified that I'm running yt-dlp version **2021.01.29** +- [ ] I've verified that I'm running yt-dlp version **2021.02.04** - [ ] 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 @@ ## Verbose log [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] yt-dlp version 2021.01.29 + [debug] yt-dlp version 2021.02.04 [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 5430bdb67..fcd261428 100644 --- a/.github/ISSUE_TEMPLATE/2_site_support_request.md +++ b/.github/ISSUE_TEMPLATE/2_site_support_request.md @@ -21,7 +21,7 @@ ## Checklist - [ ] I'm reporting a new site support request -- [ ] I've verified that I'm running yt-dlp version **2021.01.29** +- [ ] I've verified that I'm running yt-dlp version **2021.02.04** - [ ] 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 62a3cfb82..c36cc296c 100644 --- a/.github/ISSUE_TEMPLATE/3_site_feature_request.md +++ b/.github/ISSUE_TEMPLATE/3_site_feature_request.md @@ -21,13 +21,13 @@ ## Checklist - [ ] I'm reporting a site feature request -- [ ] I've verified that I'm running yt-dlp version **2021.01.29** +- [ ] I've verified that I'm running yt-dlp version **2021.02.04** - [ ] 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 81ff2f7a8..6facc7aed 100644 --- a/.github/ISSUE_TEMPLATE/4_bug_report.md +++ b/.github/ISSUE_TEMPLATE/4_bug_report.md @@ -21,7 +21,7 @@ ## Checklist - [ ] I'm reporting a broken site support issue -- [ ] I've verified that I'm running yt-dlp version **2021.01.29** +- [ ] I've verified that I'm running yt-dlp version **2021.02.04** - [ ] 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 @@ ## Verbose log [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] yt-dlp version 2021.01.29 + [debug] yt-dlp version 2021.02.04 [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 39ffeee2a..2f1f99992 100644 --- a/.github/ISSUE_TEMPLATE/5_feature_request.md +++ b/.github/ISSUE_TEMPLATE/5_feature_request.md @@ -21,13 +21,13 @@ ## Checklist - [ ] I'm reporting a feature request -- [ ] I've verified that I'm running yt-dlp version **2021.01.29** +- [ ] I've verified that I'm running yt-dlp version **2021.02.04** - [ ] I've searched the bugtracker for similar feature requests including closed ones diff --git a/Changelog.md b/Changelog.md index 4154acc47..fb81663af 100644 --- a/Changelog.md +++ b/Changelog.md @@ -19,10 +19,11 @@ # Instuctions for creating release ### 2021.02.04 * **Merge youtube-dl:** Upto [2021.02.04.1](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.02.04.1) -* **Date/time formatting in output template:** You can now use [`strftime`](https://docs.python.org/3/library/datetime.html#strftime-and-strptime-format-codes) to format date/time fields. Example: `%(upload_date>%Y-%m-%d)s` +* **Date/time formatting in output template:** + * You can use [`strftime`](https://docs.python.org/3/library/datetime.html#strftime-and-strptime-format-codes) to format date/time fields. Example: `%(upload_date>%Y-%m-%d)s` * **Multiple output templates:** - * Seperate output templates can be given for the different metadata files by using `-o TYPE:TEMPLATE` - * The alowed types are: `subtitle|thumbnail|description|annotation|infojson|pl_description|pl_infojson` + * Separate output templates can be given for the different metadata files by using `-o TYPE:TEMPLATE` + * The allowed types are: `subtitle|thumbnail|description|annotation|infojson|pl_description|pl_infojson` * [youtube] More metadata extraction for channel/playlist URLs (channel, uploader, thumbnail, tags) * New option `--no-write-playlist-metafiles` to prevent writing playlist metadata files * [audius] Fix extractor diff --git a/youtube_dlc/YoutubeDL.py b/youtube_dlc/YoutubeDL.py index b0539493c..890660745 100644 --- a/youtube_dlc/YoutubeDL.py +++ b/youtube_dlc/YoutubeDL.py @@ -2131,7 +2131,7 @@ def dl(name, info, subtitle=False): sub_format = sub_info['ext'] sub_fn = self.prepare_filename(info_dict, 'subtitle') sub_filename = subtitles_filename( - temp_filename if not skip_dl else sub_fn, + temp_filename if not skip_dl else sub_fn, sub_lang, sub_format, info_dict.get('ext')) sub_filename_final = subtitles_filename(sub_fn, sub_lang, sub_format, info_dict.get('ext')) if not self.params.get('overwrites', True) and os.path.exists(encodeFilename(sub_filename)): diff --git a/youtube_dlc/__init__.py b/youtube_dlc/__init__.py index 646b13519..c17e9a3df 100644 --- a/youtube_dlc/__init__.py +++ b/youtube_dlc/__init__.py @@ -24,7 +24,6 @@ from .utils import ( DateRange, decodeOption, - DEFAULT_OUTTMPL, DownloadError, ExistingVideoReached, expand_path, diff --git a/youtube_dlc/version.py b/youtube_dlc/version.py index cdcbcb824..d898525c9 100644 --- a/youtube_dlc/version.py +++ b/youtube_dlc/version.py @@ -1,3 +1,3 @@ from __future__ import unicode_literals -__version__ = '2021.01.29' +__version__ = '2021.02.04'