danvics/metube
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Convert generators to lists instead of filtering them out

Browse source 
Co-authored-by: alexta69 <7450369+alexta69@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2025-11-16 08:23:37 +00:00
parent 2941b4dc68
commit 82e29ca509
1 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
app/ytdl.py
View file

@ -44,38 +44,51 @@ class DownloadInfo:
self.size = None self.size = None
self.timestamp = time.time_ns() self.timestamp = time.time_ns()
self.error = error self.error = error
# Extract only picklable playlist metadata from entry # Convert non-picklable objects (like generators) to picklable forms (lists)
# This prevents issues when shelve tries to pickle DownloadInfo objects # This prevents issues when shelve tries to pickle DownloadInfo objects
# that contain non-picklable objects like generators
self.entry = self._extract_picklable_entry(entry) if entry else None self.entry = self._extract_picklable_entry(entry) if entry else None
self.playlist_item_limit = playlist_item_limit self.playlist_item_limit = playlist_item_limit
@staticmethod @staticmethod
def _extract_picklable_entry(entry): def _extract_picklable_entry(entry):
"""Extract only picklable data from entry dict. """Convert non-picklable objects in entry dict to picklable forms.
This is needed because yt-dlp may return entry dicts containing This is needed because yt-dlp may return entry dicts containing
non-picklable objects like generators, which cause errors when non-picklable objects like generators, which cause errors when
shelve tries to persist DownloadInfo objects. shelve tries to persist DownloadInfo objects. We convert generators
and other iterables to lists to preserve the data while making it picklable.
""" """
if not isinstance(entry, dict): if not isinstance(entry, dict):
return None return None
# Extract only basic types that are picklable
picklable_entry = {} picklable_entry = {}
for key, value in entry.items(): for key, value in entry.items():
# Only include playlist-related properties (used for output template) try:
# and other simple string/int/bool values # Try to use the value as-is if it's already a basic picklable type
if key.startswith('playlist') or key in ('id', 'title', 'url', 'webpage_url', '_type'):
if isinstance(value, (str, int, float, bool, type(None))): if isinstance(value, (str, int, float, bool, type(None))):
picklable_entry[key] = value picklable_entry[key] = value
elif isinstance(value, dict):
# Recursively handle nested dicts
picklable_entry[key] = DownloadInfo._extract_picklable_entry(value)
elif isinstance(value, (list, tuple)): elif isinstance(value, (list, tuple)):
# For lists/tuples, only include if all items are basic types # Already a list/tuple, keep it
picklable_entry[key] = value
elif hasattr(value, '__iter__') and not isinstance(value, (str, bytes)):
# Convert generators and other iterables to lists
try: try:
if all(isinstance(item, (str, int, float, bool, type(None))) for item in value): picklable_entry[key] = list(value)
picklable_entry[key] = value except (TypeError, ValueError):
except (TypeError, AttributeError): # If conversion fails, skip this entry
pass pass
else:
# For other types, try to pickle them to see if they work
# If they don't, we'll skip them
import pickle
pickle.dumps(value)
picklable_entry[key] = value
except (TypeError, pickle.PicklingError):
# Skip values that can't be pickled
pass
return picklable_entry if picklable_entry else None return picklable_entry if picklable_entry else None