Merge pull request #28 from rakuri255/Write_language_to_ultrastar

Write language to ultrastar
This commit is contained in:
Vadim Rangnau authored and GitHub committed 2023-05-25 21:20:50 +02:00
commit 2b74a9d55c
3 files changed
+16 -6

No files matched your search

+5 -4
View File
@@ -233,6 +233,7 @@ def run():
# Audio transcription
transcribed_data = None
language = None
if isAudio:
language, transcribed_data = transcribe_audio(transcribed_data)
remove_unecessary_punctuations(transcribed_data)
@@ -263,7 +264,7 @@ def run():
basename_without_ext, real_bpm,
song_output, transcribed_data,
ultrastar_audio_input_path,
ultrastar_note_numbers)
ultrastar_note_numbers, language)
else:
ultrastar_file_output = create_ultrastar_txt_from_ultrastar_data(song_output, ultrastar_class,
ultrastar_note_numbers)
@@ -322,12 +323,12 @@ def create_ultrastar_txt_from_ultrastar_data(song_output, ultrastar_class, ultra
def create_ultrastar_txt_from_automation(audio_separation_path, basename_without_ext, real_bpm, song_output,
transcribed_data, ultrastar_audio_input_path, ultrastar_note_numbers):
transcribed_data, ultrastar_audio_input_path, ultrastar_note_numbers, language):
real_bpm = get_bpm_from_file(ultrastar_audio_input_path)
ultrastar_file_output = os.path.join(song_output, basename_without_ext + '.txt')
ultrastar_writer.create_ultrastar_txt_from_automation(transcribed_data, ultrastar_note_numbers,
ultrastar_file_output,
basename_without_ext, real_bpm)
basename_without_ext, language, real_bpm)
if settings.create_karaoke:
no_vocals_path = os.path.join(audio_separation_path, "no_vocals.wav")
title = basename_without_ext + " [Karaoke]"
@@ -337,7 +338,7 @@ def create_ultrastar_txt_from_automation(audio_separation_path, basename_without
karaoke_txt_output_path = karaoke_output_path + ".txt"
ultrastar_writer.create_ultrastar_txt_from_automation(transcribed_data, ultrastar_note_numbers,
karaoke_txt_output_path,
title, real_bpm)
title, language, real_bpm)
return real_bpm, ultrastar_file_output
+8 -1
View File
@@ -1,5 +1,6 @@
from moduls.Ultrastar.ultrastar_converter import real_bpm_to_ultrastar_bpm, second_to_beat
from moduls.Log import PRINT_ULTRASTAR
import langcodes
import re
@@ -15,7 +16,11 @@ def get_multiplier(real_bpm):
return multiplier - 2
def create_ultrastar_txt_from_automation(transcribed_data, note_numbers, ultrastar_file_output, title, bpm=120):
def get_language_name(language):
return langcodes.Language.make(language=language).display_name()
def create_ultrastar_txt_from_automation(transcribed_data, note_numbers, ultrastar_file_output, title, language, bpm=120):
print("{} Creating {} from transcription.".format(PRINT_ULTRASTAR, ultrastar_file_output))
real_bpm = real_bpm_to_ultrastar_bpm(bpm)
@@ -29,6 +34,8 @@ def create_ultrastar_txt_from_automation(transcribed_data, note_numbers, ultrast
f.write('#TITLE:' + title + '\n')
f.write('#CREATOR:UltraSinger [GitHub]' + '\n')
f.write('#FIXER:YOUR NAME' + '\n')
if language is not None:
f.write('#LANGUAGE:' + get_language_name(language) + '\n')
f.write('#MP3:' + title + '.mp3\n')
f.write('#VIDEO:' + title + '.mp4\n')
f.write('#BPM:' + str(ultrastar_bpm) + '\n') # not the real BPM!
+3 -1
View File
@@ -12,4 +12,6 @@ numpy~=1.23.5
git+https://github.com/linto-ai/whisper-timestamped
PyHyphen~=4.0.3
demucs~=4.0.0
tqdm~=4.65.0
tqdm~=4.65.0
langcodes~=3.3.0
language-data~=1.1