From a804f6d89c233fa90ee64e84778b151909baa554 Mon Sep 17 00:00:00 2001 From: pukkandan Date: Wed, 1 Dec 2021 10:12:25 +0530 Subject: [PATCH] [cleanup Fix some typos * `MetadataFromFieldPP` is not deprecated! * Wrong args to `MetadataFromFieldPP` * Some mistakes in change log * Type in build.yml causing release tag to be placed on wrong commit --- .github/workflows/build.yml | 2 +- Changelog.md | 6 +++--- yt_dlp/postprocessor/metadataparser.py | 13 +++++-------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0b29a49d8..4a1c68f0d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -119,7 +119,7 @@ jobs: with: tag_name: ${{ steps.bump_version.outputs.ytdlp_version }} release_name: yt-dlp ${{ steps.bump_version.outputs.ytdlp_version }} - commitish: ${{ steps.push_update.outputs.head_sha }} + commitish: ${{ steps.push_release.outputs.head_sha }} body: | #### [A description of the various files]((https://github.com/yt-dlp/yt-dlp#release-files)) are in the README diff --git a/Changelog.md b/Changelog.md index 9310f73ca..f6cba7717 100644 --- a/Changelog.md +++ b/Changelog.md @@ -38,7 +38,7 @@ * Ensure directory exists when checking formats * Ensure path for link files exists by [Zirro](https://github.com/Zirro) * Ensure same config file is not loaded multiple times -* Fix 'postprocessor_hooks` +* Fix `postprocessor_hooks` * Fix `--break-on-archive` when pre-checking * Fix `--check-formats` for `mhtml` * Fix `--load-info-json` of playlists with failed entries @@ -110,10 +110,9 @@ * [youtube] Decrypt n-sig for URLs with `ratebypass` * [youtube] Minor improvement to format sorting * [cleanup] Add deprecation warnings -* [cleanup] Minor cleanup -* [cleanup] Misc cleanup * [cleanup] Refactor `JSInterpreter._seperate` * [Cleanup] Remove some unnecessary groups in regexes by [Ashish0804](https://github.com/Ashish0804) +* [cleanup] Misc cleanup ### 2021.11.10.1 @@ -1476,6 +1475,7 @@ **Note**: All uncredited changes above this point are authored by [pukkandan](https://github.com/pukkandan) +### Unreleased changes in [blackjack4494/yt-dlc](https://github.com/blackjack4494/yt-dlc) * Updated to youtube-dl release 2020.11.26 by [pukkandan](https://github.com/pukkandan) * Youtube improvements by [pukkandan](https://github.com/pukkandan) * Implemented all Youtube Feeds (ytfav, ytwatchlater, ytsubs, ythistory, ytrec) and SearchURL diff --git a/yt_dlp/postprocessor/metadataparser.py b/yt_dlp/postprocessor/metadataparser.py index 54b2c5627..807cd305d 100644 --- a/yt_dlp/postprocessor/metadataparser.py +++ b/yt_dlp/postprocessor/metadataparser.py @@ -96,7 +96,6 @@ class MetadataParserPP(PostProcessor): return f -# Deprecated class MetadataFromFieldPP(MetadataParserPP): @classmethod def to_action(cls, f): @@ -106,19 +105,17 @@ class MetadataFromFieldPP(MetadataParserPP): return ( cls.Actions.INTERPRET, match.group('in').replace('\\:', ':'), - match.group('out')) + match.group('out'), + ) def __init__(self, downloader, formats): - super().__init__(self, downloader, [self.to_action(f) for f in formats]) - self.deprecation_warning( - 'yt_dlp.postprocessor.MetadataFromFieldPP is deprecated ' - 'and may be removed in a future version. Use yt_dlp.postprocessor.MetadataParserPP instead') + super().__init__(downloader, [self.to_action(f) for f in formats]) # Deprecated class MetadataFromTitlePP(MetadataParserPP): def __init__(self, downloader, titleformat): - super().__init__(self, downloader, [(self.Actions.INTERPRET, 'title', titleformat)]) + super().__init__(downloader, [(self.Actions.INTERPRET, 'title', titleformat)]) self.deprecation_warning( 'yt_dlp.postprocessor.MetadataFromTitlePP is deprecated ' - 'and may be removed in a future version. Use yt_dlp.postprocessor.MetadataParserPP instead') + 'and may be removed in a future version. Use yt_dlp.postprocessor.MetadataFromFieldPP instead')