diff --git a/pyfpdb/AbsoluteToFpdb.py b/pyfpdb/AbsoluteToFpdb.py index bba33654..3068e9c1 100644 --- a/pyfpdb/AbsoluteToFpdb.py +++ b/pyfpdb/AbsoluteToFpdb.py @@ -129,16 +129,18 @@ or None if we fail to get the info """ info['sb'] = mg['SB'] else: info['sb'] = str(float(mg['BB']) * 0.5) # TODO: Apparently AP doesn't provide small blind info!? must search to see if it's posted, I guess - if 'BB' not in mg: - info['bb'] = mg['BB'] - info['sb'] = str(float(mg['BB']) * 0.5) # TODO: AP does provide Small BET for Limit .. I think? at least 1-on-1 limit they do.. sigh - elif 'BB' in mg: + if 'BB' in mg: info['bb'] = mg['BB'] if 'CURRENCY' in mg: info['currency'] = currencies[mg['CURRENCY']] if info['currency'] == 'T$': info['type'] = 'tour' # NB: SB, BB must be interpreted as blinds or bets depending on limit type. + if info['bb'] is None: + info['bb'] = mg['SB'] + info['sb'] = str(float(mg['SB']) * 0.5) # TODO: AP does provide Small BET for Limit .. I think? at least 1-on-1 limit they do.. sigh + + #print info; return info diff --git a/pyfpdb/GuiBulkImport.py b/pyfpdb/GuiBulkImport.py index 269efe13..4886d46b 100755 --- a/pyfpdb/GuiBulkImport.py +++ b/pyfpdb/GuiBulkImport.py @@ -284,7 +284,7 @@ def main(argv=None): parser.add_option("-q", "--quiet", action="store_false", dest="gui", default=True, help="don't start gui; deprecated (just give a filename with -f).") parser.add_option("-c", "--convert", dest="filtername", default="PokerStars", metavar="FILTER", - help="Conversion filter (*Full Tilt Poker, PokerStars, Everleaf)") + help="Conversion filter (*Full Tilt Poker, PokerStars, Everleaf, Absolute)") parser.add_option("-x", "--failOnError", action="store_true", default=False, help="If this option is passed it quits when it encounters any error") parser.add_option("-m", "--minPrint", "--status", dest="minPrint", default="0", type="int", diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py index 41154c13..bc5f0c32 100644 --- a/pyfpdb/Hud.py +++ b/pyfpdb/Hud.py @@ -423,7 +423,7 @@ class Stat_Window: return True return False - def noop(self): # i'm going to try to connect the focus-in and focus-out events here, to see if that fixes any of the focus problems. + def noop(self, arga=None, argb=None): # i'm going to try to connect the focus-in and focus-out events here, to see if that fixes any of the focus problems. return True def kill_popup(self, popup): diff --git a/pyfpdb/Tables.py b/pyfpdb/Tables.py index 082bc171..9c8c6fc6 100755 --- a/pyfpdb/Tables.py +++ b/pyfpdb/Tables.py @@ -243,6 +243,9 @@ def discover_nt_by_name(c, tablename): if 'History for table:' in titles[hwnd]: continue # Everleaf Network HH viewer window if 'HUD:' in titles[hwnd]: continue # FPDB HUD window if 'Chat:' in titles[hwnd]: continue # Some sites (FTP? PS? Others?) have seperable or seperately constructed chat windows + if ' - Table ' in titles[hwnd]: continue # Absolute table Chat window.. sigh. TODO: Can we tell what site we're trying to discover for somehow in here, so i can limit this check just to AP searches? + temp = decode_windows(c, titles[hwnd], hwnd) + #print "attach to window", temp return decode_windows(c, titles[hwnd], hwnd) return None