From 863d233c42a10fb00e3b87bcc450977eda361a1a Mon Sep 17 00:00:00 2001 From: Tutislav Date: Sat, 25 Feb 2023 18:51:19 +0100 Subject: [PATCH] Fixed YoutubeLoader, fixed lyrics search --- neodeemer/lyrics.py | 2 +- neodeemer/songinfoloader.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/neodeemer/lyrics.py b/neodeemer/lyrics.py index 5785e2d..6649652 100644 --- a/neodeemer/lyrics.py +++ b/neodeemer/lyrics.py @@ -158,7 +158,7 @@ def get_lyrics(self, url: str): def find_lyrics(self, track_dict: dict): lyrics = "" - tracks = self.search(norm(track_dict["artist_name2"] + " - " + clean_track_name(track_dict["track_name"]))) + tracks = self.search(norm(track_dict["artist_name"] + " - " + clean_track_name(track_dict["track_name"]))) for track in tracks: if contains_artist_track(track["name"], track_dict["artist_name2"], track_dict["track_name"]): lyrics = self.get_lyrics(track["url"]) diff --git a/neodeemer/songinfoloader.py b/neodeemer/songinfoloader.py index ce5d2ac..c6d7ab1 100644 --- a/neodeemer/songinfoloader.py +++ b/neodeemer/songinfoloader.py @@ -390,6 +390,7 @@ def track_to_dict(self, track, playlist=False): video_id = track.video_id video_channel = track.author file_path = os.path.join(self.music_folder_path, norm(track_name, True, True) + ".m4a") + file_path2 = os.path.join(self.music_folder_path, norm(track_name, True, True) + ".mp3") track_dict = { "artist_name": "", "artist_name2": "", @@ -409,11 +410,13 @@ def track_to_dict(self, track, playlist=False): "reason": "", "folder_path": self.music_folder_path, "file_path": file_path, - "file_path2": file_path, + "file_path2": file_path2, "locked": False, - "state": TrackStates.FOUND, "video_channel": video_channel } + track_dict.update({"state": track_file_state(track_dict)}) + if track_dict["state"] != TrackStates.COMPLETED: + track_dict["state"] = TrackStates.FOUND return track_dict def tracks_search(self, track_name):