slidemovie 0.2.2__py3-none-any.whl → 0.3.0__py3-none-any.whl

slidemovie/cli.py

@@ -14,6 +14,7 @@ logging.basicConfig(
 )
 logger = logging.getLogger(__name__)
 
+
 def main():
     """
     Entry point for the slidemovie command-line tool.
@@ -76,11 +77,18 @@ def main():
     )
 
     # --- TTS Settings Options (CLI Overrides) ---
-    parser.add_argument("--tts-provider", help="TTS Provider (e.g., google, openai)")
+    parser.add_argument(
+        "--tts-provider",
+        help="TTS Provider (e.g., google, openai)")
     parser.add_argument("--tts-model", help="TTS Model name")
     parser.add_argument("--tts-voice", help="TTS Voice/Speaker setting")
-    parser.add_argument("--prompt", help="Override TTS system prompt (automatically enables prompt usage)")
-    parser.add_argument("--no-prompt", action="store_true", help="Disable TTS system prompt")
+    parser.add_argument(
+        "--prompt",
+        help="Override TTS system prompt (automatically enables prompt usage)")
+    parser.add_argument(
+        "--no-prompt",
+        action="store_true",
+        help="Disable TTS system prompt")
 
     # --- Other Options ---
     parser.add_argument(
@@ -89,23 +97,24 @@ def main():
         help="Enable debug mode (Verbose logging, etc)."
     )
 
-    args = parser.parse_args()
-
-    # Exit if no action is specified
-    if not args.pptx and not args.video:
-        parser.print_help()
-        sys.exit(1)
-
     # 1. Initialize Movie instance (Load configuration files)
     try:
         movie = slidemovie.Movie()
     except NameError:
-        logger.error("Movie class is not defined. Make sure to import it correctly.")
+        logger.error(
+            "Movie class is not defined. Make sure to import it correctly.")
         sys.exit(1)
     except Exception as e:
         logger.error(f"Failed to initialize Movie class: {e}")
         sys.exit(1)
 
+    args = parser.parse_args()
+
+    # Exit if no action is specified
+    if not args.pptx and not args.video:
+        parser.print_help()
+        sys.exit(1)
+
     # 2. Override settings with CLI options
     if args.tts_provider:
         movie.tts_provider = args.tts_provider
@@ -118,7 +127,9 @@ def main():
         movie.tts_use_prompt = True
     if args.no_prompt:
         movie.tts_use_prompt = False
-    
+    if args.filename:
+        movie.output_filename = args.filename
+
     if args.debug:
         movie.ffmpeg_loglevel = 'info'
         movie.show_skip = True
@@ -131,13 +142,13 @@ def main():
     try:
         if args.sub:
             # Hierarchical Mode (Parent/Child)
-            logger.info(f"Configuring subproject paths: {args.project_name}/{args.sub}")
+            logger.info(
+                f"Configuring subproject paths: {args.project_name}/{args.sub}")
             movie.configure_subproject_paths(
                 parent_project_name=args.project_name,
                 subproject_name=args.sub,
                 source_parent_dir=args.source_dir,
-                output_root_dir=args.output_root,
-                output_filename=args.filename
+                output_root_dir=args.output_root
             )
         else:
             # Standard Mode (Flat)
@@ -145,8 +156,7 @@ def main():
             movie.configure_project_paths(
                 project_name=args.project_name,
                 source_dir=args.source_dir,
-                output_root_dir=args.output_root,
-                output_filename=args.filename
+                output_root_dir=args.output_root
             )
     except Exception as e:
         logger.error(f"Failed to configure paths: {e}")
@@ -162,7 +172,8 @@ def main():
         movie.build_slide_pptx()
         logger.info("PPTX generation process finished.")
         if not args.video:
-            logger.info("Please edit the generated PPTX file and run with --video to create the movie.")
+            logger.info(
+                "Please edit the generated PPTX file and run with --video to create the movie.")
 
     # Generate Video (--video)
     if args.video:
@@ -170,8 +181,9 @@ def main():
         logger.info("MODE: Build All Video Assets")
         logger.info("=" * 60)
         movie.build_all()
-        
+
         logger.info("All video processes finished.")
 
+
 if __name__ == "__main__":
     main()

slidemovie/core.py

@@ -14,6 +14,7 @@ from datetime import datetime
 # Configure module logger
 logger = logging.getLogger(__name__)
 
+
 class Movie():
     """
     A class to automatically generate narration videos based on PowerPoint slides and Markdown notes.
@@ -55,10 +56,12 @@ class Movie():
             - pandoc
         """
         required_tools = ['ffmpeg', 'ffprobe', 'pandoc']
-        missing_tools = [tool for tool in required_tools if not shutil.which(tool)]
-        
+        missing_tools = [
+            tool for tool in required_tools if not shutil.which(tool)]
+
         if missing_tools:
-            logger.error(f"Required external commands not found: {', '.join(missing_tools)}")
+            logger.error(
+                f"Required external commands not found: {', '.join(missing_tools)}")
             logger.error("Please install them before running this tool.")
             sys.exit(1)
 
@@ -86,6 +89,7 @@ class Movie():
             show_skip (bool): Whether to log skipped tasks. Default: False.
             max_retry (int): Max retries for TTS API errors. Default: 2.
             output_root (str): Root directory for video output. Default: None.
+            output_filename (str): Output video filename (without extension). Default: None (Uses project ID).
         """
         return {
             # TTS settings
@@ -116,18 +120,19 @@ class Movie():
             "show_skip": False,
             "max_retry": 2,
 
-            # Output path setting (Used if not provided via CLI)
-            "output_root": None
+            # Output path settings (Used if not provided via CLI)
+            "output_root": None,
+            "output_filename": None
         }
 
     def _load_settings(self):
         """
         Loads settings from JSON files and merges them with defaults.
-        
+
         It looks for configuration in:
         1. ~/.config/slidemovie/config.json
         2. ./config.json
-        
+
         Finally, it sets the configuration values as instance attributes.
         """
         # 1. Get default settings
@@ -139,10 +144,11 @@ class Movie():
             try:
                 os.makedirs(config_dir, exist_ok=True)
             except OSError as e:
-                logger.warning(f"Failed to create config directory {config_dir}: {e}")
+                logger.warning(
+                    f"Failed to create config directory {config_dir}: {e}")
 
         home_config_path = os.path.join(config_dir, "config.json")
-        
+
         if not os.path.exists(home_config_path):
             # Create default config file if it doesn't exist
             try:
@@ -162,7 +168,7 @@ class Movie():
 
         # 3. Process ./config.json (Current directory)
         local_config_path = "./config.json"
-        
+
         if os.path.exists(local_config_path):
             try:
                 with open(local_config_path, 'r', encoding='utf-8') as f:
@@ -173,7 +179,7 @@ class Movie():
                 logger.warning(f"Failed to load {local_config_path}: {e}")
 
         # 4. Set attributes
-        
+
         # Special handling: Convert screen_size from list to tuple
         if "screen_size" in config and isinstance(config["screen_size"], list):
             config["screen_size"] = tuple(config["screen_size"])
@@ -182,18 +188,16 @@ class Movie():
         for key, value in config.items():
             setattr(self, key, value)
 
-
-    def configure_project_paths(self, project_name, source_dir, output_root_dir=None, output_filename=None):
+    def configure_project_paths(
+            self, project_name, source_dir, output_root_dir=None):
         """
         Configures paths for a standard (flat) project structure.
-        
+
         Args:
             project_name (str): The name/ID of the project.
             source_dir (str): The directory containing source files (.md, .pptx).
-            output_root_dir (str, optional): Root directory for video output. 
+            output_root_dir (str, optional): Root directory for video output.
                                              Defaults to `self.output_root` or `{source_dir}/movie`.
-            output_filename (str, optional): Filename for the output video (without extension).
-                                             Defaults to `project_name`.
         """
         # Determine output root directory
         target_root = None
@@ -206,22 +210,25 @@ class Movie():
         else:
             target_root = f'{source_dir}/movie'
             is_automatic_path = True
-        
+
         # Expand path
         target_root = os.path.expanduser(target_root)
 
         # Handle directory existence
         if is_automatic_path:
-            # If the path is automatically determined, create it if it doesn't exist
+            # If the path is automatically determined, create it if it doesn't
+            # exist
             if not os.path.isdir(target_root):
                 try:
                     os.makedirs(target_root, exist_ok=True)
                     logger.info(f'Created output directory: {target_root}')
                 except OSError as e:
-                    logger.error(f'Failed to create directory {target_root}: {e}')
+                    logger.error(
+                        f'Failed to create directory {target_root}: {e}')
                     sys.exit(1)
         else:
-            # If the path is explicitly specified (CLI or Config), strict check is applied
+            # If the path is explicitly specified (CLI or Config), strict check
+            # is applied
             if not os.path.isdir(target_root):
                 logger.error(f'Directory {target_root} does not exist.')
                 sys.exit(1)
@@ -229,33 +236,34 @@ class Movie():
         # Set member variables
         self.source_dir = source_dir
         self.project_id = project_name
-        
-        if not output_filename:
-            output_filename = project_name
+
+        # Determine output filename
+        # Priority: self.output_filename (Config/CLI) > project_name (Default)
+        final_filename = self.output_filename if self.output_filename else project_name
 
         # Construct file paths
         self.md_file = f'{self.source_dir}/{project_name}.md'
         self.status_file = f'{self.source_dir}/status.json'
         self.video_length_file = f'{self.source_dir}/video_length.csv'
-        
+
         # Create intermediate/output directories
         self.movie_dir = f'{target_root}/{project_name}'
         if not os.path.isdir(self.movie_dir):
             os.mkdir(self.movie_dir)
 
         self.slide_file = f'{self.source_dir}/{project_name}.pptx'
-        self.video_file = f'{self.movie_dir}/{output_filename}.mp4'
+        self.video_file = f'{self.movie_dir}/{final_filename}.mp4'
 
-    def configure_subproject_paths(self, parent_project_name, subproject_name, source_parent_dir, output_root_dir=None, output_filename=None):
+    def configure_subproject_paths(
+            self, parent_project_name, subproject_name, source_parent_dir, output_root_dir=None):
         """
         Configures paths for a nested project structure (Parent Folder -> Child Folder).
-        
+
         Args:
             parent_project_name (str): The name of the parent project.
             subproject_name (str): The name of the subproject (child folder name).
             source_parent_dir (str): The directory containing the parent project folder.
             output_root_dir (str, optional): Root directory for video output.
-            output_filename (str, optional): Filename for the output video (without extension).
         """
         # Determine output root directory
         target_root = None
@@ -268,64 +276,68 @@ class Movie():
         else:
             target_root = f'{source_parent_dir}/movie'
             is_automatic_path = True
-        
+
         # Expand path
         target_root = os.path.expanduser(target_root)
 
         # Handle directory existence
         if is_automatic_path:
-            # If the path is automatically determined, create it if it doesn't exist
+            # If the path is automatically determined, create it if it doesn't
+            # exist
             if not os.path.isdir(target_root):
                 try:
                     os.makedirs(target_root, exist_ok=True)
                     logger.info(f'Created output directory: {target_root}')
                 except OSError as e:
-                    logger.error(f'Failed to create directory {target_root}: {e}')
+                    logger.error(
+                        f'Failed to create directory {target_root}: {e}')
                     sys.exit(1)
         else:
-            # If the path is explicitly specified (CLI or Config), strict check is applied
+            # If the path is explicitly specified (CLI or Config), strict check
+            # is applied
             if not os.path.isdir(target_root):
                 logger.error(f'Directory {target_root} does not exist.')
                 sys.exit(1)
 
         # Source directory is "Parent/Child"
         self.source_dir = f'{source_parent_dir}/{subproject_name}'
-        
+
         # Project ID format: "Parent-Child"
         self.project_id = f'{parent_project_name}-{subproject_name}'
-        
-        if not output_filename:
-            output_filename = self.project_id
+
+        # Determine output filename
+        # Priority: self.output_filename (Config/CLI) > self.project_id (Default)
+        final_filename = self.output_filename if self.output_filename else self.project_id
 
         # Construct file paths
         self.md_file = f'{self.source_dir}/{subproject_name}.md'
         self.status_file = f'{self.source_dir}/status.json'
         self.video_length_file = f'{self.source_dir}/video_length.csv'
-        
+
         # Create output directory hierarchy (movie/parent/child)
         parent_movie_dir = f'{target_root}/{parent_project_name}'
         self.movie_dir = f'{parent_movie_dir}/{subproject_name}'
-        
+
         if not os.path.isdir(parent_movie_dir):
             os.mkdir(parent_movie_dir)
         if not os.path.isdir(self.movie_dir):
             os.mkdir(self.movie_dir)
 
         self.slide_file = f'{self.source_dir}/{subproject_name}.pptx'
-        self.video_file = f'{self.movie_dir}/{output_filename}.mp4'
+        self.video_file = f'{self.movie_dir}/{final_filename}.mp4'
 
     def build_all(self):
         """
         Orchestrates the creation of the complete video from Markdown and PPTX files.
-        
-        Note: This does not update the PPTX file from Markdown. 
+
+        Note: This does not update the PPTX file from Markdown.
         Run `build_slide_pptx()` beforehand if necessary.
         """
         self._check_external_tools()
         if not os.path.isfile(self.md_file):
             logger.error(f'{self.md_file} does not exist.')
             sys.exit(1)
-            
+
         # 1. Generate narration audio from Markdown notes
         self.build_slide_audio()
         # 2. Generate slide images from PPTX
@@ -375,7 +387,8 @@ class Movie():
                 audio_state["wav_file"]
             )
 
-            # Regeneration check (Status mismatch OR Hash mismatch OR File missing)
+            # Regeneration check (Status mismatch OR Hash mismatch OR File
+            # missing)
             if (audio_status != "generated" or
                 saved_notes_hash != current_notes_hash or
                     not os.path.isfile(wav_path)):
@@ -384,7 +397,8 @@ class Movie():
 
                 add_prompt = audio_state.get("additional_prompt", "")
                 if norm == "":
-                    logger.error(f'Error: "::: notes" not found in {slide_id}.')
+                    logger.error(
+                        f'Error: "::: notes" not found in {slide_id}.')
                     sys.exit()
                 self._speak_to_wav(
                     norm, wav_path, additional_prompt=add_prompt)
@@ -533,7 +547,8 @@ class Movie():
                             f"[SKIP] {slide_id} (Video: unchanged/Source:{video_file_src})")
                     continue
 
