Commit Graph

889 Commits

Author SHA1 Message Date
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