evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.assembla.com/fpdb-eric

Browse Source
This commit is contained in:
Ray 2009-07-31 00:06:07 -04:00
commit fd2ad9b192
5 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pyfpdb/Database.py
View File

@ -1620,6 +1620,7 @@ class HandToWrite:
self.maxSeats = None
self.tableName = None
self.seatNos = None
self.payin_amounts = None # tourney import was complaining mightily about this missing
except:
print "htw.init error: " + str(sys.exc_info())
raise

2
pyfpdb/EverleafToFpdb.py
View File

@ -44,7 +44,7 @@ out_path (default '-' = sys.stdout)
follow : whether to tail -f the input
autostart: whether to run the thread (or you can call start() yourself)
debugging: if False, pass on partially supported game types. If true, have a go and error..."""
print "DEBUG: XXXXXXXXXXXXXXX"
#print "DEBUG: XXXXXXXXXXXXXXX"
HandHistoryConverter.__init__(self, in_path, out_path, sitename="Everleaf", follow=follow, index=index)
logging.info("Initialising Everleaf converter class")
self.filetype = "text"

7
pyfpdb/FulltiltToFpdb.py
View File

@ -140,6 +140,7 @@ follow : whether to tail -f the input"""
if mg['TOURNO'] == None: info['type'] = "ring"
else: info['type'] = "tour"
# NB: SB, BB must be interpreted as blinds or bets depending on limit type.
if info['type'] == "tour": return None # importer is screwed on tournies, pass on those hands so we don't interrupt other autoimporting
return info
#Following function is a hack, we should be dealing with this in readFile (i think correct codepage....)
@ -177,6 +178,12 @@ follow : whether to tail -f the input"""
if m.group('PLAY') != None:
hand.gametype['currency'] = 'play'
# TODO: if there's a way to figure these out, we should.. otherwise we have to stuff it with unknowns
if hand.buyin == None:
hand.buyin = "$0.00+$0.00"
if hand.level == None:
hand.level = "0"
# These work, but the info is already in the Hand class - should be used for tourneys though.
# m.group('SB')
# m.group('BB')

1
pyfpdb/Hand.py
View File

@ -56,6 +56,7 @@ class Hand(object):
self.buttonpos = 0
self.tourNo = None
self.buyin = None
self.fee = None # the Database code is looking for this one .. ?
self.level = None
self.mixed = None
self.seating = []

22
pyfpdb/fpdb_import.py
View File

@ -268,23 +268,15 @@ class Importer:
if os.path.exists(file):
stat_info = os.stat(file)
#rulog.writelines("path exists ")
try:
lastupdate = self.updated[file]
#rulog.writelines("lastupdate = %d, mtime = %d" % (lastupdate,stat_info.st_mtime))
if stat_info.st_size > lastupdate: #stat_info.st_mtime > lastupdate:
if file in self.updated:
if stat_info.st_size > self.updated[file]:
self.import_file_dict(file, self.filelist[file][0], self.filelist[file][1])
self.updated[file] = stat_info.st_size #time()
except:
self.updated[file] = stat_info.st_size #time()
# If modified in the last minute run an immediate import.
# This codepath only runs first time the file is found.
self.updated[file] = stat_info.st_size
else:
if os.path.isdir(file) or (time() - stat_info.st_mtime) < 60:
# TODO attach a HHC thread to the file
# TODO import the output of the HHC thread -- this needs to wait for the HHC to block?
self.import_file_dict(file, self.filelist[file][0], self.filelist[file][1])
# TODO we also test if directory, why?
#if os.path.isdir(file):
#self.import_file_dict(file, self.filelist[file][0], self.filelist[file][1])
self.updated[file] = 0
else:
self.updated[file] = stat_info.st_size
else:
self.removeFromFileList[file] = True
self.addToDirList = filter(lambda x: self.addImportDirectory(x, True, self.addToDirList[x][0], self.addToDirList[x][1]), self.addToDirList)