Commit Graph

1295 Commits

Author SHA1 Message Date
eblade
cb542d9b3e stripEOLspaces = rstrip, cleanup filterCrap some more, cleanup ParseActionType, should no longer count lines with player names containing "bets" or "raises" as an action, parseHandStartTime no longer uses an infinite loop, parsePositions cleaned up, parseWinLine cleaned up, recognisePlayerIDs cleaned up 2009-03-26 17:20:08 -04:00
eblade
3e6fccd34d managed to knock checkPositions down to a single line :) 2009-03-26 15:11:24 -04:00
eblade
b80a068795 per python docs http://docs.python.org/library/stdtypes.html, use != for not equal, rather than not x == y 2009-03-26 14:57:40 -04:00
eblade
6d4c812b51 do that iteration in relocate_windows the proper way 2009-03-26 12:11:07 -04:00
eblade
94a10bbfcf Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-26 11:15:01 -04:00
eblade
4341222994 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-03-26 09:48:05 -04:00
Ray
c5e05f812a Merge branch 'master' of git://git.assembla.com/fpdb-eric
Conflicts:
	pyfpdb/Hud.py
2009-03-25 19:59:59 -04:00
eblade
7c0d2eb6c6 weird, fix bug in window tracking 2009-03-25 19:33:01 -04:00
Ray
ceba4be73f More fixing of previous commit. 2009-03-25 17:48:43 -04:00
Ray
29bd0c2a7a Back out mucked window dragging changes. 2009-03-25 17:22:28 -04:00
Ray
01bc1cebf1 Fix numerous typos/bugs in previous commit. 2009-03-25 16:46:06 -04:00
Ray
9146758c5e Make flop_mucked windows follow the table on Windows. 2009-03-25 15:42:16 -04:00
Worros
74d9f14945 Make CET timezones work with Stars hands 2009-03-25 19:34:40 +09:00
Worros
20dd3e1aec Make CET timezones work with Stars hands 2009-03-25 18:35:19 +09:00
Worros
4e212787df Merge branch 'master' into siteneutral 2009-03-25 13:09:21 +09:00
Worros
7377561808 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-03-25 07:54:35 +09:00
eblade
21f352b05b Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-24 18:00:10 -04:00
Ray
a404f0f3ee Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-03-24 17:54:23 -04:00
Ray
60ffb0896e Make isWinLine find low pots. 2009-03-24 11:23:33 -04:00
Matt Turnbull
aca5dc9ed0 Parse another PokerStars datetime.
Make tail work:
  -log instead of print inode # change detected,
  -make sure splitter regexes have groups around them
  -fix a bug
  -increase buffering size to something >> a single hand

Conflicts:

	pyfpdb/HandHistoryConverter.py
2009-03-24 14:58:14 +00:00
Worros
b74f6dd58a Add new test 2009-03-24 23:27:43 +09:00
Worros
497354d4f4 Make BulkImport work only with HHCs
Added new section to config for converters for ease of creating the gui.

Removed the section in the site line for filter and supported games
2009-03-24 22:58:45 +09:00
Worros
c673897fa3 Merge branch 'master' into siteneutral
Conflicts:

	pyfpdb/fpdb_import.py
	pyfpdb/fpdb_save_to_db.py
	pyfpdb/fpdb_simple.py
