Add --mobile-version program option

[youtube-dl] / youtube-dl

diff --git a/youtube-dl b/youtube-dl
index 1e6b876e162302342337aa3c758a12111654d9db..2c1d1aa3b84b5e3cda680e22fe0a6a39dc91c777 100755 (executable)
--- a/youtube-dl
+++ b/youtube-dl
@@ -25,6 +25,23 @@ std_headers = {
 
 simple_title_chars = string.ascii_letters.decode('ascii') + string.digits.decode('ascii')
 
 
 simple_title_chars = string.ascii_letters.decode('ascii') + string.digits.decode('ascii')
 

+class DownloadError(Exception):
+       """Download Error exception.
+       
+       This exception may be thrown by FileDownloader objects if they are not
+       configured to continue on errors. They will contain the appropriate
+       error message.
+       """
+       pass
+
+class SameFileError(Exception):
+       """Same File exception.
+
+       This exception will be thrown by FileDownloader objects if they detect
+       multiple files would have to be downloaded to the same file on disk.
+       """
+       pass
+

 class FileDownloader(object):
        """File Downloader class.
 
 class FileDownloader(object):
        """File Downloader class.
 


@@ -67,6 +84,7 @@ class FileDownloader(object):
        _ies = []
 
        def __init__(self, params):
        _ies = []
 
        def __init__(self, params):

+               """Create a FileDownloader object with the given options."""

                self._ies = []
                self.set_params(params)
        
                self._ies = []
                self.set_params(params)
        


@@ -164,22 +182,22 @@ class FileDownloader(object):
                """Determine action to take when a download problem appears.
 
                Depending on if the downloader has been configured to ignore
                """Determine action to take when a download problem appears.
 
                Depending on if the downloader has been configured to ignore

-               download errors or not, this method may exit the program or
+               download errors or not, this method may throw an exception or

                not when errors are found, after printing the message. If it
                not when errors are found, after printing the message. If it

-               doesn't exit, it returns an error code suitable to be returned
+               doesn't raise, it returns an error code suitable to be returned

                later as a program exit code to indicate error.
                """
                if message is not None:
                        self.to_stderr(message)
                if not self._params.get('ignoreerrors', False):
                later as a program exit code to indicate error.
                """
                if message is not None:
                        self.to_stderr(message)
                if not self._params.get('ignoreerrors', False):

-                       sys.exit(1)
+                       raise DownloadError(message)

                return 1
 
        def download(self, url_list):
                """Download a given list of URLs."""
                retcode = 0
                if len(url_list) > 1 and self.fixed_template():
                return 1
 
        def download(self, url_list):
                """Download a given list of URLs."""
                retcode = 0
                if len(url_list) > 1 and self.fixed_template():

-                       sys.exit('ERROR: fixed output name but more than one file to download')
+                       raise SameFileError(self._params['outtmpl'])

 
                for url in url_list:
                        suitable_found = False
 
                for url in url_list:
                        suitable_found = False


@@ -194,7 +212,7 @@ class FileDownloader(object):
                                        retcode = self.trouble()
 
                                if len(results) > 1 and self.fixed_template():
                                        retcode = self.trouble()
 
                                if len(results) > 1 and self.fixed_template():

-                                       sys.exit('ERROR: fixed output name but more than one file to download')
+                                       raise SameFileError(self._params['outtmpl'])

 
                                for result in results:
 
 
                                for result in results:
 


@@ -210,6 +228,7 @@ class FileDownloader(object):
 
                                        try:
                                                filename = self._params['outtmpl'] % result
 
                                        try:
                                                filename = self._params['outtmpl'] % result

+                                               self.to_stdout('[download] Destination: %s' % filename)

                                        except (ValueError, KeyError), err:
                                                retcode = self.trouble('ERROR: invalid output template: %s' % str(err))
                                                continue
                                        except (ValueError, KeyError), err:
                                                retcode = self.trouble('ERROR: invalid output template: %s' % str(err))
                                                continue


@@ -305,7 +324,7 @@ class InfoExtractor(object):
                return True
 
        def initialize(self):
                return True
 
        def initialize(self):

-               """Initializes an instance (login, etc)."""
+               """Initializes an instance (authentication, etc)."""

                if not self._ready:
                        self._real_initialize()
                        self._ready = True
                if not self._ready:
                        self._real_initialize()
                        self._ready = True


@@ -320,10 +339,12 @@ class InfoExtractor(object):
                self._downloader = downloader
        
        def to_stdout(self, message):
                self._downloader = downloader
        
        def to_stdout(self, message):

+               """Print message to stdout if downloader is not in quiet mode."""

                if self._downloader is None or not self._downloader.get_params().get('quiet', False):
                        print message
        
        def to_stderr(self, message):
                if self._downloader is None or not self._downloader.get_params().get('quiet', False):
                        print message
        
        def to_stderr(self, message):

+               """Print message to stderr."""

                sys.stderr.write('%s\n' % message)
 
        def _real_initialize(self):
                sys.stderr.write('%s\n' % message)
 
        def _real_initialize(self):


@@ -365,6 +386,7 @@ class YoutubeIE(InfoExtractor):
                                self.to_stderr('WARNING: parsing .netrc: %s' % str(err))
                                return
 
                                self.to_stderr('WARNING: parsing .netrc: %s' % str(err))
                                return
 

+               # No authentication to be performed

                if username is None:
                        return
 
                if username is None:
                        return
 


@@ -397,7 +419,8 @@ class YoutubeIE(InfoExtractor):
                        self.to_stdout('[youtube] Confirming age')
                        age_results = urllib2.urlopen(request).read()
                except (urllib2.URLError, httplib.HTTPException, socket.error), err:
                        self.to_stdout('[youtube] Confirming age')
                        age_results = urllib2.urlopen(request).read()
                except (urllib2.URLError, httplib.HTTPException, socket.error), err:

-                       sys.exit('ERROR: unable to confirm age: %s' % str(err))
+                       self.to_stderr('ERROR: unable to confirm age: %s' % str(err))
+                       return

 
        def _real_extract(self, url):
                # Extract video id from URL
 
        def _real_extract(self, url):
                # Extract video id from URL


@@ -414,7 +437,7 @@ class YoutubeIE(InfoExtractor):
                        format_param = params.get('format', None)
 
                # Extension
                        format_param = params.get('format', None)
 
                # Extension

-               video_extension = {'18': 'mp4'}.get(format_param, 'flv')
+               video_extension = {'18': 'mp4', '17': '3gp'}.get(format_param, 'flv')

 
                # Normalize URL, including format
                normalized_url = 'http://www.youtube.com/watch?v=%s' % video_id
 
                # Normalize URL, including format
                normalized_url = 'http://www.youtube.com/watch?v=%s' % video_id


@@ -425,7 +448,8 @@ class YoutubeIE(InfoExtractor):
                        self.to_stdout('[youtube] %s: Downloading video webpage' % video_id)
                        video_webpage = urllib2.urlopen(request).read()
                except (urllib2.URLError, httplib.HTTPException, socket.error), err:
                        self.to_stdout('[youtube] %s: Downloading video webpage' % video_id)
                        video_webpage = urllib2.urlopen(request).read()
                except (urllib2.URLError, httplib.HTTPException, socket.error), err:

-                       sys.exit('ERROR: unable to download video: %s' % str(err))
+                       self.to_stderr('ERROR: unable to download video webpage: %s' % str(err))
+                       return [None]

                self.to_stdout('[youtube] %s: Extracting video information' % video_id)
                
                # "t" param
                self.to_stdout('[youtube] %s: Extracting video information' % video_id)
                
                # "t" param


@@ -513,6 +537,8 @@ if __name__ == '__main__':
                                dest='format', metavar='FMT', help='video format code')
                parser.add_option('-b', '--best-quality',
                                action='store_const', dest='video_format', help='alias for -f 18', const='18')
                                dest='format', metavar='FMT', help='video format code')
                parser.add_option('-b', '--best-quality',
                                action='store_const', dest='video_format', help='alias for -f 18', const='18')

+               parser.add_option('-m', '--mobile-version',
+                               action='store_const', dest='video_format', help='alias for -f 17', const='17')

                parser.add_option('-i', '--ignore-errors',
                                action='store_true', dest='ignoreerrors', help='continue on download errors', default=False)
                (opts, args) = parser.parse_args()
                parser.add_option('-i', '--ignore-errors',
                                action='store_true', dest='ignoreerrors', help='continue on download errors', default=False)
                (opts, args) = parser.parse_args()


@@ -554,5 +580,9 @@ if __name__ == '__main__':
                retcode = fd.download(args)
                sys.exit(retcode)
 
                retcode = fd.download(args)
                sys.exit(retcode)
 

+       except DownloadError:
+               sys.exit(1)
+       except SameFileError:
+               sys.exit('ERROR: fixed output name but more than one file to download')

        except KeyboardInterrupt:
                sys.exit('\nERROR: Interrupted by user')
        except KeyboardInterrupt:
                sys.exit('\nERROR: Interrupted by user')