evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,376 Commits 1 Branch 0 Tags 14 MiB
966fba2165
Commit Graph

1288 Commits

Author SHA1 Message Date
Worros
875f218379 Move it back again, found another way 2009-03-14 04:23:36 +09:00
Worros
321e38a16f Move 'plugin loader' to Utils file so HUD and Importer can share 2009-03-14 03:10:53 +09:00
Worros
f4e3c8de28 Remove lookupLimitBetSize() - appears to no longer be necessary 2009-03-14 02:51:10 +09:00
Matt Turnbull
21376c0b62 slight change in logic, I hope the this is right: 
if win & show : player showed [x] and won $
elif win: player won $
elif folded: player folded
else: if shown: player showed [x] and lost...
      else: player mucked
 2009-03-13 16:50:46 +00:00
Matt Turnbull
771a95fe32 if holecards can be infered from summary line, indicate that they were 
'shown' so that they can be output in summary line
 2009-03-13 16:45:32 +00:00
eblade
a5b9ea860d fix runUpdated() to not freak out if a file disappears on it 2009-03-13 06:21:48 -04:00
eblade
382ed4b067 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-03-13 06:14:43 -04:00
Worros
a7f7113705 Make determineGameType return 'tour' of currency is T$ 2009-03-13 18:45:15 +09:00
Worros
3aaf5b9716 Merge branch 'killftp' into siteneutral 
Conflicts:

	pyfpdb/fpdb_simple.py
 2009-03-13 11:09:19 +09:00
Ray
f0413a66f5 Fix moved method, but didn't change reference. 2009-03-12 17:58:12 -04:00
Ray
46f246e27d Change a rogue xrange back to range. 2009-03-12 17:51:29 -04:00
eblade
104ca5fd9e Merge branch 'master' of git://git.assembla.com/fpdboz.git 
Conflicts:
	pyfpdb/fpdb_import.py
 2009-03-12 13:27:06 -04:00
eblade
9caa8b9361 Merge branch 'master' of git://git.assembla.com/mctfpdb.git 
Conflicts:
	pyfpdb/fpdb_import.py
 2009-03-12 13:23:32 -04:00
Worros
81df5a8919 Add Full Tilt flhe o supported games 2009-03-13 02:21:31 +09:00
Ray
3a6c80825d Merge branch 'master' of git://git.assembla.com/fpdboz 2009-03-12 13:19:28 -04:00
Worros
d8a689b9fe Quick fix 2009-03-13 02:18:34 +09:00
Ray
2ac4e26337 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:

	pyfpdb/Database.py
 2009-03-12 12:13:03 -04:00
Worros
2d849c69e7 Refactor HHC call a bit, make sure out_fh gets closed 2009-03-13 00:31:29 +09:00
Worros
c523fce123 Merge branch 'master' of git://git.assembla.com/mctfpdb 
Conflicts:

	pyfpdb/fpdb_import.py
 2009-03-12 22:57:43 +09:00
Worros
73d643b753 Merge branch 'master' of git://git.assembla.com/fpdb-eric 
Conflicts:

	pyfpdb/Database.py
 2009-03-12 22:52:48 +09:00
Worros
0bd2ecc2fe Merge branch 'master' of git://git.assembla.com/free_poker_tools 
Conflicts:

	pyfpdb/Database.py
	pyfpdb/Mucked.py
 2009-03-12 22:48:46 +09:00
Matt Turnbull
76e467a5d4 get rid of thread 2009-03-12 12:24:23 +00:00
Worros
27a0db56bb Add test file for betfair 2009-03-12 20:01:41 +09:00
Worros
63a4d3f605 Fix test_fpdb_simple.py's tests 2009-03-12 19:51:03 +09:00
Worros
2bb4593672 Compare determineGameType to readSupportedGames 
Allows us to parse the header (and test it) and still skip the file.

May produce empty files in autoimport...
 2009-03-12 19:43:28 +09:00
Worros
bb2104e5f8 First successful Betfair import 2009-03-12 18:38:48 +09:00
Worros
8126972731 Betfair update. Now doesn't crash on test file. 
Board and Hero cards are read. Actions all appear to be failing.
 2009-03-12 18:23:20 +09:00
Worros
19ec7662e1 BetfairToFpdb - HandInfo regex 2009-03-12 17:26:15 +09:00
Worros
76ca6beab0 Update Betfair importer a bit 
No longer crashes on test file, but doesn't actually import anything
yet.
 2009-03-12 15:17:46 +09:00
eblade
02c5cfb39e remove call to hhc.processFile as someone removed that function 2009-03-12 01:18:31 -04:00
eblade
fbbd2c4d5c asdfsadfsadfasdfsadf 2009-03-12 00:10:34 -04:00
Matt Turnbull
cd3d4ef835 no longer 'safely' appends -- will now overwrite out_path. 2009-03-12 03:58:42 +00:00
Matt Turnbull
ff675fb3ae import working? 2009-03-12 03:15:34 +00:00
eblade
9d7395a61c unbreak psuedo-recursion 2009-03-11 23:10:31 -04:00
Ray
6bf7be6ae5 Merge branch 'master' of git://git.assembla.com/fpdb-eric 
Conflicts:

	pyfpdb/Configuration.py
	pyfpdb/Database.py
 2009-03-11 22:46:28 -04:00
eblade
27e0df2a24 Merge branch 'master' of git://git.assembla.com/fpdboz.git 
Conflicts:
	pyfpdb/Configuration.py
	pyfpdb/Database.py
 2009-03-11 22:41:43 -04:00
Ray
1fb6e5bfeb Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:

	pyfpdb/Database.py
	pyfpdb/Mucked.py
 2009-03-11 22:36:10 -04:00
Worros
c582507b9f Quick fix for typo - Fixes FTP Razz import 2009-03-12 10:49:16 +09:00
Worros
0dfcac19fb Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-03-12 08:56:21 +09:00
eblade
509192d23e call update_table_position() immediatly after creating a hud mainwindow, so that we can be sure we have both X/Y set on all platforms 2009-03-11 17:12:35 -04:00
Matt Turnbull
89bb8e3d69 stars stud sometimes says 'brings-in', 'brings in', 'brings in low' 
fewer negative rakes appearing.
 2009-03-11 18:40:17 +00:00
Ray
8887ea7099 A start on saving aux_win layouts. More to come. 2009-03-11 14:12:56 -04:00
eblade
23c1e0c405 add 3/6 FL to Everleaf table 2009-03-11 12:56:38 -04:00
Matt Turnbull
0058f47775 fulltilt razz. is this complete? can you check whether it imports? 2009-03-11 16:51:58 +00:00
Worros
c2d7822dfc Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-03-12 00:57:14 +09:00
Matt Turnbull
dba348edf3 detect horse:omaha hilo 
also appears to parse regression-test-files/stars/omahaHL.txt
 2009-03-11 14:42:49 +00:00
Matt Turnbull
ccb9bc07a7 small t tilted me 2009-03-11 14:37:31 +00:00
Matt Turnbull
cfbf57dd1b if dont have site and BB in lookupLimit table, just halve them for 
sb,bb. Should work for higher limits almost always anyway, and there are
a finite number of ulimits which we should already have in the table
 2009-03-11 14:33:07 +00:00
Worros
71c5e1300d Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-03-11 23:12:22 +09:00
Worros
fb141fd85d Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-03-11 23:09:55 +09:00
Matt Turnbull
904c108813 people who put in blinds or antes are also counted as actors preflop 2009-03-11 14:07:38 +00:00
Matt Turnbull
1bbb2f2769 here you go 2009-03-11 14:05:38 +00:00
Worros
bd792142bd Convert RegressionTest.py into test.py format. 
Still doesn't work and i'm confused
 2009-03-11 23:05:36 +09:00
Worros
3a9657df5f Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-03-11 22:02:31 +09:00
Worros
eb61313fcd Remove debug message 2009-03-11 22:01:43 +09:00
eblade
375c2555a2 still fixing convert_cards.. god i'm retarded lol 2009-03-11 06:38:17 -04:00
eblade
52db43cd6b fix my further screwed up convert_cards function.. 2009-03-11 06:31:47 -04:00
Matt Turnbull
b64c4f301e action regex not so simple. 
-really- need test_Everleaf to catch this sort of thing
 2009-03-11 01:46:46 +00:00