2009-03-24 21:46:18 +09:00
eblade
42f2cb049d add set_focus_on_map calls to hud window creation, doesn't seem to do much, but feels correct 2009-03-24 06:04:00 -04:00
eblade
d168618b4b try to squeeze a few more cycles out .. seems to not be locking up anymore, though i could be running good on that right now 2009-03-24 05:55:07 -04:00
eblade
d4165a5109 ongoing effort to squeeze a couple more cpu cycles out of the hud creation process 2009-03-24 05:19:20 -04:00
Ray
d26e3d735b Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-03-24 01:47:17 -04:00
eblade
65e2087062 fix fix 2009-03-24 00:30:27 -04:00
eblade
dca1ea7554 fix for filterAnteBLindFold to return it's value 2009-03-23 23:49:09 -04:00
Ray
2c492ed0f6 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-03-23 23:49:04 -04:00
Ray
aebbae8ed0 Change str 0 to int 0 in card translating. 2009-03-23 22:58:13 -04:00
Ray
3b04c1baac Fix bug in accessing mucked cards in stud games. 2009-03-23 22:50:54 -04:00
eblade
364a25773e Merge branch 'master' of git://git.assembla.com/mctfpdb.git 2009-03-23 20:59:53 -04:00
eblade
c844454d8d Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-03-23 20:57:30 -04:00
eblade
a863743974 move move() under the line where position to move to is stored, instead of calculating position twice in two lines 2009-03-23 19:22:04 -04:00
Ray
4fc2286dfa Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-03-23 17:18:29 -04:00
eblade
2f4783b50b mucked: present() = show(), moved a line out of a loop
fpdb_simple: fix cardMap to understand "0", for stud games
2009-03-23 17:13:32 -04:00
Ray
34fdc549fd Merge branch 'master' of git://git.assembla.com/fpdboz 2009-03-23 16:40:24 -04:00
Ray
e99ec0cd71 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-03-23 11:09:05 -04:00
Worros
5e5e79f08a Fix typo 2009-03-23 22:18:22 +09:00
eblade
6ff4997d87 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-23 05:15:20 -04:00
eblade
2bffdf25f2 comment 2009-03-23 05:14:53 -04:00
Ray
ffb1f926d9 Better way to keep up with window positions. 2009-03-22 14:05:58 -04:00
Matt Turnbull
ff3409abf3 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-03-22 16:59:06 +00:00
Matt Turnbull
56fe94219d This index is used for every insert to check if it is a dupe. Test
confirms it's useful : see the last two graphs of
http://fpdb.wiki.sourceforge.net/postgresql+tuning
2009-03-22 14:56:13 +00:00
Matt Turnbull
285c7d8824 have to supply argv to main() as a list, splitting on whitespace won't
work if you supply an argument like a path with a space in it.
2009-03-22 14:53:10 +00:00
Worros
6e021ea3a4 Remove old graph queries from file 2009-03-22 18:56:51 +09:00
Worros
40c17cffaa Recognise deep 6 tables at Full Tilt 2009-03-22 18:52:30 +09:00
Matt Turnbull
3f879ddb3d psql drop fk hang: seemed to be caused by having more than one
connection to the db open. Made GuiBulkImport use the importer's
connection instead of its own. It still has the one given to it by
fpdb.py. I really don't know. Perhaps it needed a commit.
2009-03-21 21:38:32 +00:00
eblade
a59c1e5a45 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-03-21 15:16:51 -04:00
Worros
e9853c1ff2 Make previous executemany() function the default 2009-03-22 04:07:08 +09:00
eblade
390df21623 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-03-21 15:03:03 -04:00
Matt Turnbull
411715c44d Merge branch 'master' of git://git.assembla.com/fpdboz 2009-03-21 18:02:22 +00:00
Worros
208176077e Add test code for executemany function 2009-03-22 02:59:47 +09:00
Worros
999a2b9b5f Remove debug statement 2009-03-22 02:57:37 +09:00
Worros
2747b079ed Fix saveActions to True by default 2009-03-22 02:52:41 +09:00
Matt Turnbull
2669471f6c Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-03-21 17:47:55 +00:00
Matt Turnbull
a7bace7ddc Merge branch 'master' of git://git.assembla.com/fpdboz 2009-03-21 17:46:47 +00:00
Matt Turnbull
50f775e793 More sensible prints when dropping psql indexes 2009-03-21 17:46:16 +00:00
Worros
38b0fc7157 Add all functional site importers to Bulk import gui 2009-03-22 02:20:56 +09:00
Worros
8ebcd7b68a Fix crash on Stars tourney import
If importing a tourney and the line was marked as crap this test crashed
the importer
2009-03-22 02:17:48 +09:00
eblade
0db3fc337b Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-21 13:08:27 -04:00
Ray
969f5cc265 Make shift-middle-click work as intended. 2009-03-21 12:54:51 -04:00
Worros
495c39ef69 Merge branch 'master' into siteneutral
Conflicts:

	pyfpdb/fpdb_import.py
	pyfpdb/fpdb_save_to_db.py
