rp 0.1.1383__tar.gz → 0.1.1385__tar.gz

{rp-0.1.1383 → rp-0.1.1385}/PKG-INFO

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

{rp-0.1.1383 → rp-0.1.1385}/rp/libs/powerpoint/__main__.py

@@ -26,9 +26,9 @@ Commands:
 
 Examples:
     rp run ppt convert input.pptx
-    rp run ppt convert input.pptx --part-size 50MB
-    rp run ppt convert input.pptx --num-parts 3 --upload
-    rp run ppt convert_tmux input.pptx --num-parts 3
+    rp run ppt convert input.pptx --part_size 50MB
+    rp run ppt convert input.pptx --num_parts 3 --upload
+    rp run ppt convert_tmux input.pptx --num_parts 3
     rp run ppt upload output_folder/
     rp run ppt upload part1.pptx part2.pptx part3.pptx
     rp run ppt media_to_slides video.mp4 image.png
@@ -106,7 +106,7 @@ def main():
         while i < len(rest):
             arg = rest[i]
             if arg.startswith('--'):
-                key = arg[2:].replace('-', '_')
+                key = arg[2:]
                 if key == 'upload':
                     kwargs['upload'] = True
                 elif key == 'no_dither':
@@ -147,7 +147,7 @@ def main():
         while i < len(rest):
             arg = rest[i]
             if arg.startswith('--'):
-                key = arg[2:].replace('-', '_')
+                key = arg[2:]
                 if key == 'no_dither':
                     kwargs['dither'] = False
                 elif key == 'dither':
@@ -182,10 +182,10 @@ def main():
         i = 0
         while i < len(rest):
             arg = rest[i]
-            if arg == '--folder-name' and i + 1 < len(rest):
+            if arg == '--folder_name' and i + 1 < len(rest):
                 folder_name = rest[i + 1]
                 i += 1
-            elif arg == '--merged-name' and i + 1 < len(rest):
+            elif arg == '--merged_name' and i + 1 < len(rest):
                 merged_name = rest[i + 1]
                 i += 1
             elif not arg.startswith('--'):
@@ -194,7 +194,9 @@ def main():
         cmd_upload(*paths, folder_name=folder_name, merged_name=merged_name)
 
     elif cmd == 'media_to_slides':
-        # Use fire - it handles all the arg parsing
+        if not rest or rest[0] in ('-h', '--help'):
+            print(media_to_slides_cli.__doc__)
+            return
         rp.pip_import('fire')
         import fire
         sys.argv = ['media_to_slides'] + rest

{rp-0.1.1383 → rp-0.1.1385}/rp/libs/powerpoint/convert_pptx_videos_to_gifs.py

@@ -734,28 +734,28 @@ Arguments:
     output_pptx     Output path (optional, default: <input>_gifs_<size>.pptx)
 
 Options:
-    --part-size     Target file size per part (default: 100MB)
-    --num-parts     Split output into N parts (default: 1)
+    --part_size     Target file size per part (default: 100MB)
+    --num_parts     Split output into N parts (default: 1)
     --fps           Max GIF frames per second (default: 10)
-    --dpi-iters     Binary search iterations to match part-size (default: 5)
+    --dpi_iters     Binary search iterations to match part_size (default: 5)
     --dither        Enable GIF dithering (default: True)
-    --no-dither     Disable dithering (smaller files, may have color banding)
+    --no_dither     Disable dithering (smaller files, may have color banding)
     --slides        Slide range to process (default: all)
     --upload        Upload to Google Slides after conversion (default: False)
 
 Examples:
     python convert_pptx_videos_to_gifs.py input.pptx
     python convert_pptx_videos_to_gifs.py input.pptx output.pptx
-    python convert_pptx_videos_to_gifs.py input.pptx --part-size 50MB
-    python convert_pptx_videos_to_gifs.py input.pptx --part-size 50MB --num-parts 3
-    python convert_pptx_videos_to_gifs.py input.pptx --num-parts 3 --upload
+    python convert_pptx_videos_to_gifs.py input.pptx --part_size 50MB
+    python convert_pptx_videos_to_gifs.py input.pptx --part_size 50MB --num_parts 3
+    python convert_pptx_videos_to_gifs.py input.pptx --num_parts 3 --upload
     python convert_pptx_videos_to_gifs.py input.pptx --fps 5
     python convert_pptx_videos_to_gifs.py input.pptx --fps 10000              # keep original fps
