evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
989 Commits 1 Branch 0 Tags
451a9b3ab12e8c3ec0b0a88851ef83df569f5e01
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Matt Turnbull e9fd354115 handinfo 2009-03-18 16:52:18 +00: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
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
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
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
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
Matt Turnbull 76e467a5d4 get rid of thread 2009-03-12 12:24:23 +00: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
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
Matt Turnbull 0058f47775 fulltilt razz. is this complete? can you check whether it imports? 2009-03-11 16:51:58 +00: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
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
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
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
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
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
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
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
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
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
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
Matt Turnbull 7087ede374 temp commit 2009-02-27 18:42:53 +00: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
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
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
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
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
Matt Turnbull 8cccce512d regexs start at start of lines 2009-02-25 12:34:01 +00: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
Matt Turnbull baa5b2e8b5 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-02-25 10:26:25 +00: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
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
Matt Turnbull 05701955ac Merge branch 'master' of git://git.assembla.com/fpdboz 2009-01-22 18:21:48 +00:00
Matt Turnbull f048a763c0 Merge branch 'session' of git://git.assembla.com/fpdboz 2009-01-21 21:16:33 +00: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
Matt Turnbull 9ec77775be Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-01-08 19:11:59 +00:00
Matt Turnbull 18db8a39c6 Merge branch 'master' of git@git.assembla.com:mctfpdb 2009-01-08 19:03:45 +00: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
Matt Turnbull 80e1eed7ec Merge branch 'master' of git://git.assembla.com/fpdboz 2009-01-05 19:04:46 +00: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
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
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
Matt Turnbull 16f9906d84 pot total line output matches pokerstars better 2008-12-20 02:22:21 +00:00
Matt Turnbull 28e5a05037 Merge branch 'master' of git://git.assembla.com/fpdboz 2008-12-19 11:32:40 +00: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
Matt Turnbull 7803f52307 autoimport a bit better, no? 2008-12-18 17:49:17 +00: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
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
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 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
Matt Turnbull 7926ac9def multiple 'collected pots' handles side pots, rake calculated from 
totalbets - totalcollected.
 2008-12-14 19:25:04 +00:00
Matt Turnbull 7deb0bcc3e Merge branch 'master' of git://git.assembla.com/free_poker_tools 2008-12-13 16:38:44 +00:00
Matt Turnbull 24805700da StopAutoImport kills HUD 2008-12-13 01:06:26 +00:00
Matt Turnbull cbac52ccbb Autoimport toggle button 2008-12-13 00:52:31 +00:00
Matt Turnbull b34c0e1300 setting holecards for a player is now idempotent 2008-12-11 17:35:44 +00:00