Merge 1974b2b332 into 4b5eec0aaa

Fix bug in 720b3dc453

Closes #11623
Authored by: jkruse

test/test_YoutubeDL.py

@@ -900,6 +900,15 @@ class TestYoutubeDL(unittest.TestCase):
         # test('%(foo|)s.%(ext)s', ('.mp4', '_.mp4'))  # FIXME: ?
         # test('%(foo|)s', ('', '_'))  # FIXME: ?
 
+        # Trim filename
+        test('%(id)s.%(filesize)s.%(ext)s', ('1234.1024.mp4', '123.mp4'), trim_file_name=3)
+        test(
+            '%(id)s.%(filesize)s.%(ext)s',
+            ('1234.1024.info.json', '123.info.json'),
+            info=dict(self.outtmpl_info, ext='info.json'), trim_file_name=3
+        )
+        test('12 34.%(filesize)s.%(ext)s', ('12 34.1024.mp4', '12 .mp4'), trim_file_name=3)
+
         # Environment variable expansion for prepare_filename
         os.environ['__yt_dlp_var'] = 'expanded'
         envvar = '%__yt_dlp_var%' if os.name == 'nt' else '$__yt_dlp_var'

yt_dlp/YoutubeDL.py

@@ -1428,6 +1428,12 @@ class YoutubeDL:
             if not filename:
                 return None
 
+            trim_file_name = self.params.get('trim_file_name')
+            if trim_file_name:
+                # https://github.com/yt-dlp/yt-dlp/issues/5526#issuecomment-1312783517
+                no_ext, *ext = filename.rsplit('.', info_dict.get('ext', '').count('.') + 1)
+                filename = join_nonempty(no_ext[:trim_file_name], *ext, delim='.')
+
             if tmpl_type in ('', 'temp'):
                 final_ext, ext = self.params.get('final_ext'), info_dict.get('ext')
                 if final_ext and ext and final_ext != ext and filename.endswith(f'.{final_ext}'):
@@ -1437,12 +1443,6 @@ class YoutubeDL:
                 if force_ext:
                     filename = replace_extension(filename, force_ext, info_dict.get('ext'))
 
-            # https://github.com/blackjack4494/youtube-dlc/issues/85
-            trim_file_name = self.params.get('trim_file_name', False)
-            if trim_file_name:
-                no_ext, *ext = filename.rsplit('.', 2)
-                filename = join_nonempty(no_ext[:trim_file_name], *ext, delim='.')
-
             return filename
         except ValueError as err:
             self.report_error('Error in output template: ' + str(err) + ' (encoding: ' + repr(preferredencoding()) + ')')

yt_dlp/extractor/chaturbate.py

@@ -59,16 +59,15 @@ class ChaturbateIE(InfoExtractor):
                 'Accept': 'application/json',
             }, fatal=False, impersonate=True) or {}
 
-        status = response.get('room_status')
-        if status != 'public':
-            if error := self._ERROR_MAP.get(status):
-                raise ExtractorError(error, expected=True)
-            self.report_warning('Falling back to webpage extraction')
-            return None
-
         m3u8_url = response.get('url')
         if not m3u8_url:
+            status = response.get('room_status')
+            if error := self._ERROR_MAP.get(status):
+                raise ExtractorError(error, expected=True)
+            if status == 'public':
                 self.raise_geo_restricted()
+            self.report_warning(f'Got status "{status}" from API; falling back to webpage extraction')
+            return None
 
         return {
             'id': video_id,