eblade
f45716e67e Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-10 20:32:53 -04:00
Ray
ffdf66b676 new cards file 2009-03-10 20:31:09 -04:00
eblade
f2a6c9c361 tell us what kind of database error happened if hud database errors 2009-03-10 20:19:54 -04:00
eblade
1653dcf34c fix error i made in convertcards 2009-03-10 20:19:33 -04:00
eblade
388525ed30 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 
Conflicts:
	pyfpdb/Database.py
 2009-03-10 19:31:42 -04:00
eblade
42cc948cac make sure we set self.hand in HUd create() as well as in update() 2009-03-10 19:23:28 -04:00
eblade
cc5b73bb2e add 50c/1 1/2 2/4 stakes FLHE to lookup table 2009-03-10 18:50:40 -04:00
Matt Turnbull
22df50327a Everleaf stud hands are passed if not instantiated with debugging=True 
(this is default from cmdline but not from fpdb_import)
Eerleaf gametype tests... added one.
Everleaf action fixed to capture bet amounts, I hope. The 'complete to'
has a problematic . at the end, so we must handle
[ $ 1.40 USD ]
[ $ 1 USD ]
$1.40.
$1. (haven't seen this one yet)
Sorry I've kind of destroyed the sanityCheck thing, some of it belongs
in fpdb_simple where the paths are made. I've retained check for
in_path!=out_path.
 2009-03-10 21:49:23 +00:00
eblade
f268ab79a2 about 50 more range->xrange 2009-03-10 16:01:35 -04:00
Matt Turnbull
66ee3e87a8 Treated complete as a call & raise? Make sense? 
Had to feck around with action regex though :/
 2009-03-10 18:20:14 +00:00
Matt Turnbull
f714b25487 everleaf stud markstreets, antes, bringin 
todo: completes
todo: strange pot bug :( maybe go away if we add bringin completes or
something
fulltilt: warning if bringin not found
 2009-03-10 17:25:49 +00:00
Matt Turnbull
2c2d912c6e Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:

	pyfpdb/EverleafToFpdb.py
	pyfpdb/Hand.py
	pyfpdb/HandHistoryConverter.py
 2009-03-10 16:52:18 +00:00
Matt Turnbull
2c44d634f9 commit, time to pull carl's ftp stud stuff 2009-03-10 16:17:54 +00:00
Worros
88cadd36ad Fix Everleaf to start parsing 7 Card Stud games 
Still missing readAntes
 2009-03-11 00:57:13 +09:00
Worros
e87118e9ae Make PLO work on Everleaf again 2009-03-11 00:14:23 +09:00
Worros
264b188633 [KILLFTP 5/x] Remove references to the named site "PokerStars" or 
"Full Tilt Poker"
 2009-03-10 23:03:02 +09:00
Worros
161485e44e [KILLFTP 4/x] paper bag fix caused iun patch 1. 
This code needs replacing
 2009-03-10 22:09:32 +09:00
Worros
14b58d6ad5 [KILLFTP 3/x] Fix screwup from patch 1 2009-03-10 22:03:19 +09:00
Worros
58445c0a1b [KILLFTP 2/x] More ftp specific code removal 2009-03-10 22:03:18 +09:00
Worros
72dff55f6f [KILLFTP 1/x] Tear out FTP specific hand import code 2009-03-10 22:03:18 +09:00
Matt Turnbull
0dc1bafdeb gameinfo changes to fit db spec in docs/ 
some temporary bits, broken commit do not use.
 2009-03-09 23:03:17 +00:00
Matt Turnbull
ebcfebbc2f gameinfo changes, to fit better with db spec in docs folder 
tests
 2009-03-09 23:01:58 +00:00
Matt Turnbull
f9817a7e1a Merge branch 'master' of mt@192.168.1.5:src/mctfpdb 2009-03-09 22:59:07 +00:00
Matt Turnbull
250505f13b Merge commit 'carl/master' 2009-03-09 22:28:47 +00:00
Matt Turnbull
ddaf2575e0 git complaining have to commit 2009-03-09 22:28:35 +00:00
Worros
9427c97f4c Start of card selection filter 
Doesn't display yet
 2009-03-10 01:41:36 +09:00
Ray
6314c5a7cc Display community cards. 2009-03-09 11:41:58 -04:00
Ray
3d6bd0eb46 New query: get common cards for mucked card display. 2009-03-09 11:37:34 -04:00
Worros
b062ed6e70 Add query from Eleatic Stranger on 2+2 
Preliminary query for analysing hole cards
 2009-03-10 00:34:07 +09:00
Ray
7d7bf80024 Export button is not sensitive until graph is created. 2009-03-09 10:21:40 -04:00
eblade
b64213e6c5 bulk change range to xrange 2009-03-09 06:41:02 -04:00
eblade
5f1e5d0996 revert to ray's Configuration.py 2009-03-09 06:40:38 -04:00
eblade
60e66dcf31 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 
Conflicts:
	pyfpdb/Configuration.py
 2009-03-09 06:31:13 -04:00
Worros
7f63ef7cfe Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-03-09 19:23:00 +09:00
Worros
d6b5f5d019 Merge branch 'master' of git://git.assembla.com/fpdb-eric 
Conflicts:

	pyfpdb/Configuration.py
 2009-03-09 19:22:54 +09:00
eblade
30f8c8ed07 range->xrange bs 2009-03-09 06:18:12 -04:00
eblade
3c00915861 modernize syntax in classifyLines() 2009-03-09 05:56:41 -04:00
eblade
7a6684699a remove string concat from fairly highly used convert_cards() func 2009-03-09 05:06:36 -04:00
Worros
023fe50bb0 Change default file (about to switch to another branch) 2009-03-09 17:50:09 +09:00
eblade
9dab2899f7 code optimization wrt string addition, map(), xrange() 2009-03-09 04:23:57 -04:00
eblade
66e05d08b1 make use of python's bizarre conditional assignment 2009-03-09 03:47:25 -04:00
eblade
635d59b25d use some lambda map/filter calls where they make sense instead of for loops 
localize some variables in the HUD update function
 2009-03-08 16:28:09 -04:00
eblade
1b6337365f eliminate some string addition, change calls from range() in HUD to xrange() 2009-03-08 15:39:55 -04:00
Worros
b679fddfd2 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-03-08 14:18:20 +09:00
Worros
da88e1b20c Merge branch 'master' of git://git.assembla.com/mctfpdb 
Conflicts:

	pyfpdb/EverleafToFpdb.py
	pyfpdb/FulltiltToFpdb.py
 2009-03-08 14:09:16 +09:00
Ray
1a417441f6 First commit of Mucked_Flop. Works, but needs polish. 2009-03-07 20:44:10 -05:00
Ray
5f60cfde7c Add get_aux_locations. 2009-03-07 17:02:51 -05:00
Worros
b07823b372 Merge branch 'futz' from Matt 
Conflicts:

	pyfpdb/EverleafToFpdb.py
	pyfpdb/FulltiltToFpdb.py
	pyfpdb/Hand.py
	pyfpdb/HandHistoryConverter.py
 2009-03-08 00:43:33 +09:00
Worros
dee2c63a5d Syntax cleanups and optimisations 2009-03-07 23:35:52 +09:00
Worros
17609ce71b Minor mods to Grapher to try and resolve issue with multiple plots being 
added
 2009-03-07 18:23:30 +09:00
Worros
c505e98bcf Player regex interface updates from monkeyfutz 2009-03-07 18:06:52 +09:00
Ray
753754c924 Allow Aux_windows to have layouts and some cleanup. 2009-03-06 21:46:34 -05:00
Matt Turnbull
ca6f6e513b message 2009-03-06 18:10:04 +00:00
eblade
d81a701ec2 fix kill hud not killing popups, fix some popup bugs 2009-03-05 21:27:12 -05:00
Matt Turnbull
426b5c2db5 had a go at PokerStars -> PokerStars conversion... 
fpt : bugfix
hand : DrawHand class, moved discardCards there
is 'studhi' = '7 Card Stud' in PokerStars string? was playing with
Natalie HORSE file
 2009-03-06 01:24:38 +00:00
Ray
baa8d145ae Delay getting game type to support mixed games. 2009-03-05 20:10:56 -05:00
eblade
a34c90dee3 git still pisses me off 2009-03-05 18:43:00 -05:00
eblade
fc855995c7 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 
Conflicts:
	pyfpdb/Hud.py

git is really pissing me off
 2009-03-05 18:38:10 -05:00
eblade
4f1697d390 HHC: fix missing second arg to determineGameType 2009-03-05 10:17:17 -05:00
Ray
e9861e18c8 Fix error when no aux_windows are specified. 2009-03-05 10:12:31 -05:00
Matt Turnbull
1e047b6998 Don't error gruesomely when someone exports nonexistant graph 
sys.path[0] to get basepath of fpdb script
 2009-03-05 12:31:56 +00:00
eblade
98e0a096d2 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-05 00:04:03 -05:00
Matt Turnbull
75dcf002f9 Configuration: _getframe(0) so that GuiAutoImport can run standalone 
(stack not deep enough to go one deeper)
fpdb_import: Everleaf plumbing back in place.
GuiAutoImport.py: run standalone.
 2009-03-05 01:12:15 +00:00
Ray
6667f4cddb Merge branch 'master' of git://git.assembla.com/fpdboz 2009-03-04 20:08:20 -05:00
Ray
30ac181a36 New file: Hello.py. Aux_window examples. 2009-03-04 20:07:09 -05:00
Ray
a6d70e6e13 More tuning of the aux_window interface. 2009-03-04 20:04:23 -05:00
Worros
50a1ec1ccf Add logging function from futz 2009-03-05 01:46:01 +09:00
Worros
87d9dbcf25 Merge branch 'master' of git://git.assembla.com/fpdb-eric 
Conflicts:

	pyfpdb/EverleafToFpdb.py
 2009-03-05 01:07:42 +09:00
Worros
740fe92914 rename hand.string to hand.handText 
Few other minor updates to match monkeyfutz
 2009-03-05 00:10:08 +09:00
Worros
e8552023da Whitespace and comment updates from monkeyfutz 2009-03-04 23:29:13 +09:00
eblade
4d09686309 hud_main window resizes to smallest possible size whenever a hud is removed from the list (pls test in nix guys tnx) 2009-03-04 08:17:23 -05:00
Worros
dd6a912aa7 Merge branch 'master' of git://git.assembla.com/mctfpdb into futz 2009-03-04 12:40:17 +09:00
Matt Turnbull
7049a959ec I attempted to merge monkeyfutz into master. 
Let me know how you get on.
I just remembered autoimport probably broken at this point, I have
changed the way HHC is called and only been testing standalone
filtering..
Just try it and then git checkout ^HEAD

Merge branch 'monkeyfutz'

Conflicts:

	pyfpdb/EverleafToFpdb.py
	pyfpdb/FulltiltToFpdb.py
	pyfpdb/Hand.py
 2009-03-03 18:45:02 +00:00
Matt Turnbull
703fa40073 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:

	pyfpdb/Hand.py
 2009-03-03 12:24:42 +00:00
Worros
81279a0c9e Fix col align 2009-03-03 20:43:16 +09:00
eblade
1c79ecf82c Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-03-03 06:36:57 -05:00
Worros
86101c522c GuiPositionalStats.py 
New tab, output cols aren't labelled properly but we appear to have
something sane
 2009-03-03 20:32:01 +09:00
eblade
9ebabc79dd fix my misspelling of the maxseats var 2009-03-02 19:51:18 -05:00
Matt Turnbull
36befa43a8 More futzing 
- made it so that Hand.__init__ calls the hhc readX methods in the right
  order for that kind of Hand (Stud or Holdem/Omaha)
- hhc.readX methods then callback Hand.addX methods
Why? WHY! I hear you ask. Actually I can see there's very little gain,
sorry about that; but it sort of makes sense. Now you just make the
right kind of Hand, give it the text and the right kind of HHC filter,
and it makes itself.
- apart from that, biggest actual thing done is probably in adding
  player cards for stud hands -- revamped and made it really clear (I
think) whats happening (see FullTilt.readStudPlayerCards)
When I run FullTiltToFpdf.py it goes through all the hands.
- Still have some print statements, have been changing them to
  logging.debug or logging.info as I come across them.
  You may find "tail -f logging.out" useful
Actually I'm not at all convinced about the use of logging except that
you can redirect it to stderr quite easily and then set the threshold
for what gets logged quite easily, so that might be a plus.
- Oh and the subclassing of Hand is getting clearer.
 2009-03-02 21:48:30 +00:00
Worros
25ae39d7b5 Minor fixups: set->list and FullTilt lookup table 2009-03-03 00:10:15 +09:00
Matt Turnbull
5c26bb028d Merge branch 'master' into monkeyfutz 
Everleaf converts hands
Moved process hand logic into the hand subclass that knows what it
wants, it calls back to the hhc (which knows about the format) to populate itself

Conflicts:

	pyfpdb/EverleafToFpdb.py
	pyfpdb/Hand.py
	pyfpdb/HandHistoryConverter.py
 2009-03-01 23:22:47 +00:00
eblade
3018483a6f changes to lookup list for sb/bb in flhe 2009-03-01 15:58:12 -05:00
eblade
dc458b1c19 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-03-01 13:33:46 -05:00
Worros
d4cc5d4182 Initial fix for Everlead limit games 
Only one entry in the lookup table at the moment, need to collect data
and expand for all known limits
 2009-03-02 01:52:52 +09:00
Worros
3cf8239cc9 Fix bug inmporting Everleaf PLO 2009-03-01 23:05:21 +09:00
Worros
ca9ed06351 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-03-01 22:44:03 +09:00
Ray
5ba8d3b95d Fix missing argument in call to kill_hud. 2009-02-28 18:46:54 -05:00
Ray
5bf7d9038a Fix bug in autoclosing HUDs on windows. 2009-02-28 15:19:01 -05:00
eblade
4ca4e11591 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-02-28 14:23:57 -05:00
eblade
7a7eb25529 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-02-28 14:22:06 -05:00
eblade
aecb6092d0 fix missing self. 2009-02-28 14:21:59 -05:00
Ray
b3fb9e954d Fix clobber of db object. 2009-02-28 11:31:24 -05:00
Worros
09d577214b Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-02-28 13:08:27 +09:00
Worros
e5c65fe036 Fix Everleaf HandInfo regex to support limit 2009-02-28 12:45:44 +09:00
Worros
c0400f6c66 Fix Everleaf GameInfo regex to detect FL 
Added regression test mechanism while at it
 2009-02-28 12:34:41 +09:00
Ray
d44c90aec7 Temp fix to HUD crashing when closed table is updated. 
Also fixes popups not closing correctly.
General cleanup in the HUD closing code. Closing a HUD
is now managed by the HUD_Main object--this should ensure
that no objects are left dangling.
 2009-02-27 19:47:52 -05:00
Ray
e85a531f6a Fix missing "self." in previous commit. 2009-02-27 14:27:57 -05:00
Matt Turnbull
7087ede374 temp commit 2009-02-27 18:42:53 +00:00
eblade
fe4087d929 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-02-27 13:38:26 -05:00
eblade
701079fe35 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-02-27 13:37:08 -05:00
Matt Turnbull
9254be66a1 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-02-27 18:29:43 +00:00
Matt Turnbull
a2f6578848 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-02-27 18:29:36 +00:00
Ray
167ea98b8b Eliminate erronious multi huds on same table in some cases. 2009-02-27 12:42:49 -05:00
Ray
e45c42b172 Correct mistaken removal of stderr redirect. 2009-02-27 10:36:45 -05:00
eblade
4c0b709c22 fix for error if totalprofit = 0 (new player) 2009-02-26 22:01:35 -05:00
Ray
55d61fd1a5 Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-02-26 12:02:14 -05:00
Ray
20514bd0cb Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:

	pyfpdb/GuiBulkImport.py
	pyfpdb/Hud.py
 2009-02-26 12:01:18 -05:00
Ray
af906352fc Minor changes. 2009-02-26 11:55:51 -05:00
Ray
baefbb5a07 Cleanup in GuiBulkImport, trivial change to Tables. 2009-02-26 11:53:31 -05:00
Matt Turnbull
0773818831 set -> list 2009-02-26 16:50:45 +00:00
Matt Turnbull
31b37f3746 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-02-26 16:50:27 +00:00
Worros
3fba85456c Fix button regex 2009-02-27 01:26:50 +09:00
Matt Turnbull
ca57a5a5ff set -> list 2009-02-26 16:04:08 +00:00
Matt Turnbull
da602b2908 temp 2009-02-26 15:36:23 +00:00
Worros
6d862cff52 addPlayerCards done - now need to print it 2009-02-27 00:35:15 +09:00
Worros
7f1fd2ca38 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-02-26 23:32:41 +09:00
eblade
9557117a16 add "totalprofit" stat 2009-02-26 09:27:59 -05:00
Ray
333cbdbf6d Speed and reliability changes (+cleanup) to aux window interface. 2009-02-25 23:35:15 -05:00
eblade
c7541d9f14 return appropriate tuple from import_fpdb_file on file error 2009-02-25 23:17:36 -05:00
eblade
560cb1a543 fpdb_import runUpdated() will now remove files that were found to be newly missing on it's most recent pass from it's list of files to check 2009-02-25 22:44:03 -05:00
Matt Turnbull
0986e36648 work in progress! 
- command line options
  Try the following
  ./Everleaf --help
  cat everleaf.txt | ./Everleaf -i - -o -
  Try using -i -, and pasting in a hand. Be aware it needs an EOF
<ctrl>-d (unless you specify --follow, which isn't done yet)
- HHC is a thread
- hand gametypes per hand
- lots of stupid little things just to cause trouble
- added logging

Not yet done:
- tail -f mode
- integration into fpdb_import. Two options for grand plan here:
  1)  recently modified files get a HHC filter attached
      when the HHC runs out of pipe it waits
      runUpdated finds modified files and notifies the thread
  2)  the thread follows independently, when it runs out of input it
sleeps and then tries again at intervals
I like both, 1) involves bigger changes to fpdb_import whilst with 2) we
just point the existing fpdb_import code at the filter output (the way
we currently do filtering has to be altered though)

