From 17fa3ee25f8e40c49a48a5e34456d8965efbb21d Mon Sep 17 00:00:00 2001 From: pukkandan Date: Thu, 14 Jan 2021 21:08:27 +0530 Subject: [PATCH] Documentation fixes * Change all links to point to new fork URL * Changed sponskrub links to my fork of the same * Other typos --- .github/ISSUE_TEMPLATE/1_broken_site.md | 6 +++--- .../ISSUE_TEMPLATE/2_site_support_request.md | 6 +++--- .../ISSUE_TEMPLATE/3_site_feature_request.md | 4 ++-- .github/ISSUE_TEMPLATE/4_bug_report.md | 8 ++++---- .github/ISSUE_TEMPLATE/5_feature_request.md | 4 ++-- README.md | 19 ++++++++++--------- setup.py | 2 +- youtube-dlc.cmd | 2 +- youtube_dlc/options.py | 5 +++-- youtube_dlc/update.py | 2 +- youtube_dlc/utils.py | 4 ++-- 11 files changed, 32 insertions(+), 30 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/1_broken_site.md b/.github/ISSUE_TEMPLATE/1_broken_site.md index cdaef0fee4..e4a46c4543 100644 --- a/.github/ISSUE_TEMPLATE/1_broken_site.md +++ b/.github/ISSUE_TEMPLATE/1_broken_site.md @@ -21,10 +21,10 @@ ## Checklist diff --git a/.github/ISSUE_TEMPLATE/2_site_support_request.md b/.github/ISSUE_TEMPLATE/2_site_support_request.md index 6c975a6371..8ee8698871 100644 --- a/.github/ISSUE_TEMPLATE/2_site_support_request.md +++ b/.github/ISSUE_TEMPLATE/2_site_support_request.md @@ -21,10 +21,10 @@ ## Checklist diff --git a/.github/ISSUE_TEMPLATE/3_site_feature_request.md b/.github/ISSUE_TEMPLATE/3_site_feature_request.md index db9c6b2683..f2cd497b49 100644 --- a/.github/ISSUE_TEMPLATE/3_site_feature_request.md +++ b/.github/ISSUE_TEMPLATE/3_site_feature_request.md @@ -21,8 +21,8 @@ ## Checklist diff --git a/.github/ISSUE_TEMPLATE/4_bug_report.md b/.github/ISSUE_TEMPLATE/4_bug_report.md index 088e8a7afe..51ed7c872c 100644 --- a/.github/ISSUE_TEMPLATE/4_bug_report.md +++ b/.github/ISSUE_TEMPLATE/4_bug_report.md @@ -21,11 +21,11 @@ ## Checklist diff --git a/.github/ISSUE_TEMPLATE/5_feature_request.md b/.github/ISSUE_TEMPLATE/5_feature_request.md index b1dab341fb..5eff82b433 100644 --- a/.github/ISSUE_TEMPLATE/5_feature_request.md +++ b/.github/ISSUE_TEMPLATE/5_feature_request.md @@ -21,8 +21,8 @@ ## Checklist diff --git a/README.md b/README.md index ef70223cd7..1a5dd3f6ae 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,8 @@ # YT-DLP * [NEW FEATURES](#new-features) * [INSTALLATION](#installation) - * [UPDATE](#update) - * [COMPILE](#compile) + * [Update](#update) + * [Compile](#compile) * [DESCRIPTION](#description) * [OPTIONS](#options) * [Network Options](#network-options) @@ -30,7 +30,7 @@ # YT-DLP * [Authentication Options](#authentication-options) * [Adobe Pass Options](#adobe-pass-options) * [Post-processing Options](#post-processing-options) - * [SponSkrub Options (SponsorBlock)](#sponSkrub-options-sponsorblock) + * [SponSkrub Options (SponsorBlock)](#sponskrub-options-sponsorblock) * [Extractor Options](#extractor-options) * [CONFIGURATION](#configuration) * [Authentication with .netrc file](#authentication-with-netrc-file) @@ -48,11 +48,11 @@ # YT-DLP # NEW FEATURES The major new features from the latest release of [blackjack4494/yt-dlc](https://github.com/blackjack4494/yt-dlc) 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 +* **[SponSkrub Integration](#sponSkrub-options-sponsorblock)**: You can use [SponSkrub](https://github.com/pukkandan/SponSkrub) to mark/remove sponsor sections in youtube videos by utilizing the [SponsorBlock](https://sponsor.ajay.app) API * **[Format Sorting](#sorting-formats)**: The default format sorting options have been changed so that higher resolution and better codecs will be now preferred 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 all the latest 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/yt-dlc) +* **Merged with youtube-dl v2021.01.08**: You get all the latest 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/yt-dlc) * **Youtube improvements**: * All Youtube Feeds (`:ytfav`, `:ytwatchlater`, `:ytsubs`, `:ythistory`, `:ytrec`) works correctly and support downloading multiple pages of content @@ -558,9 +558,10 @@ ## Post-Processing Options: ExtractAudio, VideoRemuxer, VideoConvertor, EmbedSubtitle, Metadata, Merger, FixupStretched, FixupM4a, FixupM3u8, - SubtitlesConvertor, SponSkrub and Default. - You can use this option multiple times to - give different arguments to different + SubtitlesConvertor, EmbedThumbnail, + XAttrMetadata, SponSkrub and Default. You + can use this option multiple times to give + different arguments to different postprocessors -k, --keep-video Keep the intermediate video file on disk after post-processing @@ -607,7 +608,7 @@ ## Post-Processing Options: --convert-subs FORMAT Convert the subtitles to other format (currently supported: srt|ass|vtt|lrc) -## [SponSkrub](https://github.com/faissaloo/SponSkrub) Options ([SponsorBlock](https://sponsor.ajay.app)): +## [SponSkrub](https://github.com/pukkandan/SponSkrub) Options ([SponsorBlock](https://sponsor.ajay.app)): --sponskrub Use sponskrub to mark sponsored sections with the data available in SponsorBlock API. This is enabled by default if the diff --git a/setup.py b/setup.py index 346c5cb64f..ae3f0c46c2 100644 --- a/setup.py +++ b/setup.py @@ -66,7 +66,7 @@ def run(self): description=DESCRIPTION, long_description=LONG_DESCRIPTION, # long_description_content_type="text/markdown", - url="https://github.com/pukkandan/yt-dlc", + url="https://github.com/pukkandan/yt-dlp", packages=find_packages(exclude=("youtube_dl","test",)), #packages=[ # 'youtube_dlc', diff --git a/youtube-dlc.cmd b/youtube-dlc.cmd index 3eca4c2e12..2597e12874 100644 --- a/youtube-dlc.cmd +++ b/youtube-dlc.cmd @@ -1 +1 @@ -py "%~dp0youtube_dl\__main__.py" \ No newline at end of file +py "%~dp0youtube_dlc\__main__.py" %* \ No newline at end of file diff --git a/youtube_dlc/options.py b/youtube_dlc/options.py index c94e3abb42..2804186ad2 100644 --- a/youtube_dlc/options.py +++ b/youtube_dlc/options.py @@ -988,8 +988,9 @@ def _comma_separated_values_options_callback(option, opt_str, value, parser): 'Give these arguments to the postprocessors. ' "Specify the postprocessor name and the arguments separated by a colon ':' " 'to give the argument to only the specified postprocessor. Supported names are ' - 'ExtractAudio, VideoRemuxer, VideoConvertor, EmbedSubtitle, Metadata, Merger, FixupStretched, FixupM4a, FixupM3u8, SubtitlesConvertor, SponSkrub and Default' - '. You can use this option multiple times to give different arguments to different postprocessors')) + 'ExtractAudio, VideoRemuxer, VideoConvertor, EmbedSubtitle, Metadata, Merger, FixupStretched, ' + 'FixupM4a, FixupM3u8, SubtitlesConvertor, EmbedThumbnail, XAttrMetadata, SponSkrub and Default. ' + 'You can use this option multiple times to give different arguments to different postprocessors')) postproc.add_option( '-k', '--keep-video', action='store_true', dest='keepvideo', default=False, diff --git a/youtube_dlc/update.py b/youtube_dlc/update.py index 12b6c86087..2c9ca3aca7 100644 --- a/youtube_dlc/update.py +++ b/youtube_dlc/update.py @@ -32,7 +32,7 @@ def rsa_verify(message, signature, key): def update_self(to_screen, verbose, opener): """Update the program file with the latest version from the repository""" - return to_screen('Update is currently broken.\nVisit https://github.com/pukkandan/yt-dlc/releases/latest to get the latest version') + return to_screen('Update is currently broken.\nVisit https://github.com/pukkandan/yt-dlp/releases/latest to get the latest version') UPDATE_URL = 'https://blackjack4494.github.io//update/' VERSION_URL = UPDATE_URL + 'LATEST_VERSION' diff --git a/youtube_dlc/utils.py b/youtube_dlc/utils.py index cf9d8258a4..a374a31bf2 100644 --- a/youtube_dlc/utils.py +++ b/youtube_dlc/utils.py @@ -2332,8 +2332,8 @@ def bug_reports_message(): if ytdl_is_updateable(): update_cmd = 'type youtube-dlc -U to update' else: - update_cmd = 'see https://github.com/pukkandan/yt-dlc on how to update' - msg = '; please report this issue on https://github.com/pukkandan/yt-dlc .' + update_cmd = 'see https://github.com/pukkandan/yt-dlp on how to update' + msg = '; please report this issue on https://github.com/pukkandan/yt-dlp .' msg += ' Make sure you are using the latest version; %s.' % update_cmd msg += ' Be sure to call youtube-dlc with the --verbose flag and include its complete output.' return msg