Attachment 222525 Details for Bug 253582 – Patch for youtube_dlc

[patch] Patch for youtube_dlc

youtubedlc20210215.patch (text/plain), 4.15 KB, created by Daniel Engberg on 2021-02-17 12:17:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2021-02-17 12:17:30 UTC

Size: 4.15 KB

patch

obsolete

>diff --git a/www/youtube_dlc/Makefile b/www/youtube_dlc/Makefile
>index 5a3fe56547b2..4e74b0899e67 100644
>--- a/www/youtube_dlc/Makefile
>+++ b/www/youtube_dlc/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	youtube_dlc
>-DISTVERSION=	2021.02.09
>+DISTVERSION=	2021.02.15
> CATEGORIES=	www
> 
> # Implicit approval to commit trivial version updates.
>@@ -21,7 +21,7 @@ MAKE_ARGS=	PYTHON=${PYTHON_CMD}
> NO_ARCH=	yes
> 
> OPTIONS_DEFINE=		FFMPEG MANPAGES RTMPDUMP SYMLINK
>-OPTIONS_DEFAULT=	RTMPDUMP
>+OPTIONS_DEFAULT=	FFMPEG RTMPDUMP
> OPTIONS_SUB=	yes
> 
> RTMPDUMP_DESC=	Use rtmpdump to download rtmp video streams
>diff --git a/www/youtube_dlc/distinfo b/www/youtube_dlc/distinfo
>index 46a2d65f33b2..434ff3797bbb 100644
>--- a/www/youtube_dlc/distinfo
>+++ b/www/youtube_dlc/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1612964303
>-SHA256 (pukkandan-yt-dlp-2021.02.09_GH0.tar.gz) = 5ed76891ba256b5554bcb7238345d53fcfbf051a1e03747574568011012a5a67
>-SIZE (pukkandan-yt-dlp-2021.02.09_GH0.tar.gz) = 1541519
>+TIMESTAMP = 1613562925
>+SHA256 (pukkandan-yt-dlp-2021.02.15_GH0.tar.gz) = 7b5c89798ddab730c36631e42001873d8d3ecf74803c48faa29149569d09f457
>+SIZE (pukkandan-yt-dlp-2021.02.15_GH0.tar.gz) = 1547487
>diff --git a/www/youtube_dlc/files/patch-youtube__dlc_____init____.py b/www/youtube_dlc/files/patch-youtube__dlc_____init____.py
>index 4303155e1606..20b1aa5cf62e 100644
>--- a/www/youtube_dlc/files/patch-youtube__dlc_____init____.py
>+++ b/www/youtube_dlc/files/patch-youtube__dlc_____init____.py
>@@ -1,27 +1,27 @@
>---- youtube_dlc/__init__.py.orig	2021-01-16 18:54:52 UTC
>+--- youtube_dlc/__init__.py.orig	2021-02-17 11:58:10 UTC
> +++ youtube_dlc/__init__.py
>-@@ -39,7 +39,6 @@ from .utils import (
>+@@ -38,7 +38,6 @@ from .utils import (
>+     std_headers,
>      write_string,
>-     render_table,
>  )
> -from .update import update_self
>  from .downloader import (
>      FileDownloader,
>  )
>-@@ -499,17 +498,13 @@ def _real_main(argv=None):
>-     }
>+@@ -555,17 +554,9 @@ def _real_main(argv=None):
>+         if opts.rm_cachedir:
>+             ydl.cache.remove()
>  
>-     with YoutubeDL(ydl_opts) as ydl:
> -        # Update version
> -        if opts.update_self:
>--            update_self(ydl.to_screen, opts.verbose, ydl._opener)
>+-            # If updater returns True, exit. Required for windows
>+-            if update_self(ydl.to_screen, opts.verbose, ydl._opener):
>+-                if actual_use:
>+-                    parser.error('The program must exit for the update to complete')
>+-                sys.exit()
> -
>-         # Remove cache dir
>-         if opts.rm_cachedir:
>-             ydl.cache.remove()
>- 
>          # Maybe do nothing
>-         if (len(all_urls) < 1) and (opts.load_info_filename is None):
>+         if not actual_use:
> -            if opts.update_self or opts.rm_cachedir:
> +            if opts.rm_cachedir:
>                  sys.exit()
>diff --git a/www/youtube_dlc/files/patch-youtube__dlc_options.py b/www/youtube_dlc/files/patch-youtube__dlc_options.py
>index 157204c5e885..497198a73265 100644
>--- a/www/youtube_dlc/files/patch-youtube__dlc_options.py
>+++ b/www/youtube_dlc/files/patch-youtube__dlc_options.py
>@@ -1,13 +1,13 @@
>---- youtube_dlc/options.py.orig	2021-01-17 22:30:37 UTC
>+--- youtube_dlc/options.py.orig	2021-02-17 12:04:51 UTC
> +++ youtube_dlc/options.py
>-@@ -131,10 +131,6 @@ def parseOpts(overrideArguments=None):
>+@@ -151,10 +151,6 @@ def parseOpts(overrideArguments=None):
>          action='version',
>          help='Print program version and exit')
>      general.add_option(
> -        '-U', '--update',
> -        action='store_true', dest='update_self',
>--        help='[BROKEN] Update this program to latest version. Make sure that you have sufficient permissions (run with sudo if needed)')
>+-        help='Update this program to latest version. Make sure that you have sufficient permissions (run with sudo if needed)')
> -    general.add_option(
>          '-i', '--ignore-errors', '--no-abort-on-error',
>          action='store_true', dest='ignoreerrors', default=True,
>-         help='Continue on download errors, for example to skip unavailable videos in a playlist (default)')
>+         help='Continue on download errors, for example to skip unavailable videos in a playlist (default) (Alias: --no-abort-on-error)')

Actions: View | Diff

Attachments on bug 253582: 222525