-    python convert_pptx_videos_to_gifs.py input.pptx --dpi-iters 10
-    python convert_pptx_videos_to_gifs.py input.pptx --no-dither
+    python convert_pptx_videos_to_gifs.py input.pptx --dpi_iters 10
+    python convert_pptx_videos_to_gifs.py input.pptx --no_dither
     python convert_pptx_videos_to_gifs.py input.pptx --slides 1-10
     python convert_pptx_videos_to_gifs.py input.pptx --slides 1,3,5,10-15
-    python convert_pptx_videos_to_gifs.py input.pptx --part-size 50MB --fps 8 --num-parts 5 --upload"""
+    python convert_pptx_videos_to_gifs.py input.pptx --part_size 50MB --fps 8 --num_parts 5 --upload"""
 
 
 if __name__ == '__main__':
@@ -784,7 +784,7 @@ if __name__ == '__main__':
     while i < len(args):
         arg = args[i]
         if arg.startswith('--'):
-            key = arg[2:].replace('-', '_')
+            key = arg[2:]
             if key == 'upload':
                 kwargs['upload'] = True
             elif key == 'no_dither':

{rp-0.1.1383 → rp-0.1.1385}/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:
@@ -327,24 +329,24 @@ def convert_tmux(
 HELP = """Parallel PowerPoint converter using tmux.
 
 Usage:
-    rp run ppt convert-tmux <input_pptx> [options]
+    rp run ppt convert_tmux <input_pptx> [options]
 
 Spawns multiple tmux panes to convert slide ranges in parallel,
 uploads each part, then merges them into one presentation.
 
 Options:
-    --num-parts     Number of parallel workers (default: 3)
-    --part-size     Target file size per part (default: 100MB)
+    --num_parts     Number of parallel workers (default: 3)
+    --part_size     Target file size per part (default: 100MB)
     --fps           Max GIF frames per second (default: 10)
-    --dpi-iters     Binary search iterations for size (default: 5)
+    --dpi_iters     Binary search iterations for size (default: 5)
     --dither        Enable dithering (default: True)
-    --no-dither     Disable dithering
+    --no_dither     Disable dithering
     --output        Output folder name
 
 Examples:
-    rp run ppt convert-tmux presentation.pptx
-    rp run ppt convert-tmux presentation.pptx --num-parts 5
-    rp run ppt convert-tmux presentation.pptx --part-size 50MB --fps 8
+    rp run ppt convert_tmux presentation.pptx
+    rp run ppt convert_tmux presentation.pptx --num_parts 5
+    rp run ppt convert_tmux presentation.pptx --part_size 50MB --fps 8
 """
 
 

{rp-0.1.1383 → rp-0.1.1385}/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')
@@ -397,15 +421,15 @@ Arguments:
     folder          A folder containing PPTX files
 
 Options:
-    --folder-name   Name for Google Drive folder (default: auto from first filename)
-    --merged-name   Name for merged presentation (default: same as folder-name)
+    --folder_name   Name for Google Drive folder (default: auto from first filename)
+    --merged_name   Name for merged presentation (default: same as folder_name)
 
 Examples:
     python google_slides_upload.py output_folder/
     python google_slides_upload.py part1.pptx part2.pptx part3.pptx
-    python google_slides_upload.py output_folder/ --folder-name "My Presentation"
-    python google_slides_upload.py output_folder/ --merged-name "Final Presentation"
-    python google_slides_upload.py *.pptx --folder-name "Project X" --merged-name "Project X Final"
+    python google_slides_upload.py output_folder/ --folder_name "My Presentation"
+    python google_slides_upload.py output_folder/ --merged_name "Final Presentation"
+    python google_slides_upload.py *.pptx --folder_name "Project X" --merged_name "Project X Final"
 
 Creates on Google Drive:
     MyDrive/<folder_name>/

{rp-0.1.1383 → rp-0.1.1385}/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,
     )
 
 
@@ -163,12 +165,6 @@ def normalize_slides_input(layout) -> list[dict]:
                 result.append(
                     {"paths": [content], "title": title, "labels": None}
                 )
-            elif isinstance(content, list):
-                paths = [p for p in content if is_media_path(p)]
-                if paths:
-                    result.append(
-                        {"paths": paths, "title": title, "labels": None}
-                    )
             elif isinstance(content, dict):
                 # {'label1': 'path1', 'label2': 'path2'}
                 labels = []
@@ -181,6 +177,12 @@ def normalize_slides_input(layout) -> list[dict]:
                     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}
+                    )
         return result
 
     # List input
@@ -196,7 +198,7 @@ def normalize_slides_input(layout) -> list[dict]:
                     paths.append(path)
             if paths:
                 result.append({"paths": paths, "title": None, "labels": labels})
