jj

Provider/alldebrid.py

@@ -152,15 +152,20 @@ class AllDebrid(Provider):
             return None
 
     @staticmethod
-    def _flatten_files(items: Any) -> Iterable[Dict[str, Any]]:
-        """Flatten AllDebrid magnet file tree into file dicts.
+    def _flatten_files(items: Any, *, _prefix: Optional[List[str]] = None) -> Iterable[Dict[str, Any]]:
+        """Flatten AllDebrid magnet file tree into file dicts, preserving relative paths.
 
         API commonly returns:
           - file: {n: name, s: size, l: link}
           - folder: {n: name, e: [sub_items]}
 
+        This flattener attaches a best-effort relative path to each yielded file node
+        as `_relpath` using POSIX separators (e.g., "Season 1/E01.mkv").
+
         Some call sites in this repo also expect {name, size, link}, so we accept both.
         """
+        prefix = list(_prefix or [])
+
         if not items:
             return
         if isinstance(items, dict):
@@ -174,13 +179,21 @@ class AllDebrid(Provider):
 
             children = node.get('e') or node.get('children')
             if isinstance(children, list):
-                yield from AllDebrid._flatten_files(children)
+                folder_name = node.get('n') or node.get('name')
+                next_prefix = prefix
+                if isinstance(folder_name, str) and folder_name.strip():
+                    next_prefix = prefix + [folder_name.strip()]
+                yield from AllDebrid._flatten_files(children, _prefix=next_prefix)
                 continue
 
             name = node.get('n') or node.get('name')
             link = node.get('l') or node.get('link')
             if isinstance(name, str) and name.strip() and isinstance(link, str) and link.strip():
-                yield node
+                rel_parts = prefix + [name.strip()]
+                relpath = "/".join([p for p in rel_parts if p])
+                enriched = dict(node)
+                enriched["_relpath"] = relpath
+                yield enriched
 
     def search(
         self,
@@ -269,6 +282,7 @@ class AllDebrid(Provider):
             for file_node in self._flatten_files(file_tree):
                 file_name = str(file_node.get('n') or file_node.get('name') or '').strip()
                 file_url = str(file_node.get('l') or file_node.get('link') or '').strip()
+                relpath = str(file_node.get('_relpath') or file_name or '').strip()
                 file_size = file_node.get('s') or file_node.get('size')
                 if not file_name or not file_url:
                     continue
@@ -300,7 +314,13 @@ class AllDebrid(Provider):
                             ("Folder", magnet_name),
                             ("ID", str(magnet_id)),
                         ],
-                        full_metadata={"magnet": magnet_status, "magnet_id": magnet_id, "file": file_node},
+                        full_metadata={
+                            "magnet": magnet_status,
+                            "magnet_id": magnet_id,
+                            "magnet_name": magnet_name,
+                            "relpath": relpath,
+                            "file": file_node,
+                        },
                     )
                 )
                 if len(results) >= max(1, limit):