Attachment 89063 Details for Bug 125931 – file.diff

[patch] file.diff

file.diff (text/plain), 5.70 KB, created by Pankov Pavel on 2008-07-24 14:50:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pankov Pavel

Created: 2008-07-24 14:50:03 UTC

Size: 5.70 KB

patch

obsolete

>Index: www/youtube_dl/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/www/youtube_dl/Makefile,v
>retrieving revision 1.23
>diff -u -r1.23 Makefile
>--- www/youtube_dl/Makefile	14 Jun 2008 08:41:42 -0000	1.23
>+++ www/youtube_dl/Makefile	24 Jul 2008 13:39:34 -0000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	youtube_dl
>-PORTVERSION=	2008.06.08
>+PORTVERSION=	2008.07.22
> CATEGORIES=	www
> MASTER_SITES=	http://www.arrakis.es/~rggi3/youtube-dl/
> DISTNAME=	youtube-dl-${PORTVERSION}
>Index: www/youtube_dl/distinfo
>===================================================================
>RCS file: /home/ncvs/ports/www/youtube_dl/distinfo,v
>retrieving revision 1.20
>diff -u -r1.20 distinfo
>--- www/youtube_dl/distinfo	14 Jun 2008 08:41:42 -0000	1.20
>+++ www/youtube_dl/distinfo	24 Jul 2008 13:39:34 -0000
>@@ -1,3 +1,3 @@
>-MD5 (youtube-dl-2008.06.08) = f74dad01219537fdb59c69b915f1d7ee
>-SHA256 (youtube-dl-2008.06.08) = 3bebe8503ca41db8073a8a15a5773a8815e764a84f51f3f27c720a8c466c1c5a
>-SIZE (youtube-dl-2008.06.08) = 16488
>+MD5 (youtube-dl-2008.07.22) = f0e3e1181b0d95df4b47af1665007f0e
>+SHA256 (youtube-dl-2008.07.22) = 67fd936d602c418627eeac275d2f0c40006f674d924ea1e3622c80d42c2fd2a1
>+SIZE (youtube-dl-2008.07.22) = 21398
>Index: www/youtube_dl/files/conv2avi.patch
>===================================================================
>RCS file: /home/ncvs/ports/www/youtube_dl/files/conv2avi.patch,v
>retrieving revision 1.6
>diff -u -r1.6 conv2avi.patch
>--- www/youtube_dl/files/conv2avi.patch	14 Jun 2008 08:41:42 -0000	1.6
>+++ www/youtube_dl/files/conv2avi.patch	24 Jul 2008 13:39:34 -0000
>@@ -1,34 +1,42 @@
>---- youtube-dl.orig	2008-06-09 09:36:33.000000000 +0400
>-+++ youtube-dl	2008-06-09 09:43:10.000000000 +0400
>-@@ -216,6 +216,7 @@
>- cmdl_parser.add_option('-t', '--title', action='store_true', dest='use_title', help='use title in file name')
>- cmdl_parser.add_option('-l', '--literal', action='store_true', dest='use_literal', help='use literal title in file name')
>- cmdl_parser.add_option('-n', '--netrc', action='store_true', dest='use_netrc', help='use .netrc authentication data')
>-+cmdl_parser.add_option('-a', '--avi', action='store_true', dest='use_avi', help='convert file to MPEG4 format')
>- cmdl_parser.add_option('-g', '--get-url', action='store_true', dest='get_url', help='print final video URL only')
>- cmdl_parser.add_option('-2', '--title-too', action='store_true', dest='get_title', help='used with -g, print title too')
>- cmdl_parser.add_option('-f', '--format', dest='video_format', metavar='FORMAT', help='append &fmt=FORMAT to the URL')
>-@@ -420,6 +421,22 @@
>- 	
>- 	except KeyboardInterrupt:
>- 		sys.exit('\n')
>--	
>+--- youtube-dl-orig	2008-07-24 08:17:26.000000000 +0400
>++++ youtube-dl	2008-07-24 08:19:28.000000000 +0400
>+@@ -264,6 +264,22 @@
>+ 					except (urllib2.URLError, httplib.HTTPException, socket.error), err:
>+ 						retcode = self.trouble('ERROR: unable to download video data: %s' % str(err))
>+ 						continue
> +
>-+	# Convert to avi if needed
>-+	avi_filename = '%s.avi' % video_filename
>++					# Convert to avi if needed
>++					if self._params['useavi']:
>++						avi_filename = '%s.avi' % filename
> +
>-+	try:
>-+		os.system('%%CONV2AVI_CMD%% "%s" "%s" > %s 2> %s' % (video_filename, avi_filename, os.path.devnull, os.path.devnull))
>-+		cond_print('Video file converted to %s\n' % avi_filename)
>-+	except OSError:
>-+		sys.exit('Error: unable to convert file.\n')
>-+	except KeyboardInterrupt:
>-+		sys.exit('\n')
>++						try:
>++							os.system('%%CONV2AVI_CMD%% "%s" "%s" > %s 2> %s' % (filename, avi_filename, os.path.devnull, os.path.devnull))
>++							self.to_stdout('Video file converted to %s' % avi_filename)
>++						except OSError, e:
>++							retcode = self.trouble('ERROR: unable to convert file: %s' % e.strerror)
> +
>-+	try:
>-+		os.unlink(video_filename)
>-+	except OSError:
>-+		sys.exit('Error: unable to remove downloaded file.\n')
>++						try:
>++							os.unlink(filename)
>++						except OSError, e:
>++							retcode = self.trouble('ERROR: unable to remove downloaded file: %s' % e.strerror)
> +
>- # Finish
>- sys.exit()
>+ 				break
>+ 			if not suitable_found:
>+ 				retcode = self.trouble('ERROR: no suitable InfoExtractor: %s' % url)
>+@@ -563,6 +579,8 @@
>+ 				action='store_true', dest='useliteral', help='use literal title in file name', default=False)
>+ 		parser.add_option('-n', '--netrc',
>+ 				action='store_true', dest='usenetrc', help='use .netrc authentication data', default=False)
>++		parser.add_option('-a', '--avi',
>++				action='store_true', dest='useavi', help='convert file to MPEG4 format', default=False)
>+ 		parser.add_option('-g', '--get-url',
>+ 				action='store_true', dest='geturl', help='simulate, quiet but print URL', default=False)
>+ 		parser.add_option('-e', '--get-title',
>+@@ -609,6 +627,7 @@
>+ 				or (opts.useliteral and '%(title)s-%(id)s.%(ext)s')
>+ 				or '%(id)s.%(ext)s'),
>+ 			'ignoreerrors': opts.ignoreerrors,
>++			'useavi': opts.useavi,
>+ 			})
>+ 		fd.add_info_extractor(youtube_ie)
>+ 		retcode = fd.download(args)
>Index: www/youtube_dl/files/patch-youtube-dl
>===================================================================
>RCS file: /home/ncvs/ports/www/youtube_dl/files/patch-youtube-dl,v
>retrieving revision 1.1
>diff -u -r1.1 patch-youtube-dl
>--- www/youtube_dl/files/patch-youtube-dl	16 Aug 2006 12:51:40 -0000	1.1
>+++ www/youtube_dl/files/patch-youtube-dl	24 Jul 2008 13:39:34 -0000
>@@ -1,8 +1,8 @@
>---- youtube-dl-orig	Fri Aug 11 01:00:08 2006
>-+++ youtube-dl	Sat Aug 12 13:46:38 2006
>+--- youtube-dl-orig	2008-07-24 07:42:53.000000000 +0400
>++++ youtube-dl	2008-07-24 07:45:30.000000000 +0400
> @@ -1,4 +1,4 @@
> -#!/usr/bin/env python
> +#!%%PYTHON_CMD%%
>- #
>- # Copyright (c) 2006 Ricardo Garcia Gonzalez
>- #
>+ # -*- coding: utf-8 -*-
>+ # Author: Ricardo Garcia Gonzalez
>+ # License: Public domain code

Actions: View | Diff

Attachments on bug 125931: 89063