-        elif isinstance(item, list):
+        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})
@@ -704,8 +706,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")
 
@@ -822,6 +825,7 @@ def cli(
     title_size: int = DEFAULT_TITLE_SIZE,
     label_size: int = DEFAULT_LABEL_SIZE,
     sort_by: str = "name",
+    per_slide: int = None,
 ):
     """Upload media to Google Drive and create a Google Slides presentation.
 
@@ -830,16 +834,17 @@ def cli(
 
     Options:
         --name NAME             Presentation name (default: auto-generated timestamp)
-        --folder-name NAME      Google Drive folder name (default: auto-generated timestamp)
+        --folder_name NAME      Google Drive folder name (default: auto-generated timestamp)
         --title TITLE           Slide title (applies to all slides)
         --captions              Use filenames as captions for each media item
-        --label-position POS    Label position: 'top' (default) or 'bottom'
-        --bg-color COLOR        Background color: name ('black'), hex ('#FFAABB'), default: white
-        --font-color COLOR      Text color: name ('white'), hex ('#FFAABB'), default: black
+        --label_position POS    Label position: 'top' (default) or 'bottom'
+        --bg_color COLOR        Background color: name ('black'), hex ('#FFAABB'), default: white
+        --font_color COLOR      Text color: name ('white'), hex ('#FFAABB'), default: black
         --font FONT             Font family (default: Lexend)
-        --title-size SIZE       Title font size in pt (default: 24)
-        --label-size SIZE       Label font size in pt (default: 12)
-        --sort-by METHOD        Sort files by: 'name' (default), 'date', 'size', 'number'
+        --title_size SIZE       Title font size in pt (default: 24)
+        --label_size SIZE       Label font size in pt (default: 12)
+        --sort_by METHOD        Sort files by: 'name' (default), 'date', 'size', 'number'
+        --per_slide N           Items per slide (optional, default: 1)
 
     Supported formats:
         Videos: .mp4, .mov, .avi, .mkv, .webm
@@ -849,8 +854,8 @@ def cli(
         rp run ppt media_to_slides video1.mp4 image.png                      # 2 files -> 2 slides
         rp run ppt media_to_slides media_folder/                             # folder -> one slide per file
         rp run ppt media_to_slides "*.png" --name "My Images" --captions     # glob with captions
-        rp run ppt media_to_slides folder/ --title "Demo" --bg-color black --font-color white  # dark theme
-        rp run ppt media_to_slides frames/ --sort-by number --captions --label-position bottom
+        rp run ppt media_to_slides folder/ --title "Demo" --bg_color black --font_color white  # dark theme
+        rp run ppt media_to_slides frames/ --sort_by number --captions --label_position bottom
 
     Note: First run opens browser for Google OAuth authentication.
     """
@@ -865,13 +870,21 @@ def cli(
     if not media_paths:
         raise ValueError("No media files found")
 
+    # Split into grids if requested
+    if per_slide is not None:
+        media_paths = rp.split_into_sublists(media_paths, per_slide)
+
     # Build layout
     if captions:
-        labeled = {
-            rp.get_file_name(p, include_file_extension=False): p
+        # Each item gets its filename as a label, one per slide (or per grid if per_slide used)
+        layout = [
+            {rp.get_file_name(p, include_file_extension=False): p}
+            if isinstance(p, str) else
+            {rp.get_file_name(x, include_file_extension=False): x for x in p}
             for p in media_paths
-        }
-        layout = {title: labeled} if title else [labeled]
+        ]
+        if title:
+            layout = {title: layout[0]} if len(layout) == 1 else layout
     elif title:
         layout = {title: media_paths}
     else:

{rp-0.1.1383 → rp-0.1.1385}/rp/r.py

@@ -17273,6 +17273,9 @@ def is_iterable(x):
     except:
         return False
 
+def is_non_str_iterable(x):
+    return not isinstance(x,str) and is_iterable(x) 
+
 # region Network Utilities: ［get_my_local_ip_address，get_my_ip，get_my_mac_address，get_my_public_ip_address］  
 def get_my_local_ip_address() -> str:
     import socket

rp-0.1.1385/rp/version.py

@@ -0,0 +1 @@
+1385

{rp-0.1.1383 → rp-0.1.1385}/rp.egg-info/PKG-INFO

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

rp-0.1.1385/version.py

@@ -0,0 +1 @@
+1385

rp-0.1.1383/rp/version.py

@@ -1 +0,0 @@
-1383

rp-0.1.1383/version.py

@@ -1 +0,0 @@
-1383