From 7d21cb727eecddffc59612d78e0392f96e828845 Mon Sep 17 00:00:00 2001
From: Hellow <Lars.Noack@outlook.de>
Date: Wed, 7 Dec 2022 00:02:28 +0100
Subject: [PATCH] added lyrics to object thingie

---
 src/.fuse_hidden0000846000000007          | Bin 0 -> 65536 bytes
 src/goof.py                               |   5 ++--
 src/music_kraken/database/new_database.py |  32 ++++++++++++++++++----
 src/test.db                               | Bin 65536 -> 65536 bytes
 4 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 src/.fuse_hidden0000846000000007

diff --git a/src/.fuse_hidden0000846000000007 b/src/.fuse_hidden0000846000000007
new file mode 100644
index 0000000000000000000000000000000000000000..8043063737df059bf3955a6ef5bc0bdeefb599a9
GIT binary patch
literal 65536
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
W00bZa0SG_<0uX=z1RyX}0{;My(vT|v

literal 0
HcmV?d00001

diff --git a/src/goof.py b/src/goof.py
index a024391..1ca9a54 100644
--- a/src/goof.py
+++ b/src/goof.py
@@ -12,7 +12,7 @@ import music_kraken.database.new_database as db
 cache = music_kraken.database.new_database.Database("test.db")
 cache.reset()
 
-song = Song(
+song_input = Song(
     title="Vein Deep in the Solution",
     release_name="One Final Action",
     length=666,
@@ -37,4 +37,5 @@ lyrics = Lyrics(text="these are some Lyrics that don't belong to any Song", lang
 
 cache.push([song, lyrics])
 
-cache.pull_single_song(song_ref=song_ref)
+song_output = cache.pull_single_song(song_ref=song_ref)
+print(song_output)
diff --git a/src/music_kraken/database/new_database.py b/src/music_kraken/database/new_database.py
index c875e39..86b5d8e 100644
--- a/src/music_kraken/database/new_database.py
+++ b/src/music_kraken/database/new_database.py
@@ -186,7 +186,30 @@ class Database:
         pass
 
     def pull_lyrics(self, song_ref: Reference = None, lyrics_ref: Reference = None) -> List[Lyrics]:
-        pass
+        """
+        Gets a list of sources. if lyrics_ref is passed in the List will most likely only
+        contain one Element if everything goes accordingly.
+        **If neither song_ref nor lyrics_ref are passed in it will return ALL lyrics**
+        :param song_ref:
+        :param lyrics_ref:
+        :return:
+        """
+
+        where = "1=1"
+        if song_ref is not None:
+            where = f"song_id=\"{song_ref.id}\""
+        elif lyrics_ref is not None:
+            where = f"id=\"{lyrics_ref.id}\""
+
+        query = LYRICS_QUERY.format(where=where)
+        self.cursor.execute(query)
+
+        lyrics_rows = self.cursor.fetchall()
+        return [Lyrics(
+            id_=lyrics_row['id'],
+            text=lyrics_row['text'],
+            language=lyrics_row['language']
+        ) for lyrics_row in lyrics_rows]
 
     def pull_sources(self, song_ref: Reference = None, source_ref: Reference = None) -> List[Source]:
         """
@@ -234,7 +257,7 @@ class Database:
             logger.warning(f"Multiple Songs found for the id {song_ref.id}. Defaulting to the first one.")
         song_result = song_rows[0]
 
-        song = Song(
+        return Song(
             id_=song_result['song_id'],
             title=song_result['title'],
             isrc=song_result['isrc'],
@@ -244,11 +267,10 @@ class Database:
                 file=song_result['file'],
                 path=song_result['path']
             ),
-            sources=self.pull_sources(song_ref=song_ref)
+            sources=self.pull_sources(song_ref=song_ref),
+            lyrics=self.pull_lyrics(song_ref=song_ref)
         )
 
-        return song
-
 
 if __name__ == "__main__":
     cache = Database("")
diff --git a/src/test.db b/src/test.db
index 8043063737df059bf3955a6ef5bc0bdeefb599a9..c19a7131864d1d30cf2373aee8ec65aef01e2396 100644
GIT binary patch
delta 874
zcma))zfM$95XSGa5Lpww(2B`YY{bM&GWX1!J!cXl4`2*Z+``WDH&#%v)NE~gAAo|!
z4&6<x@d>cBu(9wNXg$IUoMNV$eDlrso8@wIx!nBvV>(MpY|4@$kXT?Z9y}!j1|27K
z#3rWo-|1ajHMzoP?JT3WF=PuADFBDaAkIV}XM9eab;LNlIXpP7*?m5G)bG9Bp7dIn
z$ch6Wx(JLxz!o70+KN#*NFW@(AHKjE)yGZKY_!)+`>VZP@9tc+$1lhIsK)rl!MLB)
zcv-#wa5PIYSCrWSBF=$bX%aAi4Ow^M=R%Z+Z<nuzFPB^w@c!>YqC$0bKUe{Gb@S)x
z%%EsxJ%j6<2PWmfiJe1mI!9{@NRx)G+t(L9=`Ii{D1Zexdj&p81jC(X@;*k)i*&X~
zCp8#OM_c{7-Cm>039|xZq#~Lkh>;F33YQguOK^)%=`8IJH@DC0a{BqXy{Nfr{2zSH
VRS)1RoIWYP)$Ej7Pd?sF{{bc^@;?9o

delta 874
zcma))zfM#^6vpqe5M2_y(4xswY=DHEWd6^b#K;2}qZGHW<Ib5mvC@LIW^3E~02DNI
zz;0rVPk^O`jfKxZ>#R>O#Y}bbo$vd8XR+8^EH>|cOlK||FQe3;mC|4`Cx|K|DAk7$
zJR)0M{hdCwRg+7x-_BH@Vq&WRZTXC42|We@P6S7ZT}Y9JH>XEuHM_r#o^>zZKA&{i
zvf`9Hh@@jtwGMj2J!FrPPzpy%4&P4?MUCoq(=;3HZPVVizgBy@*X`NyxEs|N-#8j~
zlNv9}4<Fyph+}fXS_qgV80jU195r~tpl#5sEe-cqC&SH^sVn&4cUz^pTo2Y%v3&UR
zVn*bhHf#!Zk-@CZ#*hr4v5umoK9Cr;9$#Ow*NQMDkmwkU@I9a_C>)b4&`r-m%=5)O
zf3Dg6Wwh13+w0IvL()cI6G}_0N=xWG<RqCQhR8(oPx&Gr3=fa5>Qepu)?U`68n40E
Vr1}rO#_3MEt!B5p)#UtX`VVK`>7xJu