Save and restore console title (Fixes #1782)

youtube_dl/YoutubeDL.py

@@ -213,6 +213,25 @@ def to_console_title(self, message):
         elif 'TERM' in os.environ:
             self.to_screen('\033]0;%s\007' % message, skip_eol=True)
 
+    def save_console_title(self):
+        if not self.params.get('consoletitle', False):
+            return
+        if 'TERM' in os.environ:
+            self.to_screen('\033[22t')
+
+    def restore_console_title(self):
+        if not self.params.get('consoletitle', False):
+            return
+        if 'TERM' in os.environ:
+            self.to_screen('\033[23t')
+
+    def __enter__(self):
+        self.save_console_title()
+        return self
+
+    def __exit__(self, *args):
+        self.restore_console_title()
+
     def fixed_template(self):
         """Checks if the output template is fixed."""
         return (re.search(u'(?u)%\\(.+?\\)s', self.params['outtmpl']) is None)

youtube_dl/__init__.py

@@ -603,8 +603,7 @@ def _real_main(argv=None):
                      u' file! Use "%%(ext)s" instead of %r' %
                      determine_ext(outtmpl, u''))
 
-    # YoutubeDL
+    ydl_opts = {
-    ydl = YoutubeDL({
         'usenetrc': opts.usenetrc,
         'username': opts.username,
         'password': opts.password,
@@ -667,61 +666,63 @@ def _real_main(argv=None):
         'youtube_print_sig_code': opts.youtube_print_sig_code,
         'age_limit': opts.age_limit,
         'download_archive': opts.download_archive,
-        })
+    }
 
-    if opts.verbose:
+    with YoutubeDL(ydl_opts) as ydl:
-        write_string(u'[debug] youtube-dl version ' + __version__ + u'\n')
+        if opts.verbose:
-        try:
+            write_string(u'[debug] youtube-dl version ' + __version__ + u'\n')
-            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):
-                write_string(u'[debug] Git HEAD: ' + out + u'\n')
-        except:
             try:
-                sys.exc_clear()
+                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):
+                    write_string(u'[debug] Git HEAD: ' + out + u'\n')
             except:
-                pass
+                try:
-        write_string(u'[debug] Python version %s - %s' %(platform.python_version(), platform_name()) + u'\n')
+                    sys.exc_clear()
+                except:
+                    pass
+            write_string(u'[debug] Python version %s - %s' %
+                         (platform.python_version(), platform_name()) + u'\n')
 
-        proxy_map = {}
+            proxy_map = {}
-        for handler in opener.handlers:
+            for handler in opener.handlers:
-            if hasattr(handler, 'proxies'):
+                if hasattr(handler, 'proxies'):
-                proxy_map.update(handler.proxies)
+                    proxy_map.update(handler.proxies)
-        write_string(u'[debug] Proxy map: ' + compat_str(proxy_map) + u'\n')
+            write_string(u'[debug] Proxy map: ' + compat_str(proxy_map) + u'\n')
 
-    ydl.add_default_info_extractors()
+        ydl.add_default_info_extractors()
 
-    # PostProcessors
+        # PostProcessors
-    # Add the metadata pp first, the other pps will copy it
+        # Add the metadata pp first, the other pps will copy it
-    if opts.addmetadata:
+        if opts.addmetadata:
-        ydl.add_post_processor(FFmpegMetadataPP())
+            ydl.add_post_processor(FFmpegMetadataPP())
-    if opts.extractaudio:
+        if opts.extractaudio:
-        ydl.add_post_processor(FFmpegExtractAudioPP(preferredcodec=opts.audioformat, preferredquality=opts.audioquality, nopostoverwrites=opts.nopostoverwrites))
+            ydl.add_post_processor(FFmpegExtractAudioPP(preferredcodec=opts.audioformat, preferredquality=opts.audioquality, nopostoverwrites=opts.nopostoverwrites))
-    if opts.recodevideo:
+        if opts.recodevideo:
-        ydl.add_post_processor(FFmpegVideoConvertor(preferedformat=opts.recodevideo))
+            ydl.add_post_processor(FFmpegVideoConvertor(preferedformat=opts.recodevideo))
-    if opts.embedsubtitles:
+        if opts.embedsubtitles:
-        ydl.add_post_processor(FFmpegEmbedSubtitlePP(subtitlesformat=opts.subtitlesformat))
+            ydl.add_post_processor(FFmpegEmbedSubtitlePP(subtitlesformat=opts.subtitlesformat))
 
-    # Update version
+        # Update version
-    if opts.update_self:
+        if opts.update_self:
-        update_self(ydl.to_screen, opts.verbose)
+            update_self(ydl.to_screen, opts.verbose)
 
-    # Maybe do nothing
+        # Maybe do nothing
-    if len(all_urls) < 1:
+        if len(all_urls) < 1:
-        if not opts.update_self:
+            if not opts.update_self:
-            parser.error(u'you must provide at least one URL')
+                parser.error(u'you must provide at least one URL')
-        else:
+            else:
-            sys.exit()
+                sys.exit()
 
-    try:
+        try:
-        retcode = ydl.download(all_urls)
+            retcode = ydl.download(all_urls)
-    except MaxDownloadsReached:
+        except MaxDownloadsReached:
-        ydl.to_screen(u'--max-download limit reached, aborting.')
+            ydl.to_screen(u'--max-download limit reached, aborting.')
-        retcode = 101
+            retcode = 101
 
     # Dump cookie jar if requested
     if opts.cookiefile is not None: