karaoke-gen 0.58.0__tar.gz → 0.59.0__tar.gz

{karaoke_gen-0.58.0 → karaoke_gen-0.59.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: karaoke-gen
-Version: 0.58.0
+Version: 0.59.0
 Summary: Generate karaoke videos with synchronized lyrics. Handles the entire process from downloading audio and lyrics to creating the final video with title screens.
 License: MIT
 Author: Andrew Beveridge
@@ -25,7 +25,7 @@ Requires-Dist: google-auth-httplib2
 Requires-Dist: google-auth-oauthlib
 Requires-Dist: kbputils (>=0.0.16,<0.0.17)
 Requires-Dist: lyrics-converter (>=0.2.1)
-Requires-Dist: lyrics-transcriber (>=0.66)
+Requires-Dist: lyrics-transcriber (>=0.69)
 Requires-Dist: lyricsgenius (>=3)
 Requires-Dist: matplotlib (>=3)
 Requires-Dist: modal (>=1.0.5,<2.0.0)

{karaoke_gen-0.58.0 → karaoke_gen-0.59.0}/karaoke_gen/karaoke_finalise/karaoke_finalise.py

@@ -46,6 +46,7 @@ class KaraokeFinalise:
         non_interactive=False,
         user_youtube_credentials=None,  # Add support for pre-stored credentials
         server_side_mode=False,  # New parameter for server-side deployment
+        selected_instrumental_file=None,  # Add support for pre-selected instrumental file
     ):
         self.log_level = log_level
         self.log_formatter = log_formatter
@@ -103,6 +104,7 @@ class KaraokeFinalise:
         self.non_interactive = non_interactive
         self.user_youtube_credentials = user_youtube_credentials
         self.server_side_mode = server_side_mode
+        self.selected_instrumental_file = selected_instrumental_file
 
         self.suffixes = {
             "title_mov": " (Title).mov",
@@ -151,7 +153,8 @@ class KaraokeFinalise:
             self.ffmpeg_base_command += " -y"
 
         # Detect and configure hardware acceleration
-        self.nvenc_available = self.detect_nvenc_support()
+        # TODO: Re-enable this once we figure out why the resulting MP4s are 10x larger than when encoded with x264...
+        self.nvenc_available = False # self.detect_nvenc_support()
         self.configure_hardware_acceleration()
 
     def check_input_files_exist(self, base_name, with_vocals_file, instrumental_audio_file):
@@ -1064,7 +1067,7 @@ class KaraokeFinalise:
                     os.remove(file_path)
                     self.logger.info(f"Deleted .DS_Store file: {file_path}")
 
-        rclone_cmd = f"rclone copy -v {shlex.quote(self.public_share_dir)} {shlex.quote(self.rclone_destination)}"
+        rclone_cmd = f"rclone copy -v --ignore-existing {shlex.quote(self.public_share_dir)} {shlex.quote(self.rclone_destination)}"
         self.execute_command(rclone_cmd, "Copying to cloud destination")
 
     def post_discord_notification(self):
@@ -1189,7 +1192,7 @@ class KaraokeFinalise:
         current_dir = os.getcwd()
         
         # Use rclone copy to upload the entire current directory to the remote destination
-        rclone_upload_cmd = f"rclone copy -v {shlex.quote(current_dir)} {shlex.quote(remote_dest)}"
+        rclone_upload_cmd = f"rclone copy -v --ignore-existing {shlex.quote(current_dir)} {shlex.quote(remote_dest)}"
         
         if self.dry_run:
             self.logger.info(f"DRY RUN: Would upload current directory to: {remote_dest}")
@@ -1625,7 +1628,15 @@ class KaraokeFinalise:
         with_vocals_file = self.find_with_vocals_file()
         base_name, artist, title = self.get_names_from_withvocals(with_vocals_file)
 
-        instrumental_audio_file = self.choose_instrumental_audio_file(base_name)
+        # Use the selected instrumental file if provided, otherwise search for one
+        if self.selected_instrumental_file:
+            if not os.path.isfile(self.selected_instrumental_file):
+                raise Exception(f"Selected instrumental file not found: {self.selected_instrumental_file}")
+            instrumental_audio_file = self.selected_instrumental_file
+            self.logger.info(f"Using pre-selected instrumental file: {instrumental_audio_file}")
+        else:
+            self.logger.info("No instrumental file pre-selected, searching for instrumental files...")
+            instrumental_audio_file = self.choose_instrumental_audio_file(base_name)
 
         input_files = self.check_input_files_exist(base_name, with_vocals_file, instrumental_audio_file)
         output_files = self.prepare_output_filenames(base_name)

{karaoke_gen-0.58.0 → karaoke_gen-0.59.0}/karaoke_gen/lyrics_processor.py

@@ -274,7 +274,8 @@ class LyricsProcessor:
 
             # Save correction data to JSON file for review interface
             # Use the expected filename format: "{artist} - {title} (Lyrics Corrections).json"
-            corrections_filename = f"{filename_artist} - {filename_title} (Lyrics Corrections).json"
+            # Use sanitized names to be consistent with all other files created by lyrics_transcriber
+            corrections_filename = f"{sanitized_artist} - {sanitized_title} (Lyrics Corrections).json"
             corrections_filepath = os.path.join(lyrics_dir, corrections_filename)
             
             # Use the CorrectionResult's to_dict() method to serialize

{karaoke_gen-0.58.0 → karaoke_gen-0.59.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "karaoke-gen"
-version = "0.58.0"
+version = "0.59.0"
 description = "Generate karaoke videos with synchronized lyrics. Handles the entire process from downloading audio and lyrics to creating the final video with title screens."
 authors = ["Andrew Beveridge <andrew@beveridge.uk>"]
 license = "MIT"
@@ -28,7 +28,7 @@ thefuzz = ">=0.22"
 numpy = ">=2"
 audio-separator = { version = ">=0.34.0", extras = ["cpu"] }
 lyrics-converter = ">=0.2.1"
-lyrics-transcriber = ">=0.66"
+lyrics-transcriber = ">=0.69"
 kbputils = "^0.0.16"
 attrs = ">=24.2.0"
 cattrs = ">=24.1.2"