Merge 3b8e915274 into 4b5eec0aaa

Fix bug in 720b3dc453

Closes #11623
Authored by: jkruse

yt_dlp/downloader/fragment.py

@@ -497,7 +497,11 @@ class FragmentFD(FileDownloader):
                             'fragment_filename_sanitized': frag_filename,
                             'fragment_index': frag_index,
                         })
-                        if not append_fragment(decrypt_fragment(fragment, self._read_fragment(ctx)), frag_index, ctx):
+                        decrypted_fragment = decrypt_fragment(fragment, self._read_fragment(ctx))
+                        if self.params.get('keep_fragments', False):
+                            f, _ = self.sanitize_open(ctx.get('fragment_filename_sanitized'), 'wb')
+                            f.write(decrypted_fragment)
+                        if not append_fragment(decrypted_fragment, frag_index, ctx):
                             return False
                 except KeyboardInterrupt:
                     self._finish_multiline_status()
@@ -511,8 +515,11 @@ class FragmentFD(FileDownloader):
                     break
                 try:
                     download_fragment(fragment, ctx)
-                    result = append_fragment(
+                    decrypted_fragment = decrypt_fragment(fragment, self._read_fragment(ctx))
-                        decrypt_fragment(fragment, self._read_fragment(ctx)), fragment['frag_index'], ctx)
+                    if self.params.get('keep_fragments', False):
+                        f, _ = self.sanitize_open(ctx.get('fragment_filename_sanitized'), 'wb')
+                        f.write(decrypted_fragment)
+                    result = append_fragment(decrypted_fragment, fragment['frag_index'], ctx)
                 except KeyboardInterrupt:
                     if info_dict.get('is_live'):
                         break

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:
-            self.raise_geo_restricted()
+            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,