urlv.close()
if hasattr(sys, "frozen"): #py2exe
- directory = os.path.dirname(filename)
exe = os.path.abspath(filename)
+ directory = os.path.dirname(exe)
if not os.access(directory, os.W_OK):
sys.exit('ERROR: no write permissions on %s' % directory)
try:
- urllib.urlretrieve(UPDATE_URL_EXE, exe + '.new')
+ urlh = urllib2.urlopen(UPDATE_URL_EXE)
+ newcontent = urlh.read()
+ urlh.close()
+ with open(exe + '.new', 'wb') as outf:
+ outf.write(newcontent)
except (IOError, OSError), err:
sys.exit('ERROR: unable to download latest version')
b = open(bat, 'w')
print >> b, """
+echo Updating youtube-dl...
ping 127.0.0.1 -n 5 -w 1000 > NUL
move /Y "%s.new" "%s"
del "%s"
sys.exit('ERROR: unable to download latest version')
try:
- outf = open(filename, 'wb')
- try:
+ with open(filename, 'wb') as outf:
outf.write(newcontent)
- finally:
- outf.close()
except (IOError, OSError), err:
sys.exit('ERROR: unable to overwrite current version')
postproc.add_option('--extract-audio', action='store_true', dest='extractaudio', default=False,
- help='convert video files to audio-only files (requires ffmpeg and ffprobe)')
+ help='convert video files to audio-only files (requires ffmpeg or avconv and ffprobe or avprobe)')
postproc.add_option('--audio-format', metavar='FORMAT', dest='audioformat', default='best',
help='"best", "aac", "vorbis", "mp3", "m4a", or "wav"; best by default')
postproc.add_option('--audio-quality', metavar='QUALITY', dest='audioquality', default='128K',
- help='ffmpeg audio bitrate specification, 128k by default')
+ help='ffmpeg/avconv audio bitrate specification, 128k by default')
postproc.add_option('-k', '--keep-video', action='store_true', dest='keepvideo', default=False,
help='keeps the video file on disk after the post-processing; the video is erased by default')
YahooSearchIE(),
DepositFilesIE(),
FacebookIE(),
+ BlipTVUserIE(),
BlipTVIE(),
VimeoIE(),
MyVideoIE(),
MixcloudIE(),
StanfordOpenClassroomIE(),
MTVIE(),
+ XNXXIE(),
GenericIE()
]
urllib2.install_opener(opener)
socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words)
- if opts.verbose:
- print(u'[debug] Proxy map: ' + str(proxy_handler.proxies))
-
extractors = gen_extractors()
if opts.list_extractors:
'prefer_free_formats': opts.prefer_free_formats,
'verbose': opts.verbose,
})
+
+ if opts.verbose:
+ fd.to_screen(u'[debug] Proxy map: ' + str(proxy_handler.proxies))
+
for extractor in extractors:
fd.add_info_extractor(extractor)