X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2F__init__.py;h=95add9eb1102d669983f6647adc6ffb9d7ad58d9;hb=db30f02b50a565091376b316208bfdddd729b4ed;hp=cc2f555b948908046c98e7ff7d8811daf1729973;hpb=cb6ff87fbb05e421f77b57a79699c647866ceb09;p=youtube-dl diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index cc2f555b9..95add9eb1 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -21,6 +21,7 @@ __authors__ = ( 'Filippo Valsorda', 'Christian Albrecht', 'Dave Vasilevsky', + 'Jaime Marquínez Ferrándiz', ) __license__ = 'Public Domain' @@ -34,141 +35,15 @@ import socket import subprocess import sys import warnings +import platform from .utils import * +from .update import update_self from .version import __version__ from .FileDownloader import * -from .InfoExtractors import * +from .InfoExtractors import gen_extractors from .PostProcessor import * -def update_self(to_screen, verbose, filename): - """Update the program file with the latest version from the repository""" - - from zipimport import zipimporter - import json, traceback, hashlib - - UPDATE_URL = "http://rg3.github.com/youtube-dl/update/" - VERSION_URL = UPDATE_URL + 'LATEST_VERSION' - JSON_URL = UPDATE_URL + 'versions.json' - UPDATES_RSA_KEY = (0x9d60ee4d8f805312fdb15a62f87b95bd66177b91df176765d13514a0f1754bcd2057295c5b6f1d35daa6742c3ffc9a82d3e118861c207995a8031e151d863c9927e304576bc80692bc8e094896fcf11b66f3e29e04e3a71e9a11558558acea1840aec37fc396fb6b65dc81a1c4144e03bd1c011de62e3f1357b327d08426fe93, 65537) - - - if not isinstance(globals().get('__loader__'), zipimporter) and not hasattr(sys, "frozen"): - to_screen(u'It looks like you installed youtube-dl with pip, setup.py or a tarball. Please use that to update.') - return - - # Check if there is a new version - try: - newversion = compat_urllib_request.urlopen(VERSION_URL).read().decode('utf-8').strip() - except: - if verbose: to_screen(traceback.format_exc().decode()) - to_screen(u'ERROR: can\'t find the current version. Please try again later.') - return - if newversion == __version__: - to_screen(u'youtube-dl is up-to-date (' + __version__ + ')') - return - - # Download and check versions info - try: - versions_info = compat_urllib_request.urlopen(JSON_URL).read().decode('utf-8') - versions_info = json.loads(versions_info) - except: - if verbose: to_screen(traceback.format_exc().decode()) - to_screen(u'ERROR: can\'t obtain versions info. Please try again later.') - return - if not 'signature' in versions_info: - to_screen(u'ERROR: the versions file is not signed or corrupted. Aborting.') - return - signature = versions_info['signature'] - del versions_info['signature'] - if not rsa_verify(json.dumps(versions_info, sort_keys=True), signature, UPDATES_RSA_KEY): - to_screen(u'ERROR: the versions file signature is invalid. Aborting.') - return - - to_screen(u'Updating to version ' + versions_info['latest'] + '...') - version = versions_info['versions'][versions_info['latest']] - if version.get('notes'): - to_screen(u'PLEASE NOTE:') - for note in version['notes']: - to_screen(note) - - if not os.access(filename, os.W_OK): - to_screen(u'ERROR: no write permissions on %s' % filename) - return - - # Py2EXE - if hasattr(sys, "frozen"): - exe = os.path.abspath(filename) - directory = os.path.dirname(exe) - if not os.access(directory, os.W_OK): - to_screen(u'ERROR: no write permissions on %s' % directory) - return - - try: - urlh = compat_urllib_request.urlopen(version['exe'][0]) - newcontent = urlh.read() - urlh.close() - except (IOError, OSError) as err: - if verbose: to_screen(traceback.format_exc().decode()) - to_screen(u'ERROR: unable to download latest version') - return - - newcontent_hash = hashlib.sha256(newcontent).hexdigest() - if newcontent_hash != version['exe'][1]: - to_screen(u'ERROR: the downloaded file hash does not match. Aborting.') - return - - try: - with open(exe + '.new', 'wb') as outf: - outf.write(newcontent) - except (IOError, OSError) as err: - if verbose: to_screen(traceback.format_exc().decode()) - to_screen(u'ERROR: unable to write the new version') - return - - try: - bat = os.path.join(directory, 'youtube-dl-updater.bat') - b = open(bat, 'w') - b.write(""" -echo Updating youtube-dl... -ping 127.0.0.1 -n 5 -w 1000 > NUL -move /Y "%s.new" "%s" -del "%s" - \n""" %(exe, exe, bat)) - b.close() - - os.startfile(bat) - except (IOError, OSError) as err: - if verbose: to_screen(traceback.format_exc().decode()) - to_screen(u'ERROR: unable to overwrite current version') - return - - # Zip unix package - elif isinstance(globals().get('__loader__'), zipimporter): - try: - urlh = compat_urllib_request.urlopen(version['bin'][0]) - newcontent = urlh.read() - urlh.close() - except (IOError, OSError) as err: - if verbose: to_screen(traceback.format_exc().decode()) - to_screen(u'ERROR: unable to download latest version') - return - - newcontent_hash = hashlib.sha256(newcontent).hexdigest() - if newcontent_hash != version['bin'][1]: - to_screen(u'ERROR: the downloaded file hash does not match. Aborting.') - return - - try: - with open(filename, 'wb') as outf: - outf.write(newcontent) - except (IOError, OSError) as err: - if verbose: to_screen(traceback.format_exc().decode()) - to_screen(u'ERROR: unable to overwrite current version') - return - - to_screen(u'Updated youtube-dl. Restart youtube-dl to use the new version.') - def parseOpts(): def _readOptions(filename_bytes): try: @@ -373,7 +248,7 @@ def parseOpts(): postproc.add_option('-x', '--extract-audio', action='store_true', dest='extractaudio', default=False, 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') + help='"best", "aac", "vorbis", "mp3", "m4a", "opus", or "wav"; best by default') postproc.add_option('--audio-quality', metavar='QUALITY', dest='audioquality', default='5', help='ffmpeg/avconv audio quality specification, insert a value between 0 (better) and 9 (worse) for VBR or a specific bitrate like 128K (default 5)') postproc.add_option('-k', '--keep-video', action='store_true', dest='keepvideo', default=False, @@ -400,51 +275,13 @@ def parseOpts(): return parser, opts, args -def gen_extractors(): - """ Return a list of an instance of every supported extractor. - The order does matter; the first extractor matched is the one handling the URL. - """ - return [ - YoutubePlaylistIE(), - YoutubeChannelIE(), - YoutubeUserIE(), - YoutubeSearchIE(), - YoutubeIE(), - MetacafeIE(), - DailymotionIE(), - GoogleSearchIE(), - PhotobucketIE(), - YahooIE(), - YahooSearchIE(), - DepositFilesIE(), - FacebookIE(), - BlipTVUserIE(), - BlipTVIE(), - VimeoIE(), - MyVideoIE(), - ComedyCentralIE(), - EscapistIE(), - CollegeHumorIE(), - XVideosIE(), - SoundcloudIE(), - InfoQIE(), - MixcloudIE(), - StanfordOpenClassroomIE(), - MTVIE(), - YoukuIE(), - XNXXIE(), - GooglePlusIE(), - ArteTvIE(), - NBAIE(), - JustinTVIE(), - FunnyOrDieIE(), - TweetReelIE(), - GenericIE() - ] - def _real_main(): parser, opts, args = parseOpts() + # Update version + if opts.update_self: + update_self(fd.to_screen, opts.verbose, sys.argv[0]) + # Open appropriate CookieJar if opts.cookiefile is None: jar = compat_cookiejar.CookieJar() @@ -537,7 +374,7 @@ def _real_main(): except (TypeError, ValueError) as err: parser.error(u'invalid playlist end number specified') if opts.extractaudio: - if opts.audioformat not in ['best', 'aac', 'mp3', 'vorbis', 'm4a', 'wav']: + if opts.audioformat not in ['best', 'aac', 'mp3', 'm4a', 'opus', 'vorbis', 'wav']: parser.error(u'invalid audio format specified') if opts.audioquality: opts.audioquality = opts.audioquality.strip('k').strip('K') @@ -602,6 +439,17 @@ def _real_main(): }) if opts.verbose: + fd.to_screen(u'[debug] youtube-dl version ' + __version__) + try: + sp = subprocess.Popen(['git', 'rev-parse', '--short', 'HEAD'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, + cwd=os.path.dirname(os.path.abspath(__file__))) + out, err = sp.communicate() + out = out.decode().strip() + if re.match('[0-9a-f]+', out): + fd.to_screen(u'[debug] Git HEAD: ' + out) + except: + pass + fd.to_screen(u'[debug] Python version %s - %s' %(platform.python_version(), platform.platform())) fd.to_screen(u'[debug] Proxy map: ' + str(proxy_handler.proxies)) for extractor in extractors: @@ -611,10 +459,6 @@ def _real_main(): if opts.extractaudio: fd.add_post_processor(FFmpegExtractAudioPP(preferredcodec=opts.audioformat, preferredquality=opts.audioquality, keepvideo=opts.keepvideo, nopostoverwrites=opts.nopostoverwrites)) - # Update version - if opts.update_self: - update_self(fd.to_screen, opts.verbose, sys.argv[0]) - # Maybe do nothing if len(all_urls) < 1: if not opts.update_self: