From 2394d9387d798a3a7a6ab5dfc8f9f7ada0fdf90f Mon Sep 17 00:00:00 2001
From: Rob Canning <rc@kiben.net>
Date: Sun, 21 Jan 2024 01:29:33 +0100
Subject: [PATCH] table creation to seperate file

---
 database/show.db                    | Bin 446464 -> 446464 bytes
 html/templates/episode.jinja        |   2 +-
 mk_music_library_db.py              |  36 +++++++++++++++
 mk_show.py                          |  66 +++++++---------------------
 playlists/track_playout_history.txt |  20 ++++-----
 5 files changed, 61 insertions(+), 63 deletions(-)

diff --git a/database/show.db b/database/show.db
index 6b52de323831f18656065f1192e1660bf2ec176c..ce70dc0773b0fc8a8e83203366846bb221fd0f0d 100644
GIT binary patch
delta 1921
zcmZwHdrVwa8UXM)_nvd+!90a248!d_D6~LfZh4ea+rmJnFSbDKV-Q-(6vu@^OM!OV
zYAc*OkNsn#rJ2O9(O7GAjc&5q29;%95;oBo<EzFdMza;ys7a&Q?Yi0QW|Ok}9gMsG
zklg%c=HBx??sw1JscZhJYyN3J8M|E4<{dND3=oIwUnXjwGdUx!dHbAWX~q+b*@H%_
zYA)0?l8&EF92-f-x_0mH+#cKi(<goYj-BMLxXN-%4xO->i1SZ`oS3n@A8}3&XA>rq
z>3H@aI+Sfkf1YhYAI@$<AIjFC1KALo$QGdeSu@&~c?><0IgR#aPM|%RB>G_HFdENv
zpa(Ni^nr|yc4f-Z&P*}7H)BQH)92AWlj&jn*p==>ccu@ZvGfkKE!~K=rmN7FbO3Em
z%ko>(7IaJM9J)CrW1CVkc2lYgZA`VI4XHY`E>()wrexHH6hkA%1X^tzL)RM*pq0j?
z3|ME#fO13L<r*U&4I3&N5@YCUF@S19PN+oeME#-(^@(b<P{=5+@S+7mHh15ni035Y
zI*K@DWA-*AZzE!<M9d`!cPe<!L|h~I!*swkg3q$gMe+Oo+>Iga$t&tuZYjbGZM@&)
zs(1D{Ubo-Mdppl(TVts(CwMM&y?G`W<lH45v)Qedy1iAJ*{c{)xHHe|p!V--04~k*
zD!BW-s>57>#=;_Il?(G5%9KLIAhmjJeYK89T~OCIFCXx$d!*D#Zgq?fO(e~?!Q)_$
zcv9yqP7D)`VmM~@dQ-jdk2$O`^(Je8uHUd$a9?HB(E1W9fe&6{7WnS>JSMN6lNV~k
zV%#jN9`X2OdyOkqjZ(61Ra1Ri;^aVbq~#Zf_r3Yg>dKDMlS%U;+!!EncsNS7#Y6>{
ziM(qy#ixkg6%xsiUCHs}>7jv%;EvJp;do+vaCCekN!A}o4h)_gHGcy)zEk$V%Xbvb
zW!Ra_*Kn{(HntV)f8gctO%2%sAO4POaJPU|!eoTR!=jJMg=^~qa-p_DVfgk5zJV`y
z{55?1E^CCFJ-iYAa)=j)MOc;5rEOjuo(QZIeRPr5%CVJ!dy)F#{35l(-9^e=BCg2T
ziiQevND*gX;~aklzGzpqu-HxHm8yszdlF|?%If`rM1JZi@dG(iV#B><vz;}$?0H45
ztRrkY>zvQK;;gY}9hY$P_1Yl+HAMscKkByS4MS`&+Cxg<)W69tIOSk|ZWSXm)th_n
zlOni&AG^BzfVo8!Q=<|7W+OU$IY8DeKP_U0k7gB&^{aKu<0c#;w=w(w#>$y+P(%AM
zSr3mdPm9tHDsrLQz9%=c(EkTPRCu)tv+3K_R`{}A^>gJs6=$s=@5|7$I?3uvR#)H9
zY2HoJ@w%O<3Mrj+D=f!J5H5X6E<n)AN{Ab_T3LpaL9|jC%pK`=vo$yr9Xy{YhjN2^
zs%`RhQ6oyIaX&Vu!#x`tAyqlgP&rKJv5TZ0rZOttM7OdTg564!mB{~d#W5-%ah&>K
z!Or&Zjlx6?lKbQF5KJePW;wbbSqqmP>?z{N{q+pyYE|~avrcTt27MMq%iSD10h2St
z&rN^Ed{!8nr&_LSvIo9!v1(E@Yj?BH2_F>Y)YuE2gS;Ew878~)Ouxp}$HYaNdK9Af
z*erDBvng^IHhjR+@ZJSp$yNC(PQv9ProlppdEnCbtPk8?c7Poc_0)imOL+iVKBX6-
z=@u;j-zrwkj|xH!6{2sk?J&KHZ6n)Z!ApB#`aS9Z{e8+{OCdW)_CZ$}55sQ@@GYYh
zu>!IiI<Mn&POW2cuFPTKfGqq1DTakQdHyn450gIDLRP_ok3CKD!BbBr;G<&ZBO?$!
ziaqKf(gHm((ho2C*>j{Dn&WH%EE;o?C^SEg8>qj4Hp8@wws2)VmiQT5>!+)s>nn9D
zbTYb=EA@DG2P9Ur3uK#Ys1&9)Q4OYbx&~SU%**fpag6(3QzP(-P&dLeA?k*!?X(CM
R+iAfsmjY~dDZrKK{{nfA^gRFo

delta 1995
zcmZvcZERCj7{`0=J?FMvZ`&1Cx4ITCg$=eb+O2E%#^}mc#*5nu<8{Jhn-y?_0fRVS
za65e?Ad%u#o<v0liXR{l2`1A-lkSrcV?^PL#`mDcsDT6x`a$$L1N6&o?)lw&&prR=
z`Jd;Ud&kC$$Ht4Z#bo%HyTv(dSkzCf_CF0&y=<`g>>sF?t#>Xuv~{YMsFsa|9uG;?
z?(6Lvj7MWDx;k5<UH7kpZ+xy2{by^G?7Zl+eM!i`MK%8^+vtu=ufbs0o>_<7mRW_2
zXPS|ZX6lfAnMKIn%pBw+nF3@_#)#aUeir#~dLMFAdM9#YI*#0s-i%zA?m%{>Bgk0V
zkL*a7BHPmsB3Gr&$Q7w4k;_L@19(}M>On?RYmqIfWynaX7TKJtKrTtmMmD8H`o@$A
z*^nGT)+L3uHYv2BWDFThE=2~C0c2HjF4CVADqoTzD-*-WibNl>Jh2A3ATcTgr3oRJ
zmk_h`CT1eFgp8cc_aNQ8A6d*rg&yQ>NEfe17V=7@lMB^M?nKVu!d(8-2>ULC^$~<B
zjODc;%prtQj$m#CwMhnp#X#(X_+VILAH;R+u~WQXtzS6gIsUG^N5A7!k~DUZ#t1eE
zn>;~d)OdwFG@)utmdKomd@s`#G7FC0CeMIY#@xgPO=T=i=0aqpv|ZmalF#O0&_&?*
zOIojQf4nkJlw=`y(?p|w@|GX|E@y+JOm`eAg=_^oK&oNvwCsVKBT@rsBT~JY2+#BT
zD2Lv|)CIYPY^74e4KzXY$-{FXo0h_`yOL?71ddg*mx)Ec@e;=BliK0+MQF$bJqsj{
ze&yIs7`;l06~lKJ&j@?Iq8>f=dN+LSW0mBA3DwWOAj)IBlqTB2v0vE;A3jG`SPZ9e
z^j3a=CZC3gN11@m02?FSQ1u&2!AGwu<%%q}TR$ADV;;ywm;;WgN)O}**;=-i*U$uf
z+M>*c=G*iD)c;Nkz!hSZ$`(#&LWan7)(Y7WTSAsXE=V7S>@U;`{$DAB#kFjNbV4ku
zc;Q@)QUOvOD<Eyqc?GMpdpX;nNbg}{k4XF`DS}*==)XV~!e~8fCIyhIXRi<kIM$M3
z_@sfk$m0+hMUVanX@>4N*$QtpvXf*zgr8tJFf}n72}Agt<bka<Gz?iEZC0d(m|`W2
zkI`8WlV}rkme4jus=?k?=v~5|A&Z5fxiGeodLSF4^I&P1IhFdmWn6tt_QCm+atKaD
zXg<6)K#Sm;0a|eIPMA&H2`f_e__)G~jWq`Qa@%q17uKjcZu#31H(xi;H|;m(j5W9`
z3yf{ttg2>HpwQ(q&XIUwwZFQi(vN3A^ZOg7&eoy9q2cxMz5C)L-SNHKhITdYKO>H_
z(ZP8CzP&@ccJv#6&?k>*@R}-@czLx&1au7qjZP;g(*%SY%UBh7mNU)NF|;c#8aUEy
z7K}!j+sl1<Lf=y2F*+q4m`1OEccd7uS|qn3q{i<tcbA<vn1!q?SSIGtsP9;E-jR6L
zWWzpQ%X_23%pSd=E&w-QV9&$RGc5RjcJdC}>*Y?Ph~R0QN^GAdF?@TL`tBzE3VL6p
z^>E@d*<|OMB80)R3gOtHUu!Ida1pV<6*qnpQy#ws-bI#rxtC3iygRq~)1^51i&OxE
zAK#zcb(p*)wR`ytDulH&r@T$KO5m83osiARGxf<(1!(V6&Ccs(p=u90g|VPM6bisa
zjcPce8|y5Im#d3Q#LH>D{PUyKbg#xx^|P=MBtkRSgXNTXcpCrusnfN0C12~2ULUmI
zlFGF_+|#ORH>fY$HmJAkovPh_%6iFm#`cHWZH?LNxD#(!=t{~9^~sJRJ(e*~Z6&6L
zDaSui$1KR%n1@+5QXaTBqDa4aWFE`gOmV4E16rTlOw7QaByM=Snw5%G4pP%H%Jr&0
zU2yX=xtto?@JF|`fweMa4dwIiMG7%?FS84F|4yt^rDJpx#ez+CxWu=)n927Au=^(|
Nq)1yR51ap+;J-M31Kj`s

diff --git a/html/templates/episode.jinja b/html/templates/episode.jinja
index 93471b1..da301db 100644
--- a/html/templates/episode.jinja
+++ b/html/templates/episode.jinja
@@ -117,7 +117,7 @@
         <div class="col-md-7">
 	  <h4>This weeks playlist:</h4>
 	  {% for track in episode_playlist[0:] %}
-	  <h4>{{track}}</h4>
+	  <p><b> {{track}} </b> </p>
 	  {% endfor %}
 	  <!-- <table> -->
 	  <!--   {% for track in episode_playlist[0:] %} -->
diff --git a/mk_music_library_db.py b/mk_music_library_db.py
index 7a9300d..a24f14a 100755
--- a/mk_music_library_db.py
+++ b/mk_music_library_db.py
@@ -1,5 +1,7 @@
 #!/usr/bin/python3
 
+# CREATE MUSIC DATABASE ------------------------------------------
+
 import sys, os, datetime, fnmatch, glob, random, time, pathlib, re
 from datetime import timedelta
 from os.path import join
@@ -43,6 +45,39 @@ def database_create(conn):
     conn.execute(str(mus_lib))
     print('''MUSIC LIBRARY Table created successfully''');
 
+
+#conn = ''
+
+def database_create_episodes_table(conn):
+    # the show database
+
+#    conn = sqlite3.connect("database/show.db")
+
+    #TODO put the below back as a raw quiry to make if not exists possible  
+    q = Query \
+        .create_table("EPISODES") \
+        .columns(
+            Column("id", "INT", nullable=True),
+            Column("episode", "INT", nullable=True),
+            Column("date", 'DATETIME', nullable=True),
+            Column("album", "VARCHAR(200)", nullable=True),
+            Column("track", "VARCHAR(120)", nullable=True),
+            Column("artist", "VARCHAR(120)", nullable=True),
+            Column("trackdur", "FLOAT", nullable=True),
+            Column("genre", "VARCHAR(120)", nullable=True),
+            Column("year", 'DATETIME', nullable=True),
+            Column("path", "VARCHAR(120)", nullable=False))\
+        .unique("path") \
+        .primary_key("path")
+    
+     #TODO get the unique path back into action find bug   
+    conn.execute(str(q))
+    
+    
+
+
+    print("EPISODES Table created successfully");
+    
 def mk_db_entry(conn):
     print("ADDING TRACKS TO DATABASE > > > one moment please! ");
     label_url = "https://fixme.bandcamp.com/"
@@ -76,6 +111,7 @@ def count_tracks(conn):
 def main():
 
     database_create(conn)
+    database_create_episodes_table(conn)
     mk_db_entry(conn)
     count_tracks(conn)
 
diff --git a/mk_show.py b/mk_show.py
index e85c889..d111c31 100755
--- a/mk_show.py
+++ b/mk_show.py
@@ -1,5 +1,7 @@
 #!/usr/bin/python3
 
+# CREATE PODCAST -----------------------------------------
+
 import sys, os, datetime, fnmatch, glob, random, time, pathlib, re
 from datetime import timedelta
 from os.path import join
@@ -30,6 +32,8 @@ artist_abreviated = []
 
 web_path = "/home/rob/antena/html/episode/{0}/img".format(episode_number)
 
+conn = sqlite3.connect("database/show.db")
+
 if os.path.exists(web_path):
     print("path_exists_doing_nothing")
 else: os.makedirs(web_path)
@@ -44,49 +48,6 @@ def set_episode_date(input_date):
     #return episode_date
     print(episode_date)
 
-conn = ''
-def database_create_episodes_table():
-    # the show database
-    global conn
-    conn = sqlite3.connect("database/show.db")
-
-    q = Query \
-        .create_table("EPISODES") \
-        .columns(
-            Column("id", "INT", nullable=True),
-            Column("episode", "INT", nullable=True),
-            Column("date", 'DATETIME', nullable=True),
-            Column("album", "VARCHAR(200)", nullable=True),
-            Column("track", "VARCHAR(120)", nullable=True),
-            Column("artist", "VARCHAR(120)", nullable=True),
-            Column("trackdur", "FLOAT", nullable=True),
-            Column("genre", "VARCHAR(120)", nullable=True),
-            Column("year", 'DATETIME', nullable=True),
-            Column("path", "VARCHAR(120)", nullable=False))\
-        .primary_key("path")
-    #.unique("path") \
-     #TODO get the unique path back into action find bug   
-    conn.execute(str(q))
-    
-    
-
-
-    print("EPISODES Table created successfully");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    
 def create_intro(episode_playlist):
     intropath = path + "audio/texts/clips/this_is"
     intro = random.choice(os.listdir(intropath))
@@ -108,7 +69,7 @@ def check_archive(track):
         print("____ TRACK ALREADY PLAYED _____")
         return False
 
-def create_episode_playlist(episode_playlist: list, complete_playlist:list):
+def create_episode_playlist(conn, episode_playlist: list, complete_playlist:list):
 
     global episode_duration
     global archive
@@ -125,7 +86,7 @@ def create_episode_playlist(episode_playlist: list, complete_playlist:list):
         cursor = conn.cursor()
         cursor.execute("SELECT *  FROM MUSIC_LIBRARY ORDER BY RANDOM() LIMIT 1 ;")
         r = cursor.fetchone() # FETCH ONE RANDOM TRACK FROM THE DATABASE 
-        print(str(r)+"ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss")
+       
         #        for t in r:
         song =             str(r[9])
         track_label =      str(r[1])
@@ -135,8 +96,8 @@ def create_episode_playlist(episode_playlist: list, complete_playlist:list):
         track_duration =   float(r[6])
         track_genre =      str(r[5])
         track_year =       str(r[7])
-        track_path = '/'.join(song.split('/')[0:-1])
-
+        track_path = song #'/'.join(song.split('/')[0:-1])
+        #print(str(song)+"ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss")
         # SOME LOGIC TO SEE IF WE ALLOW THAT TRACK OR NOT
 
     
@@ -404,7 +365,10 @@ def create_html_homepage_from_template(episode_playlist):
     show_info = []
 
     episode_artists = []
-    for i in range(10):
+
+    num_eps = 4
+
+    for i in range(num_eps):
         artists = []
         cursor.execute("SELECT artist FROM EPISODES WHERE episode=?", [i])
         rows = cursor.fetchall()
@@ -417,7 +381,7 @@ def create_html_homepage_from_template(episode_playlist):
         episode_artists.append(artists)
 
     episodes = []
-    for i in range(10):      # get this from new table EPISODE_STATS number of tracks in DB
+    for i in range(num_eps):      # get this from new table EPISODE_STATS number of tracks in DB
         print(episode_artists[i])
         an_episode = dict(date="2012-02-", \
                           episode_artists=episode_artists[i], episode_number=i, \
@@ -524,9 +488,9 @@ def create_RSS_XML_from_template():
 
 def main():
 
-    database_create_episodes_table()
+#    database_create_episodes_table()
     set_episode_date(input_date)
-    create_episode_playlist(episode_playlist, complete_playlist)
+    create_episode_playlist(conn, episode_playlist, complete_playlist)
     create_show_coverart(episode_playlist, 1)         #episode_duration = 100
     #create_animated_gif()
     create_intro(episode_playlist)
diff --git a/playlists/track_playout_history.txt b/playlists/track_playout_history.txt
index d4290f3..e90dd7b 100644
--- a/playlists/track_playout_history.txt
+++ b/playlists/track_playout_history.txt
@@ -1,13 +1,11 @@
 
-Stampede
-Vrtnice
-zvoki iz dnevne sobe
-jez
-The Left Eye
-NeoPogo - FeS2
-BE CREEP - Burnt Dreams
-Zlatko Kaučič, Tomaž Grom - Torn Memories Of Folklore - Raztrgana folklora spomina - 08 Almost The Same
+Some Spatter Left
 The Mother (Act VII)
-一点一滴
-Jean-Luc Guionnet & Samo Kutin - Kopaš - 02 02
-Vertex
+Tilt - Tilt - 03 Alicante 3
+Hunahpu & Xbalanque
+Maskardh - Thrills Of Deconstruction
+Heretics Fork
+94
+Zlatko Kaučič, Tomaž Grom - The Ear Is The Shadow Of The Eye - 12 Battling For A Title - Za naslov se boriva
+Crossing The Rubicon
+šopscum solata