From f5546c0b3c77c7bd3b964c76bb5597d6f8905970 Mon Sep 17 00:00:00 2001 From: pukkandan Date: Tue, 12 Jan 2021 21:23:31 +0530 Subject: [PATCH] Fix typos (Closes #14) :skip ci all Co-authored by: FelixFrog --- .github/ISSUE_TEMPLATE/6_question.md | 4 ++-- Changelog.md | 10 +++++----- README.md | 11 +++++------ pyinst.py | 2 +- youtube_dlc/YoutubeDL.py | 3 ++- youtube_dlc/options.py | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/6_question.md b/.github/ISSUE_TEMPLATE/6_question.md index 647eb2d0c3..2d8e9c4dca 100644 --- a/.github/ISSUE_TEMPLATE/6_question.md +++ b/.github/ISSUE_TEMPLATE/6_question.md @@ -20,8 +20,8 @@ assignees: '' ## Checklist diff --git a/Changelog.md b/Changelog.md index eea5bff12b..e377593ae3 100644 --- a/Changelog.md +++ b/Changelog.md @@ -15,7 +15,7 @@ --> -### 2020.01.10 +### 2021.01.10 * [archive.org] Fix extractor and add support for audio and playlists by @wporr * [Animelab] Added by @mariuszskon * [youtube:search] Fix view_count by @ohnonot @@ -25,7 +25,7 @@ * Create `to_screen` and similar functions in postprocessor/common -### 2020.01.09 +### 2021.01.09 * [youtube] Fix bug in automatic caption extraction * Add `post_hooks` to YoutubeDL by @alexmerkel * Batch file enumeration improvements by @glenn-slayden @@ -34,8 +34,8 @@ * Kill child processes when yt-dlc is killed by @Unrud -### 2020.01.08 -* **Merge youtube-dl:** Upto [2020.01.08](https://github.com/ytdl-org/youtube-dl/commit/bf6a74c620bd4d5726503c5302906bb36b009026) +### 2021.01.08 +* **Merge youtube-dl:** Upto [2021.01.08](https://github.com/ytdl-org/youtube-dl/commit/bf6a74c620bd4d5726503c5302906bb36b009026) * Extractor stitcher ([1](https://github.com/ytdl-org/youtube-dl/commit/bb38a1215718cdf36d73ff0a7830a64cd9fa37cc), [2](https://github.com/ytdl-org/youtube-dl/commit/a563c97c5cddf55f8989ed7ea8314ef78e30107f)) have not been merged * Moved changelog to seperate file @@ -85,7 +85,7 @@ * Relaxed validation for format filters so that any arbitrary field can be used * Fix for embedding thumbnail in mp3 by @pauldubois98 * Make Twitch Video ID output from Playlist and VOD extractor same. This is only a temporary fix -* **Merge youtube-dl:** Upto [2020.01.03](https://github.com/ytdl-org/youtube-dl/commit/8e953dcbb10a1a42f4e12e4e132657cb0100a1f8) - See [blackjack4494/yt-dlc#280](https://github.com/blackjack4494/yt-dlc/pull/280) for details +* **Merge youtube-dl:** Upto [2021.01.03](https://github.com/ytdl-org/youtube-dl/commit/8e953dcbb10a1a42f4e12e4e132657cb0100a1f8) - See [blackjack4494/yt-dlc#280](https://github.com/blackjack4494/yt-dlc/pull/280) for details * Extractors [tiktok](https://github.com/ytdl-org/youtube-dl/commit/fb626c05867deab04425bad0c0b16b55473841a2) and [hotstar](https://github.com/ytdl-org/youtube-dl/commit/bb38a1215718cdf36d73ff0a7830a64cd9fa37cc) have not been merged * Cleaned up the fork for public use diff --git a/README.md b/README.md index 62b36404c3..2c0b85ae0d 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,6 @@ This is a fork of [youtube-dlc](https://github.com/blackjack4494/yt-dlc) which i * [INSTALLATION](#installation) * [UPDATE](#update) * [COMPILE](#compile) -* [YOUTUBE-DLC](#youtube-dlc) * [DESCRIPTION](#description) * [OPTIONS](#options) * [Network Options](#network-options) @@ -53,9 +52,9 @@ The major new features from the latest release of [blackjack4494/yt-dlc](https:/ * 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) -* **Youtube improvements**: - * All Youtube Feeds (`:ytfav`, `ytwatchlater`, `:ytsubs`, `:ythistory`, `:ytrec`) work correctly and support downloading multiple pages of content - * Youtube search works correctly (`ytsearch:`, `ytsearchdate`) along with Search URLs +* **Youtube improvements**: + * All Youtube Feeds (`:ytfav`, `:ytwatchlater`, `:ytsubs`, `:ythistory`, `:ytrec`) works correctly and support downloading multiple pages of content + * Youtube search works correctly (`ytsearch:`, `ytsearchdate:`) along with Search URLs * Redirect channel's home URL automatically to `/video` to preserve the old behaviour * **New extractors**: AnimeLab, Rcs, Gedi, bitwave.tv @@ -107,9 +106,9 @@ Then simply type this # DESCRIPTION -**youtube-dlc** is a command-line program to download videos from YouTube.com and a few more sites. It requires the Python interpreter, version 2.6, 2.7, or 3.2+, and it is not platform specific. It should work on your Unix box, on Windows or on macOS. It is released to the public domain, which means you can modify it, redistribute it or use it however you like. +**youtube-dlc** is a command-line program to download videos from youtube.com many other [video platforms](docs/supportedsites.md). It requires the Python interpreter, version 2.6, 2.7, or 3.2+, and it is not platform specific. It should work on your Unix box, on Windows or on macOS. It is released to the public domain, which means you can modify it, redistribute it or use it however you like. - youtube-dlc [OPTIONS] URL [URL...] + youtube-dlc [OPTIONS] [--] URL [URL...] # OPTIONS diff --git a/pyinst.py b/pyinst.py index 199f0734fd..6e5faf5a95 100644 --- a/pyinst.py +++ b/pyinst.py @@ -74,7 +74,7 @@ version_file = VSVersionInfo( ), StringStruct("OriginalFilename", "youtube-dlc.exe"), StringStruct("ProductName", "Youtube-dlc"), - StringStruct("ProductVersion", version + " | git.io/JUGsM"), + StringStruct("ProductVersion", version + " | git.io/JLh7K"), ], ) ] diff --git a/youtube_dlc/YoutubeDL.py b/youtube_dlc/YoutubeDL.py index f648e09046..60986c58e1 100644 --- a/youtube_dlc/YoutubeDL.py +++ b/youtube_dlc/YoutubeDL.py @@ -179,7 +179,7 @@ class YoutubeDL(object): outtmpl: Template for output names. restrictfilenames: Do not allow "&" and spaces in file names. trim_file_name: Limit length of filename (extension excluded). - ignoreerrors: Do not stop on download errors. (Default False when running youtube-dlc, but True when directly accessing YoutubeDL class) + ignoreerrors: Do not stop on download errors. (Default True when running youtube-dlc, but False when directly accessing YoutubeDL class) force_generic_extractor: Force downloader to use the generic extractor nooverwrites: Prevent overwriting files. playliststart: Playlist item to start at. @@ -2563,6 +2563,7 @@ class YoutubeDL(object): if self.params.get('call_home', False): ipaddr = self.urlopen('https://yt-dl.org/ip').read().decode('utf-8') self._write_string('[debug] Public IP address: %s\n' % ipaddr) + return latest_version = self.urlopen( 'https://yt-dl.org/latest/version').read().decode('utf-8') if version_tuple(latest_version) > version_tuple(__version__): diff --git a/youtube_dlc/options.py b/youtube_dlc/options.py index 41ad8a5795..75e8db988c 100644 --- a/youtube_dlc/options.py +++ b/youtube_dlc/options.py @@ -785,7 +785,7 @@ def parseOpts(overrideArguments=None): verbosity.add_option( '-C', '--call-home', dest='call_home', action='store_true', default=False, - help='Contact the youtube-dlc server for debugging') + help='[Broken] Contact the youtube-dlc server for debugging') verbosity.add_option( '--no-call-home', dest='call_home', action='store_false',