evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
721 Commits 1 Branch 0 Tags 14 MiB
e8d90bd705
Commit Graph

657 Commits

Author SHA1 Message Date
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
Matt Turnbull
092b1a1b83 Merge branch 'exp' 2008-12-10 18:08:46 +00:00
Matt Turnbull
f3afba129a Revert "Add start of graph export functionality" 
This reverts commit 998ab6eac3.
 2008-12-10 18:01:20 +00:00
Matt Turnbull
d1a8c445e2 for perusal of dispatcher 2008-12-10 17:56:16 +00:00
Matt Turnbull
dda88b76ba cosmetics, comments, some value checking 
added mucked / folded / shown summary lines
 2008-12-10 16:30:57 +00:00
Worros
9ca0574d78 Really basic check that username exists 2008-12-10 21:21:43 +09:00
Worros
dc33003ce4 Merge branch 'master' of git://git.assembla.com/fpdb 2008-12-10 20:14:44 +09:00
Worros
8258c19c8f Merge branch 'master' of git://git.assembla.com/fpdb-sql 2008-12-10 19:39:37 +09:00
Worros
5a568527b8 Merge branch 'exp' of git://git.assembla.com/mctfpdb 2008-12-10 19:39:27 +09:00
Ray
fff1e53eb9 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:

	pyfpdb/Hud.py
 2008-12-10 00:02:50 -05:00
steffen123
c8d12cfe61 p144 - updated table design after comments on draw tables 2008-12-10 03:55:12 +00:00
Matt Turnbull
3ff2ec2106 removed read board cards from markStreets 2008-12-10 00:58:10 +00:00
Worros
390519c549 Merge branch 'exp' of git://git.assembla.com/mctfpdb 2008-12-10 09:50:42 +09: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
sqlcoder
1a43ccf2da remove redundant unique keyword in create table statements 2008-12-09 23:38:40 +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
7ac433fede 2 decimal places for rake 2008-12-09 15:35:16 +00:00
Matt Turnbull
2d6412c8a7 pseudo stars! 2008-12-09 15:32:37 +00:00
Worros
f607b3ff63 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2008-12-09 23:50:35 +09:00
Worros
7b05adea80 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2008-12-09 23:49:25 +09:00
Worros
49f1f6bda0 Merge branch 'exp' of git://git.assembla.com/mctfpdb 2008-12-09 23:48:28 +09:00
eblade
5e23b55361 specify right function name to timer, duh 2008-12-09 08:35:19 -05:00
eblade
7516d17a40 add 0.5 sec auto-timer to auto-run update_table_position 2008-12-09 08:21:50 -05:00
eblade
9dd6f36df6 add Hud::update_table_position(), tracks table.x and table.y, repositions all stat_windows within. triggered each update(), and when the Reposition Stats menu option is selected. 
fix windows code to use same gdkhandle variables as unix code
 2008-12-09 07:51:41 -05:00
eblade
7d4bded3d5 make sure we close each handle opened by ProcessOpen in the win32 calls 2008-12-09 01:43:13 -05:00
sqlcoder
71a587faca mods to use insert_id() instead of repeated selects and get postgres working 2008-12-09 00:29:39 +00:00
Ray
7d75e4af91 Add winner and pot to Mucked list list box + intfac imp. 2008-12-08 14:10:45 -05: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
sqlcoder
30e61901d6 use spaces not tabs and get first part of insert_id() code working again 2008-12-08 01:38:06 +00:00