From e11df8467df6fd212f05dbbbe3113c7e7c9a875a Mon Sep 17 00:00:00 2001 From: Vadim Date: Sun, 4 Jun 2023 01:35:45 +0200 Subject: [PATCH 1/3] - try getting additional data from musicbrainz database --- UltraSinger.py | 4 ++++ modules/musicbrainz_client.py | 24 ++++++++++++++++++++++++ requirements.txt | 6 ++++-- 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 modules/musicbrainz_client.py diff --git a/UltraSinger.py b/UltraSinger.py index 665a25c..71bf846 100644 --- a/UltraSinger.py +++ b/UltraSinger.py @@ -57,6 +57,7 @@ from modules.Ultrastar import ( ) from modules.Ultrastar.ultrastar_txt import UltrastarTxt from Settings import Settings +from modules.musicbrainz_client import get_music_infos settings = Settings() @@ -332,6 +333,9 @@ def run(): ) os_helper.create_folder(cache_path) + # Get additional data for song + get_music_infos(basename_without_ext) + # Separate vocal from audio audio_separation_path = separate_vocal_from_audio( basename_without_ext, cache_path, ultrastar_audio_input_path diff --git a/modules/musicbrainz_client.py b/modules/musicbrainz_client.py new file mode 100644 index 0000000..9b5d8d5 --- /dev/null +++ b/modules/musicbrainz_client.py @@ -0,0 +1,24 @@ +import musicbrainzngs + +def get_music_infos(search_string): + print("Searching song in musicbrainz...") + #https://python-musicbrainzngs.readthedocs.io/en/v0.7.1/usage/#searching + + musicbrainzngs.set_useragent("UltraSinger", "0.1", "https://github.com/rakuri255/UltraSinger") + + artists = musicbrainzngs.search_artists(search_string) + artist = artists['artist-list'][0]['name'] + release_groups = musicbrainzngs.search_release_groups(search_string, artist=artist) + + release = release_groups['release-group-list'][0] + print(f"title: {release['title']}") + print(f"artist: {artist}") + print(f"artist-credit-phrase: {release['artist-credit-phrase']}") + print(f"first-release-date: {release['first-release-date']}") + genre = [] + for tag in release['tag-list']: + genre.append(tag['name']) + print(f"genre: {genre}") + + #release_id = release['id'] + #data = musicbrainzngs.get_image_list(release_id) diff --git a/requirements.txt b/requirements.txt index f6f4116..710f5f2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -crepe==0.0.13 -librosa==0.9.2 +crepe~=0.0.12 +librosa~=0.9.1 pretty_midi==0.2.9 pydub==0.25.1 Levenshtein==0.20.9 @@ -19,3 +19,5 @@ Pillow~=9.5.0 isort==5.12 black==23.3 pylint==2.17 + +musicbrainzngs~=0.7.1 \ No newline at end of file From a698f0ba7b9aa59b4fd0c53e99aa848c15bedb0b Mon Sep 17 00:00:00 2001 From: Vadim Date: Sun, 4 Jun 2023 01:39:41 +0200 Subject: [PATCH 2/3] - fix requirements --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 710f5f2..2dc1ce3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -crepe~=0.0.12 -librosa~=0.9.1 +crepe==0.0.13 +librosa==0.9.2 pretty_midi==0.2.9 pydub==0.25.1 Levenshtein==0.20.9 From 3cd84c8ced0acc5e314a74b63ab6c62173fecef8 Mon Sep 17 00:00:00 2001 From: Vadim Date: Sun, 18 Jun 2023 21:13:30 +0200 Subject: [PATCH 3/3] - Search and add additional data to txt --- src/UltraSinger.py | 69 ++++++++++++++++++++--- src/modules/Audio/youtube.py | 8 ++- src/modules/Ultrastar/ultrastar_txt.py | 2 + src/modules/Ultrastar/ultrastar_writer.py | 4 ++ src/modules/musicbrainz_client.py | 50 +++++++++++----- src/modules/os_helper.py | 7 ++- 6 files changed, 114 insertions(+), 26 deletions(-) diff --git a/src/UltraSinger.py b/src/UltraSinger.py index 7e558a4..2dd24dc 100644 --- a/src/UltraSinger.py +++ b/src/UltraSinger.py @@ -259,6 +259,7 @@ def run() -> None: is_audio = ".txt" not in settings.input_file_path ultrastar_class = None real_bpm = None + (title, artist, year, genre) = (None, None, None, None) if not is_audio: # Parse Ultrastar txt print( @@ -279,6 +280,7 @@ def run() -> None: basename_without_ext, song_output, ultrastar_audio_input_path, + (title, artist, year, genre) ) = download_from_youtube() else: # Audio File print( @@ -288,6 +290,7 @@ def run() -> None: basename_without_ext, song_output, ultrastar_audio_input_path, + (title, artist, year, genre) ) = infos_from_audio_input_file() cache_path = os.path.join(song_output, "cache") @@ -296,9 +299,6 @@ def run() -> None: ) os_helper.create_folder(cache_path) - # Get additional data for song - get_music_infos(basename_without_ext) - # Separate vocal from audio audio_separation_path = separate_vocal_from_audio( basename_without_ext, cache_path, ultrastar_audio_input_path @@ -357,6 +357,10 @@ def run() -> None: ultrastar_audio_input_path, ultrastar_note_numbers, language, + title, + artist, + year, + genre ) else: ultrastar_file_output = create_ultrastar_txt_from_ultrastar_data( @@ -507,6 +511,10 @@ def create_ultrastar_txt_from_automation( ultrastar_audio_input_path: str, ultrastar_note_numbers: list[int], language: str, + title: str, + artist: str, + year: str, + genre: [] ): """Create Ultrastar txt from automation""" ultrastar_header = UltrastarTxtValue() @@ -522,6 +530,20 @@ def create_ultrastar_txt_from_automation( else None ) + # Additional data + if title is not None: + ultrastar_header.title = title + if artist is not None: + ultrastar_header.artist = artist + if year is not None: + ultrastar_header.year = year + if genre: + genre_str = "" + for g in genre: + genre_str += g + ", " + genre_str = genre_str[:-1] + ultrastar_header.genre = genre_str + real_bpm = get_bpm_from_file(ultrastar_audio_input_path) ultrastar_file_output = os.path.join( song_output, basename_without_ext + ".txt" @@ -552,16 +574,37 @@ def create_ultrastar_txt_from_automation( return real_bpm, ultrastar_file_output -def infos_from_audio_input_file() -> tuple[str, str, str]: +def infos_from_audio_input_file() -> tuple[str, str, str, tuple[str, str, str, []]]: """Infos from audio input file""" basename = os.path.basename(settings.input_file_path) basename_without_ext = os.path.splitext(basename)[0] + + artist, title = None, None + if " - " in basename_without_ext: + artist, title = basename_without_ext.split(" - ", 1) + search_string = f"{artist} - {title}" + else: + search_string = basename_without_ext + + # Get additional data for song + (title_info, artist_info, year_info, genre_info) = get_music_infos(search_string) + + if title_info is not None: + title = title_info + artist = artist_info + + if artist is not None and title is not None: + basename_without_ext = f"{artist} - {title}" + extension = os.path.splitext(basename)[1] + basename = f"{basename_without_ext}{extension}" + song_output = os.path.join(settings.output_file_path, basename_without_ext) song_output = get_unused_song_output_dir(song_output) os_helper.create_folder(song_output) os_helper.copy(settings.input_file_path, song_output) + os_helper.rename(os.path.join(song_output, os.path.basename(settings.input_file_path)), os.path.join(song_output, basename)) ultrastar_audio_input_path = os.path.join(song_output, basename) - return basename_without_ext, song_output, ultrastar_audio_input_path + return basename_without_ext, song_output, ultrastar_audio_input_path, (title, artist, year_info, genre_info) FILENAME_REPLACEMENTS = (('?:"', ""), ("<", "("), (">", ")"), ("/\\|*", "-")) @@ -577,10 +620,18 @@ def sanitize_filename(fname: str) -> str: return fname -def download_from_youtube() -> tuple[str, str, str]: +def download_from_youtube() -> tuple[str, str, str, tuple[str, str, str, []]]: """Download from YouTube""" - title = get_youtube_title(settings.input_file_path) - basename_without_ext = sanitize_filename(title) + (artist, title) = get_youtube_title(settings.input_file_path) + + # Get additional data for song + (title_info, artist_info, year_info, genre_info) = get_music_infos(f"{artist} - {title}") + + if title_info is not None: + title = title_info + artist = artist_info + + basename_without_ext = sanitize_filename(f"{artist} - {title}") basename = basename_without_ext + ".mp3" song_output = os.path.join(settings.output_file_path, basename_without_ext) song_output = get_unused_song_output_dir(song_output) @@ -595,7 +646,7 @@ def download_from_youtube() -> tuple[str, str, str]: settings.input_file_path, basename_without_ext, song_output ) ultrastar_audio_input_path = os.path.join(song_output, basename) - return basename_without_ext, song_output, ultrastar_audio_input_path + return basename_without_ext, song_output, ultrastar_audio_input_path, (title, artist, year_info, genre_info) def parse_ultrastar_txt() -> tuple[str, float, str, str, UltrastarTxtValue]: diff --git a/src/modules/Audio/youtube.py b/src/modules/Audio/youtube.py index bcda43c..a4ca385 100644 --- a/src/modules/Audio/youtube.py +++ b/src/modules/Audio/youtube.py @@ -9,7 +9,7 @@ from PIL import Image from src.modules.console_colors import ULTRASINGER_HEAD -def get_youtube_title(url: str) -> str: +def get_youtube_title(url: str) -> tuple[str, str]: """Get the title of the YouTube video""" ydl_opts = {} @@ -18,7 +18,11 @@ def get_youtube_title(url: str) -> str: url, download=False # We just want to extract the info ) - return result["title"] + if "artist" in result: + return result["artist"], result["track"] + if " - " in result["title"]: + return result["title"].split(" - ")[0], result["title"].split(" - ")[1] + return result["channel"], result["title"] def download_youtube_audio(url: str, clear_filename: str, output_path: str): diff --git a/src/modules/Ultrastar/ultrastar_txt.py b/src/modules/Ultrastar/ultrastar_txt.py index 0c8bd2f..99ab54c 100644 --- a/src/modules/Ultrastar/ultrastar_txt.py +++ b/src/modules/Ultrastar/ultrastar_txt.py @@ -59,6 +59,8 @@ class UltrastarTxtValue: artist = "" title = "" + year = "" + genre = "" mp3 = "" video = None gap = "" diff --git a/src/modules/Ultrastar/ultrastar_writer.py b/src/modules/Ultrastar/ultrastar_writer.py index 3e8703f..e61dcd7 100644 --- a/src/modules/Ultrastar/ultrastar_writer.py +++ b/src/modules/Ultrastar/ultrastar_writer.py @@ -69,6 +69,10 @@ def create_ultrastar_txt_from_automation( file.write(f"#{UltrastarTxtTag.BPM}:{round(ultrastar_bpm, 2)}\n") # not the real BPM! file.write(f"#{UltrastarTxtTag.GAP}:{int(gap * 1000)}\n") file.write(f"#{UltrastarTxtTag.COMMENT}:{ultrastar_class.comment}\n") + if ultrastar_class.year is not None: + file.write(f"#{UltrastarTxtTag.YEAR}:{ultrastar_class.year}\n") + if ultrastar_class.genre: + file.write(f"#{UltrastarTxtTag.GENRE}:{ultrastar_class.genre}\n") # Write the singing part previous_end_beat = 0 diff --git a/src/modules/musicbrainz_client.py b/src/modules/musicbrainz_client.py index 9b5d8d5..245413e 100644 --- a/src/modules/musicbrainz_client.py +++ b/src/modules/musicbrainz_client.py @@ -1,24 +1,46 @@ import musicbrainzngs +import string +from src.modules.console_colors import ULTRASINGER_HEAD, blue_highlighted, red_highlighted -def get_music_infos(search_string): - print("Searching song in musicbrainz...") - #https://python-musicbrainzngs.readthedocs.io/en/v0.7.1/usage/#searching + +def get_music_infos(search_string: str) -> tuple[str, str, str, []]: + print(f"{ULTRASINGER_HEAD} Searching song in {blue_highlighted('musicbrainz')}") + # https://python-musicbrainzngs.readthedocs.io/en/v0.7.1/usage/#searching musicbrainzngs.set_useragent("UltraSinger", "0.1", "https://github.com/rakuri255/UltraSinger") artists = musicbrainzngs.search_artists(search_string) artist = artists['artist-list'][0]['name'] release_groups = musicbrainzngs.search_release_groups(search_string, artist=artist) - release = release_groups['release-group-list'][0] - print(f"title: {release['title']}") - print(f"artist: {artist}") - print(f"artist-credit-phrase: {release['artist-credit-phrase']}") - print(f"first-release-date: {release['first-release-date']}") - genre = [] - for tag in release['tag-list']: - genre.append(tag['name']) - print(f"genre: {genre}") - #release_id = release['id'] - #data = musicbrainzngs.get_image_list(release_id) + title = None + if 'title' in release: + clean_search_string = search_string.translate(str.maketrans('', '', string.punctuation)).lower() + clean_release_title = release['title'].translate(str.maketrans('', '', string.punctuation)).lower() + if clean_release_title in clean_search_string: + title = release['title'] + else: + print( + f"{ULTRASINGER_HEAD} cant find title {red_highlighted(release['title'])} in {red_highlighted(search_string)}") + + if 'artist-credit-phrase' in release: + artist = release['artist-credit-phrase'] + + if title is None or artist is None: + print(f"{ULTRASINGER_HEAD} {red_highlighted('No match found')}") + return None, None, None, [] + + print(f"{ULTRASINGER_HEAD} Found and using {blue_highlighted(title)} by {blue_highlighted(artist)}") + + year = None + if 'first-release-date' in release: + year = release['first-release-date'] + print(f"{ULTRASINGER_HEAD} Release year: {blue_highlighted(year)}") + + genre = [] + if 'tag-list' in release: + for tag in release['tag-list']: + genre.append(tag['name']) + + return title, artist, year, genre diff --git a/src/modules/os_helper.py b/src/modules/os_helper.py index 8cb65f6..68deeb7 100644 --- a/src/modules/os_helper.py +++ b/src/modules/os_helper.py @@ -19,11 +19,16 @@ def move(original: str, target: str) -> None: shutil.move(original, target) -def copy(original:str, target: str) -> None: +def copy(original: str, target: str) -> None: """Copies a file from one location to another.""" shutil.copy(original, target) +def rename(original: str, target: str) -> None: + """Renames a file.""" + os.rename(original, target) + + def current_executor_path() -> str: """Current executor path""" return os.getcwd()