2009-03-22 01:41:50 +09:00
Worros
1e788621a5 Merge branch 'master' of git://git.assembla.com/mctfpdb
Conflicts:

	pyfpdb/FulltiltToFpdb.py
2009-03-22 01:35:03 +09:00
Worros
86d350984e Dodgy 6 max fix to FTP converter 2009-03-22 01:31:36 +09:00
Worros
2675a681b8 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-03-22 01:31:05 +09:00
eblade
f870d4c283 Merge branch 'master' of git://git.assembla.com/mctfpdb.git 2009-03-21 12:06:00 -04:00
eblade
cb34be8454 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-21 12:04:18 -04:00
Ray
39db65b65d Fix bug in defaults of import params + bug in printing same. 2009-03-21 11:38:17 -04:00
Matt Turnbull
239330ae7b filterCrap after checking if hand is in db
refactor GuiBulkImport : add main() so that it can be called from
interactive shell (for profiling purposes).
2009-03-21 15:34:23 +00:00
Matt Turnbull
451a9b3ab1 GuiBulkImport: import directories from cmdline. Basically now does what
CliFpdb should do, but reads most settings from xml config.
2009-03-21 14:27:49 +00:00
Worros
ae4704b8dc First working(?) version of siteneutral import 2009-03-21 21:23:51 +09:00
eblade
7f6128af8d Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-21 05:51:30 -04:00
Worros
863e4f353b Merge branch 'master' into siteneutral 2009-03-21 13:36:02 +09:00
Worros
93b0e65549 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-03-21 13:30:57 +09:00
Ray
847fd5f6c1 Tool tips for FlopMucked. 2009-03-20 19:32:02 -04:00
Ray
d59016f249 Button clicking for FlopMucked. 2009-03-20 19:28:57 -04:00
Ray
72c0cdfa52 Needed to make previous commit work. 2009-03-19 20:58:40 -04:00
Worros
98df6f74a9 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-03-20 08:41:35 +09:00
Ray
33055f7f86 Hello_menu demo added to Hello.py module. 2009-03-19 16:10:18 -04:00
Ray
75a94299f9 Make sure HUD_main gets community cards for AWs to use. 2009-03-19 13:18:50 -04:00
Worros
444e780f29 Merge branch 'master' into siteneutral
Conflicts:

	pyfpdb/fpdb_import.py
	pyfpdb/fpdb_parse_logic.py
	pyfpdb/fpdb_simple.py
2009-03-20 00:27:08 +09:00
Matt Turnbull
82e540066c Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-03-19 13:41:17 +00:00
Matt Turnbull
cbba16feaf comment 2009-03-19 13:41:05 +00:00
Worros
a8e14f3c89 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-03-19 21:20:00 +09:00
eblade
0e89adc1db clean up some more ugly 2009-03-19 04:12:42 -04:00
eblade
f552ab2470 more cleanup of junk 2009-03-19 03:52:18 -04:00
eblade
593691301b move some junk around classifyLines, as it will normally run into the first stuff first, allowing us to shorten the execution for smaller hands 2009-03-19 03:40:40 -04:00
eblade
375e0ed7c9 fpdb_parse_logic: fix possible breakage i might've made to tournament parse
fpdb_simple: more usage of 'any' operator where appropriate
2009-03-19 03:30:44 -04:00
eblade
e4ac034774 extensive use of any() in WTSD WMSD calcs 2009-03-18 23:48:23 -04:00
eblade
f823db4eef generateHudCacheData: fix the code for identifying cutoff, button, sb, bb 2009-03-18 23:27:15 -04:00
eblade
4830b72121 more cleanup 2009-03-18 22:31:39 -04:00
eblade
c6179a1b85 fix typo 2009-03-18 22:05:01 -04:00
eblade
5b532180a3 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git
Conflicts:
	pyfpdb/fpdb_save_to_db.py
