Merge branch 'master' into good
This commit is contained in:
Mika Bostrom
commit
da03de49dd
|
|
@ -1651,7 +1651,8 @@ class Database:
|
|||
pdata[p]['street2CheckCallRaiseDone'],
|
||||
pdata[p]['street3CheckCallRaiseChance'],
|
||||
pdata[p]['street3CheckCallRaiseDone'],
|
||||
pdata[p]['street4CheckCallRaiseChance']
|
||||
pdata[p]['street4CheckCallRaiseChance'],
|
||||
pdata[p]['street4CheckCallRaiseDone']
|
||||
) )
|
||||
|
||||
q = self.sql.query['store_hands_players']
|
||||
|
|
|
|||
|
|
@ -326,6 +326,8 @@ def main(argv=None):
|
|||
help="How often to print a one-line status report (0 (default) means never)")
|
||||
parser.add_option("-u", "--usage", action="store_true", dest="usage", default=False,
|
||||
help="Print some useful one liners")
|
||||
parser.add_option("-s", "--starsarchive", action="store_true", dest="starsArchive", default=False,
|
||||
help="Do the required conversion for Stars Archive format (ie. as provided by support")
|
||||
(options, argv) = parser.parse_args(args = argv)
|
||||
|
||||
if options.usage == True:
|
||||
|
|
@ -369,6 +371,8 @@ def main(argv=None):
|
|||
importer.setThreads(-1)
|
||||
importer.addBulkImportImportFileOrDir(os.path.expanduser(options.filename), site=options.filtername)
|
||||
importer.setCallHud(False)
|
||||
if options.starsArchive:
|
||||
importer.setStarsArchive(True)
|
||||
(stored, dups, partial, errs, ttime) = importer.runImport()
|
||||
importer.clearFileList()
|
||||
print 'GuiBulkImport done: Stored: %d \tDuplicates: %d \tPartial: %d \tErrors: %d in %s seconds - %.0f/sec'\
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@ class Hand(object):
|
|||
self.starttime = 0
|
||||
self.handText = handText
|
||||
self.handid = 0
|
||||
self.cancelled = False
|
||||
self.dbid_hands = 0
|
||||
self.dbid_pids = None
|
||||
self.dbid_gt = 0
|
||||
|
|
@ -263,6 +264,9 @@ If a player has None chips he won't be added."""
|
|||
log.debug("markStreets:\n"+ str(self.streets))
|
||||
else:
|
||||
log.error("markstreets didn't match")
|
||||
log.error(" - Assuming hand cancelled")
|
||||
self.cancelled = True
|
||||
raise FpdbParseError
|
||||
|
||||
def checkPlayerExists(self,player):
|
||||
if player not in [p[1] for p in self.players]:
|
||||
|
|
@ -613,6 +617,8 @@ class HoldemOmahaHand(Hand):
|
|||
hhc.readPlayerStacks(self)
|
||||
hhc.compilePlayerRegexs(self)
|
||||
hhc.markStreets(self)
|
||||
if self.cancelled:
|
||||
return
|
||||
hhc.readBlinds(self)
|
||||
hhc.readAntes(self)
|
||||
hhc.readButton(self)
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ class HandHistoryConverter():
|
|||
codepage = "cp1252"
|
||||
|
||||
|
||||
def __init__(self, in_path = '-', out_path = '-', follow=False, index=0, autostart=True):
|
||||
def __init__(self, in_path = '-', out_path = '-', follow=False, index=0, autostart=True, starsArchive=False):
|
||||
"""\
|
||||
in_path (default '-' = sys.stdin)
|
||||
out_path (default '-' = sys.stdout)
|
||||
|
|
@ -66,6 +66,7 @@ follow : whether to tail -f the input"""
|
|||
log.info("HandHistory init - %s subclass, in_path '%s'; out_path '%s'" % (self.sitename, in_path, out_path) )
|
||||
|
||||
self.index = 0
|
||||
self.starsArchive = starsArchive
|
||||
|
||||
self.in_path = in_path
|
||||
self.out_path = out_path
|
||||
|
|
@ -254,6 +255,11 @@ which it expects to find at self.re_TailSplitHands -- see for e.g. Everleaf.py.
|
|||
self.readFile()
|
||||
self.obs = self.obs.strip()
|
||||
self.obs = self.obs.replace('\r\n', '\n')
|
||||
if self.starsArchive == True:
|
||||
log.debug("Converting starsArchive format to readable")
|
||||
m = re.compile('^Hand #\d+', re.MULTILINE)
|
||||
self.obs = m.sub('', self.obs)
|
||||
|
||||
if self.obs is None or self.obs == "":
|
||||
log.info("Read no hands.")
|
||||
return []
|
||||
|
|
|
|||
|
|
@ -3404,10 +3404,11 @@ class Sql:
|
|||
street2CheckCallRaiseDone,
|
||||
street3CheckCallRaiseChance,
|
||||
street3CheckCallRaiseDone,
|
||||
street4CheckCallRaiseChance
|
||||
street4CheckCallRaiseChance,
|
||||
street4CheckCallRaiseDone
|
||||
)
|
||||
VALUES (
|
||||
%s, %s, %s, %s,
|
||||
%s, %s, %s, %s, %s,
|
||||
%s, %s, %s, %s, %s,
|
||||
%s, %s, %s, %s, %s,
|
||||
%s, %s, %s, %s, %s,
|
||||
|
|
|
|||
|
|
@ -91,6 +91,7 @@ class Importer:
|
|||
self.settings.setdefault("writeQMaxWait", 10) # not used
|
||||
self.settings.setdefault("dropIndexes", "don't drop")
|
||||
self.settings.setdefault("dropHudCache", "don't drop")
|
||||
self.settings.setdefault("starsArchive", False)
|
||||
|
||||
self.writeq = None
|
||||
self.database = Database.Database(self.config, sql = self.sql)
|
||||
|
|
@ -134,6 +135,9 @@ class Importer:
|
|||
def setDropHudCache(self, value):
|
||||
self.settings['dropHudCache'] = value
|
||||
|
||||
def setStarsArchive(self, value):
|
||||
self.settings['starsArchive'] = value
|
||||
|
||||
# def setWatchTime(self):
|
||||
# self.updated = time()
|
||||
|
||||
|
|
@ -425,25 +429,31 @@ class Importer:
|
|||
mod = __import__(filter)
|
||||
obj = getattr(mod, filter_name, None)
|
||||
if callable(obj):
|
||||
hhc = obj(in_path = file, out_path = out_path, index = 0) # Index into file 0 until changeover
|
||||
hhc = obj(in_path = file, out_path = out_path, index = 0, starsArchive = self.settings['starsArchive']) # Index into file 0 until changeover
|
||||
if hhc.getStatus() and self.NEWIMPORT == False:
|
||||
(stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(db, out_path, site, q)
|
||||
elif hhc.getStatus() and self.NEWIMPORT == True:
|
||||
#This code doesn't do anything yet
|
||||
handlist = hhc.getProcessedHands()
|
||||
self.pos_in_file[file] = hhc.getLastCharacterRead()
|
||||
to_hud = []
|
||||
|
||||
for hand in handlist:
|
||||
#try, except duplicates here?
|
||||
hand.prepInsert(self.database)
|
||||
hand.insert(self.database)
|
||||
if self.callHud and hand.dbid_hands != 0:
|
||||
#print "DEBUG: call to HUD: handsId: %s" % hand.dbid_hands
|
||||
#pipe the Hands.id out to the HUD
|
||||
print "fpdb_import: sending hand to hud", hand.dbid_hands, "pipe =", self.caller.pipe_to_hud
|
||||
self.caller.pipe_to_hud.stdin.write("%s" % (hand.dbid_hands) + os.linesep)
|
||||
if hand is not None:
|
||||
#try, except duplicates here?
|
||||
hand.prepInsert(self.database)
|
||||
hand.insert(self.database)
|
||||
if self.callHud and hand.dbid_hands != 0:
|
||||
to_hud.append(hand.dbid_hands)
|
||||
else:
|
||||
log.error("Hand processed but empty")
|
||||
self.database.commit()
|
||||
|
||||
#pipe the Hands.id out to the HUD
|
||||
for hid in to_hud:
|
||||
print "fpdb_import: sending hand to hud", hand.dbid_hands, "pipe =", self.caller.pipe_to_hud
|
||||
self.caller.pipe_to_hud.stdin.write("%s" % (hid) + os.linesep)
|
||||
|
||||
errors = getattr(hhc, 'numErrors')
|
||||
stored = getattr(hhc, 'numHands')
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
PokerStars Game #25979907808: Omaha Pot Limit ($0.05/$0.10 USD) - 2009/03/15 6:20:33 ET
|
||||
Table 'Waterman' 6-max Seat #1 is the button
|
||||
Seat 1: s0rrow ($11.65 in chips)
|
||||
s0rrow: posts small blind $0.05
|
||||
ritalinIV: is sitting out
|
||||
Hand cancelled
|
||||
*** SUMMARY ***
|
||||
Seat 1: s0rrow (button) collected ($0)
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user