yt_dlp/YoutubeDL.py

@@ -1602,10 +1602,8 @@ class YoutubeDL:
             if ret is NO_DEFAULT:
                 while True:
                     filename = self._format_screen(self.prepare_filename(info_dict), self.Styles.FILENAME)
-                    self.to_screen(
+                    reply = input(self._format_screen(
-                        self._format_screen(f'Download "{filename}"? (Y/n): ', self.Styles.EMPHASIS),
+                        f'Download "{filename}"? (Y/n): ', self.Styles.EMPHASIS)).lower().strip()
-                        skip_eol=True)
-                    reply = input().lower().strip()
                     if reply in {'y', ''}:
                         return None
                     elif reply == 'n':
@@ -3032,10 +3030,9 @@ class YoutubeDL:
                     # Bypass interactive format selection if no formats & --ignore-no-formats-error
                     formats_to_download = None
                     break
-                self.to_screen(self._format_screen('\nEnter format selector ', self.Styles.EMPHASIS)
+                req_format = input(self._format_screen('\nEnter format selector ', self.Styles.EMPHASIS)
-                               + '(Press ENTER for default, or Ctrl+C to quit)'
+                                   + '(Press ENTER for default, or Ctrl+C to quit)'
-                               + self._format_screen(': ', self.Styles.EMPHASIS), skip_eol=True)
+                                   + self._format_screen(': ', self.Styles.EMPHASIS))
-                req_format = input()
                 try:
                     format_selector = self.build_format_selector(req_format) if req_format else None
                 except SyntaxError as err:
@@ -3481,12 +3478,11 @@ class YoutubeDL:
                     if dl_filename is not None:
                         self.report_file_already_downloaded(dl_filename)
                     elif fd:
-                        if fd != FFmpegFD and temp_filename != '-':
+                        for f in info_dict['requested_formats'] if fd != FFmpegFD else []:
-                            for f in info_dict['requested_formats']:
+                            f['filepath'] = fname = prepend_extension(
-                                f['filepath'] = fname = prepend_extension(
+                                correct_ext(temp_filename, info_dict['ext']),
-                                    correct_ext(temp_filename, info_dict['ext']),
+                                'f{}'.format(f['format_id']), info_dict['ext'])
-                                    'f{}'.format(f['format_id']), info_dict['ext'])
+                            downloaded.append(fname)
-                                downloaded.append(fname)
                         info_dict['url'] = '\n'.join(f['url'] for f in info_dict['requested_formats'])
                         success, real_download = self.dl(temp_filename, info_dict)
                         info_dict['__real_download'] = real_download