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
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
c505e98bcf
Player regex interface updates from monkeyfutz
2009-03-07 18:06:52 +09:00
Matt Turnbull
ca6f6e513b
message
2009-03-06 18:10:04 +00: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
Worros
50a1ec1ccf
Add logging function from futz
2009-03-05 01:46:01 +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
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
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
Worros
3cf8239cc9
Fix bug inmporting Everleaf PLO
2009-03-01 23:05:21 +09: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
Matt Turnbull
7087ede374
temp commit
2009-02-27 18:42:53 +00:00
Matt Turnbull
ca57a5a5ff
set -> list
2009-02-26 16:04:08 +00:00
Worros
7f1fd2ca38
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-02-26 23:32:41 +09: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
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
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
eblade
b2ee8fa0ce
add a couple of missing commas
2009-02-23 07:56:33 -05: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
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
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
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
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
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
Worros
77591788e4
Minor regex update for raises in Everleaf
2009-02-20 16:38:13 +09:00
Worros
6214131713
Small change - note we should error check
2009-02-05 18:50:50 +09:00
Worros
3bc8327d12
Remove euro symbol is it barfs python
2009-01-22 01:31:39 +09:00
Worros
0857739d83
Add Euro Symbol (€) and EUR to regexes
2008-12-31 01:28:28 +09:00
Matt Turnbull
fe2c806822
Everleaf appears to need addCallandRaise
2008-12-17 11:57:06 +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
Matt Turnbull
58411a1ae3
use python datetime handling functions : strptime strftime
2008-12-16 23:23:33 +00:00
Matt Turnbull
8bd58e849e
some generality changes for FTP support
2008-12-16 17:14:37 +00: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
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
Matt Turnbull
3dbb0e8376
Everleaf uncalled bets; pot total; rake
2008-12-14 22:05:51 +00:00
Matt Turnbull
7926ac9def
multiple 'collected pots' handles side pots, rake calculated from
...
totalbets - totalcollected.
2008-12-14 19:25:04 +00:00
Matt Turnbull
7500bcdf92
Everleaf sometimes shows the entire winning hand without reporting holecards seperately.
2008-12-11 17:31:58 +00:00
Matt Turnbull
dda88b76ba
cosmetics, comments, some value checking
...
added mucked / folded / shown summary lines
2008-12-10 16:30:57 +00:00
Matt Turnbull
3ff2ec2106
removed read board cards from markStreets
2008-12-10 00:58:10 +00:00
Matt Turnbull
91105824bd
wasn't printing bets
...
and fixed last fix
2008-12-10 00:48:45 +00:00
Matt Turnbull
215d5a74b2
If the small blind is dead and it's folded round to big blind, no one collects a pot. Warning if we do not see 'collected' line.
2008-12-10 00:05:12 +00:00
Matt Turnbull
c9cb2ea7dd
takes care of weirdness with everleaf saying:
...
player folds
but also
player: bets
takes care of double spaces and other junk where stack size is usually reported.
2008-12-09 23:58:38 +00:00
Matt Turnbull
e8810839f9
bit less mess
2008-12-09 23:38:16 +00:00
Matt Turnbull
6b0dcc37d4
I set it up with Speed_Kuala_full.txt and now it's time to go through them all fixing the bugs.
2008-12-09 23:30:58 +00:00
Matt Turnbull
2d6412c8a7
pseudo stars!
2008-12-09 15:32:37 +00:00
Matt Turnbull
4f44eff3da
getting somewhere, very messy, using pokereval, not sure if this is right direction, comments please
2008-12-08 06:23:50 +00:00
Matt Turnbull
72addde510
whitespace
2008-12-06 14:15:41 +00:00
Matt Turnbull
95f43dfd74
pot total and rake
2008-12-06 14:13:38 +00:00
Matt Turnbull
47e2fd053a
unimplemented is more meaningful warning
2008-12-05 02:42:13 +00:00
Matt Turnbull
862502cdc0
Hand class keeping track of pot total / bet amounts
...
Began to turn hand.printHand into the writeHand method but this may not be necessary after all
2008-12-05 02:40:04 +00:00
Matt Turnbull
92656ae6a0
hole cards / community cards extracted and added to printout
2008-12-03 23:57:20 +00:00
Worros
fed3374901
Start output of action lines for Super class
2008-11-27 21:29:19 +09:00
Worros
b495387d94
Move Everleaf updates - action now parsed
2008-11-27 20:54:42 +09:00
Worros
55332d4983
More Everleaf updates, may have a functional regex for action in NLHE
2008-11-16 13:44:16 +09:00
Worros
e4021b0525
Fix comment re: stars time format
2008-11-14 15:02:38 +10:00
Worros
6e182831ac
Everleaf update - Holecards read
2008-11-12 14:12:18 +10:00
Worros
2bdc7f5057
Everleaf converter update - blinds posting
2008-11-11 18:54:24 +10:00
Worros
45b2b4b212
Fix sb/bb - no need to convert
2008-11-11 08:22:33 +10:00
Worros
d112c39c1c
More Everleaf updates - parse player stacks and seats
2008-11-11 00:19:45 +10:00
Worros
da83795e5a
Fix 'duh' error and grab button position
2008-11-10 23:29:49 +10:00
Worros
816a9e3b58
More Everleaf converter updates, now parsing some hand info
2008-11-10 23:02:56 +10:00
Worros
0bbf801d89
Bit more Everleaf
2008-11-10 16:41:04 +10:00
Worros
d4038c3f19
Lots of changes. Fixes the hud for auto-import - at least for me.
...
Does configer Importer to use the Config class.
2008-11-09 21:57:58 +10:00
Worros
328bba2d23
Updates
...
- change HH object init call.
- override carbon readFile function and hack so minidom can read it
2008-11-09 10:46:14 +10:00
Worros
7df572895b
Work on plugin initialisation, add Carbon poker plugin
2008-11-09 09:49:05 +10:00
Worros
70f9e6edca
Make Everleaf actully inherit from the super class
2008-11-07 23:19:18 +13:00
Worros
7e41c73742
Add initial versions of Hand Converter class, and initial implementation.
2008-11-07 21:47:00 +13:00