@@ -39,11 +40,16 @@ def process_creation_form(req,form):
player1 = form["player1"]
player2 = form["player2"]
username = form["username"]
+ try:
+ description = form["description"]
+ except:
+ description = ""
+ helper.debug(req,form,"game creation: will use '%s' as description." % description)
#check if at least one of the players is the current user
if (player1 == username) or (player2 == username):
#create game
- gamename = psql.create_goban_table(player1,player2,int(form["gobansize"]))
+ gamename = psql.create_goban_table(player1,player2,int(form["gobansize"]),description)
#update entries for player one and player two
for player in [player1,player2]:
gameslot = psql.get_free_game_slot(player)
diff --git a/goban.py b/goban.py
index 714d912..887326b 100755
--- a/goban.py
+++ b/goban.py
@@ -135,6 +135,7 @@ def set_stone(gobandict, position,req,form):
#write new sgf file into database
psql.update_goban_table_field(name,"x1","sgf",new_sgf)
psql.update_turn_number(name,turn+1)
+ psql.set_time(name)
return ""
else: #move not ok
return "This is not a legal move (says Gnugo)."
diff --git a/helper.py b/helper.py
index 063a607..9ec6b5f 100644
--- a/helper.py
+++ b/helper.py
@@ -1,4 +1,4 @@
-import string,re
+import string,re,time
DEBUG = 1
@@ -101,12 +101,39 @@ def dict_coords_to_gnugo_coords(coords,size):
return letter+str(digit)
+def format_time(mytime):
+ """
+ gets output of time.time()
+ formats it nicely and returns as string.
+ """
+ acttime = int(time.time())
+ if mytime == None:
+ retstring = ""
+ elif acttime-mytime<86400: #given time is less than 24h ago
+ tmp = acttime-mytime
+ hour = int(tmp/3600)
+ minute = int((tmp-hour*3600)/60)
+ if hour == 0:
+ retstring = "%dm ago" % (minute)
+ else:
+ retstring = "%dh %dm ago" % (hour,minute)
+ else:
+ mytime = int(mytime)
+ retstring = time.strftime("%Y-%m-%d %H:%M",time.gmtime(mytime))
+ return retstring
+def clean_list(l):
+ #removing None-entries
+ clean = []
+ for item in l:
+ if (item != "None") and (item != None):
+ clean.append(item)
+ return clean
+
-
def test():
print dict_coords_to_gnugo_coords((6,5),7)
-
+ print format_time(time.time()-20000)
if __name__ == "__main__":
diff --git a/init_webgo.py b/init_webgo.py
index 3e0113f..18e2e7b 100755
--- a/init_webgo.py
+++ b/init_webgo.py
@@ -9,13 +9,14 @@ def clear():
def create():
#psql.create_goban_table("gast","gast2",9)
psql.create_user_table()
- psql.add_webgo_user("gast","gast")
- psql.add_webgo_user("gast2","gast2")
+ #psql.add_webgo_user("gast","gast")
+ #psql.add_webgo_user("gast2","gast2")
def main():
clear()
create()
-
-
\ No newline at end of file
+
+if __name__ == "__main__":
+ main()
\ No newline at end of file
diff --git a/login.py b/login.py
index 36d7b72..4a29c36 100755
--- a/login.py
+++ b/login.py
@@ -1,4 +1,5 @@
import psql,init_webgo,helper,gamecreation
+from sets import Set as set
from mod_python import *
def process_form(req,form):
@@ -42,29 +43,47 @@ def game_overview_form(req,form):
username = form["username"]
sessionid = form["sessionid"]
+
data = helper.header()+ """
Current Games:
- '
#now comes the option for creating new games.
data += "
New Game:
\n"
if counter > 0:
diff --git a/psql.py b/psql.py
index c4bbafe..b9b4bfa 100755
--- a/psql.py
+++ b/psql.py
@@ -1,5 +1,5 @@
import helper,gnugo
-import pgdb,sys
+import pgdb,sys,time
DEBUG = 1
@@ -32,7 +32,7 @@ def create_table(name,layout=""):
executestring = "CREATE TABLE %s ( %s );" % (name,layout)
sql_one_liner(executestring)
-def create_goban_table(player1,player2,size):
+def create_goban_table(player1,player2,size,description=""):
"""
gets:player1, player2, size of goban.
creates postgresql table containing goban data.
@@ -43,56 +43,59 @@ def create_goban_table(player1,player2,size):
turn_number
size
name
+ description
player1
player2
sgf
+ created
+ lastmove
and the meaning of these fields:
(turn_number,x1) is the current turn,
(size,x1) is the length of a side of the goban,
(name,x1) is the name of this goban.
+ (description,x1) is the user-given name of this goban.
(player1,x1) is the name of one player.
(player2,x1) is the name of the other player.
(sgf,x1) contains a sgf file with the current board.
+ (created,x1) is the time of creation of the table
+ (lastmove,x1) is the time of the last player move
"""
tablename = helper.generate_game_name()
- data="line text"
- data = "x1 text"
+ data="line text, x1 text"
create_table(tablename,data)
#now insert additional variables
- tmplist=[]
- tmplist.append("turn_number")
- tmplist.append("1")
- insert_into_table(tablename,str(tuple(tmplist)))
+ insert_into_table(tablename,strtuple("turn_number","1"))
#size of goban
- tmplist=[]
- tmplist.append("size")
- tmplist.append(size)
- insert_into_table(tablename,str(tuple(tmplist)))
+ insert_into_table(tablename,strtuple("size",size))
#name of goban (=name of table in database)
- tmplist=[]
- tmplist.append("name")
- tmplist.append(tablename)
- insert_into_table(tablename,str(tuple(tmplist)))
+ insert_into_table(tablename,strtuple("name",tablename))
+ #description of goban (=user-given name)
+ insert_into_table(tablename,strtuple("description",description))
#name of player1
- tmplist=[]
- tmplist.append("player1")
- tmplist.append(player1)
- insert_into_table(tablename,str(tuple(tmplist)))
+ insert_into_table(tablename,strtuple("player1",player1))
#name of player2
- tmplist=[]
- tmplist.append("player2")
- tmplist.append(player2)
- insert_into_table(tablename,str(tuple(tmplist)))
+ insert_into_table(tablename,strtuple("player2",player2))
#empty sgf file as string
- tmplist=[]
- tmplist.append("sgf")
sgf = gnugo.create_sgf_file(size)
- tmplist.append(sgf)
- insert_into_table(tablename,str(tuple(tmplist)))
+ insert_into_table(tablename,strtuple("sgf",sgf))
+ #time of creation
+ insert_into_table(tablename,strtuple("created",str(int(time.time()))))
+ #time of last move
+ insert_into_table(tablename,strtuple("lastmove",str(int(time.time()))))
+
return tablename
-
+def strtuple(s1,s2):
+ """
+ creating a string looking like a tuple.
+ gets 2 strings.
+ useful for inserting something into a table.
+ """
+ tmplist = []
+ tmplist.append(s1)
+ tmplist.append(s2)
+ return str(tuple(tmplist))
def create_user_table():
"""
@@ -194,7 +197,6 @@ def get_user_game_list(name):
ret.append(cursor.fetchone()[0]) #[0], because return is a list
except:
ret = "could not get info of all games -- table corrupt?"
- return ret
cursor.close()
return ret
@@ -339,13 +341,6 @@ def update_goban_table_field(table,column,line,new_value):
"""
update_database_field(table,column,new_value,"line",line)
-def update_goban_field(table,x,y,content):
- """
- gets: goban dictionary, x,y coordinates, new content for field.
- modifies goban in database.
- """
- update_goban_table_field(table,"x"+str(x),"y"+str(y),content)
-
def update_turn_number(table,new_number):
"""
gets: name of table,new turn number
@@ -367,6 +362,20 @@ def get_sgf(table):
cursor.close()
return sgf
+def get_description(table):
+ """
+ gets table name,
+ returns content of "description" field.
+ """
+ cursor=db.cursor()
+ data="select x1 from %s where line='description';" % (table)
+ cursor.execute(data)
+ # Commit the changes
+ db.commit()
+ sgf = cursor.fetchone()[0]
+ cursor.close()
+ return sgf
+
def fetchall_list_to_goban_dict(list):
"""
@@ -393,8 +402,31 @@ def fetchall_list_to_goban_dict(list):
return ret
+def get_time(table,whichtime):
+ """
+ gets:
+ - a table name,
+ - a string equal "created" or "lastmove".
+ returns either the time of creation or the time of the last player move for
+ the table, depending of whichtime.
+ """
+ cursor=db.cursor()
+ data="select x1 from %s where line='%s';" % (table,whichtime)
+ cursor.execute(data)
+ # Commit the changes
+ db.commit()
+ try:
+ time = int(cursor.fetchone()[0])
+ except:
+ time = None
+ cursor.close()
+ return time
-
+def set_time(tablename):
+ """
+ gets name of goban table, sets lastmove to current time.
+ """
+ update_goban_table_field(tablename,"x1","lastmove",int(time.time()))