rp 0.1.1384__tar.gz → 0.1.1386__tar.gz

{rp-0.1.1384 → rp-0.1.1386}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: rp
-Version: 0.1.1384
+Version: 0.1.1386
 Summary: Ryan's Python: IDE + Library + Tools
 Home-page: https://github.com/RyannDaGreat/rp
 Author: Ryan Burgert

{rp-0.1.1384 → rp-0.1.1386}/rp/libs/powerpoint/convert_tmux.py

@@ -187,10 +187,12 @@ def run_orchestrator(
     from googleapiclient.discovery import build
     drive_service = build('drive', 'v3', credentials=creds)
 
-    # Create folder
-    folder_id = gsu.create_folder(drive_service, folder_name)
+    # Create folder under rp/generated_slides/
+    parent_id = gsu.get_rp_slides_folder(drive_service)
+    folder_id = gsu.create_folder(drive_service, folder_name, parent_id)
     folder_url = f"https://drive.google.com/drive/folders/{folder_id}"
-    rp.fansi_print(f"  Folder: {folder_url}", 'white')
+    rp.fansi_print(f"  Folder: rp/generated_slides/{folder_name}", 'white')
+    rp.fansi_print(f"  {folder_url}", 'white')
 
     # Move parts to folder
     for r in results:

{rp-0.1.1384 → rp-0.1.1386}/rp/libs/powerpoint/google_slides_upload.py

@@ -89,6 +89,22 @@ def get_credentials(token_path: str = None) -> Credentials:
     return creds
 
 
+def get_or_create_folder(service, folder_name: str, parent_id: str = None) -> str:
+    """Get existing folder by name or create it. Returns folder ID."""
+    query = f"name='{folder_name}' and mimeType='application/vnd.google-apps.folder' and trashed=false"
+    if parent_id:
+        query += f" and '{parent_id}' in parents"
+    else:
+        query += " and 'root' in parents"
+
+    results = service.files().list(q=query, fields='files(id)').execute()
+    files = results.get('files', [])
+    if files:
+        return files[0]['id']
+
+    return create_folder(service, folder_name, parent_id)
+
+
 def create_folder(service, folder_name: str, parent_id: str = None) -> str:
     """Create a folder on Google Drive. Returns folder ID."""
     metadata = {
@@ -102,6 +118,12 @@ def create_folder(service, folder_name: str, parent_id: str = None) -> str:
     return folder.get('id')
 
 
+def get_rp_slides_folder(service) -> str:
+    """Get or create the rp/generated_slides folder hierarchy. Returns folder ID."""
+    rp_folder = get_or_create_folder(service, 'rp')
+    return get_or_create_folder(service, 'generated_slides', rp_folder)
+
+
 def make_public(service, file_id: str) -> str:
     """
     Make a file publicly viewable by anyone with the link.
@@ -332,8 +354,10 @@ def upload_and_merge_pptx(
     creds = get_credentials()
     drive_service = build('drive', 'v3', credentials=creds)
 
-    # Create folder
-    rp.fansi_print(f"\nCreating folder: {folder_name}", 'cyan')
+    # Create folder under rp/generated_slides/
+    if parent_folder_id is None:
+        parent_folder_id = get_rp_slides_folder(drive_service)
+    rp.fansi_print(f"\nCreating folder: rp/generated_slides/{folder_name}", 'cyan')
     folder_id = create_folder(drive_service, folder_name, parent_folder_id)
     folder_url = f"https://drive.google.com/drive/folders/{folder_id}"
     rp.fansi_print(f"  {folder_url}", 'white')

{rp-0.1.1384 → rp-0.1.1386}/rp/libs/powerpoint/media_to_slides.py

@@ -36,6 +36,7 @@ try:
         get_credentials,
         create_folder,
         make_public,
+        get_rp_slides_folder,
     )
 except ImportError:
     from google_slides_upload import (
@@ -45,6 +46,7 @@ except ImportError:
         get_credentials,
         create_folder,
         make_public,
+        get_rp_slides_folder,
     )
 
 
@@ -138,6 +140,39 @@ def is_media_path(x) -> bool:
     return ext in IMAGE_EXTENSIONS or ext in VIDEO_EXTENSIONS
 
 
+def _parse_labeled_dict(d: dict) -> tuple[list, list]:
+    """Parse {label: path} dict. Returns (paths, labels) or raises if backwards."""
+    labels = []
+    paths = []
+    for label, path in d.items():
+        if is_media_path(path):
+            labels.append(label)
+            paths.append(path)
+    if not paths and d:
+        first_key = next(iter(d.keys()))
+        if is_media_path(first_key):
+            raise ValueError(
+                f"Dict has paths as keys, but expected {{label: path}}. "
+                f"Got {{{repr(first_key)}: ...}}. Flip your dict."
+            )
+    return paths, labels
+
+
+def _parse_content(content, title=None) -> dict | None:
+    """Parse content into a slide dict, or None if no valid paths."""
+    if is_media_path(content):
+        return {"paths": [content], "title": title, "labels": None}
+    if isinstance(content, dict):
+        paths, labels = _parse_labeled_dict(content)
+        if paths:
+            return {"paths": paths, "title": title, "labels": labels}
+    elif rp.is_non_str_iterable(content):
+        paths = [p for p in content if is_media_path(p)]
+        if paths:
+            return {"paths": paths, "title": title, "labels": None}
+    return None
+
+
 def normalize_slides_input(layout) -> list[dict]:
     """
     Normalize flexible input formats into list of slide dicts.
@@ -151,58 +186,22 @@ def normalize_slides_input(layout) -> list[dict]:
         - Dict with nested labels: {'Slide 1': {'vid': 'a.mp4', 'img': 'b.png'}}
         - Single path: 'a.mp4'
     """
-    # Single path
     if is_media_path(layout):
         return [{"paths": [layout], "title": None, "labels": None}]
 
-    # Dict with slide titles
     if isinstance(layout, dict):
         result = []
         for title, content in layout.items():
-            if is_media_path(content):
-                result.append(
-                    {"paths": [content], "title": title, "labels": None}
-                )
-            elif isinstance(content, dict):
-                # {'label1': 'path1', 'label2': 'path2'}
-                labels = []
-                paths = []
-                for label, path in content.items():
-                    if is_media_path(path):
-                        labels.append(label)
-                        paths.append(path)
-                if paths:
-                    result.append(
-                        {"paths": paths, "title": title, "labels": labels}
-                    )
-            elif rp.is_non_str_iterable(content):
-                paths = [p for p in content if is_media_path(p)]
-                if paths:
-                    result.append(
-                        {"paths": paths, "title": title, "labels": None}
-                    )
+            slide = _parse_content(content, title)
+            if slide:
+                result.append(slide)
         return result
 
-    # List input
     result = []
     for item in layout:
-        if isinstance(item, dict):
-            # Dict slide: {'label': 'path', ...}
-            labels = []
-            paths = []
-            for label, path in item.items():
-                if is_media_path(path):
-                    labels.append(label)
-                    paths.append(path)
-            if paths:
-                result.append({"paths": paths, "title": None, "labels": labels})
-        elif rp.is_non_str_iterable(item):
-            paths = [p for p in item if is_media_path(p)]
-            if paths:
-                result.append({"paths": paths, "title": None, "labels": None})
-        elif is_media_path(item):
-            result.append({"paths": [item], "title": None, "labels": None})
-
+        slide = _parse_content(item)
+        if slide:
+            result.append(slide)
     return result
 
 
@@ -685,7 +684,12 @@ def media_to_slides(
                 all_paths.append(path)
 
     if not all_paths:
-        raise ValueError("No media files provided")
+        raise ValueError(
+            f"No media files found in layout. "
+            f"Got {len(slides)} slides but no valid paths. "
+            f"Layout type: {type(layout).__name__}, "
+            f"Input: {repr(layout)[:500]}"
+        )
 
     if folder_name is None:
         folder_name = f"Media_{time.strftime('%Y%m%d_%H%M%S')}"
@@ -704,8 +708,9 @@ def media_to_slides(
     drive_service = build("drive", "v3", credentials=creds)
     slides_service = build("slides", "v1", credentials=creds)
 
-    rp.fansi_print(f"\nCreating folder: {folder_name}", "cyan")
-    folder_id = create_folder(drive_service, folder_name)
+    rp.fansi_print(f"\nCreating folder: rp/generated_slides/{folder_name}", "cyan")
+    parent_id = get_rp_slides_folder(drive_service)
+    folder_id = create_folder(drive_service, folder_name, parent_id)
     folder_url = FOLDER_URL.format(folder_id)
     rp.fansi_print(f"  {folder_url}", "white")
 
@@ -865,7 +870,10 @@ def cli(
             media_paths.append(p)
 
     if not media_paths:
-        raise ValueError("No media files found")
+        raise ValueError(
+            f"No media files found. Searched {len(paths)} paths. "
+            f"Supported formats: {', '.join(MEDIA_EXTENSIONS)}"
+        )
 
     # Split into grids if requested
     if per_slide is not None:

{rp-0.1.1384 → rp-0.1.1386}/rp/r.py

@@ -13748,7 +13748,7 @@ def invert_dict(d: dict, bijection=True, precedence='last') -> dict:
         items = list(d.items())
         if precedence=='first':
             items = items[::-1]
-        return {v:k for v,k in items}
+        return {v:k for k,v in items}
     else:
         # {0: 'a', 1: 'a', 2: 'b'} ⟶ {'a': (0,1), 'b': (2,)}
         out={}

rp-0.1.1386/rp/version.py

@@ -0,0 +1 @@
+1386

{rp-0.1.1384 → rp-0.1.1386}/rp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: rp
-Version: 0.1.1384
+Version: 0.1.1386
 Summary: Ryan's Python: IDE + Library + Tools
 Home-page: https://github.com/RyannDaGreat/rp
 Author: Ryan Burgert

rp-0.1.1386/version.py

@@ -0,0 +1 @@
+1386

rp-0.1.1384/rp/version.py

@@ -1 +0,0 @@
-1384

rp-0.1.1384/version.py

@@ -1 +0,0 @@
-1384