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

Merge branch 'master' of git://git.assembla.com/mctfpdb.git

Browse Source 
Conflicts:
	pyfpdb/fpdb_import.py
This commit is contained in:
eblade 2009-03-12 13:23:32 -04:00
commit 9caa8b9361
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pyfpdb/Hand.py
View File

@ -102,10 +102,6 @@ If a player has None chips he won't be added."""
else: else:
logging.error("markstreets didn't match") logging.error("markstreets didn't match")
#def addHoleCards -- to Holdem subclass
def checkPlayerExists(self,player): def checkPlayerExists(self,player):
if player not in [p[1] for p in self.players]: if player not in [p[1] for p in self.players]:
print "checkPlayerExists", player, "fail" print "checkPlayerExists", player, "fail"

2
pyfpdb/HandHistoryConverter.py
View File

@ -90,7 +90,7 @@ class HandHistoryConverter(threading.Thread):
else: else:
# TODO: out_path should be sanity checked before opening. Perhaps in fpdb_import? # TODO: out_path should be sanity checked before opening. Perhaps in fpdb_import?
# I'm not sure what we're looking for, although we don't want out_path==in_path!='-' # I'm not sure what we're looking for, although we don't want out_path==in_path!='-'
self.out_fh = open(self.out_path, 'a') #TODO: append may be overly conservative. self.out_fh = open(self.out_path, 'w') # doomswitch is now on :|
self.sitename = sitename self.sitename = sitename
self.follow = follow self.follow = follow
self.compiledPlayers = set() self.compiledPlayers = set()

3
pyfpdb/fpdb_import.py
View File

@ -252,9 +252,8 @@ class Importer:
supp = conv.readSupportedGames() # Should this be done by HHC on init? supp = conv.readSupportedGames() # Should this be done by HHC on init?
#gt = conv.determineGameType() #gt = conv.determineGameType()
# TODO: Check that gt is in supp - error appropriately if not # TODO: Check that gt is in supp - error appropriately if not
# conv.processFile()
if(conv.getStatus()): if(conv.getStatus()):
(stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(conv.getProcessedFile(), site) (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(out_path, site)
else: else:
# conversion didn't work # conversion didn't work
# TODO: appropriate response? # TODO: appropriate response?