[xiph-commits] r13251 - in trunk/icebreaker: . Icebreaker/icebreaker

[nickmudd at svn.xiph.org]

Author: nickmudd
Date: 2007-07-12 17:52:42 -0700 (Thu, 12 Jul 2007)
New Revision: 13251

Modified:
   trunk/icebreaker/Icebreaker/icebreaker/model.py
   trunk/icebreaker/icebreaker.py
Log:
updated playlists database definition


Modified: trunk/icebreaker/Icebreaker/icebreaker/model.py
===================================================================
--- trunk/icebreaker/Icebreaker/icebreaker/model.py	2007-07-13 00:18:08 UTC (rev 13250)
+++ trunk/icebreaker/Icebreaker/icebreaker/model.py	2007-07-13 00:52:42 UTC (rev 13251)
@@ -124,6 +124,11 @@
     name = StringCol()
     description = StringCol()
     position = IntCol()
-    day = StringCol()
-    time = StringCol()
+    monday = lfl
+    tuesday = lfl
+    wednesday = lfl
+    thursday = lfl
+    friday = lfl
+    saturday = lfl
+    sunday = lfl
     current = BoolCol()

Modified: trunk/icebreaker/icebreaker.py
===================================================================
--- trunk/icebreaker/icebreaker.py	2007-07-13 00:18:08 UTC (rev 13250)
+++ trunk/icebreaker/icebreaker.py	2007-07-13 00:52:42 UTC (rev 13251)
@@ -9,7 +9,6 @@
 # Import variables from config file.
 execfile('config.py')
 
-# NOT FINISHED, NEED TO RE-DO
 class playlists(SQLObject):
     _connection = conn
     name = StringCol()
@@ -53,10 +52,10 @@
         # make days in columns
         # time in tuples per playlist
     
-        n=datetime.now().strftime("%H:%M:%S")
-        s = #time in schedule
-        # Placeholder, not real formatting
-        f=datetime.time(datetime(*strptime(s, "%H:%M")[0:6]))
+        n=datetime.now().strftime("%H:%M")
+        s = #time from playlists
+        # convert string time to real time object
+        f=datetime.time(datetime(*strptime(s, "%H:%M")[0:6])).strftime("%H:%M")
 
         # use timedelta
         #if no list