mirror of
https://github.com/rakuri255/UltraSinger.git
synced 2026-11-20 13:07:52 +09:00
Fix tests
This commit is contained in:
1 parent
ba5b047851
commit
0e2d8b935e
4 files changed
+133
-106
No files matched your search
@@ -9,7 +9,10 @@ class TestGetMusicInfos(unittest.TestCase):
|
||||
|
||||
@patch('musicbrainzngs.search_artists')
|
||||
@patch('musicbrainzngs.search_recordings')
|
||||
def test_get_music_infos(self, mock_search_recordings, mock_search_artists):
|
||||
@patch('musicbrainzngs.get_image_front')
|
||||
@patch('musicbrainzngs.get_image_list')
|
||||
@patch('musicbrainzngs.get_release_group_by_id')
|
||||
def test_get_music_infos(self, mock_get_release_group_by_id, mock_get_image_list, mock_get_image_front, mock_search_recordings, mock_search_artists):
|
||||
# Arrange
|
||||
artist = 'UltraSinger'
|
||||
title = 'That\'s Rocking! (UltrStar 2023) FULL HD'
|
||||
@@ -17,78 +20,83 @@ class TestGetMusicInfos(unittest.TestCase):
|
||||
# Set up mock return values for the MusicBrainz API calls
|
||||
mock_search_artists.return_value = {
|
||||
'artist-list': [
|
||||
{'name': artist}
|
||||
]
|
||||
}
|
||||
|
||||
mock_search_recordings.return_value = {
|
||||
'recording-list': [
|
||||
{'artist-credit': [
|
||||
{'name': 'Half Japanese',
|
||||
'artist': {
|
||||
'name': 'Half Japanese',
|
||||
'sort-name': 'Half Japanese'
|
||||
}}],
|
||||
'release-list': [{'title': title,
|
||||
'status': 'Official',
|
||||
'artist-credit': [{'name': 'Half Japanese'}],
|
||||
'date': '2014-04-20',
|
||||
'artist-credit-phrase': artist}],
|
||||
'artist-credit-phrase': artist}]}
|
||||
|
||||
# Call the function to test
|
||||
title, artist, year, genre = search_musicbrainz(title, artist)
|
||||
|
||||
# Assert the returned values
|
||||
self.assertEqual(title, 'That\'s Rocking!')
|
||||
self.assertEqual(artist, 'UltraSinger')
|
||||
self.assertEqual(year, '2023-01-01')
|
||||
self.assertEqual(genre, 'Genre 1,Genre 2,')
|
||||
|
||||
@patch('musicbrainzngs.search_artists')
|
||||
@patch('musicbrainzngs.search_recordings')
|
||||
def test_get_music_infos_when_title_and_artist_are_the_same(self, mock_search_release_groups, mock_search_artists):
|
||||
# Arrange
|
||||
artist = "ArtistIsTitle"
|
||||
title = "ArtistIsTitle"
|
||||
|
||||
# Set up mock return values for the MusicBrainz API calls
|
||||
mock_search_artists.return_value = {
|
||||
'artist-list': [
|
||||
{'name': artist}
|
||||
]
|
||||
}
|
||||
|
||||
mock_search_release_groups.return_value = {
|
||||
'release-group-list': [
|
||||
{
|
||||
'title': title,
|
||||
'artist-credit-phrase': artist,
|
||||
'id': 'fake_artist_id',
|
||||
'name': artist
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
# Act search_not_same but musicbrainz returns the same artist and title
|
||||
title, artist, year, genre = search_musicbrainz("ArtistIsTitle", "ArtistNotTitle")
|
||||
# image_data = musicbrainzngs.get_image_front(release['id'])
|
||||
mock_get_image_front.return_value = b'fake image data'
|
||||
|
||||
|
||||
mock_get_image_list.return_value = {
|
||||
'images': [
|
||||
{
|
||||
'front': True,
|
||||
'image': 'https://example.com/image.jpg'
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
mock_get_release_group_by_id.return_value = {
|
||||
'release-group': {
|
||||
'first-release-date': '2023-01-01'
|
||||
}
|
||||
}
|
||||
|
||||
mock_search_recordings.return_value = {
|
||||
'recording-list': [
|
||||
{
|
||||
'title': 'That\'s Rocking!',
|
||||
'artist-credit-phrase': artist,
|
||||
'release-list': [
|
||||
{
|
||||
'id': 'fake_release_id',
|
||||
'release-group': {
|
||||
'id': 'fake_group_id',
|
||||
}
|
||||
},
|
||||
],
|
||||
'tag-list': [
|
||||
{'name': 'Genre 1'},
|
||||
{'name': 'Genre 2'},
|
||||
],
|
||||
'artist-credit': [
|
||||
{
|
||||
'artist': {'id': 'fake_artist_id'}
|
||||
}
|
||||
],
|
||||
}
|
||||
]}
|
||||
|
||||
# Call the function to test
|
||||
song_info_single_line = search_musicbrainz(f'{artist} - {title}', None) # Single line test
|
||||
|
||||
# Assert the returned values
|
||||
self.assertEqual(song_info_single_line.title, 'That\'s Rocking!')
|
||||
self.assertEqual(song_info_single_line.artist, 'UltraSinger')
|
||||
self.assertEqual(song_info_single_line.year, '2023')
|
||||
self.assertEqual(song_info_single_line.genres, 'Genre 1,Genre 2,')
|
||||
self.assertEqual(song_info_single_line.cover_image_data, b'fake image data')
|
||||
self.assertEqual(song_info_single_line.cover_url, 'https://example.com/image.jpg')
|
||||
|
||||
song_info_multi_line = search_musicbrainz(title, artist) # multi line test
|
||||
|
||||
self.assertEqual(song_info_multi_line.title, 'That\'s Rocking!')
|
||||
self.assertEqual(song_info_multi_line.artist, 'UltraSinger')
|
||||
self.assertEqual(song_info_multi_line.year, '2023')
|
||||
self.assertEqual(song_info_multi_line.genres, 'Genre 1,Genre 2,')
|
||||
self.assertEqual(song_info_multi_line.cover_image_data, b'fake image data')
|
||||
self.assertEqual(song_info_multi_line.cover_url, 'https://example.com/image.jpg')
|
||||
|
||||
# Assert
|
||||
self.assertEqual(title, None)
|
||||
self.assertEqual(artist, None)
|
||||
self.assertEqual(year, None)
|
||||
self.assertEqual(genre, None)
|
||||
|
||||
# Act search_is_same and musicbrainz returns the same artist and title
|
||||
title, artist, year, genre = search_musicbrainz(title, artist)
|
||||
|
||||
# Assert
|
||||
self.assertEqual(title, 'ArtistIsTitle')
|
||||
self.assertEqual(artist, 'ArtistIsTitle')
|
||||
self.assertEqual(year, None)
|
||||
self.assertEqual(genre, None)
|
||||
|
||||
@patch('musicbrainzngs.search_artists')
|
||||
@patch('musicbrainzngs.search_recordings')
|
||||
def test_get_empty_artist_music_infos(self, mock_search_release_groups, mock_search_artists):
|
||||
def test_get_empty_artist_music_infos(self, mock_search_recordings, mock_search_artists):
|
||||
# Arrange
|
||||
artist = 'UltraSinger'
|
||||
title = 'That\'s Rocking! (UltrStar 2023) FULL HD'
|
||||
@@ -98,32 +106,45 @@ class TestGetMusicInfos(unittest.TestCase):
|
||||
'artist-list': []
|
||||
}
|
||||
|
||||
mock_search_release_groups.return_value = {
|
||||
'release-group-list': [
|
||||
mock_search_recordings.return_value = {
|
||||
'recording-list': [
|
||||
{
|
||||
'title': f' {title} ', # Also test leading and trailing whitespaces
|
||||
'artist-credit-phrase': f' {artist} ', # Also test leading and trailing whitespaces
|
||||
'first-release-date': ' 2023-01-01 ', # Also test leading and trailing whitespaces
|
||||
'title': 'That\'s Rocking!',
|
||||
'artist-credit-phrase': artist,
|
||||
'release-list': [
|
||||
{
|
||||
'id': 'fake_release_id',
|
||||
'release-group': {
|
||||
'id': 'fake_group_id',
|
||||
}
|
||||
},
|
||||
],
|
||||
'tag-list': [
|
||||
{'name': ' Genre 1 '}, # Also test leading and trailing whitespaces
|
||||
{'name': ' Genre 2 '} # Also test leading and trailing whitespaces
|
||||
]
|
||||
{'name': 'Genre 1'},
|
||||
{'name': 'Genre 2'},
|
||||
],
|
||||
'artist-credit': [
|
||||
{
|
||||
'artist': {'id': 'fake_artist_id'}
|
||||
}
|
||||
],
|
||||
}
|
||||
]
|
||||
}
|
||||
]}
|
||||
|
||||
# Act
|
||||
title, artist, year, genre = search_musicbrainz(title, artist)
|
||||
song_info_single_line = search_musicbrainz(f'{artist} - {title}', None) # Single line test
|
||||
|
||||
# Assert
|
||||
self.assertEqual(title, None)
|
||||
self.assertEqual(artist, None)
|
||||
self.assertEqual(year, None)
|
||||
self.assertEqual(genre, None)
|
||||
self.assertEqual(song_info_single_line.title, f'{artist} - {title}')
|
||||
self.assertEqual(song_info_single_line.artist, "Unknown Artist")
|
||||
self.assertEqual(song_info_single_line.year, None)
|
||||
self.assertEqual(song_info_single_line.genres, None)
|
||||
self.assertEqual(song_info_single_line.cover_image_data, None)
|
||||
self.assertEqual(song_info_single_line.cover_url, None)
|
||||
|
||||
@patch('musicbrainzngs.search_artists')
|
||||
@patch('musicbrainzngs.search_recordings')
|
||||
def test_get_empty_release_music_infos(self, mock_search_release_groups, mock_search_artists):
|
||||
def test_get_empty_release_music_infos(self, mock_search_recordings, mock_search_artists):
|
||||
# Arrange
|
||||
artist = 'UltraSinger'
|
||||
title = 'That\'s Rocking! (UltrStar 2023) FULL HD'
|
||||
@@ -135,25 +156,28 @@ class TestGetMusicInfos(unittest.TestCase):
|
||||
]
|
||||
}
|
||||
|
||||
mock_search_release_groups.return_value = {
|
||||
'release-group-list': []
|
||||
mock_search_recordings.return_value = {
|
||||
'recording-list': []
|
||||
}
|
||||
|
||||
# Act
|
||||
title, artist, year, genre = search_musicbrainz(title, artist)
|
||||
song_info_single_line = search_musicbrainz(f'{artist} - {title}', None) # Single line test
|
||||
|
||||
# Assert
|
||||
self.assertEqual(title, None)
|
||||
self.assertEqual(artist, None)
|
||||
self.assertEqual(year, None)
|
||||
self.assertEqual(genre, None)
|
||||
self.assertEqual(song_info_single_line.title, f'{artist} - {title}')
|
||||
self.assertEqual(song_info_single_line.artist, "Unknown Artist")
|
||||
self.assertEqual(song_info_single_line.year, None)
|
||||
self.assertEqual(song_info_single_line.genres, None)
|
||||
self.assertEqual(song_info_single_line.cover_image_data, None)
|
||||
self.assertEqual(song_info_single_line.cover_url, None)
|
||||
|
||||
#@unittest.skip("Search with real data only test manually")
|
||||
|
||||
@unittest.skip("Search with real data only test manually")
|
||||
def test_search_musicbrainz_with_real_data(self):
|
||||
|
||||
# Arrange
|
||||
search_list = [
|
||||
#(search_artist, seartch_title, expected_artist, expected_title)
|
||||
# (search_artist, seartch_title, expected_artist, expected_title)
|
||||
|
||||
(None, 't', None, None), # this should return "Unknown artist"
|
||||
('Căsuța noastră', 'Gică Petrescu', 'Gică Petrescu', 'Căsuța noastră'), # Gică Petrescu - Gică Petrescu
|
||||
|
||||
+2
-2
@@ -524,8 +524,8 @@ def infos_from_audio_input_file() -> tuple[str, str, str, MediaInfo]:
|
||||
os.path.join(song_folder_output_path, basename),
|
||||
)
|
||||
# Todo: Read ID3 tags
|
||||
if song_info.image_data is not None:
|
||||
save_image(song_info.image_data, basename_without_ext, song_folder_output_path)
|
||||
if song_info.cover_image_data is not None:
|
||||
save_image(song_info.cover_image_data, basename_without_ext, song_folder_output_path)
|
||||
ultrastar_audio_input_path = os.path.join(song_folder_output_path, basename)
|
||||
real_bpm = get_bpm_from_file(settings.input_file_path)
|
||||
return (
|
||||
|
||||
@@ -111,9 +111,9 @@ def download_from_youtube(input_url: str, output_folder_path: str, cookiefile: s
|
||||
__download_youtube_audio(input_url, basename_without_ext, song_output, cookiefile)
|
||||
__download_youtube_video(input_url, basename_without_ext, song_output, cookiefile)
|
||||
|
||||
if song_info.cover_url is not None and song_info.image_data is not None:
|
||||
if song_info.cover_url is not None and song_info.cover_image_data is not None:
|
||||
cover_url = song_info.cover_url
|
||||
save_image(song_info.image_data, basename_without_ext, song_output)
|
||||
save_image(song_info.cover_image_data, basename_without_ext, song_output)
|
||||
else:
|
||||
cover_url = __download_youtube_thumbnail(
|
||||
input_url, basename_without_ext, song_output
|
||||
|
||||
@@ -14,7 +14,7 @@ class SongInfo:
|
||||
artist: str
|
||||
year: Optional[str] = None
|
||||
genres: Optional[str] = None
|
||||
image_data: Optional[bytes] = None
|
||||
cover_image_data: Optional[bytes] = None
|
||||
cover_url: Optional[str] = None
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ def __clean_string(s: str) -> str:
|
||||
return s.translate(str.maketrans('', '', string.punctuation)).lower().strip()
|
||||
|
||||
|
||||
def search_musicbrainz(title: str, artist: str) -> SongInfo:
|
||||
def search_musicbrainz(title: str, artist) -> SongInfo:
|
||||
# Musicbrainz API documentation
|
||||
# https://python-musicbrainzngs.readthedocs.io/en/latest/api/
|
||||
|
||||
@@ -37,6 +37,7 @@ def search_musicbrainz(title: str, artist: str) -> SongInfo:
|
||||
|
||||
# remove from search_string "official video"
|
||||
# todo: do we need filter?
|
||||
origin_title = title
|
||||
for filter in title_filter:
|
||||
title = title.lower().replace(filter.lower(), "").strip()
|
||||
if artist is not None:
|
||||
@@ -49,7 +50,7 @@ def search_musicbrainz(title: str, artist: str) -> SongInfo:
|
||||
|
||||
if recording is None:
|
||||
print(f"{ULTRASINGER_HEAD} {red_highlighted('No match found')}")
|
||||
return SongInfo(title=title, artist="Unknown Artist")
|
||||
return SongInfo(title=origin_title, artist="Unknown Artist")
|
||||
|
||||
artist = recording['artist-credit-phrase']
|
||||
title = recording['title']
|
||||
@@ -58,10 +59,9 @@ def search_musicbrainz(title: str, artist: str) -> SongInfo:
|
||||
|
||||
year = __get_year(recording)
|
||||
genres = __get_genres(recording)
|
||||
|
||||
image_data, image_url = __get_image(recording)
|
||||
|
||||
return SongInfo(title=title, artist=artist, year=year, genres=genres, image_data=image_data, cover_url=image_url)
|
||||
return SongInfo(title=title, artist=artist, year=year, genres=genres, cover_image_data=image_data, cover_url=image_url)
|
||||
|
||||
|
||||
def __single_line_search(search_string):
|
||||
@@ -70,26 +70,29 @@ def __single_line_search(search_string):
|
||||
|
||||
artists = musicbrainzngs.search_artists(search_string, limit=10, artist=search_string)
|
||||
recordings = musicbrainzngs.search_recordings(search_string, limit=100, artistname=search_string)
|
||||
artist = None
|
||||
found_artist = None
|
||||
|
||||
for record in recordings['recording-list']:
|
||||
if artist is not None:
|
||||
if found_artist is not None:
|
||||
break
|
||||
|
||||
for a in record['artist-credit']:
|
||||
if artist is not None:
|
||||
for artist_credit in record['artist-credit']:
|
||||
if found_artist is not None:
|
||||
break
|
||||
if isinstance(a, str):
|
||||
if isinstance(artist_credit, str):
|
||||
continue
|
||||
# todo: there is also an "alias-list". Maybe search also there?
|
||||
|
||||
for y in artists['artist-list']:
|
||||
if a['artist'] and a['artist']['id'] == y['id']:
|
||||
artist = record['artist-credit-phrase']
|
||||
for artist in artists['artist-list']:
|
||||
if artist_credit['artist'] and artist_credit['artist']['id'] == artist['id']:
|
||||
found_artist = record['artist-credit-phrase']
|
||||
break
|
||||
|
||||
if found_artist is None:
|
||||
return None
|
||||
|
||||
recordings = [x for x in recordings['recording-list'] if
|
||||
__clean_string(x['artist-credit-phrase']) == __clean_string(artist)]
|
||||
__clean_string(x['artist-credit-phrase']) == __clean_string(found_artist)]
|
||||
|
||||
recording = None
|
||||
|
||||
@@ -164,7 +167,7 @@ def __get_image(recording) -> (bytes, str):
|
||||
except:
|
||||
continue
|
||||
if image_data is not None:
|
||||
print(f"{ULTRASINGER_HEAD} Found image")
|
||||
print(f"{ULTRASINGER_HEAD} Found cover image")
|
||||
|
||||
return image_data, image_url
|
||||
|
||||
|
||||
Reference in new issue
Block a user