projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move XNXX into its own file
[youtube-dl]
/
youtube_dl
/
FileDownloader.py
diff --git
a/youtube_dl/FileDownloader.py
b/youtube_dl/FileDownloader.py
index a8517a390303a9f23b8b99e80cff9043f2f14333..b3a07617cd9553b4bbaf4ea632f65332e8ff0ebf 100644
(file)
--- a/
youtube_dl/FileDownloader.py
+++ b/
youtube_dl/FileDownloader.py
@@
-1,8
+1,3
@@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-from __future__ import absolute_import
-
import math
import io
import os
import math
import io
import os
@@
-322,6
+317,9
@@
class FileDownloader(object):
filetime = timeconvert(timestr)
if filetime is None:
return filetime
filetime = timeconvert(timestr)
if filetime is None:
return filetime
+ # Ignore obviously invalid dates
+ if filetime == 0:
+ return
try:
os.utime(filename, (time.time(), filetime))
except:
try:
os.utime(filename, (time.time(), filetime))
except:
@@
-763,21
+761,21
@@
class FileDownloader(object):
except (OSError, IOError):
self.report_error(u'RTMP download detected but "rtmpdump" could not be run')
return False
except (OSError, IOError):
self.report_error(u'RTMP download detected but "rtmpdump" could not be run')
return False
+ verbosity_option = '--verbose' if self.params.get('verbose', False) else '--quiet'
# Download using rtmpdump. rtmpdump returns exit code 2 when
# the connection was interrumpted and resuming appears to be
# possible. This is part of rtmpdump's normal usage, AFAIK.
# Download using rtmpdump. rtmpdump returns exit code 2 when
# the connection was interrumpted and resuming appears to be
# possible. This is part of rtmpdump's normal usage, AFAIK.
- basic_args = ['rtmpdump', '-q', '-r', url, '-o', tmpfilename]
- if self.params.get('verbose', False): basic_args[1] = '-v'
+ basic_args = ['rtmpdump', verbosity_option, '-r', url, '-o', tmpfilename]
if player_url is not None:
if player_url is not None:
- basic_args += ['-
W
', player_url]
+ basic_args += ['-
-swfVfy
', player_url]
if page_url is not None:
basic_args += ['--pageUrl', page_url]
if play_path is not None:
if page_url is not None:
basic_args += ['--pageUrl', page_url]
if play_path is not None:
- basic_args += ['-
y
', play_path]
+ basic_args += ['-
-playpath
', play_path]
if tc_url is not None:
basic_args += ['--tcUrl', url]
if tc_url is not None:
basic_args += ['--tcUrl', url]
- args = basic_args + [[], ['-
e', '-k
', '1']][self.params.get('continuedl', False)]
+ args = basic_args + [[], ['-
-resume', '--skip
', '1']][self.params.get('continuedl', False)]
if self.params.get('verbose', False):
try:
import pipes
if self.params.get('verbose', False):
try:
import pipes