-                logger.info(f"Converting video: {video_file_src} -> {slide_id}.mp4")
+                logger.info(
+                    f"Converting video: {video_file_src} -> {slide_id}.mp4")
 
                 # FFmpeg command: Resize + Audio re-encode
                 cmd = [
@@ -580,7 +595,8 @@ class Movie():
                 png_file = os.path.join(self.movie_dir, f"{slide_id}.png")
                 wav_file = os.path.join(self.movie_dir, f"{slide_id}.wav")
 
-                if not os.path.isfile(png_file) or not os.path.isfile(wav_file):
+                if not os.path.isfile(
+                        png_file) or not os.path.isfile(wav_file):
                     # Skip if assets are missing
                     logger.warning(f"Material missing, skipping: {slide_id}")
                     continue
@@ -1040,7 +1056,8 @@ class Movie():
         current_config = self._get_build_config()
 
         if stored_config is None:
-            logger.info("No build_config in state file. Applying current settings.")
+            logger.info(
+                "No build_config in state file. Applying current settings.")
             state["build_config"] = current_config
             self._save_audio_state(state)
             stored_config = current_config
@@ -1048,7 +1065,8 @@ class Movie():
         if stored_config != current_config:
             import pprint
             logger.error("build_config inconsistency detected.")
-            logger.error("Changing resolution/FPS mid-process is not supported. Aborting.")
+            logger.error(
+                "Changing resolution/FPS mid-process is not supported. Aborting.")
             logger.error("-" * 40)
             logger.error("[Stored Config]")
             logger.error(pprint.pformat(stored_config))
@@ -1064,7 +1082,8 @@ class Movie():
 
         # Auto-fill if missing (Migration)
         if stored_tts is None:
-            logger.info("No TTS config in state file. Applying current settings.")
+            logger.info(
+                "No TTS config in state file. Applying current settings.")
             state["tts_config"] = current_tts
             self._save_audio_state(state)
 
@@ -1080,13 +1099,15 @@ class Movie():
             logger.warning("[Current Config (Now)]")
             logger.warning(pprint.pformat(current_tts))
             logger.warning("=" * 60)
-            logger.warning("Generating audio with different settings may result in inconsistent audio in the video.")
+            logger.warning(
+                "Generating audio with different settings may result in inconsistent audio in the video.")
 
             while True:
                 choice = input(
                     "Select action: 1) Ignore and Continue (Overwrite config)  2) Abort [1/2]: ").strip()
                 if choice == '1':
-                    logger.info("Applying new settings and continuing. Updating state file.")
+                    logger.info(
+                        "Applying new settings and continuing. Updating state file.")
                     state["tts_config"] = current_tts
                     self._save_audio_state(state)
                     break

{slidemovie-0.2.2.dist-info → slidemovie-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slidemovie
-Version: 0.2.2
+Version: 0.3.0
 Summary: Markdown and PowerPoint to narration video generator
 Author: Katsutoshi Seki
 License-Expression: MIT
@@ -69,7 +69,7 @@ Dynamic: license-file
 pip install slidemovie
 ```
 
-*Note: You also need to install **FFmpeg**, **Pandoc**, **LibreOffice**, and **Poppler**, and set up your **AI API Key** (Google or OpenAI). See the [documentation](https://sekika.github.io/slidemovie/installation.html) for details.*
+*Note: You also need to install **FFmpeg**, **Pandoc**, **LibreOffice**, and **Poppler**, and set up your **AI API Key** (Google or OpenAI). See the [documentation](https://sekika.github.io/slidemovie/installation/) for details.*
 
 ### 2. Create a Project
 

slidemovie-0.3.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+slidemovie/__init__.py,sha256=-WEYzm_3B2Db9t-qwLidp6SEU113UpDRxz8DE3Xaeo8,45
+slidemovie/cli.py,sha256=zxP7crk62wTeSD1EEF1JUseLocNqFcHqxTGt8FnXqhA,6038
+slidemovie/core.py,sha256=vES8IYE_N6AHwpjD5gIGPPLr17g28K44xGHiA0ioVCo,53885
+slidemovie-0.3.0.dist-info/licenses/LICENSE,sha256=3i1-4ZoSUnRhEe7bNNHEJ-b6J7YAxQS9WRzq2T-4xmE,1085
+slidemovie-0.3.0.dist-info/METADATA,sha256=r8yr7WU9Gw4aeCHZfhvYnhCkhRT7HGFatr-7wEqR2HE,3592
+slidemovie-0.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+slidemovie-0.3.0.dist-info/entry_points.txt,sha256=QKCaqBM90pFuO9XUrGCIjUaQU66HdWU_5h0TJGWxhNY,51
+slidemovie-0.3.0.dist-info/top_level.txt,sha256=fDoWtBH9a9EM1ZygcKZB571mXl3eXBd93VK3SrgrGiQ,11
+slidemovie-0.3.0.dist-info/RECORD,,

slidemovie-0.2.2.dist-info/RECORD

@@ -1,9 +0,0 @@
-slidemovie/__init__.py,sha256=-WEYzm_3B2Db9t-qwLidp6SEU113UpDRxz8DE3Xaeo8,45
-slidemovie/cli.py,sha256=D59fkBvl5f3fwu9oSIvNy0VO_E3tNXS48f9zEH4UNx0,5968
-slidemovie/core.py,sha256=PXrQNqPx3oA1GBeaW0R69jXCJjd23VzEOM4qIso3FNM,53577
-slidemovie-0.2.2.dist-info/licenses/LICENSE,sha256=3i1-4ZoSUnRhEe7bNNHEJ-b6J7YAxQS9WRzq2T-4xmE,1085
-slidemovie-0.2.2.dist-info/METADATA,sha256=F3rqyWbbXMRZtYb0_pYkQNYkom7wJOUkmD_DHUO2lHQ,3596
-slidemovie-0.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-slidemovie-0.2.2.dist-info/entry_points.txt,sha256=QKCaqBM90pFuO9XUrGCIjUaQU66HdWU_5h0TJGWxhNY,51
-slidemovie-0.2.2.dist-info/top_level.txt,sha256=fDoWtBH9a9EM1ZygcKZB571mXl3eXBd93VK3SrgrGiQ,11
-slidemovie-0.2.2.dist-info/RECORD,,