2009-03-18 21:39:12 -04:00
eblade
8b933bbd7b fpdb_import: formatting cleanup
fpdb_simple: significant performance enhancements likely in checkPositions, convertCardValuesBoard, filterCrap, float2int, isActionLine, isWinLine
2009-03-18 21:22:04 -04:00
Ray
530462cc72 Fix for too large mucked windows on Windows. 2009-03-18 21:05:29 -04:00
eblade
1b626271ee fpdb_save_to_db: minor cleanup 2009-03-18 17:15:21 -04:00
eblade
a424a9c77d fpdb_parse_logic: cleanup 2009-03-18 17:07:32 -04:00
Matt Turnbull
e9fd354115 handinfo 2009-03-18 16:52:18 +00:00
Ray
8009281e5a More fixing of import options. 2009-03-18 12:32:34 -04:00
eblade
4c67cad27a Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-18 11:52:49 -04:00
eblade
a5770722ad Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-18 11:52:24 -04:00
Ray
e67f715f27 Another silly screw up. 2009-03-18 11:37:36 -04:00
Ray
e485a9c035 Fix silly cut/paste problem. 2009-03-18 11:34:43 -04:00
eblade
4e62a25d03 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-18 10:58:37 -04:00
Ray
48c2c36de6 Put index dropping back in for postgres. 2009-03-17 11:18:55 -04:00
eblade
74ef867bb2 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-17 05:27:14 -04:00
Ray
466f6c09c2 Make a whole bunch of config defaults work as desired. 2009-03-16 23:34:00 -04:00
eblade
42db4f03ee Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-16 21:18:22 -04:00
Ray
067373b128 Fixed defaults for saveActions and fastStoreHudCache. 2009-03-16 21:07:11 -04:00
eblade
a93718f953 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-16 21:00:56 -04:00
eblade
8e5396295d some silly cleanup 2009-03-16 20:52:50 -04:00
eblade
80c3922bc0 remove pyc, merge with everyone else
remove some useless junk in fpdb.display_tab()
2009-03-16 18:35:56 -04:00
Ray
bc2277af74 Comment out index dropping for postgres--prevent hang. 2009-03-16 18:23:45 -04:00
Ray
66e734588c Fix extra lines in previous commit. 2009-03-16 18:00:57 -04:00
eblade
fc411d6df7 Merge branch 'master' of git://git.assembla.com/mctfpdb.git 2009-03-16 17:50:59 -04:00
eblade
b79734167d Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-03-16 17:49:34 -04:00
eblade
4e8a347692 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-16 17:46:26 -04:00
Worros
629d48ad9d Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-03-16 08:24:08 +09:00
Ray
6d292c50d9 Use saveActions and fastStoreHudCache in fpdb_import, etc. 2009-03-15 17:40:01 -04:00
Ray
6f927e6b7b saveActions and fastStoreHudCache added to import element. 2009-03-15 15:54:22 -04:00
Ray
9fca5a75b2 Allow saving of aux_window layouts. 2009-03-15 15:27:47 -04:00
Matt Turnbull
08dae30f1f Ensure both holecards are known (holdem) or all four (omaha) before
printing a 'shows hand' line : not ideal, but legacy importer chokes
otherwise
2009-03-15 16:51:50 +00:00
Matt Turnbull
cfbdff5159 add -x command line option to specify converter
usage:
./GuiBulkImport -q -f lala.txt -x EverleafToFpdb
2009-03-15 16:50:59 +00:00
Worros
40d98b11d9 PokerStarsToFpdb - PLO parsing update 2009-03-15 14:32:52 +09:00
Worros
c0d7724921 Merge branch 'master' into siteneutral 2009-03-15 12:39:37 +09:00
Worros
b77bbed8a2 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-03-15 12:37:07 +09:00
Ray
e0a406e66d Make Configiuration.py executable. 2009-03-14 12:54:52 -04:00
Ray
5348737819 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-03-14 12:54:11 -04:00
Worros
22ff84852b Kludge maxseats for Stars 2009-03-15 00:30:38 +09:00
Matt Turnbull
51444f2ac4 print a showdown section if anyone showed any kind of hand (obv logic
not 100%, people can show cards without a showdown, but legacy importer
expects cards there, right?)

