From 48b1ab92885df91afab12774e43e0357d41d5283 Mon Sep 17 00:00:00 2001
From: Lars Noack <lars.noack@outlook.de>
Date: Mon, 16 Jan 2023 14:31:43 +0100
Subject: [PATCH] added genre

---
 src/goof.py                               |   1 +
 src/music_kraken/database/new_database.py |   8 +++++---
 src/music_kraken/database/objects/song.py |   5 ++++-
 src/music_kraken/static_files/new_db.sql  |   1 +
 test.db                                   | Bin 69632 -> 69632 bytes
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/goof.py b/src/goof.py
index d392223..83d1459 100644
--- a/src/goof.py
+++ b/src/goof.py
@@ -53,6 +53,7 @@ album_input.artists = [
 ]
 
 song_input = Song(
+    genre="HS Core",
     title="Vein Deep in the Solution",
     length=666,
     isrc="US-S1Z-99-00001",
diff --git a/src/music_kraken/database/new_database.py b/src/music_kraken/database/new_database.py
index fec292a..e4ef7ea 100644
--- a/src/music_kraken/database/new_database.py
+++ b/src/music_kraken/database/new_database.py
@@ -27,7 +27,7 @@ logger = logging.getLogger("database")
 SONG_QUERY = """
 SELECT 
 Song.id AS song_id, Song.name AS title, Song.isrc AS isrc, Song.length AS length, Song.album_id, Song.tracksort,
-Target.id AS target_id, Target.file AS file, Target.path AS path
+Target.id AS target_id, Target.file AS file, Target.path AS path, Song.genre AS genre
 FROM Song
 LEFT JOIN Target ON Song.id=Target.song_id 
 WHERE {where};
@@ -173,9 +173,10 @@ class Database:
             song.isrc,
             song.length,
             song.get_album_id(),
-            song.tracksort
+            song.tracksort,
+            song.genre
         )
-        query = f"INSERT OR REPLACE INTO {table} (id, name, isrc, length, album_id, tracksort) VALUES (?, ?, ?, ?, ?, ?);"
+        query = f"INSERT OR REPLACE INTO {table} (id, name, isrc, length, album_id, tracksort, genre) VALUES (?, ?, ?, ?, ?, ?, ?);"
 
         self.cursor.execute(query, values)
         self.connection.commit()
@@ -475,6 +476,7 @@ class Database:
             isrc=song_result['isrc'],
             length=song_result['length'],
             tracksort=song_result['tracksort'],
+            genre=song_result['genre'],
             target=Target(
                 id_=song_result['target_id'],
                 file=song_result['file'],
diff --git a/src/music_kraken/database/objects/song.py b/src/music_kraken/database/objects/song.py
index 07c7c23..42ba666 100644
--- a/src/music_kraken/database/objects/song.py
+++ b/src/music_kraken/database/objects/song.py
@@ -93,6 +93,7 @@ class Song(DatabaseObject, ID3Metadata):
             isrc: str = None,
             length: int = None,
             tracksort: int = None,
+            genre: str = None,
             sources: List[Source] = None,
             target: Target = None,
             lyrics: List[Lyrics] = None,
@@ -115,6 +116,7 @@ class Song(DatabaseObject, ID3Metadata):
         self.mb_id: str | None = mb_id
         self.album_name: str | None = album_name
         self.tracksort: int | None = tracksort
+        self.genre: str = genre
         
         self.sources: List[Source] = []
         if sources is not None:
@@ -175,7 +177,8 @@ class Song(DatabaseObject, ID3Metadata):
         return {
             ID3_MAPPING.TITLE: [self.title],
             ID3_MAPPING.ISRC: [self.isrc],
-            ID3_MAPPING.LENGTH: [str(self.length)]
+            ID3_MAPPING.LENGTH: [str(self.length)],
+            ID3_MAPPING.GENRE: [self.genre]
         }
     
     def get_metadata(self) -> Metadata:
diff --git a/src/music_kraken/static_files/new_db.sql b/src/music_kraken/static_files/new_db.sql
index ef77458..7585a9c 100644
--- a/src/music_kraken/static_files/new_db.sql
+++ b/src/music_kraken/static_files/new_db.sql
@@ -5,6 +5,7 @@ CREATE TABLE Song
     isrc        TEXT,
     length      INT,    -- length is in milliseconds (could be wrong)
     tracksort   INT,
+    genre       TEXT,
     album_id    BIGINT,
     FOREIGN KEY(album_id) REFERENCES Album(id)
 );
diff --git a/test.db b/test.db
index a291c6d153c9edbf3040157eb72ebdc147257adb..742490ea1e604bd6d40de6da92c47f2f19bbc96c 100644
GIT binary patch
delta 2434
zcmc&#&1)T19L>DRB=05Zn*^y*T4*T26yi_r_XntHDWZ@Rl`_jHbHCEsl9VPDLGVS;
zE_7p@h1)FLbrJiXx-M?q*^PyVt8QH=`X6{-y3mvauPbML=iGDdIluGU-5=lGAOGUL
z^TV<3=jFqh-@5Niuh0B2#i!A9-oaDt_LrUU$@eF|Du(y>){4RJ#kcLwrEGHk^y%yq
z-`wjyE;jt;ZQo=w^UYp)r~PQG{IERReKeSx{jvMfYk9j`85@045W%epU^S7zoW)>_
zpb!YPA|S8oAevL>p6{)<+SStNk1Am6u<{O&2^?5J4wOYTIObiTn6jYRrG;Q`T;JSS
zxVp8uVIr!h!hzGC0W+9^su=<7xTj2FPPP8Hl|@R+t?W!yBhR@A0xa?b7)2B`DXj-D
zjblbQNoZ*9pIcsj<LbiYt=m2YzrXug*-H_dU&yO0MPh3yuR6zaeTwR-_-L(iZmb-1
z&@<(Ep{W)gsH+t)#1zynXh2qT%4<P%@Xf0$OK+zj-^nJcGpp@RWwBw*V+__AA1x6Y
zG!F`tm!26zH8rOBe&vP56x9C3@5<GGXL+bU<>LNZ-;|3f9u0new>_J5vVZH>ZqEfT
z99Irv<OHxfhD9mufFc!8jFm!|r#OD4Ra7z7MlvFmk`RB2DRoYRaSnk*NIGJ;rh@)6
z7ne`U{zq9+t-MlcEUB~B#Mnl=S#WVo42xreYN?0|mJ`w3>tT}O$yCfxUfvxmhvh+e
zcQAMHgR(aYYRVfNCOSpkp`$6Z57`Wg-B16|k;=Qjj7DmI*j-dH-zb^|+8Ps+fCy-(
zI2d7_N0=h+O;a4a++$MLK_V6lMLJ-d7*LKXAetdfVuCE;JAQk|Z>E^C6^*_!SJhk*
z!eem???W`&Yp8L}z;Q_s7J*Zvcdq$uztB85IQ!r1j%Js`zwJ&DdT4iw&?g0!Kz>wU
z`Ji}kv+Q}UU5%Xu&xnrQ99vo$TmwgpVC`)X+`WEnYkTL#R$k2$?F2?h0Fo5NvQrFd
zAuw=(BzDBs9GUG~H?QxAiM(27gi(b^0K{xuMLyQ3ijbfsqqUbVHe}|SKOa6<j9z7Z
zFt_mLlOaeURg9)3;RZJ`I+#Md6<_7T-ri#W@lV~P&60BaT0UM??UdF!BD!~i6>F^s
xm$amgz@3DajmRB08H_x&^HQ|-|F}{1QuacM8>?AfRViRcnLT@K%-q-6>|YBqeFp#l

delta 2440
zcmd5;O>10L7|xxWo6ID3ZnCKH3mr;m3h}@>=blecQ&H?9Eq-x#N;#iN+A>p|DTsp8
zMae>4SO)hIT!<o(8Fk%XU_o4D;UZf%MgM{C3{nj=^ei1_`Ob5m_j%s;dFS@Q{OyDJ
zFRq<?FxUR7yniNd50?8+94&1xzp?yu>(bKm&2L)IEPlT5eeqzjx?+pTQSoE5wV5rh
zojse~(W5Wh$D_~6kDJGH<(=|;`*^b2`L#WKJzuQ1=HP=R7gS<~ys;HxK15_Vj!0Q2
z2~%E3CI`EF{SJJu-RciIrrR6rh7UUZUU%oc#$vqzAT=eCJI@86$cPxx1{oYMvfg3F
z40BPCS3A*N-|Oyl-tBeY*)c?0K`VkNXA-d>q1X_Kg!Gk*UK7LFM;VaZY-F{Q+ImhH
zQaEVDuv17m_?eH|O0A`>I2nEW!X`~YT>`>+xj$F#mxtxiWcA{Q<?upYXDLeL)54Ty
z8yk7uN}+uQ*fb^uUMtT@MTM}43qug&${<y7hiG&hi|AEk)##P2jki-!Z-H{pZZ}(X
zl$;0b1Y%+;v(p|t!2watrN^Qok^0fkTj$qPP{$X4Dz_ica@Kpw!{fJpDA!XgoBVdQ
zxsp^lzWGOcXpEM^JBO?k9I+}Wq+_L#z|1>CD#lnyar;W6sA0H6FfmjnARak5qXcM3
zc!i9`S}95cqxQcu@!Dw{@JUwGTQAq%Qb#M#P!&0YWwEerlu~4vkR&?7Vhp42h9u3C
z&ZlKk!?V#%X=P?#3de_wRQzu?DW4Pvzqi+|@xifBAtkv7#|$X!xkVOBMKp8Fa4{+l
zUm6kuIpZj#5cA+#B@LtyRS<zrR#8&PG#iBeAaqmqqX+(8S*;ZYd@dQxn{n{E^+<C<
zkg(2rN`&RnLWK51XLRrIIhum}P-;l5a{u4VN@;Xvd`hD;<5S2_GYgcyccUC)7M-am
zM-Ie8kn|WSp(VnS5X*Fg)1oi!_WFYt8+pBEs1}A9g8~Q()o^DtiyT4bN1}w{O2_`q
z8+!w>kk^|c29VKlq=*1)%%M8Mo>Uc_nxK`VJX52;?mtz$Kh1JDY;XRP<O!sTX_6<r
zpcbZuDa0F~%7wdk*T=`dw1+A2lJffHe7>%mDQG907@lIq<p#hd-K7(7r=ew2a*vu{
mSh17WIi=U}pVuME68;yYxUrq(b)5oslG&4w95eNGw(>U-a&%V!