Comments welcome of course.
 2009-02-26 00:59:36 +00:00
eblade
7ebf27c07e add site config option "use_frames", set to "True" to get frames 2009-02-25 15:25:58 -05:00
eblade
3c9f5537ea import should stop erroring out and crashing if a file it wanted to read has been deleted 2009-02-25 12:40:39 -05:00
Worros
440602198f Fix(?) HeroCards regex for stud 2009-02-26 01:48:41 +09:00
Worros
59136c70d1 Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-02-26 01:24:15 +09:00
Worros
354a67c0e4 Some bringin code for stud/razz 2009-02-26 01:23:46 +09:00
Worros
a71be6ddd3 Add stud/razz ante for FullTilt converter 2009-02-26 00:45:46 +09:00
Matt Turnbull
d5b7b17b21 bugfix 2009-02-25 15:16:18 +00:00
Matt Turnbull
e5489056ff less broken, please check sanity 2009-02-25 14:59:11 +00:00
Matt Turnbull
65c34a7377 keeping Everleaf uptodate with FullSteamAhead changes 
Also, made static regexes class-wide, so compile once on import
 2009-02-25 14:35:28 +00:00
Matt Turnbull
abf489f0c6 need re.MULTILINE and not to have syntax errors 2009-02-25 14:14:42 +00:00
Matt Turnbull
bb4eece2f7 Merge branch 'master' of git://git.assembla.com/fpdboz 
Only seemed to conflict the [ --> \[ in the HeroCards re

Conflicts:

	pyfpdb/FulltiltToFpdb.py
 2009-02-25 12:36:45 +00:00
Worros
d500a9f9c5 More Razz - First pass through hh that doesn't crash 2009-02-25 21:34:05 +09:00
Matt Turnbull
8cccce512d regexs start at start of lines 2009-02-25 12:34:01 +00:00
Worros
8b9b77edb9 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-02-25 20:40:55 +09:00
Matt Turnbull
a324dc4c7e Merge branch 'master' of git://git.assembla.com/fpdboz 2009-02-25 11:32:14 +00:00
Matt Turnbull
a5b7b8202a tiny changes 2009-02-25 11:32:03 +00:00
eblade
cda897608c EverleafToFpdb: should at least recognise Stud, once the HandInfo regex is fixed. Not that it'll do anything good with it. 
HHC: return doing nothing but printing a warning message to output, if determineGameType() returns None
 2009-02-25 06:01:44 -05:00
Worros
a6df1b6461 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-02-25 19:35:54 +09:00
Worros
3d9026da2c More razz updates 2009-02-25 19:32:12 +09:00
Matt Turnbull
baa5b2e8b5 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-02-25 10:26:25 +00:00
Worros
dd6c23ad85 Move markStreets outside of if statement in main processing loop 2009-02-25 02:12:45 +09:00
Worros
a8a870548e Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-02-25 02:08:06 +09:00
Worros
a4f0e9a1fd Fulltilt nlhe working, more razz stuff 
Everleaf still broken - need to create/move button regex to new abstract
method
 2009-02-25 02:05:51 +09:00
Worros
7fd90ce760 Thinko - use right regex 2009-02-25 01:27:10 +09:00
Worros
b38c62367a Preliminary razz support for Fulltilt 
Breaks stuff
 2009-02-25 01:17:25 +09:00
Ray
c535dc7f24 Cleaner intermediate print during autoimport. 2009-02-24 10:54:02 -05:00
Worros
bca9fb15cf Note in code re: os.walk 2009-02-24 22:46:05 +09:00
eblade
163842e379 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-02-23 22:48:28 -05:00
Ray
f1530860d2 Fixed problem with unreliable fav_seat placement. 
Eliminated special query to get actual seat by
incorporating in to stat_dict query. Provided for
graceful skipping of hands when there is an error
in a query in the read_stdin() thread. Left
intermediate prints for use of others.
 2009-02-23 21:33:23 -05:00
eblade
b2ee8fa0ce add a couple of missing commas 2009-02-23 07:56:33 -05:00
Worros
a4911b8b9e More syntax error 2009-02-23 21:56:29 +09:00
eblade
4a12d5e9a7 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-02-23 07:53:29 -05:00
Worros
5aecfb8e30 Oops. fix syntax error 2009-02-23 19:24:21 +09:00
Matt Turnbull
03f89ee439 for some reason my GuiBulkImport was missing get_vbox() 
Added a combobox for selecting a filter
But import brokea  bit
 2009-02-23 01:03:18 +00:00
eblade
89fde673e2 should detect FL games (need to implement way to actually not continue processing FL since we don't support it currently) 2009-02-22 18:03:19 -05:00
eblade
482ad798aa Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-02-22 18:01:51 -05:00
Worros
1c1adfaf08 Preliminary support for Everleaf PLO? 2009-02-22 18:21:49 +09:00
Worros
232c0df33a determineGameType fixed for FTP, PLO working 2009-02-22 18:07:11 +09:00
Worros
baae7af5e0 Remove a tonne of debug, neaten output 2009-02-22 14:37:38 +09:00
Worros
3febe073cc Make FullTilt wrk with new importer 2009-02-22 12:42:16 +09:00
Ray
2ebb026543 Cleanup in HUD_main and HUD.py to simplify. 
HUD_run_me no longer needed but not removed.
 2009-02-21 18:19:49 -05:00
eblade
0dc63746f9 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-02-21 11:20:28 -05:00
Worros
40ccefe105 Separate collected and collectees for output 2009-02-22 01:17:06 +09:00
Worros
cf52ee4822 Fix blinds output 
Changes self.posted to be a list of lists.
[[p1, "small blind"][p2, "big blind"][p3, "big blind"][p4, "both"]]
 2009-02-22 00:22:25 +09:00
eblade
560bead1d3 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-02-21 09:39:33 -05:00
Worros
76688ed1c2 Fix regex for posting both blinds 
Partially fix output:

neslein: posts small blind [$ 0.05 USD]
dokiprogym: posts big blind [$ 0.10 USD]
EricBlade: posts both blinds [$ 0.15 USD]
Tilting2: posts big blind [$ 0.10 USD]

becomes:

neslein: posts small blind $0.05
dokiprogym: posts big blind $0.10
Tilting2: posts big blind $0.10
EricBlade: posts big blind $0.10

EricBlade should post .15
 2009-02-21 23:26:37 +09:00
Worros
d196b80a60 Deal with case 'no small blind and walk in bb' 2009-02-21 22:31:57 +09:00
Worros
5c6793d373 Add sanity check to HHC 
Make sure input file and output file are different so we dont overwrite
the source.
 2009-02-21 22:06:10 +09:00
eblade
9fa6d05528 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-02-21 07:46:20 -05:00
Worros
420c4fec69 Add 'Uncalled bet' line to output of new converter 2009-02-21 21:37:47 +09:00
eblade
45d2e5cedd Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-02-21 06:44:14 -05:00
Worros
e8d90bd705 Fix for table names with '-' in them 2009-02-21 20:42:16 +09:00
eblade
4baa9835f9 fix my last patch to use os.path.sep instead of hardcoded "\\" 2009-02-21 06:25:12 -05:00
Worros
36568075fe Add output line for main import code 
Main import should probably read summary, meh
 2009-02-21 20:24:11 +09:00
Worros
22c9fd6acb Adds command line operation to file. 
Only supports a single file at the moment
 2009-02-21 20:05:17 +09:00
eblade
6fc903b504 contingency plan in case you refer to the filename iwthout it's full pathname, ie manual conversion 2009-02-20 17:22:36 -05:00
eblade
506f0fd751 add folder with date-name to outputfilename for everleaf converter (uses whatever the prior folder name in the path was, regardless of if it's a date or not, but normally it would be a date) 2009-02-20 16:54:42 -05:00
eblade
824f6a3129 Merge branch 'master' of git://git.assembla.com/mctfpdb.git 
Conflicts:
	pyfpdb/HandHistoryConverter.py
 2009-02-20 15:58:00 -05:00
Matt Turnbull
2b13d38da6 fixed keyword arg before non keyword arg bug from last commit 2009-02-20 18:02:23 +00:00
Matt Turnbull
483e177346 Explicit matching of player names 
About the only place where we are guaranteed to get all the players'
names correctly is in the seating plan in the hand header. We extract
the names and build a regex that matches only the names. We only do this
if the current regex is out of date, to avoid recompiling them too
often.
I also did away with self.rexx because it seemed unnecessary and was
difficult to work with.
 2009-02-20 16:29:52 +00:00
eblade
b8f88661f3 Add comment to Hand.py, around addCollectPot(). Please look at that, Matt. 2009-02-20 03:33:25 -05:00
eblade
c02f5dbaeb Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-02-20 03:26:12 -05:00
Worros
81c92f9599 Revert last change and try alternate 
Assumes that the player names cannot have a ':' or a ' ' in them
 2009-02-20 17:22:58 +09:00
eblade
fe5045b14f hand error in checkPlayerExists will tell you why it failed 2009-02-20 02:44:06 -05:00
Worros
65821dbd2b Remove debug line that slipped thorugh in last commit 2009-02-20 16:42:57 +09:00
Worros
77591788e4 Minor regex update for raises in Everleaf 2009-02-20 16:38:13 +09:00
eblade
f0dc69250c Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-02-20 02:30:41 -05:00
Worros
e5ab933659 Fix major bug in fpdb_import 
Hat tip to Eric
 2009-02-20 16:06:22 +09:00
eblade
71b47c237a Merge branch 'master' of git://git.assembla.com/fpdboz.git 
Conflicts:
	pyfpdb/HandHistoryConverter.py
 2009-02-19 16:59:28 -05:00
eblade
14cf64f81b HHC will return without generating python errors if given an empty input, commented out echoing the input 2009-02-19 16:56:37 -05:00
Worros
08a4d568cc Fix parseHandStartTime for FullTilt 
Doesn't come close to fixing Full Tilt tourneys as far as i can tell.
 2009-02-20 02:26:29 +09:00
Worros
d9656b25f6 Oversight in Hand.py (?) 
Bp missing in this function, and doesn't run if called. No idea if the
function has ever been called.
 2009-02-20 01:37:48 +09:00
Worros
bc8f1b56b6 Remove Unicode mode from file read. 
Hope this fixes the issue with Erics source file getting nuked
 2009-02-19 22:58:29 +09:00
Worros
98ea23cd49 Couple of additional fixes for import 2009-02-19 22:10:31 +09:00
Worros
50ca5d5457 Fix tab/spacing 2009-02-19 21:15:12 +09:00
Worros
66fe3f990b Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-02-19 20:35:33 +09:00
Worros
2a90c798a2 Make executable 2009-02-19 20:35:05 +09:00
eblade
d2159b6430 changes to make auto-import recursive, and to get the converter thingee kind of working 2009-02-19 05:38:51 -05:00
Worros
dcee1c6d28 Merge branch 'master' of git://git.assembla.com/free_poker_tools 
Conflicts:

	pyfpdb/fpdb_import.py
 2009-02-11 16:40:33 +09:00
Ray
18140defd8 Update bulk import, optionally drop indexes, improve gui 2009-02-07 10:06:48 -05:00
Worros
6214131713 Small change - note we should error check 2009-02-05 18:50:50 +09:00
Worros
315d010311 Make Everleaf converter actually function. 
Makes HandHistoryConverter actually write out a file to
$hhArchiveBase/sitename/

Adds code in importer call the functions in EverleafToFpdb
 2009-02-05 18:28:18 +09:00
Ray
9395643aad Straighten out Cards01.png thing. (see typo) 2009-01-30 17:27:31 -05:00
Ray
79fd998718 Added Cards0.png = ftp card images for use with Mucked.py 2009-01-30 17:13:00 -05:00
Ray
5f290ace56 Updated version to 0.10 via new VERSION variable. 2009-01-30 13:00:29 -05:00
Worros
9cd88c0399 Comment patch: FTP HH headers 2009-01-30 13:23:09 +09:00
Ray
8ee2b72a42 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-01-29 12:37:25 -05:00
Worros
b023a9404c Quick commit to add the failing Full Tilt HH Header 
Only as a comment for now. Need to pull together all the valid Full Tilt
HH lines so we can write a decent regex to match
 2009-01-30 02:18:19 +09:00
Worros
d684b50415 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-01-29 11:27:28 +09:00
eblade
e17c2eb64e fpdb_import: cleanup, and fix for FT bug that puts multiple seats on one line of summary 2009-01-28 03:46:43 -05:00
Ray
c767bb9986 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-01-27 23:52:51 -05:00
Worros
c4ce2ea95a Make grapher export image file. 
Currently dangerous with no error checking.

Exports a png file in the same dimensions as it appears on screen
 2009-01-28 12:51:39 +09:00
Worros
e782fbd5f3 Comment out sample session detection code 2009-01-28 12:35:54 +09:00
Ray
58ccf0327c Complete prev commit by deleting intermed output. 2009-01-27 14:13:54 -05:00
Ray
9ddce0b016 Remove some comments that didn't get removed with its code. 2009-01-27 14:11:53 -05:00
Worros
1179067033 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-01-27 19:35:35 +09:00
Worros
07b765482d Added prelim Betfair parser. 
Straight copy of the current Everleaf parser
 2009-01-27 16:22:15 +09:00
Ray
64f1f17d7c Make player stats rows not expand = prettier. 2009-01-26 20:02:01 -05:00
Ray
3261f28506 Put a frame around each eb in the stat window-avoid tooltip annoyance. 2009-01-26 18:31:04 -05:00
Ray
37a643f054 Kill aux windows when killing the HUD. 2009-01-26 14:31:08 -05:00
Ray
b6ee768f2c Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-01-24 09:22:27 -05:00
Ray
9981a62847 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-01-24 09:22:18 -05:00
Matt Turnbull
05701955ac Merge branch 'master' of git://git.assembla.com/fpdboz 2009-01-22 18:21:48 +00:00
eblade
24e9e56726 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-01-22 00:19:38 -05:00
Matt Turnbull
f048a763c0 Merge branch 'session' of git://git.assembla.com/fpdboz 2009-01-21 21:16:33 +00:00
Worros
30cd579131 Session detection code. 
Possible use in showing sessions graphically on the plot
 2009-01-22 01:40:05 +09:00
Worros
3bc8327d12 Remove euro symbol is it barfs python 2009-01-22 01:31:39 +09:00
Ray
02e03c7ed9 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-01-19 12:57:05 -05:00
eblade
4d5b86ebdf Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-01-19 03:31:18 -05:00
Worros
b2c135ee12 Possible fix for problem Eric is reporting in importer 2009-01-19 11:32:34 +09:00
eblade
6941521a8c Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-01-18 07:29:32 -05:00
Worros
8cf705240c Change bulk import output slightly 2009-01-17 02:41:18 +09:00
Worros
ffb037b1fe Added output totals for bulk import 2009-01-17 02:24:00 +09:00
Worros
a3ff477395 Added comment/debug to damaged FTP file 
Doesn't fix issue, but documents what the bug is in the FTP software,
and prints the file name and line number that it occurs in so user can
fix.

Ideally the parser itself would be able to deal with this.
 2009-01-17 00:24:01 +09:00
eblade
9bf8551327 update get_nt_exe() to elevate privileges before calling OpenProcess, bizarre. 2009-01-15 11:09:30 -05:00
eblade
cd1d4df96d HUD_main: 
Add site name to list of windows being HUDed,
	fix weird call convention to the "del" operator, which is not a function.
	call clean_title() on hud titles being killed, so we actually kill (deep) tables and such

HUD:
	Add function "kill_hud_menu", which is now called from the Kill This HUD menu option, to avoid a potential loop in kill_hud()
	Record the handle of the HUD's destroy signal, use it to un-register, before performing a kill, also avoiding potential loop there
	Do not allow kill_hud() to be called twice in the same HUD object, return doing nothing if deleted is already set on it (that should totally solve the loop problem)
 2009-01-14 23:05:08 -05:00
Ray
b965654962 Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-01-12 19:22:18 -05:00
Ray
fcd70293fb minor formatting changes 2009-01-12 19:21:43 -05:00
Ray
d5597f7955 HUD_runme.py needs to be executable. 2009-01-12 19:20:24 -05:00
Matt Turnbull
5db308e1b2 execute permission on HUD_run_me.py 
removed huge chunk of duplicate code in fpdb_simple.py (strange git
problem -- first 300 lines or so were duplicated in a pull)
 2009-01-10 01:46:23 +00:00
eblade
0fd6c4a9b2 fpdb_parse_logic: use 'in' instead of 'find' 2009-01-08 10:40:18 -05:00
eblade
0cd97db548 fix typo from last commit 2009-01-08 06:25:25 -05:00
eblade
37a418484f Replace all occurences in Tables.py where RegExps and the string 'find()' method were being used for simple string checks, with "in" operator 2009-01-08 06:17:56 -05:00
eblade
326805950b Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 
Conflicts:
	pyfpdb/Hud.py
 2009-01-07 12:46:19 -05:00
eblade
ff3d6c75b8 Merge branch 'master' of git://git.assembla.com/mctfpdb.git 2009-01-07 12:36:09 -05:00
Matt Turnbull
d14dddca90 Break from thread loop instead of continuing. Fixes a bug where 
we'd be looking up a new_hand_id of ""
 2009-01-06 23:13:12 +00:00
Matt Turnbull
214861fc51 Merge branch 'master' of git://github.com/sqlcoder/fpdb-sql 2009-01-06 20:37:29 +00:00
eblade
fb9d7c0af2 Add file HUD_run_me, to be run by GuiAutoImport 
GuiAutoImport: run HUD_run_me instead of HUD_main
HUD_main: Add HUD_removed() function, called by HUD when an individual HUD is closed, eliminates polling them every update; use 'in' operator instead of has_key
HUD: clean up code that deals with lack of font descriptor in config, and notification of what font was selected
HUD: clean up unnecessary use of keys() functions, and 'in' vs has_key
HUD: restore previous definition of reposition_windows(), although i can't make it error at will anymore
Tables: cleanup with keys() and in operator
fpdb: no longer raise an error on duplicate tab, since we currently depend on that, it's not an error, right?
 2009-01-06 05:18:45 -05:00
Ray
c0557c7ef9 rationalized button presses, fixed reposition windows 2009-01-05 20:26:39 -05:00
Matt Turnbull
80e1eed7ec Merge branch 'master' of git://git.assembla.com/fpdboz 2009-01-05 19:04:46 +00:00
Ray
d994f04e01 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-01-05 10:53:31 -05:00
Ray
644201e669 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:

	pyfpdb/HUD_config.xml.example
 2009-01-05 10:53:10 -05:00
Ray
84653ff99c updating HUD_config.xml.example 2009-01-05 10:49:27 -05:00
sqlcoder
ab1e8cf670 added new faster version of storeHudCache routine, storeHudCache2 
Set the fastStoreHudCache variable to True to test this out.
In the best case it only does one DB operation (update), if
this fails because the record does not exist it does an insert.
 2009-01-03 19:55:54 +00:00
sqlcoder
cc31f86269 add profit/100 hands stat 2009-01-03 18:00:44 +00:00
sqlcoder
257dd35c93 let fpdb_db routine work out which bits of config to use for connection 2009-01-03 17:59:48 +00:00
sqlcoder
26ad0ff91b Merge branch 'master' of git://git.assembla.com/fpdboz 2009-01-03 17:10:58 +00:00
eblade
0f90d8a899 discover functions all return None, instead of False, fixing bool has_key() problem in hud 2008-12-31 13:14:28 -05:00
eblade
26a549d7d2 discover functions all return None, instead of False 2008-12-31 13:13:35 -05:00
eblade
9b6e18c2c0 Merge branch 'master' of git://git.assembla.com/mctfpdb.git 2008-12-31 12:08:25 -05:00
eblade
6276386aa8 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2008-12-31 12:06:58 -05:00
eblade
9989a97c25 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2008-12-31 12:03:15 -05:00
Worros
0857739d83 Add Euro Symbol (€) and EUR to regexes 2008-12-31 01:28:28 +09:00
sqlcoder
e469202b66 Merge branch 'master' of git://git.assembla.com/fpdboz 2008-12-28 09:50:33 +00:00
eblade
6de2607505 create_hud adds to the main_hud window, a list of tables that are being monitored (it is culled in read_stdin(), so i'll need to do some thinking on that to remove lag time between removal of hud and removal from list) 
i can see using this for table info, debug info, buy-in info maybe, but i wanted some place i could write to directly and see things in real time rather than depending on the logs
 2008-12-24 07:56:32 -05:00
Matt Turnbull
a76442f67e Poll if HUD window is already terminated before attempting to 
communicate the \n character to tell it to terminate.
 2008-12-22 20:17:29 +00:00
eblade
fc4671fc98 add NA for attempted steal % 2008-12-21 18:42:21 -05:00
eblade
d4e16b9b05 code/comment cleanup 2008-12-21 17:14:57 -05:00
eblade
24069d607b code/comment cleanup in Hud 2008-12-21 06:49:34 -05:00
eblade
c974864e13 Merge branch 'master' of git://git.assembla.com/mctfpdb.git 2008-12-21 06:11:33 -05:00
Matt Turnbull
a6c2152be4 break less badly on a hand which I can't handle at the moment 2008-12-20 22:52:47 +00:00
Ray
93a4059488 Merge branch 'master' of git://git.assembla.com/mctfpdb 2008-12-20 16:45:40 -05:00
Ray
74dbd8ab3d Merge branch 'master' of git://git.assembla.com/fpdb-eric 2008-12-20 16:44:50 -05:00
Ray
0dd46d38ac Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:

	pyfpdb/Hud.py
 2008-12-20 16:32:30 -05:00
Matt Turnbull
da41e8e2ce Rid of cruft 2008-12-20 16:57:12 +00:00
Matt Turnbull
319ea7080d Pot taking on much functionality 
committing before deleting a lot of commented out bits
 2008-12-20 16:48:25 +00:00
eblade
0cb5bc046a Merge branch 'master' of git://git.assembla.com/fpdboz.git 
Conflicts:
	pyfpdb/Hud.py

stupid single blank line. wtf.
 2008-12-20 01:42:38 -05:00
Worros
5d909fb648 Reapply stars regex changed reverted during a merge 2008-12-20 12:20:18 +09:00
Worros
83f50bafd3 Merge branch 'master' of git://git.assembla.com/free_poker_tools into session 
Conflicts:

	pyfpdb/Hud.py
 2008-12-20 12:19:37 +09:00
Matt Turnbull
16f9906d84 pot total line output matches pokerstars better 2008-12-20 02:22:21 +00:00
eblade
aad02554ca (font size config) Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2008-12-19 15:13:33 -05:00
eblade
bb3dee75e0 Merge branch 'master' of git://git.assembla.com/mctfpdb.git 2008-12-19 15:06:43 -05:00
Ray
15e1461cca Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:

	pyfpdb/Hud.py
 2008-12-19 14:08:36 -05:00
Matt Turnbull
28e5a05037 Merge branch 'master' of git://git.assembla.com/fpdboz 2008-12-19 11:32:40 +00:00
eblade
e9f9fa4111 Merge branch 'master' of git://git.assembla.com/fpdboz.git 
Conflicts:
	pyfpdb/fpdb_simple.py

GIT is really, really pissing me off. These 'conflicts' were two identical lines, with no beginning/trailing whitespace.
 2008-12-19 04:39:45 -05:00
Worros
659f0bb508 Grapher: Fix Postgres to work again 2008-12-19 17:27:18 +09:00
Worros
db6a8c5b31 Grapher: Make date ranges work - MySQL 2008-12-19 17:21:58 +09:00
Worros
2d700820f4 Add Everleaf to DB init process 
Should these come from config on startup...?
 2008-12-19 16:58:24 +09:00
Worros
49aa8921e3 Grapher: Update to support mutiple sites and players 
Makes sites actually selectable via checkboxes.

Removed the sitename from the graph string for the moment - How that
string is generated needs a major overhaul
 2008-12-19 16:52:32 +09:00
Matt Turnbull
b37ddc5ace So close, yet so far. Need to calculate rake to output the side pots 
line correctly.
 2008-12-19 03:01:45 +00:00
eblade
653cf9847d allow position 8 in hud cache 2008-12-18 20:38:43 -05:00
eblade
685abee8b1 re-indent function 2008-12-18 17:39:43 -05:00
eblade
42113f301f finish conflict resolution on those patches to check/parsePositions .. git really sucks. 2008-12-18 15:45:13 -05:00
eblade
2ccd00d3fd redo changes to checkPositions, and such 2008-12-18 15:42:46 -05:00
eblade
9263aa998e redo changes to parsePositions 2008-12-18 15:40:28 -05:00
Matt Turnbull
7803f52307 autoimport a bit better, no? 2008-12-18 17:49:17 +00:00
Ray
bb9f85233e font and font_size added to config and used in HUD. 2008-12-17 21:57:05 -05:00
sqlcoder
f9a805f5cd add do_commit(config) method to fpdb_db.py to make creating 
a db connection easier. Used this in guiplayerstats.py to
create a separate connection and added commit to stop
locks here blocking hand imports.
 2008-12-17 23:03:17 +00:00
Ray
e0105c5ed1 Clean up db connection in aux window. Hole cards to stud mucked list. 2008-12-17 13:24:37 -05:00
Matt Turnbull
fe2c806822 Everleaf appears to need addCallandRaise 2008-12-17 11:57:06 +00:00
Matt Turnbull
d168166495 Added: 
addCallandRaise  - when reported amount is the actual amount transfered
addRaiseBy       - when reported is the amount additional to the
previous bet
_addRaise        - common helper
 2008-12-17 11:54:26 +00:00
Matt Turnbull
877f0771ab nongreedy matches in collect_pot_re to fix kicker being picked up 
instead of hand bug
 2008-12-17 11:22:02 +00:00
Worros
dd7ede8903 Adjust regex to read 'and is all-in' 2008-12-17 14:04:29 +09:00
Worros
e5e8643557 Minor update to handinfo regex for OnGame 2008-12-17 13:46:16 +09:00
Matt Turnbull
a5bd749959 quick hack to Hand to help ongame 2008-12-17 00:30:31 +00:00
Matt Turnbull
ef48b83a80 OnGame is a bit weird, here's a start 2008-12-17 00:29:54 +00:00
Matt Turnbull
58411a1ae3 use python datetime handling functions : strptime strftime 2008-12-16 23:23:33 +00:00
Matt Turnbull
070091472c first BB is treated as a call & raise of sb, so if folded round to bb, 
it's an uncalled bet and he collects pot
 2008-12-16 22:03:13 +00:00
Matt Turnbull
6f1e335275 FullTilt output is looking good, tried it on a HandHQ history, no crashes! 
Hand.py: report summary line only for players who acted preflop (as with
stacks)

bug in a BB calling itself fixed
 2008-12-16 21:49:04 +00:00
Matt Turnbull
1f1332b849 a bit more FTP; works? on 7 hand sample. No regression test of Everleaf 
:(
 2008-12-16 21:08:10 +00:00
Matt Turnbull
f230a82add board cards read 
button read
 2008-12-16 17:26:58 +00:00
Matt Turnbull
8bd58e849e some generality changes for FTP support 2008-12-16 17:14:37 +00:00
Worros
186ef42663 Upper case Flop Turn and River in board dict 2008-12-16 23:48:49 +09:00
Worros
1a46230176 Add first pass Full Tilt converter 2008-12-16 23:45:58 +09:00
Worros
d42739a958 Merge branch 'master' of git://git.assembla.com/mctfpdb 2008-12-16 22:39:51 +09:00
Matt Turnbull
988a7e3eb5 Added 'and is all-in' logic. 
Altered to read actions in correct street order. hand.streetList must be
set correctly for different types of games.
 2008-12-16 04:29:11 +00:00
eblade
6e1499fb69 reposition_windows() after bringing one forward that has been hidden previously, even though they should already be relocating while hidden.. suspect gtk bug 2008-12-15 23:07:37 -05:00
eblade
eec9c94342 merge from carl 2008-12-15 22:46:31 -05:00
Worros
eb6de6c68c Merge branch 'master' of git://git.assembla.com/fpdb-eric 2008-12-16 12:45:05 +09:00
Worros
5a7ccad725 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2008-12-16 12:42:35 +09:00
eblade
e50fbf4f21 timer runs only under windows, not only under unix, oops 2008-12-15 22:38:04 -05:00
Worros
fe59ec8ac2 Merge branch 'master' of git://git.assembla.com/mctfpdb 2008-12-16 12:32:54 +09:00
Worros
828cfc405d Merge branch 'master' of git://git.assembla.com/fpdb-eric 
Conflicts:

	pyfpdb/fpdb_simple.py
 2008-12-16 12:17:50 +09:00
Matt Turnbull
9c5d0f4598 Writes hands to stderr, miscellanous crap to stdout; usuable as cmdline 
filter: ./Everleaf 'hhfile' 1>/dev/null 2>outfile

Holecards are sets -- should work on Omaha hi hands also.

Successfully imported Speed_Kuala_full.txt to fpdb.

Added gettext.

cards strings are handled a little better (one fewer regex)

Testfile can be supplied as first cmd line arg.
 2008-12-15 23:56:19 +00:00
sqlcoder
695b3a53cf update mysql query for position stats (postgres one still to do ...) 2008-12-15 23:15:54 +00:00
Worros
764ef1b286 Merge branch 'master' of git://git.assembla.com/mctfpdb 
Merge execution fixes from Ray with toggle button code from Matt.

Conflicts:

	pyfpdb/GuiAutoImport.py
 2008-12-15 17:22:49 +09:00
eblade
691608b6ca update_table_position will kill huds that are closed, timer will not be called when under unix, currently, as this function only works in windows. 
checkPositions() accepts position 9 again.
 2008-12-15 02:04:35 -05:00
eblade
65e43a34e6 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 
Conflicts:
	pyfpdb/fpdb_simple.py
 2008-12-14 21:57:03 -05:00
Matt Turnbull
fb02d9224b Merge branch 'exp' 
Conflicts:

	pyfpdb/Hand.py
 2008-12-14 22:15:14 +00:00
Matt Turnbull
2796a95669 Merge branch 'master' of git://github.com/sqlcoder/fpdb-sql 2008-12-14 22:09:17 +00:00
Matt Turnbull
3dbb0e8376 Everleaf uncalled bets; pot total; rake 2008-12-14 22:05:51 +00:00
Ray
5afc411cad Fix the "(deep)" error on FTP. 2008-12-14 15:10:59 -05:00
Matt Turnbull
7926ac9def multiple 'collected pots' handles side pots, rake calculated from 
totalbets - totalcollected.
 2008-12-14 19:25:04 +00:00
sqlcoder
f1be7c2ec0 saveActions setting was supposed to be True in 'official' code 2008-12-14 11:31:47 +00:00
Ray
a0ef01a0d1 Use execution_path() for finding card images. 2008-12-13 23:08:11 -05:00
sqlcoder
2ae8c792a6 playerstats: round value for variance before displaying, correct 
calculation of $/hand
 2008-12-14 03:07:05 +00:00
sqlcoder
791068d24f refine column headings, handle null stats and remove debug message 2008-12-14 02:50:09 +00:00
sqlcoder
26506b3421 use new routine in fpdb_simple to create indexes 2008-12-14 02:42:07 +00:00
sqlcoder
fb6b8e5a5b add variable at top of file to control whether actions are saved 
or not and commented out timing debug statement
 2008-12-14 02:38:09 +00:00
sqlcoder
d4e03424bf call routines to drop and recreate some indexes and foreign 
keys before and after bulk import
 2008-12-14 02:30:19 +00:00
sqlcoder
a429cbb6e1 added new routines to drop and recreate indexes and foreign keys. 
These could be called from any combination of standalone menu options,
as part of the database re-create option or as part of the bulk
import option
 2008-12-14 02:23:40 +00:00
Ray
094f176c5d Moved execution_path() to Configuration.py. 2008-12-13 17:37:23 -05:00
Ray
3994d3bb94 Get and use path for HUD_main.py to prevent some crashes. 2008-12-13 14:57:08 -05:00
eblade
a6544f5d10 Merge branch 'master' of git://git.assembla.com/fpdboz.git 
Conflicts:
	pyfpdb/fpdb_simple.py
 2008-12-13 12:54:32 -05:00
eblade
84dfb0e967 looks like a whitespace churn, don't know why 2008-12-13 12:52:25 -05:00
Ray
71309ab337 Merge branch 'master' of git://git.assembla.com/fpdboz 2008-12-13 12:33:48 -05:00
eblade
2002da9fb7 Merge branch 'master' of git://git.assembla.com/fpdboz 2008-12-13 11:51:31 -05:00
Matt Turnbull
7deb0bcc3e Merge branch 'master' of git://git.assembla.com/free_poker_tools 2008-12-13 16:38:44 +00:00
sqlcoder
ef060cd96a playerstats: refine mysql query to stop divide by zero errors and 
format figures properly
 2008-12-13 14:47:03 +00:00
sqlcoder
c533822c96 playerstats: refine postgres query to stop divide by zero errors and 
format figures properly
 2008-12-13 14:33:12 +00:00
sqlcoder
6e72d602e9 playerstats changes: modify columns shown, use left join in case 
playeractions data is missing, correct postgres syntax but now
giving divide by zero error
 2008-12-13 14:15:03 +00:00
sqlcoder
e9fa9e4324 revert back to carl's version, previous simplification of playerstats 
query doesn't allow calculation of things like variance as added
by Eleatic Stranger
 2008-12-13 13:18:16 +00:00
Worros
e8bf2d8a22 Additional Player stats from Eleatic Stranger 
Variance and $/hand
 2008-12-13 14:03:53 +09:00
sqlcoder
3148d0398c pulled from fpdboz 2008-12-13 03:35:31 +00:00
sqlcoder
f51d760a54 revise position stats query using hudcache data and create postgres version 2008-12-13 03:17:54 +00:00
sqlcoder
cb2e8a96ef use hudcache query for all player stats and tidy up output 2008-12-13 02:18:02 +00:00
sqlcoder
167c0de3b5 include antes in hudcache totalProfit figure 2008-12-13 02:02:07 +00:00
sqlcoder
a03a6852e8 convert tabs to spaces 2008-12-13 01:32:44 +00:00
sqlcoder
a426ec9434 include antes in net profit calculation 2008-12-13 01:15:25 +00:00
Matt Turnbull
24805700da StopAutoImport kills HUD 2008-12-13 01:06:26 +00:00
Ray
b37913f279 Fix call to aux window clobbered by merge. 2008-12-12 20:05:23 -05:00
Ray
b80dc2fb38 Merge branch 'master' of git://git.assembla.com/fpdboz 2008-12-12 20:00:29 -05:00
Matt Turnbull
cbac52ccbb Autoimport toggle button 2008-12-13 00:52:31 +00:00
Ray
8bacf766f7 Clean up duplicate functions. 2008-12-12 18:30:18 -05:00
Ray
eba9ccef90 Turn off window dragging to avoid crash when client is closed. 2008-12-12 17:44:11 -05:00
Ray
77804f68e4 Pick up the blinds/bring in when getting action. 2008-12-12 13:04:59 -05:00
Ray
6c6e7fa793 Fixed mucked cards import for stud games--AGAIN. 2008-12-12 12:16:19 -05:00
Worros
ec7c21621d Move hand into its own file and fix 2008-12-12 23:29:45 +09:00
Worros
0e2f6bf4ab Fix default value when run from RegressionTest 2008-12-12 20:25:26 +09:00
Worros
6afe8f0240 Add regression test for clean_title function and revert regex change 2008-12-12 20:12:45 +09:00
Worros
ff1a2c42b8 HHC - Make getGameTypeAsString actually do a lookup 2008-12-12 19:51:57 +09:00
Worros
1db21d8d0d Merge branch 'exp' of git://git.assembla.com/mctfpdb 2008-12-12 18:52:52 +09:00
Worros
8262705edb Test patch for xaiviax FullTilt deep problem 2008-12-12 17:40:33 +09:00
Worros
02b2e5044c Remove duplicate function from Tables.py 2008-12-12 17:38:55 +09:00
Matt Turnbull
b34c0e1300 setting holecards for a player is now idempotent 2008-12-11 17:35:44 +00:00
Matt Turnbull
7500bcdf92 Everleaf sometimes shows the entire winning hand without reporting holecards seperately. 2008-12-11 17:31:58 +00:00
Worros
f4ab01ca23 Merge branch 'master' of git://git.assembla.com/mctfpdb 
Conflicts:

	pyfpdb/GuiGraphViewer.py
	pyfpdb/Hud.py
 2008-12-12 00:50:51 +09:00
Ray
8500851b99 Merge branch 'master' of git://git.assembla.com/fpdboz 2008-12-11 10:25:40 -05:00
Ray
2f88818eb9 Minor changes to aux-window support. 2008-12-11 10:24:37 -05:00
Worros
3a1ddad58f Fix crasher in Grapher if no hands returned. 
Should alert user or at least draw something in right pane.
 2008-12-11 23:55:03 +09:00
Worros
90803b297f PlayerStat update - Postgres fixes (still failing) 
Fixed parameter passing to execute - psycopg2 appears to be a bit fussy
about how parameters are passed.

Main query still doesn't work.

psycopg2.DataError: division by zero - appears to be caused by

,round(100*sum(wonAtSD)/sum(sawShowdown)) AS wmsd

Stuck there.
 2008-12-11 23:42:33 +09:00
Worros
7fcd2d9c93 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2008-12-11 19:08:24 +09:00
Worros
438b6238e8 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2008-12-11 19:08:12 +09:00
Matt Turnbull
90b87c0d98 should be right? 2008-12-10 23:27:29 +00:00
sqlcoder
b62d1fb2a9 remove connection code from fpdb_import.py and use fpdb_db.py instead 2008-12-10 23:22:47 +00:00
Matt Turnbull
e90712c9a7 copied & pasted this back in, can't work out how to revert my reversion. 2008-12-10 23:16:29 +00:00
Matt Turnbull
489efc779b Merge branch 'master' of git://git.assembla.com/free_poker_tools 
Conflicts:

	pyfpdb/Hud.py

Hope I chose the right lines here.
 2008-12-10 22:52:07 +00:00
Matt Turnbull
69f6769a6b Merge branch 'master' of git://git.assembla.com/fpdb-eric 2008-12-10 22:48:20 +00:00
Matt Turnbull
fd2cb9dc42 Merge branch 'master' of git://git.assembla.com/fpdboz 2008-12-10 22:47:54 +00:00
Ray
95f5eab448 merge with eric's drag changes 2008-12-10 13:45:56 -05:00
eblade
efc3e591ea fix timeout callbacks for tracking table position 2008-12-10 13:35:15 -05:00