|
Lines 1-14
Link Here
|
| 1 |
--- ./youtube_dl/__init__.py.orig 2014-02-25 09:29:35.000000000 +0000 |
1 |
--- youtube_dl/__init__.py.orig 2014-08-19 11:48:06.000000000 -0400 |
| 2 |
+++ ./youtube_dl/__init__.py 2014-02-25 09:29:49.000000000 +0000 |
2 |
+++ youtube_dl/__init__.py 2014-08-19 12:10:22.000000000 -0400 |
| 3 |
@@ -76,7 +76,6 @@ |
3 |
@@ -100,7 +100,6 @@ |
| 4 |
std_headers, |
4 |
std_headers, |
| 5 |
write_string, |
5 |
write_string, |
| 6 |
) |
6 |
) |
| 7 |
-from .update import update_self |
7 |
-from .update import update_self |
| 8 |
from .FileDownloader import ( |
8 |
from .downloader import ( |
| 9 |
FileDownloader, |
9 |
FileDownloader, |
| 10 |
) |
10 |
) |
| 11 |
@@ -206,8 +205,6 @@ |
11 |
@@ -233,8 +232,6 @@ |
| 12 |
action='help', help='print this help text and exit') |
12 |
action='help', help='print this help text and exit') |
| 13 |
general.add_option('-v', '--version', |
13 |
general.add_option('-v', '--version', |
| 14 |
action='version', help='print program version and exit') |
14 |
action='version', help='print program version and exit') |
|
Lines 17-37
Link Here
|
| 17 |
general.add_option('-i', '--ignore-errors', |
17 |
general.add_option('-i', '--ignore-errors', |
| 18 |
action='store_true', dest='ignoreerrors', help='continue on download errors, for example to skip unavailable videos in a playlist', default=False) |
18 |
action='store_true', dest='ignoreerrors', help='continue on download errors, for example to skip unavailable videos in a playlist', default=False) |
| 19 |
general.add_option('--abort-on-error', |
19 |
general.add_option('--abort-on-error', |
| 20 |
@@ -777,17 +774,6 @@ |
20 |
@@ -847,10 +844,6 @@ |
| 21 |
if opts.xattrs: |
21 |
ydl.add_post_processor(FFmpegAudioFixPP()) |
| 22 |
ydl.add_post_processor(XAttrMetadataPP()) |
22 |
ydl.add_post_processor(AtomicParsleyPP()) |
| 23 |
|
23 |
|
| 24 |
- # Update version |
24 |
- # Update version |
| 25 |
- if opts.update_self: |
25 |
- if opts.update_self: |
| 26 |
- update_self(ydl.to_screen, opts.verbose) |
26 |
- update_self(ydl.to_screen, opts.verbose) |
| 27 |
- |
27 |
- |
| 28 |
- # Maybe do nothing |
28 |
# Remove cache dir |
| 29 |
- if (len(all_urls) < 1) and (opts.load_info_filename is None): |
29 |
if opts.rm_cachedir: |
| 30 |
- if not opts.update_self: |
30 |
if opts.cachedir is None: |
| 31 |
- parser.error(u'you must provide at least one URL') |
31 |
@@ -870,7 +863,7 @@ |
| 32 |
- else: |
32 |
|
| 33 |
- sys.exit() |
33 |
# Maybe do nothing |
| 34 |
- |
34 |
if (len(all_urls) < 1) and (opts.load_info_filename is None): |
| 35 |
try: |
35 |
- if not (opts.update_self or opts.rm_cachedir): |
| 36 |
if opts.load_info_filename is not None: |
36 |
+ if not (opts.rm_cachedir): |
| 37 |
retcode = ydl.download_with_info_file(opts.load_info_filename) |
37 |
parser.error(u'you must provide at least one URL') |
|
|
38 |
else: |
| 39 |
sys.exit() |