slight change to get through the horse test file
2009-03-14 15:02:23 +00:00
Worros
faf19215e8 Make Hand initable without a hhc
Proof of concept code in test_PokerStars.py
2009-03-14 23:01:40 +09:00
Matt Turnbull
6e01ebaee2 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-03-14 14:00:47 +00:00
Matt Turnbull
c1a7c45966 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-03-14 13:45:40 +00:00
Matt Turnbull
547ffd0e41 tiny output bugs fixed. 2009-03-14 13:45:09 +00:00
Worros
d847a71c6e Move addDiscard from upper class to specialised DrawHand 2009-03-14 22:23:30 +09:00
Worros
a5ceeece3a Added note about renamed test file
Also changed name of Bike test file so I can tell what it is from ls
2009-03-14 22:18:30 +09:00
Matt Turnbull
2caddfe97a Merge branch 'master' of git://git.assembla.com/fpdboz 2009-03-14 12:48:13 +00:00
Matt Turnbull
822546da7b blinds can be all in. 2009-03-14 12:44:14 +00:00
Worros
42e23ae449 Merge branch 'calcstats' 2009-03-14 21:21:04 +09:00
Worros
b41afcd076 Add stub insert and select methods to Hand class 2009-03-14 21:19:20 +09:00
Worros
d212d81e03 Add variables for most HudCache stats and add optional arg to Hand
Will almost certainly need to change all of the data structures in the
variables as they are only for a single player
2009-03-14 20:40:27 +09:00
Worros
311e79c6e6 Quick note on test file.
Intend on keeping better notes on test files so we can verify in testing
at some point
2009-03-14 20:03:28 +09:00
Worros
04b43e3b95 Add preliminary Badugi support
Done to flesh out what DrawHand will look like
2009-03-14 19:48:34 +09:00
eblade
6eb489c3a5 Merge branch 'master' of git://git.assembla.com/fpdboz.git
Conflicts:
	pyfpdb/Hud.py
2009-03-14 03:56:43 -04:00
Worros
d389706e85 Revert dodgy import line 2009-03-14 11:21:23 +09:00
Worros
9cdfa5f279 Remove 3rd arg from Hud module loader
Mea culpa
2009-03-14 11:06:47 +09:00
eblade
79d9bd6d58 make third parameter to importName() optional 2009-03-13 18:09:25 -04:00
eblade
69c026bd29 remove "import Utils" 2009-03-13 18:05:27 -04:00
Worros
d3103f099e Make Stars Badugi recognised 2009-03-14 06:42:20 +09:00
Worros
93acab5bcb Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-03-14 06:20:53 +09:00
Worros
3683a82e0f Merge branch 'master' into siteneutral 2009-03-14 05:32:16 +09:00
eblade
d35184cc79 Merge branch 'master' of git://git.assembla.com/fpdboz.git
Conflicts:
	pyfpdb/fpdb_import.py
2009-03-13 16:10:44 -04:00
Worros
bbdbe7e47d Remove TODO for previous patch 2009-03-14 05:10:13 +09:00
eblade
2ad252ded6 Merge branch 'master' of git://git.assembla.com/mctfpdb.git 2009-03-13 16:07:38 -04:00
Worros
6ebab06981 Make converters dynamically loadable in autoimport
Adds 1 restriction to the HHC sub classes, the classname must be the
same as the filename - ToFpdb.py

FulltiltToFpdb.py must contain a hhc class named Fulltilt
EverleafToFpdb.py must contain a hhc class named Everleaf
2009-03-14 05:00:12 +09:00
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