Merge remote-tracking branch 'rmanola/master' (Closes: #124)
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 15 Sep 2011 10:43:27 +0000 (12:43 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 15 Sep 2011 10:43:27 +0000 (12:43 +0200)
Add option to specify mp3 quality and prevent the video from being deleted

1  2 
youtube-dl

diff --cc youtube-dl
index d01b259,fd2edef..a2100aa
mode 100755,100644..100755
@@@ -3290,14 -2609,19 +3290,16 @@@ class PostProcessor(object)
                """
                return information # by default, do nothing
  
 +
  class FFmpegExtractAudioPP(PostProcessor):
  
-       def __init__(self, downloader=None, preferredcodec=None):
 -      def __init__(self, downloader=None, preferredcodec=None, preferredquality=None, keepvideo=None):
++      def __init__(self, downloader=None, preferredcodec=None, preferredquality=None, keepvideo=False):
                PostProcessor.__init__(self, downloader)
                if preferredcodec is None:
                        preferredcodec = 'best'
 -              if preferredquality is None:
 -                      preferredquality = '128K'
 -              if keepvideo is None:
 -                      keepvideo = False;
                self._preferredcodec = preferredcodec
+               self._preferredquality = preferredquality
+               self._keepvideo = keepvideo
  
        @staticmethod
        def get_audio_codec(path):
                                # MP3 otherwise.
                                acodec = 'libmp3lame'
                                extension = 'mp3'
-                               more_opts = ['-ab', '128k']
 -                              more_opts = ['-ab', self._preferredquality]
++                              more_opts = []
++                              if self._preferredquality is not None:
++                                      more_opts += ['-ab', self._preferredquality]
                else:
                        # We convert the audio (lossy)
                        acodec = {'mp3': 'libmp3lame', 'aac': 'aac'}[self._preferredcodec]
                        extension = self._preferredcodec
-                       more_opts = ['-ab', '128k']
 -                      more_opts = ['-ab', self._preferredquality]
++                      more_opts = []
++                      if self._preferredquality is not None:
++                              more_opts += ['-ab', self._preferredquality]
                        if self._preferredcodec == 'aac':
                                more_opts += ['-f', 'adts']
  
                        self._downloader.to_stderr(u'WARNING: error running ffmpeg')
                        return None
  
-               try:
-                       os.remove(path)
-               except (IOError, OSError):
-                       self._downloader.to_stderr(u'WARNING: Unable to remove downloaded video file')
-                       return None
 +              # Try to update the date time for extracted audio file.
 +              if information.get('filetime') is not None:
 +                      try:
 +                              os.utime(new_path, (time.time(), information['filetime']))
 +                      except:
 +                              self._downloader.to_stderr(u'WARNING: Cannot update utime of audio file')
 +
+               if not self._keepvideo:
+                       try:
+                               os.remove(path)
+                       except (IOError, OSError):
+                               self._downloader.to_stderr(u'WARNING: Unable to remove downloaded video file')
+                               return None
  
                information['filepath'] = new_path
                return information
  
 -### MAIN PROGRAM ###
 -if __name__ == '__main__':
 +
 +def updateSelf(downloader, filename):
 +      ''' Update the program file with the latest version from the repository '''
 +      # Note: downloader only used for options
 +      if not os.access(filename, os.W_OK):
 +              sys.exit('ERROR: no write permissions on %s' % filename)
 +
 +      downloader.to_screen('Updating to latest version...')
 +
        try:
 -              # Modules needed only when running the main program
 -              import getpass
 -              import optparse
 +              try:
 +                      urlh = urllib.urlopen(UPDATE_URL)
 +                      newcontent = urlh.read()
 +              finally:
 +                      urlh.close()
 +      except (IOError, OSError), err:
 +              sys.exit('ERROR: unable to download latest version')
  
 -              # Function to update the program file with the latest version from the repository.
 -              def update_self(downloader, filename):
 -                      # Note: downloader only used for options
 -                      if not os.access(filename, os.W_OK):
 -                              sys.exit('ERROR: no write permissions on %s' % filename)
 +      try:
 +              outf = open(filename, 'wb')
 +              try:
 +                      outf.write(newcontent)
 +              finally:
 +                      outf.close()
 +      except (IOError, OSError), err:
 +              sys.exit('ERROR: unable to overwrite current version')
  
 -                      downloader.to_screen('Updating to latest stable version...')
 -                      try:
 -                              latest_url = 'http://github.com/rg3/youtube-dl/raw/master/LATEST_VERSION'
 -                              latest_version = urllib.urlopen(latest_url).read().strip()
 -                              prog_url = 'http://github.com/rg3/youtube-dl/raw/%s/youtube-dl' % latest_version
 -                              newcontent = urllib.urlopen(prog_url).read()
 -                      except (IOError, OSError), err:
 -                              sys.exit('ERROR: unable to download latest version')
 -                      try:
 -                              stream = open(filename, 'w')
 -                              stream.write(newcontent)
 -                              stream.close()
 -                      except (IOError, OSError), err:
 -                              sys.exit('ERROR: unable to overwrite current version')
 -                      downloader.to_screen('Updated to version %s' % latest_version)
 -
 -              # Parse command line
 -              parser = optparse.OptionParser(
 -                      usage='Usage: %prog [options] url...',
 -                      version='2011.03.29',
 -                      conflict_handler='resolve',
 -              )
 -
 -              parser.add_option('-h', '--help',
 -                              action='help', help='print this help text and exit')
 -              parser.add_option('-v', '--version',
 -                              action='version', help='print program version and exit')
 -              parser.add_option('-U', '--update',
 -                              action='store_true', dest='update_self', help='update this program to latest stable version')
 -              parser.add_option('-i', '--ignore-errors',
 -                              action='store_true', dest='ignoreerrors', help='continue on download errors', default=False)
 -              parser.add_option('-r', '--rate-limit',
 -                              dest='ratelimit', metavar='LIMIT', help='download rate limit (e.g. 50k or 44.6m)')
 -              parser.add_option('-R', '--retries',
 -                              dest='retries', metavar='RETRIES', help='number of retries (default is 10)', default=10)
 -              parser.add_option('--playlist-start',
 -                              dest='playliststart', metavar='NUMBER', help='playlist video to start at (default is 1)', default=1)
 -              parser.add_option('--playlist-end',
 -                              dest='playlistend', metavar='NUMBER', help='playlist video to end at (default is last)', default=-1)
 -              parser.add_option('--dump-user-agent',
 -                              action='store_true', dest='dump_user_agent',
 -                              help='display the current browser identification', default=False)
 -
 -              authentication = optparse.OptionGroup(parser, 'Authentication Options')
 -              authentication.add_option('-u', '--username',
 -                              dest='username', metavar='USERNAME', help='account username')
 -              authentication.add_option('-p', '--password',
 -                              dest='password', metavar='PASSWORD', help='account password')
 -              authentication.add_option('-n', '--netrc',
 -                              action='store_true', dest='usenetrc', help='use .netrc authentication data', default=False)
 -              parser.add_option_group(authentication)
 -
 -              video_format = optparse.OptionGroup(parser, 'Video Format Options')
 -              video_format.add_option('-f', '--format',
 -                              action='store', dest='format', metavar='FORMAT', help='video format code')
 -              video_format.add_option('--all-formats',
 -                              action='store_const', dest='format', help='download all available video formats', const='-1')
 -              video_format.add_option('--max-quality',
 -                              action='store', dest='format_limit', metavar='FORMAT', help='highest quality format to download')
 -              parser.add_option_group(video_format)
 -
 -              verbosity = optparse.OptionGroup(parser, 'Verbosity / Simulation Options')
 -              verbosity.add_option('-q', '--quiet',
 -                              action='store_true', dest='quiet', help='activates quiet mode', default=False)
 -              verbosity.add_option('-s', '--simulate',
 -                              action='store_true', dest='simulate', help='do not download video', default=False)
 -              verbosity.add_option('-g', '--get-url',
 -                              action='store_true', dest='geturl', help='simulate, quiet but print URL', default=False)
 -              verbosity.add_option('-e', '--get-title',
 -                              action='store_true', dest='gettitle', help='simulate, quiet but print title', default=False)
 -              verbosity.add_option('--get-thumbnail',
 -                              action='store_true', dest='getthumbnail',
 -                              help='simulate, quiet but print thumbnail URL', default=False)
 -              verbosity.add_option('--get-description',
 -                              action='store_true', dest='getdescription',
 -                              help='simulate, quiet but print video description', default=False)
 -              verbosity.add_option('--get-filename',
 -                              action='store_true', dest='getfilename',
 -                              help='simulate, quiet but print output filename', default=False)
 -              verbosity.add_option('--no-progress',
 -                              action='store_true', dest='noprogress', help='do not print progress bar', default=False)
 -              verbosity.add_option('--console-title',
 -                              action='store_true', dest='consoletitle',
 -                              help='display progress in console titlebar', default=False)
 -              parser.add_option_group(verbosity)
 -
 -              filesystem = optparse.OptionGroup(parser, 'Filesystem Options')
 -              filesystem.add_option('-t', '--title',
 -                              action='store_true', dest='usetitle', help='use title in file name', default=False)
 -              filesystem.add_option('-l', '--literal',
 -                              action='store_true', dest='useliteral', help='use literal title in file name', default=False)
 -              filesystem.add_option('-A', '--auto-number',
 -                              action='store_true', dest='autonumber',
 -                              help='number downloaded files starting from 00000', default=False)
 -              filesystem.add_option('-o', '--output',
 -                              dest='outtmpl', metavar='TEMPLATE', help='output filename template')
 -              filesystem.add_option('-a', '--batch-file',
 -                              dest='batchfile', metavar='FILE', help='file containing URLs to download (\'-\' for stdin)')
 -              filesystem.add_option('-w', '--no-overwrites',
 -                              action='store_true', dest='nooverwrites', help='do not overwrite files', default=False)
 -              filesystem.add_option('-c', '--continue',
 -                              action='store_true', dest='continue_dl', help='resume partially downloaded files', default=False)
 -              filesystem.add_option('--cookies',
 -                              dest='cookiefile', metavar='FILE', help='file to dump cookie jar to')
 -              filesystem.add_option('--no-part',
 -                              action='store_true', dest='nopart', help='do not use .part files', default=False)
 -              filesystem.add_option('--no-mtime',
 -                              action='store_false', dest='updatetime',
 -                              help='do not use the Last-modified header to set the file modification time', default=True)
 -              parser.add_option_group(filesystem)
 -
 -              postproc = optparse.OptionGroup(parser, 'Post-processing Options')
 -              postproc.add_option('--extract-audio', action='store_true', dest='extractaudio', default=False,
 -                              help='convert video files to audio-only files (requires ffmpeg and ffprobe)')
 -              postproc.add_option('--audio-format', metavar='FORMAT', dest='audioformat', default='best',
 -                              help='"best", "aac" or "mp3"; best by default')
 -              postproc.add_option('--audio-quality', metavar='QUALITY', dest='audioquality', default='128K',
 -                              help='128K, 160K or 192K; 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')
 -              parser.add_option_group(postproc)
 -
 -              (opts, args) = parser.parse_args()
 -
 -              # Open appropriate CookieJar
 -              if opts.cookiefile is None:
 -                      jar = cookielib.CookieJar()
 -              else:
 -                      try:
 -                              jar = cookielib.MozillaCookieJar(opts.cookiefile)
 -                              if os.path.isfile(opts.cookiefile) and os.access(opts.cookiefile, os.R_OK):
 -                                      jar.load()
 -                      except (IOError, OSError), err:
 -                              sys.exit(u'ERROR: unable to open cookie file')
 +      downloader.to_screen('Updated youtube-dl. Restart to use the new version.')
  
 -              # Dump user agent
 -              if opts.dump_user_agent:
 -                      print std_headers['User-Agent']
 -                      sys.exit(0)
 +def parseOpts():
 +      # Deferred imports
 +      import getpass
 +      import optparse
  
 -              # General configuration
 -              cookie_processor = urllib2.HTTPCookieProcessor(jar)
 -              urllib2.install_opener(urllib2.build_opener(urllib2.ProxyHandler(), cookie_processor, YoutubeDLHandler()))
 -              socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words)
 +      def _format_option_string(option):
 +              ''' ('-o', '--option') -> -o, --format METAVAR'''
 +
 +              opts = []
 +
 +              if option._short_opts: opts.append(option._short_opts[0])
 +              if option._long_opts: opts.append(option._long_opts[0])
 +              if len(opts) > 1: opts.insert(1, ', ')
 +
 +              if option.takes_value(): opts.append(' %s' % option.metavar)
 +
 +              return "".join(opts)
 +
 +      def _find_term_columns():
 +              columns = os.environ.get('COLUMNS', None)
 +              if columns:
 +                      return int(columns)
  
 -              # Batch file verification
 -              batchurls = []
 -              if opts.batchfile is not None:
 -                      try:
 -                              if opts.batchfile == '-':
 -                                      batchfd = sys.stdin
 -                              else:
 -                                      batchfd = open(opts.batchfile, 'r')
 -                              batchurls = batchfd.readlines()
 -                              batchurls = [x.strip() for x in batchurls]
 -                              batchurls = [x for x in batchurls if len(x) > 0 and not re.search(r'^[#/;]', x)]
 -                      except IOError:
 -                              sys.exit(u'ERROR: batch file could not be read')
 -              all_urls = batchurls + args
 -
 -              # Conflicting, missing and erroneous options
 -              if opts.usenetrc and (opts.username is not None or opts.password is not None):
 -                      parser.error(u'using .netrc conflicts with giving username/password')
 -              if opts.password is not None and opts.username is None:
 -                      parser.error(u'account username missing')
 -              if opts.outtmpl is not None and (opts.useliteral or opts.usetitle or opts.autonumber):
 -                      parser.error(u'using output template conflicts with using title, literal title or auto number')
 -              if opts.usetitle and opts.useliteral:
 -                      parser.error(u'using title conflicts with using literal title')
 -              if opts.username is not None and opts.password is None:
 -                      opts.password = getpass.getpass(u'Type account password and press return:')
 -              if opts.ratelimit is not None:
 -                      numeric_limit = FileDownloader.parse_bytes(opts.ratelimit)
 -                      if numeric_limit is None:
 -                              parser.error(u'invalid rate limit specified')
 -                      opts.ratelimit = numeric_limit
 -              if opts.retries is not None:
 -                      try:
 -                              opts.retries = long(opts.retries)
 -                      except (TypeError, ValueError), err:
 -                              parser.error(u'invalid retry count specified')
                try:
 -                      opts.playliststart = long(opts.playliststart)
 -                      if opts.playliststart <= 0:
 -                              raise ValueError
 -              except (TypeError, ValueError), err:
 -                      parser.error(u'invalid playlist start number specified')
 +                      sp = subprocess.Popen(['stty', 'size'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 +                      out,err = sp.communicate()
 +                      return int(out.split()[1])
 +              except:
 +                      pass
 +              return None
 +
 +      max_width = 80
 +      max_help_position = 80
 +
 +      # No need to wrap help messages if we're on a wide console
 +      columns = _find_term_columns()
 +      if columns: max_width = columns
 +
 +      fmt = optparse.IndentedHelpFormatter(width=max_width, max_help_position=max_help_position)
 +      fmt.format_option_strings = _format_option_string
 +
 +      kw = {
 +              'version'   : __version__,
 +              'formatter' : fmt,
 +              'usage' : '%prog [options] url [url...]',
 +              'conflict_handler' : 'resolve',
 +      }
 +
 +      parser = optparse.OptionParser(**kw)
 +
 +      # option groups
 +      general        = optparse.OptionGroup(parser, 'General Options')
 +      selection      = optparse.OptionGroup(parser, 'Video Selection')
 +      authentication = optparse.OptionGroup(parser, 'Authentication Options')
 +      video_format   = optparse.OptionGroup(parser, 'Video Format Options')
 +      postproc       = optparse.OptionGroup(parser, 'Post-processing Options')
 +      filesystem     = optparse.OptionGroup(parser, 'Filesystem Options')
 +      verbosity      = optparse.OptionGroup(parser, 'Verbosity / Simulation Options')
 +
 +      general.add_option('-h', '--help',
 +                      action='help', help='print this help text and exit')
 +      general.add_option('-v', '--version',
 +                      action='version', help='print program version and exit')
 +      general.add_option('-U', '--update',
 +                      action='store_true', dest='update_self', help='update this program to latest version')
 +      general.add_option('-i', '--ignore-errors',
 +                      action='store_true', dest='ignoreerrors', help='continue on download errors', default=False)
 +      general.add_option('-r', '--rate-limit',
 +                      dest='ratelimit', metavar='LIMIT', help='download rate limit (e.g. 50k or 44.6m)')
 +      general.add_option('-R', '--retries',
 +                      dest='retries', metavar='RETRIES', help='number of retries (default is 10)', default=10)
 +      general.add_option('--dump-user-agent',
 +                      action='store_true', dest='dump_user_agent',
 +                      help='display the current browser identification', default=False)
 +      general.add_option('--list-extractors',
 +                      action='store_true', dest='list_extractors',
 +                      help='List all supported extractors and the URLs they would handle', default=False)
 +
 +      selection.add_option('--playlist-start',
 +                      dest='playliststart', metavar='NUMBER', help='playlist video to start at (default is 1)', default=1)
 +      selection.add_option('--playlist-end',
 +                      dest='playlistend', metavar='NUMBER', help='playlist video to end at (default is last)', default=-1)
 +      selection.add_option('--match-title', dest='matchtitle', metavar='REGEX',help='download only matching titles (regex or caseless sub-string)')
 +      selection.add_option('--reject-title', dest='rejecttitle', metavar='REGEX',help='skip download for matching titles (regex or caseless sub-string)')
 +
 +      authentication.add_option('-u', '--username',
 +                      dest='username', metavar='USERNAME', help='account username')
 +      authentication.add_option('-p', '--password',
 +                      dest='password', metavar='PASSWORD', help='account password')
 +      authentication.add_option('-n', '--netrc',
 +                      action='store_true', dest='usenetrc', help='use .netrc authentication data', default=False)
 +
 +
 +      video_format.add_option('-f', '--format',
 +                      action='store', dest='format', metavar='FORMAT', help='video format code')
 +      video_format.add_option('--all-formats',
 +                      action='store_const', dest='format', help='download all available video formats', const='-1')
 +      video_format.add_option('--max-quality',
 +                      action='store', dest='format_limit', metavar='FORMAT', help='highest quality format to download')
 +
 +
 +      verbosity.add_option('-q', '--quiet',
 +                      action='store_true', dest='quiet', help='activates quiet mode', default=False)
 +      verbosity.add_option('-s', '--simulate',
 +                      action='store_true', dest='simulate', help='do not download the video and do not write anything to disk', default=False)
 +      verbosity.add_option('--skip-download',
 +                      action='store_true', dest='skip_download', help='do not download the video', default=False)
 +      verbosity.add_option('-g', '--get-url',
 +                      action='store_true', dest='geturl', help='simulate, quiet but print URL', default=False)
 +      verbosity.add_option('-e', '--get-title',
 +                      action='store_true', dest='gettitle', help='simulate, quiet but print title', default=False)
 +      verbosity.add_option('--get-thumbnail',
 +                      action='store_true', dest='getthumbnail',
 +                      help='simulate, quiet but print thumbnail URL', default=False)
 +      verbosity.add_option('--get-description',
 +                      action='store_true', dest='getdescription',
 +                      help='simulate, quiet but print video description', default=False)
 +      verbosity.add_option('--get-filename',
 +                      action='store_true', dest='getfilename',
 +                      help='simulate, quiet but print output filename', default=False)
 +      verbosity.add_option('--get-format',
 +                      action='store_true', dest='getformat',
 +                      help='simulate, quiet but print output format', default=False)
 +      verbosity.add_option('--no-progress',
 +                      action='store_true', dest='noprogress', help='do not print progress bar', default=False)
 +      verbosity.add_option('--console-title',
 +                      action='store_true', dest='consoletitle',
 +                      help='display progress in console titlebar', default=False)
 +
 +
 +      filesystem.add_option('-t', '--title',
 +                      action='store_true', dest='usetitle', help='use title in file name', default=False)
 +      filesystem.add_option('-l', '--literal',
 +                      action='store_true', dest='useliteral', help='use literal title in file name', default=False)
 +      filesystem.add_option('-A', '--auto-number',
 +                      action='store_true', dest='autonumber',
 +                      help='number downloaded files starting from 00000', default=False)
 +      filesystem.add_option('-o', '--output',
 +                      dest='outtmpl', metavar='TEMPLATE', help='output filename template')
 +      filesystem.add_option('-a', '--batch-file',
 +                      dest='batchfile', metavar='FILE', help='file containing URLs to download (\'-\' for stdin)')
 +      filesystem.add_option('-w', '--no-overwrites',
 +                      action='store_true', dest='nooverwrites', help='do not overwrite files', default=False)
 +      filesystem.add_option('-c', '--continue',
 +                      action='store_true', dest='continue_dl', help='resume partially downloaded files', default=False)
 +      filesystem.add_option('--cookies',
 +                      dest='cookiefile', metavar='FILE', help='file to dump cookie jar to')
 +      filesystem.add_option('--no-part',
 +                      action='store_true', dest='nopart', help='do not use .part files', default=False)
 +      filesystem.add_option('--no-mtime',
 +                      action='store_false', dest='updatetime',
 +                      help='do not use the Last-modified header to set the file modification time', default=True)
 +      filesystem.add_option('--write-description',
 +                      action='store_true', dest='writedescription',
 +                      help='write video description to a .description file', default=False)
 +      filesystem.add_option('--write-info-json',
 +                      action='store_true', dest='writeinfojson',
 +                      help='write video metadata to a .info.json file', default=False)
 +
 +
 +      postproc.add_option('--extract-audio', action='store_true', dest='extractaudio', default=False,
 +                      help='convert video files to audio-only files (requires ffmpeg and ffprobe)')
 +      postproc.add_option('--audio-format', metavar='FORMAT', dest='audioformat', default='best',
 +                      help='"best", "aac" or "mp3"; best by default')
++      postproc.add_option('--audio-quality', metavar='QUALITY', dest='audioquality', default='128K',
++                      help='ffmpeg 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')
 +
 +
 +      parser.add_option_group(general)
 +      parser.add_option_group(selection)
 +      parser.add_option_group(filesystem)
 +      parser.add_option_group(verbosity)
 +      parser.add_option_group(video_format)
 +      parser.add_option_group(authentication)
 +      parser.add_option_group(postproc)
 +
 +      opts, args = parser.parse_args()
 +
 +      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.
 +      """
 +      youtube_ie = YoutubeIE()
 +      google_ie = GoogleIE()
 +      yahoo_ie = YahooIE()
 +      return [
 +              youtube_ie,
 +              MetacafeIE(youtube_ie),
 +              DailymotionIE(),
 +              YoutubePlaylistIE(youtube_ie),
 +              YoutubeUserIE(youtube_ie),
 +              YoutubeSearchIE(youtube_ie),
 +              google_ie,
 +              GoogleSearchIE(google_ie),
 +              PhotobucketIE(),
 +              yahoo_ie,
 +              YahooSearchIE(yahoo_ie),
 +              DepositFilesIE(),
 +              FacebookIE(),
 +              BlipTVIE(),
 +              VimeoIE(),
 +              MyVideoIE(),
 +              ComedyCentralIE(),
 +              EscapistIE(),
 +
 +              GenericIE()
 +      ]
 +
 +def main():
 +      parser, opts, args = parseOpts()
 +
 +      # Open appropriate CookieJar
 +      if opts.cookiefile is None:
 +              jar = cookielib.CookieJar()
 +      else:
                try:
 -                      opts.playlistend = long(opts.playlistend)
 -                      if opts.playlistend != -1 and (opts.playlistend <= 0 or opts.playlistend < opts.playliststart):
 -                              raise ValueError
 -              except (TypeError, ValueError), err:
 -                      parser.error(u'invalid playlist end number specified')
 -              if opts.extractaudio:
 -                      if opts.audioformat not in ['best', 'aac', 'mp3']:
 -                              parser.error(u'invalid audio format specified')
 -
 -              # Information extractors
 -              youtube_ie = YoutubeIE()
 -              metacafe_ie = MetacafeIE(youtube_ie)
 -              dailymotion_ie = DailymotionIE()
 -              youtube_pl_ie = YoutubePlaylistIE(youtube_ie)
 -              youtube_user_ie = YoutubeUserIE(youtube_ie)
 -              youtube_search_ie = YoutubeSearchIE(youtube_ie)
 -              google_ie = GoogleIE()
 -              google_search_ie = GoogleSearchIE(google_ie)
 -              photobucket_ie = PhotobucketIE()
 -              yahoo_ie = YahooIE()
 -              yahoo_search_ie = YahooSearchIE(yahoo_ie)
 -              deposit_files_ie = DepositFilesIE()
 -              facebook_ie = FacebookIE()
 -              generic_ie = GenericIE()
 -
 -              # File downloader
 -              fd = FileDownloader({
 -                      'usenetrc': opts.usenetrc,
 -                      'username': opts.username,
 -                      'password': opts.password,
 -                      'quiet': (opts.quiet or opts.geturl or opts.gettitle or opts.getthumbnail or opts.getdescription or opts.getfilename),
 -                      'forceurl': opts.geturl,
 -                      'forcetitle': opts.gettitle,
 -                      'forcethumbnail': opts.getthumbnail,
 -                      'forcedescription': opts.getdescription,
 -                      'forcefilename': opts.getfilename,
 -                      'simulate': (opts.simulate or opts.geturl or opts.gettitle or opts.getthumbnail or opts.getdescription or opts.getfilename),
 -                      'format': opts.format,
 -                      'format_limit': opts.format_limit,
 -                      'outtmpl': ((opts.outtmpl is not None and opts.outtmpl.decode(preferredencoding()))
 -                              or (opts.format == '-1' and opts.usetitle and u'%(stitle)s-%(id)s-%(format)s.%(ext)s')
 -                              or (opts.format == '-1' and opts.useliteral and u'%(title)s-%(id)s-%(format)s.%(ext)s')
 -                              or (opts.format == '-1' and u'%(id)s-%(format)s.%(ext)s')
 -                              or (opts.usetitle and opts.autonumber and u'%(autonumber)s-%(stitle)s-%(id)s.%(ext)s')
 -                              or (opts.useliteral and opts.autonumber and u'%(autonumber)s-%(title)s-%(id)s.%(ext)s')
 -                              or (opts.usetitle and u'%(stitle)s-%(id)s.%(ext)s')
 -                              or (opts.useliteral and u'%(title)s-%(id)s.%(ext)s')
 -                              or (opts.autonumber and u'%(autonumber)s-%(id)s.%(ext)s')
 -                              or u'%(id)s.%(ext)s'),
 -                      'ignoreerrors': opts.ignoreerrors,
 -                      'ratelimit': opts.ratelimit,
 -                      'nooverwrites': opts.nooverwrites,
 -                      'retries': opts.retries,
 -                      'continuedl': opts.continue_dl,
 -                      'noprogress': opts.noprogress,
 -                      'playliststart': opts.playliststart,
 -                      'playlistend': opts.playlistend,
 -                      'logtostderr': opts.outtmpl == '-',
 -                      'consoletitle': opts.consoletitle,
 -                      'nopart': opts.nopart,
 -                      'updatetime': opts.updatetime,
 -                      })
 -              fd.add_info_extractor(youtube_search_ie)
 -              fd.add_info_extractor(youtube_pl_ie)
 -              fd.add_info_extractor(youtube_user_ie)
 -              fd.add_info_extractor(metacafe_ie)
 -              fd.add_info_extractor(dailymotion_ie)
 -              fd.add_info_extractor(youtube_ie)
 -              fd.add_info_extractor(google_ie)
 -              fd.add_info_extractor(google_search_ie)
 -              fd.add_info_extractor(photobucket_ie)
 -              fd.add_info_extractor(yahoo_ie)
 -              fd.add_info_extractor(yahoo_search_ie)
 -              fd.add_info_extractor(deposit_files_ie)
 -              fd.add_info_extractor(facebook_ie)
 -
 -              # This must come last since it's the
 -              # fallback if none of the others work
 -              fd.add_info_extractor(generic_ie)
 -
 -              # PostProcessors
 -              if opts.extractaudio:
 -                      fd.add_post_processor(FFmpegExtractAudioPP(preferredcodec=opts.audioformat,preferredquality=opts.audioquality,keepvideo=opts.keepvideo))
 -
 -              # Update version
 -              if opts.update_self:
 -                      update_self(fd, sys.argv[0])
 -
 -              # Maybe do nothing
 -              if len(all_urls) < 1:
 -                      if not opts.update_self:
 -                              parser.error(u'you must provide at least one URL')
 +                      jar = cookielib.MozillaCookieJar(opts.cookiefile)
 +                      if os.path.isfile(opts.cookiefile) and os.access(opts.cookiefile, os.R_OK):
 +                              jar.load()
 +              except (IOError, OSError), err:
 +                      sys.exit(u'ERROR: unable to open cookie file')
 +
 +      # Dump user agent
 +      if opts.dump_user_agent:
 +              print std_headers['User-Agent']
 +              sys.exit(0)
 +
 +      # Batch file verification
 +      batchurls = []
 +      if opts.batchfile is not None:
 +              try:
 +                      if opts.batchfile == '-':
 +                              batchfd = sys.stdin
                        else:
 -                              sys.exit()
 -              retcode = fd.download(all_urls)
 +                              batchfd = open(opts.batchfile, 'r')
 +                      batchurls = batchfd.readlines()
 +                      batchurls = [x.strip() for x in batchurls]
 +                      batchurls = [x for x in batchurls if len(x) > 0 and not re.search(r'^[#/;]', x)]
 +              except IOError:
 +                      sys.exit(u'ERROR: batch file could not be read')
 +      all_urls = batchurls + args
 +
 +      # General configuration
 +      cookie_processor = urllib2.HTTPCookieProcessor(jar)
 +      opener = urllib2.build_opener(urllib2.ProxyHandler(), cookie_processor, YoutubeDLHandler())
 +      urllib2.install_opener(opener)
 +      socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words)
 +
 +      extractors = gen_extractors()
 +
 +      if opts.list_extractors:
 +              for ie in extractors:
 +                      print(ie.IE_NAME)
 +                      matchedUrls = filter(lambda url: ie.suitable(url), all_urls)
 +                      all_urls = filter(lambda url: url not in matchedUrls, all_urls)
 +                      for mu in matchedUrls:
 +                              print(u'  ' + mu)
 +              sys.exit(0)
 +
 +      # Conflicting, missing and erroneous options
 +      if opts.usenetrc and (opts.username is not None or opts.password is not None):
 +              parser.error(u'using .netrc conflicts with giving username/password')
 +      if opts.password is not None and opts.username is None:
 +              parser.error(u'account username missing')
 +      if opts.outtmpl is not None and (opts.useliteral or opts.usetitle or opts.autonumber):
 +              parser.error(u'using output template conflicts with using title, literal title or auto number')
 +      if opts.usetitle and opts.useliteral:
 +              parser.error(u'using title conflicts with using literal title')
 +      if opts.username is not None and opts.password is None:
 +              opts.password = getpass.getpass(u'Type account password and press return:')
 +      if opts.ratelimit is not None:
 +              numeric_limit = FileDownloader.parse_bytes(opts.ratelimit)
 +              if numeric_limit is None:
 +                      parser.error(u'invalid rate limit specified')
 +              opts.ratelimit = numeric_limit
 +      if opts.retries is not None:
 +              try:
 +                      opts.retries = long(opts.retries)
 +              except (TypeError, ValueError), err:
 +                      parser.error(u'invalid retry count specified')
 +      try:
 +              opts.playliststart = int(opts.playliststart)
 +              if opts.playliststart <= 0:
 +                      raise ValueError(u'Playlist start must be positive')
 +      except (TypeError, ValueError), err:
 +              parser.error(u'invalid playlist start number specified')
 +      try:
 +              opts.playlistend = int(opts.playlistend)
 +              if opts.playlistend != -1 and (opts.playlistend <= 0 or opts.playlistend < opts.playliststart):
 +                      raise ValueError(u'Playlist end must be greater than playlist start')
 +      except (TypeError, ValueError), err:
 +              parser.error(u'invalid playlist end number specified')
 +      if opts.extractaudio:
 +              if opts.audioformat not in ['best', 'aac', 'mp3']:
 +                      parser.error(u'invalid audio format specified')
 +
 +      # File downloader
 +      fd = FileDownloader({
 +              'usenetrc': opts.usenetrc,
 +              'username': opts.username,
 +              'password': opts.password,
 +              'quiet': (opts.quiet or opts.geturl or opts.gettitle or opts.getthumbnail or opts.getdescription or opts.getfilename or opts.getformat),
 +              'forceurl': opts.geturl,
 +              'forcetitle': opts.gettitle,
 +              'forcethumbnail': opts.getthumbnail,
 +              'forcedescription': opts.getdescription,
 +              'forcefilename': opts.getfilename,
 +              'forceformat': opts.getformat,
 +              'simulate': opts.simulate,
 +              'skip_download': (opts.skip_download or opts.simulate or opts.geturl or opts.gettitle or opts.getthumbnail or opts.getdescription or opts.getfilename or opts.getformat),
 +              'format': opts.format,
 +              'format_limit': opts.format_limit,
 +              'outtmpl': ((opts.outtmpl is not None and opts.outtmpl.decode(preferredencoding()))
 +                      or (opts.format == '-1' and opts.usetitle and u'%(stitle)s-%(id)s-%(format)s.%(ext)s')
 +                      or (opts.format == '-1' and opts.useliteral and u'%(title)s-%(id)s-%(format)s.%(ext)s')
 +                      or (opts.format == '-1' and u'%(id)s-%(format)s.%(ext)s')
 +                      or (opts.usetitle and opts.autonumber and u'%(autonumber)s-%(stitle)s-%(id)s.%(ext)s')
 +                      or (opts.useliteral and opts.autonumber and u'%(autonumber)s-%(title)s-%(id)s.%(ext)s')
 +                      or (opts.usetitle and u'%(stitle)s-%(id)s.%(ext)s')
 +                      or (opts.useliteral and u'%(title)s-%(id)s.%(ext)s')
 +                      or (opts.autonumber and u'%(autonumber)s-%(id)s.%(ext)s')
 +                      or u'%(id)s.%(ext)s'),
 +              'ignoreerrors': opts.ignoreerrors,
 +              'ratelimit': opts.ratelimit,
 +              'nooverwrites': opts.nooverwrites,
 +              'retries': opts.retries,
 +              'continuedl': opts.continue_dl,
 +              'noprogress': opts.noprogress,
 +              'playliststart': opts.playliststart,
 +              'playlistend': opts.playlistend,
 +              'logtostderr': opts.outtmpl == '-',
 +              'consoletitle': opts.consoletitle,
 +              'nopart': opts.nopart,
 +              'updatetime': opts.updatetime,
 +              'writedescription': opts.writedescription,
 +              'writeinfojson': opts.writeinfojson,
 +              'matchtitle': opts.matchtitle,
 +              'rejecttitle': opts.rejecttitle,
 +              })
 +      for extractor in extractors:
 +              fd.add_info_extractor(extractor)
 +
 +      # PostProcessors
 +      if opts.extractaudio:
-               fd.add_post_processor(FFmpegExtractAudioPP(preferredcodec=opts.audioformat))
++              fd.add_post_processor(FFmpegExtractAudioPP(preferredcodec=opts.audioformat, preferredquality=opts.audioquality, keepvideo=opts.keepvideo))
 +
 +      # Update version
 +      if opts.update_self:
 +              updateSelf(fd, sys.argv[0])
 +
 +      # Maybe do nothing
 +      if len(all_urls) < 1:
 +              if not opts.update_self:
 +                      parser.error(u'you must provide at least one URL')
 +              else:
 +                      sys.exit()
 +      retcode = fd.download(all_urls)
  
 -              # Dump cookie jar if requested
 -              if opts.cookiefile is not None:
 -                      try:
 -                              jar.save()
 -                      except (IOError, OSError), err:
 -                              sys.exit(u'ERROR: unable to save cookie jar')
 +      # Dump cookie jar if requested
 +      if opts.cookiefile is not None:
 +              try:
 +                      jar.save()
 +              except (IOError, OSError), err:
 +                      sys.exit(u'ERROR: unable to save cookie jar')
 +
 +      sys.exit(retcode)
  
 -              sys.exit(retcode)
  
 +if __name__ == '__main__':
 +      try:
 +              main()
        except DownloadError:
                sys.exit(1)
        except SameFileError: