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

1062 Commits

Author SHA1 Message Date
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
Worros
08a4d568cc Fix parseHandStartTime for FullTilt 
Doesn't come close to fixing Full Tilt tourneys as far as i can tell.
 2009-02-20 02:26:29 +09:00
Worros
d9656b25f6 Oversight in Hand.py (?) 
Bp missing in this function, and doesn't run if called. No idea if the
function has ever been called.
 2009-02-20 01:37:48 +09:00
Worros
bc8f1b56b6 Remove Unicode mode from file read. 
Hope this fixes the issue with Erics source file getting nuked
 2009-02-19 22:58:29 +09:00
Worros
98ea23cd49 Couple of additional fixes for import 2009-02-19 22:10:31 +09:00
Worros
50ca5d5457 Fix tab/spacing 2009-02-19 21:15:12 +09:00
Worros
66fe3f990b Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-02-19 20:35:33 +09:00
Worros
2a90c798a2 Make executable 2009-02-19 20:35:05 +09:00
eblade
d2159b6430 changes to make auto-import recursive, and to get the converter thingee kind of working 2009-02-19 05:38:51 -05:00
Worros
dcee1c6d28 Merge branch 'master' of git://git.assembla.com/free_poker_tools 
Conflicts:

	pyfpdb/fpdb_import.py
 2009-02-11 16:40:33 +09:00
Ray
18140defd8 Update bulk import, optionally drop indexes, improve gui 2009-02-07 10:06:48 -05:00
Worros
6214131713 Small change - note we should error check 2009-02-05 18:50:50 +09:00
Worros
315d010311 Make Everleaf converter actually function. 
Makes HandHistoryConverter actually write out a file to
$hhArchiveBase/sitename/

Adds code in importer call the functions in EverleafToFpdb
 2009-02-05 18:28:18 +09:00
Ray
9395643aad Straighten out Cards01.png thing. (see typo) 2009-01-30 17:27:31 -05:00
Ray
79fd998718 Added Cards0.png = ftp card images for use with Mucked.py 2009-01-30 17:13:00 -05:00
Ray
5f290ace56 Updated version to 0.10 via new VERSION variable. 2009-01-30 13:00:29 -05:00
Worros
9cd88c0399 Comment patch: FTP HH headers 2009-01-30 13:23:09 +09:00
Ray
8ee2b72a42 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-01-29 12:37:25 -05:00
Worros
b023a9404c Quick commit to add the failing Full Tilt HH Header 
Only as a comment for now. Need to pull together all the valid Full Tilt
HH lines so we can write a decent regex to match
 2009-01-30 02:18:19 +09:00
Worros
d684b50415 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-01-29 11:27:28 +09:00
eblade
e17c2eb64e fpdb_import: cleanup, and fix for FT bug that puts multiple seats on one line of summary 2009-01-28 03:46:43 -05:00
Ray
c767bb9986 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-01-27 23:52:51 -05:00
Worros
c4ce2ea95a Make grapher export image file. 
Currently dangerous with no error checking.

Exports a png file in the same dimensions as it appears on screen
 2009-01-28 12:51:39 +09:00
Worros
e782fbd5f3 Comment out sample session detection code 2009-01-28 12:35:54 +09:00
Ray
58ccf0327c Complete prev commit by deleting intermed output. 2009-01-27 14:13:54 -05:00
Ray
9ddce0b016 Remove some comments that didn't get removed with its code. 2009-01-27 14:11:53 -05:00
Worros
1179067033 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-01-27 19:35:35 +09:00
Worros
07b765482d Added prelim Betfair parser. 
Straight copy of the current Everleaf parser
 2009-01-27 16:22:15 +09:00
Ray
64f1f17d7c Make player stats rows not expand = prettier. 2009-01-26 20:02:01 -05:00
Ray
3261f28506 Put a frame around each eb in the stat window-avoid tooltip annoyance. 2009-01-26 18:31:04 -05:00
Ray
37a643f054 Kill aux windows when killing the HUD. 2009-01-26 14:31:08 -05:00
Ray
b6ee768f2c Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-01-24 09:22:27 -05:00
Ray
9981a62847 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-01-24 09:22:18 -05:00
Matt Turnbull
05701955ac Merge branch 'master' of git://git.assembla.com/fpdboz 2009-01-22 18:21:48 +00:00
eblade
24e9e56726 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-01-22 00:19:38 -05:00
Matt Turnbull
f048a763c0 Merge branch 'session' of git://git.assembla.com/fpdboz 2009-01-21 21:16:33 +00:00
Worros
30cd579131 Session detection code. 
Possible use in showing sessions graphically on the plot
 2009-01-22 01:40:05 +09:00
Worros
3bc8327d12 Remove euro symbol is it barfs python 2009-01-22 01:31:39 +09:00
Ray
02e03c7ed9 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-01-19 12:57:05 -05:00
eblade
4d5b86ebdf Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-01-19 03:31:18 -05:00
Worros
b2c135ee12 Possible fix for problem Eric is reporting in importer 2009-01-19 11:32:34 +09:00
eblade
6941521a8c Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-01-18 07:29:32 -05:00
Worros
8cf705240c Change bulk import output slightly 2009-01-17 02:41:18 +09:00
Worros
ffb037b1fe Added output totals for bulk import 2009-01-17 02:24:00 +09:00
Worros
a3ff477395 Added comment/debug to damaged FTP file 
Doesn't fix issue, but documents what the bug is in the FTP software,
and prints the file name and line number that it occurs in so user can
fix.

Ideally the parser itself would be able to deal with this.
 2009-01-17 00:24:01 +09:00
eblade
9bf8551327 update get_nt_exe() to elevate privileges before calling OpenProcess, bizarre. 2009-01-15 11:09:30 -05:00
eblade
cd1d4df96d HUD_main: 
Add site name to list of windows being HUDed,
	fix weird call convention to the "del" operator, which is not a function.
	call clean_title() on hud titles being killed, so we actually kill (deep) tables and such

HUD:
	Add function "kill_hud_menu", which is now called from the Kill This HUD menu option, to avoid a potential loop in kill_hud()
	Record the handle of the HUD's destroy signal, use it to un-register, before performing a kill, also avoiding potential loop there
	Do not allow kill_hud() to be called twice in the same HUD object, return doing nothing if deleted is already set on it (that should totally solve the loop problem)
 2009-01-14 23:05:08 -05:00
Ray
b965654962 Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-01-12 19:22:18 -05:00
Ray
fcd70293fb minor formatting changes 2009-01-12 19:21:43 -05:00
Ray
d5597f7955 HUD_runme.py needs to be executable. 2009-01-12 19:20:24 -05: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
eblade
0fd6c4a9b2 fpdb_parse_logic: use 'in' instead of 'find' 2009-01-08 10:40:18 -05:00
eblade
0cd97db548 fix typo from last commit 2009-01-08 06:25:25 -05:00
eblade
37a418484f Replace all occurences in Tables.py where RegExps and the string 'find()' method were being used for simple string checks, with "in" operator 2009-01-08 06:17:56 -05:00
eblade
326805950b Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 
Conflicts:
	pyfpdb/Hud.py
 2009-01-07 12:46:19 -05:00
eblade
ff3d6c75b8 Merge branch 'master' of git://git.assembla.com/mctfpdb.git 2009-01-07 12:36:09 -05: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
eblade
fb9d7c0af2 Add file HUD_run_me, to be run by GuiAutoImport 
GuiAutoImport: run HUD_run_me instead of HUD_main
HUD_main: Add HUD_removed() function, called by HUD when an individual HUD is closed, eliminates polling them every update; use 'in' operator instead of has_key
HUD: clean up code that deals with lack of font descriptor in config, and notification of what font was selected
HUD: clean up unnecessary use of keys() functions, and 'in' vs has_key
HUD: restore previous definition of reposition_windows(), although i can't make it error at will anymore
Tables: cleanup with keys() and in operator
fpdb: no longer raise an error on duplicate tab, since we currently depend on that, it's not an error, right?
 2009-01-06 05:18:45 -05:00
Ray
c0557c7ef9 rationalized button presses, fixed reposition windows 2009-01-05 20:26:39 -05:00
Matt Turnbull
80e1eed7ec Merge branch 'master' of git://git.assembla.com/fpdboz 2009-01-05 19:04:46 +00:00
Ray
d994f04e01 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-01-05 10:53:31 -05:00
Ray
644201e669 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:

	pyfpdb/HUD_config.xml.example
 2009-01-05 10:53:10 -05:00
Ray
84653ff99c updating HUD_config.xml.example 2009-01-05 10:49:27 -05:00
sqlcoder
ab1e8cf670 added new faster version of storeHudCache routine, storeHudCache2 
Set the fastStoreHudCache variable to True to test this out.
In the best case it only does one DB operation (update), if
this fails because the record does not exist it does an insert.
 2009-01-03 19:55:54 +00:00
sqlcoder
cc31f86269 add profit/100 hands stat 2009-01-03 18:00:44 +00:00
sqlcoder
257dd35c93 let fpdb_db routine work out which bits of config to use for connection 2009-01-03 17:59:48 +00:00
sqlcoder
26ad0ff91b Merge branch 'master' of git://git.assembla.com/fpdboz 2009-01-03 17:10:58 +00:00
eblade
0f90d8a899 discover functions all return None, instead of False, fixing bool has_key() problem in hud 2008-12-31 13:14:28 -05:00
eblade
26a549d7d2 discover functions all return None, instead of False 2008-12-31 13:13:35 -05:00
eblade
9b6e18c2c0 Merge branch 'master' of git://git.assembla.com/mctfpdb.git 2008-12-31 12:08:25 -05:00
eblade
6276386aa8 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2008-12-31 12:06:58 -05:00
eblade
9989a97c25 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2008-12-31 12:03:15 -05:00
Worros
0857739d83 Add Euro Symbol (€) and EUR to regexes 2008-12-31 01:28:28 +09:00
sqlcoder
e469202b66 Merge branch 'master' of git://git.assembla.com/fpdboz 2008-12-28 09:50:33 +00:00
eblade
6de2607505 create_hud adds to the main_hud window, a list of tables that are being monitored (it is culled in read_stdin(), so i'll need to do some thinking on that to remove lag time between removal of hud and removal from list) 
i can see using this for table info, debug info, buy-in info maybe, but i wanted some place i could write to directly and see things in real time rather than depending on the logs
 2008-12-24 07:56:32 -05: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
eblade
fc4671fc98 add NA for attempted steal % 2008-12-21 18:42:21 -05:00
eblade
d4e16b9b05 code/comment cleanup 2008-12-21 17:14:57 -05:00
eblade
24069d607b code/comment cleanup in Hud 2008-12-21 06:49:34 -05:00
eblade
c974864e13 Merge branch 'master' of git://git.assembla.com/mctfpdb.git 2008-12-21 06:11:33 -05: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
Ray
93a4059488 Merge branch 'master' of git://git.assembla.com/mctfpdb 2008-12-20 16:45:40 -05:00
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
sqlcoder
3ea95acb0c add db param to allow insert_id() matching fpdb_parse_logic.py 2008-12-08 00:55:03 +00:00
Worros
a73a9d446c Merge branch 'master' of git://git.assembla.com/free_poker_tools 2008-12-08 09:43:42 +09:00
sqlcoder
4dc15bfd94 pulled and merged from fpdboz 2008-12-07 23:38:33 +00:00
sqlcoder
ec01f7ae40 move code closer to carl's repo 2008-12-07 17:23:38 +00:00
Worros
ba944c2d7c Merge branch 'master' of git://git.assembla.com/free_poker_tools 
Conflicts:

	pyfpdb/fpdb_simple.py
 2008-12-07 18:07:00 +09:00
Worros
edd3d3ec07 White space churn to RegressionTester 2008-12-07 17:35:37 +09:00
Worros
977e954574 Fixups to GuiPlayerStats 
Now sets up and obeys the radio buttons more correctly.

Also reads the names from the text box, and replaces <player_test> in
the sql query.
 2008-12-07 17:06:01 +09:00
Worros
425997d66a Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2008-12-07 14:17:05 +09:00
Worros
b1a9109190 Merge branch 'exp' of git://git.assembla.com/mctfpdb 2008-12-07 14:04:00 +09:00
Mika Bostrom
90e348946f First step at fixing the bulk importer with postgres 2008-12-06 21:59:58 +02:00
Mika Bostrom
415eb4a3c6 Retab/whitespace demangly fpdb_import.py 2008-12-06 21:50:40 +02:00
Mika Bostrom
19c0328955 Change syntax for CREATE INDEX... for postgresql 2008-12-06 21:14:39 +02: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
Mika Bostrom
6070066f8a obtain_global_lock() is a method, not top-level function 2008-12-06 15:16:55 +02:00
Mika Bostrom
dfb8a06686 Allow to connect to local PostgreSQL via domain socket 2008-12-06 15:07:37 +02:00
Mika Bostrom
7ecfac5437 Retab/whitespace demangle fpdb_db.py 2008-12-06 14:40:04 +02:00
Mika Bostrom
c9700fc1a7 Some debugs 2008-12-06 14:34:44 +02:00
Mika Bostrom
0f05d0886e Modify local HUD_config.xml, clean some places and change DB type to 
postgresql
 2008-12-06 14:10:50 +02:00
Worros
998ab6eac3 Add start of graph export functionality 
No function yet - just adds callback
 2008-12-06 20:51:36 +09:00
Worros
88075bc4f2 Colorise the stats rows, add refresh button 
Refresh button destroys table at the moment.
 2008-12-06 20:50:06 +09:00
Mika Bostrom
3eb1a1dd0b Start to clean up psycopg2.connect() and surroundings 2008-12-06 13:41:39 +02:00
Worros
1576387d61 Add GuiPlayerStats to menu 2008-12-06 19:09:18 +09:00
Worros
803491e6fd Add new GUI insterface for players stats 
First pass at displaying player stats. Only works if your player id is
3, and you play nl
 2008-12-06 19:08:07 +09:00
Ray
1e9263f202 Fix width of left column. 2008-12-05 12:51:19 -05:00
Worros
d17e353509 Merge branch 'exp' of git://git.assembla.com/mctfpdb 2008-12-05 22:50:22 +09:00
Worros
51ce6fc191 Index mods '+0' from sqlcoder on mailing list 
Have been tested and provide a significant improvement on import.

"""
Along with new indexes, I think some of the sql in fpdb_simple can be
altered to make it use existing indexes more effectively. Generally
these mods affect statements where the db has a choice of 2 indexes to
use and I think it is choosing badly, e.g. it is using tourneyTypeId
which could match the whole table when it could use the new
siteTourneyNo index which will return very few rows.

To stop the db from using an index I'm just adding zero to the field, so
something like
   playerId = %s
changes to
   playerId+0 = %s
We humans can tell this is no real change at all, but the db sees this
as a change from <field> = <value> to <expression> = <value>, and it can
only use the index if the <field> the index is on is being tested.
(Nowadays you can index expressions in some databases but we'll ignore
that!)
"""
 2008-12-05 17:18:13 +09: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
Ray
22111e6d3f Merge branch 'master' of git://git.assembla.com/fpdb-eric 2008-12-04 12:57:05 -05:00
Ray
3cfea4eb30 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:

	pyfpdb/fpdb_simple.py
 2008-12-04 12:56:27 -05:00
Worros
afea3315fc Merge branch 'exp' of git://git.assembla.com/mctfpdb 2008-12-04 18:47:42 +09:00
Worros
42381eaabc Merge branch 'master' of git://git.assembla.com/mctfpdb 
Conflicts:

	pyfpdb/fpdb_simple.py
 2008-12-04 18:46:55 +09:00
Worros
fefbcfca65 Whitespace churn on Graph viewer 2008-12-04 16:15:38 +09:00
Worros
a1ed9603f3 Revert debug changes made while working with Eric 2008-12-04 15:52:24 +09:00
Matt Turnbull
92656ae6a0 hole cards / community cards extracted and added to printout 2008-12-03 23:57:20 +00:00
sqlcoder
160db08689 calc totalprofit for hud 2008-12-03 23:14:03 +00:00
eblade
0186145065 remove no-longer-needed "topify_window" for Stat_Window, removed some lines that were commented out due to no longer being needed, etc. Seems to fix the windows randomly re-attaching in Win32. 2008-12-03 13:35:19 -05:00
Ray
7063e03d6e futile attempt to fix mystery crash 2008-12-03 12:48:04 -05:00
Ray
3be6453b42 Minor bug in import parameters. 2008-12-03 12:01:37 -05:00
Worros
1f7f3f7187 Fix MySQL 'ADD INDEX' syntax, add functions to create_tables 2008-12-03 18:18:20 +09:00
Worros
165ca5bf19 Oops - fix last commit 2008-12-03 17:41:20 +09:00
Worros
f25e524c06 Add sqlcoders indexes to query file 2008-12-03 17:37:31 +09:00
eblade
cd858d6ade add "debug stat windows" to hud menu .. doesn't do anything useful yet, as i'm trying to figure out what part to actually debug 2008-12-03 03:25:49 -05:00
eblade
703c2a1d12 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2008-12-03 03:25:02 -05:00
Worros
bac92f7b6e playerStats query from sqlcoder - massive whitepsace churn - Apologies 2008-12-03 17:00:11 +09:00
Worros
e7650427b0 Initial placement of playerStatsByPosition 
Doesn't do much thats useful yet - hard coded to nl and playerid=3
 2008-12-03 16:36:49 +09:00
sqlcoder
567d585a54 script to update index choices 2008-12-02 23:28:06 +00:00
eblade
3f86c54b17 add "NA" to fold to steal stats for 0/0's 2008-12-02 10:14:38 -05:00
sqlcoder
a824814c0a sqlcoder initial updates 2008-12-02 00:15:50 +00:00
Matt Turnbull
85f64b42fb Merge branch 'master' of git://git.assembla.com/fpdboz 2008-12-01 14:34:39 +00:00
Worros
8820a691e8 Update bulk import codepath to output total import time. 2008-12-01 20:07:38 +09:00
eblade
401bcc15cd remove debug code i accidently committed last time 
account for dead seats between blinds
fix some improper position handling when BB in seat 2, with dead hand in seat 1, and SB on last seat
 2008-11-27 11:27:23 -05:00
Worros
762ae46afb Merge branch 'master' of git://git.assembla.com/fpdb-eric 
Conflicts:

	pyfpdb/GuiGraphViewer.py
 2008-11-27 22:50:58 +09:00
eblade
1de34462e3 remove spurious window realize from popup_window as well 
printEmailErrorMessage also writes a traceback to the stderr, so we can more easily figure out -what part- it failed in
parsePositions will ignore a small blind if it appears to be coming from the same place as the big (does this mess with dead blinds? who knows)
 2008-11-27 08:35:17 -05: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
eblade
274cecdc58 stat windows no longer call realize() as that is done automatically by gtk when needed 
importer dumps bad hands to hand-errors.txt after printing the normal email message
parse_logic should ignore lines where small blind is found to be "$0", however, it's still causing errors
 2008-11-27 05:12:07 -05:00
eblade
6e116f4b02 don't bother doing show_all on each stat_window, then hide, just hide first. (probably shouldn't need to even hide them first, but they seem to sometimes start hidden sometimes not) 2008-11-27 02:31:52 -05:00
Worros
7cc8ce7757 Clean up profit graph function 2008-11-27 10:29:41 +09:00
Worros
6c4c450f07 Fix for postgres graph query - Remove column names to fix syntax error 2008-11-27 10:28:19 +09:00
eblade
49390940e3 add middle-click on stat_window to hide it (since we don't currently have a way to hide it when someone leaves) 2008-11-25 08:52:59 -05:00
eblade
2c00422f34 clean up some stat descriptions 2008-11-25 07:33:20 -05:00
eblade
53a95ccc80 stat windows are hidden by default, and only brought forward when there's a player in a seat that has recorded a hand 2008-11-25 07:03:33 -05:00
eblade
f8749fe7fb Add "hudcolor" attribute to all <stat> definitions, drop font size to Sans 7, since i can't fit my stats in comfortably anymore 2008-11-25 06:47:58 -05:00
eblade
c815edaa9b Merge branch 'master' of git://git.assembla.com/fpdboz 2008-11-22 18:16:55 -05:00
eblade
5642f4bafc Merge branch 'master' of git://git.assembla.com/free_poker_tools 2008-11-22 18:16:46 -05:00
Ray
2155c12587 Fixed error detecting FTP tables on NT 2008-11-22 17:28:12 -05:00
Worros
bffbc18ff4 : 2008-11-18 14:27:30 +09:00
eblade
50938c4912 Merge branch 'master' of git://git.assembla.com/fpdboz 2008-11-17 14:38:01 -05:00
Ray
17ad796917 More changes to support mucked/aux windows. 2008-11-16 17:53:31 -05:00
Worros
55332d4983 More Everleaf updates, may have a functional regex for action in NLHE 2008-11-16 13:44:16 +09:00
Worros
7aa0cff8d8 Make ftp kinda work 2008-11-16 13:43:24 +09:00
Worros
dfbcf8efc7 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2008-11-16 11:49:37 +09:00
eblade
284955350a Merge branch 'master' of git://git.assembla.com/fpdboz.git 2008-11-14 15:46:02 -05:00
eblade
1ed20a5f70 Merge branch 'master' of git://git.assembla.com/fpdboz.git 
Conflicts:
	pyfpdb/GuiGraphViewer.py
 2008-11-14 15:45:56 -05:00
Ray
37cd869209 fix reading of mucked cards for stud games 2008-11-14 13:10:17 -05:00
Worros
0059d20f8e Add callback for test entry so player name is changable. Still buggy but partially functional 2008-11-14 22:41:37 +10:00
Worros
ba52cb93d1 Actually implement sqlcoders query as intended. 
Query running in about 30% of the time.
 2008-11-14 19:27:37 +10:00
Worros
e4021b0525 Fix comment re: stars time format 2008-11-14 15:02:38 +10:00
Worros
115c5d920d Text was annoying me. Turned into multiline string. 2008-11-14 14:58:35 +10:00
Worros
86ba757080 Major update to the layout of GuiGraphViewer. 
Changes the structure to a left a left options pane and a right graph pane.

Starting to create the options dynamically, and use callbacks sanely.
 2008-11-14 14:54:34 +10:00
eblade
05f3f5eee2 fix indentation typo 2008-11-13 19:42:35 -05:00
eblade
077cb70c79 Merge Carl's changes from sqlcoder to GuiGraph to mine from earlier 2008-11-13 19:41:20 -05:00
Worros
34e374a55e Patch from sqlcoder to make the query for the profit graph smarter/faster 2008-11-14 08:15:28 +10:00
Ray
d90fa208de Smooth wrinkles in mucked card display. 2008-11-13 17:07:24 -05:00
Ray
806744bf34 Mucked window enabled. 2008-11-12 23:02:51 -05:00
Ray
ca960cad96 Support for the mucked cards window. Still a bug in the card storing. 2008-11-12 22:45:09 -05:00
Ray
b35e6c5570 fix bug in saving layouts when fav_seat != 0 2008-11-12 10:28:48 -05:00
Worros
c2475db712 Bugfix - fixes new stars format import, also fixes bug in bulk import (that i introduced a few commits ago) 2008-11-12 22:40:29 +10:00
eblade
5903988e38 merge with ray/carl 
GuiGraphViewer: configure matplotlib to use GTK properly, add in error handling for graphing across a database with hands the player you've requested wasn't involved in. please see # todo note on that.
 2008-11-12 06:30:49 -05:00
Worros
6e182831ac Everleaf update - Holecards read 2008-11-12 14:12:18 +10:00
Ray
29a04f639d Merge branch 'master' of git://git.assembla.com/fpdboz 2008-11-11 14:28:50 -05:00
Ray
f5b39068cf Added a query to get stats aggregated for all stakes. 2008-11-11 14:27:35 -05:00
Ray
461c870690 Fine tuning tournament support. 2008-11-11 14:25:56 -05:00
Ray
9923e6e8ca Merge branch 'master' of git://git.assembla.com/fpdb-eric 
Conflicts:

	pyfpdb/Configuration.py
 2008-11-11 09:55:41 -05:00
Ray
036729b8c2 Support tournaments 2008-11-11 09:50:20 -05:00
Ray
43f64dda3d Merge branch 'master' of git://trac-git.assembla.com/fpdb 2008-11-11 09:49:04 -05:00
Ray
15d7ea70dc Support tournament detection = major refactor of Tables.py 2008-11-11 09:40:31 -05:00
eblade
863c5be428 change text in hud main windows (smaller, indicates presence of menu and moveability), add opacity and move support (does not yet save it's position) 2008-11-11 04:36:44 -05:00
Worros
2bdc7f5057 Everleaf converter update - blinds posting 2008-11-11 18:54:24 +10:00
Worros
4bbd18d935 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2008-11-11 16:24:07 +10:00
eblade
32b1d7fa86 add opacity to p4e/everleaf config example 2008-11-10 22:42:51 -05: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
6de1ac1c82 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2008-11-10 22:55:24 +10:00
eblade
2074d755aa Hud.py: fix typos in definitions of reposition_windows and kill_hud, eliminating errors when those functions are called 
move pop-up window to button 3 when clicked on a stat window, added move/resize functionality to button 1 (hold shift to resize, or just click/drag to move)
restore opacity in windows (new window movement works with opacity set)
fix error in popup_window initilization referring to window instead of main_window, oops
 2008-11-10 05:58:55 -05:00
eblade
e713a9c654 fix weird error on windows? possibly just with p4e? trapping if we read 0 lines from history file 2008-11-10 03:46:37 -05:00
eblade
3325538c66 Merge branch 'master' of git://git.assembla.com/fpdb.git 
Conflicts:
	docs/default.conf
 2008-11-10 03:24:05 -05:00
eblade
f767ec2207 windows git is buggy 2008-11-10 03:22:21 -05:00
Worros
397cb9dd29 Merge branch 'master' of git://git.assembla.com/fpdb 2008-11-10 16:41:47 +10:00
Worros
0bbf801d89 Bit more Everleaf 2008-11-10 16:41:04 +10:00
Worros
7053b7f748 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2008-11-10 14:11:57 +10:00
steffen123
f38cdab8e0 p143 - update title 2008-11-10 02:21:47 +00:00
steffen123
49151a92bf p142 - commented tourney summary parsing as it fails on me. this is alpha9 2008-11-10 02:02:12 +00: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
d0218363c6 Fix GuiAutoImport startup after I deleted the default setting in a previous patch. 
Setting now comes from config
 2008-11-09 20:57:42 +10:00
Worros
c53d78491a Minor update to Carbon poker - read gametype + sb/bb 2008-11-09 16:27:27 +10:00
Worros
43f8620dea Remove FpdbRegex until functional 2008-11-09 15:33:42 +10:00
Worros
669382aa01 Remove errors import 2008-11-09 15:30:57 +10:00
Worros
d6706a5bdf First pass at turning file from pokerstats into class 2008-11-09 14:00:39 +10:00
Worros
7bc686c859 Add Regex file pokerstars_cash.py from pokerstats package (http://bostik.iki.fi/pokerstats/) 
Intend to turn into a class plugins can subclass and override the various regexes
 2008-11-09 13:29:58 +10:00
Worros
f3224f87cc Add sanity check function, creates ~/.fpdb/HandHistories/<sitename> if it doens't exist. 
Fixes hhbase and hhdir interpretation.
 2008-11-09 12:58:46 +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
Ray
28037de7a6 skip the set_opacity statement in windows until figured out 2008-11-08 16:58:24 -05:00
Worros
4f64464df3 Fix accessor method to import params in Coonfig. Make cli print using accessor 2008-11-08 23:45:14 +10:00
Worros
c215360a92 Read new parameter in config 2008-11-08 23:01:07 +10:00
Worros
a5ead615fc Add parameter for base path to store HH's 2008-11-08 22:41:06 +10:00
Worros
bfa5137889 Merge branch 'master' of git://git.assembla.com/fpdb 2008-11-08 13:04:04 +10:00
Worros
8a2a851abc Merge branch 'master' of git://git.assembla.com/free_poker_tools 2008-11-08 13:03:52 +10:00
steffen123
56c928ccdc p141 - support new PS UTC timestamps 2008-11-07 20:26:03 +00:00
steffen123
5a045f944f Merge git://git.assembla.com/free_poker_tools 2008-11-07 19:58:11 +00:00
Ray
803b9a7a64 Merge branch 'master' of git://trac-git.assembla.com/fpdb 2008-11-07 14:28:58 -05:00
Ray
e26fdd79a4 possible fix to wrong window positioning seen by Elaetic 2008-11-07 12:22:37 -05:00
Ray
98d0305aa8 fixed psycopg2 connection parameters 2008-11-07 11:07:42 -05: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
Worros
1f3a39142a Change import_file_dict to take new args and fix all callers. 
Rename the main parser and make room for site converters.
 2008-11-07 21:18:12 +13:00
Worros
2b9eed8958 Change db access function to always get the latest committed transactions. 
Fixes graph updating, so i made the label a bit prettier, and a bit better behaved.
 2008-11-07 18:12:48 +13:00
Worros
b32745c28a Merge branch 'master' of git://git.assembla.com/free_poker_tools 2008-11-07 17:16:21 +13:00
steffen123
c739395189 p140 - added CLI option to fpdb.py to control redirection of stderr 2008-11-07 00:14:25 +00:00
steffen123
93b6f9ddaa Merge git://git.assembla.com/free_poker_tools 2008-11-07 00:00:00 +00:00
steffen123
dd74c29551 p139 - fixed TV and removed old config 2008-11-06 23:58:41 +00:00
eblade
27c6c4884e stat popups attach themselves to the stat window as children, have proper colors 2008-11-06 06:58:28 -05:00
eblade
c330bd772b add .exe to PokerStars tablefinder in default config, change some things for the "everleaf" entry 2008-11-06 06:26:25 -05:00
Worros
68344b5ec0 Modified Auto import GUI to allow n-sites based on config file. Added filter option to display. Added option to enable or disable sites in Config 2008-11-06 18:39:49 +13:00
eblade
b2e32c2e15 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2008-11-05 23:46:40 -05:00
Ray
cf1efb8d27 transaction isolation code suggested by sql_coder on the forums 2008-11-05 22:44:29 -05:00
Worros
cf714a8ec1 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2008-11-06 12:19:00 +13:00
Worros
a29372a756 Fix copy-paste error in Stat.py for a_freq_3 function. 
Hat tip to sqlcoder on sourceforge.
 2008-11-06 12:14:46 +13:00
Ray
a41aec44dd added set/get _sit_parameters to Config + removed keep_above in Hud 2008-11-05 16:52:47 -05:00
Ray
22831cc8c6 added get_converter to support Carl's importer change 2008-11-05 15:04:04 -05:00
Ray
f52a60c79d Merge branch 'master' of git://git.assembla.com/fpdboz 2008-11-05 14:49:20 -05:00
Worros
8191db6487 Add new parameters to HUD_config.xml.example in prep for HH filter plugins 2008-11-06 06:57:15 +13:00
Worros
54b1d18146 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2008-11-06 06:49:54 +13:00
Worros
92381254e8 Change the filelist and dirlist type to be a hash of lists, delete postgres sql schema 
dirlist is in the form:
{'Site': [ "/path/to/dir", "filter" ] }

Where filter will be the plugin to convert to stars/fpdb hand history file.

filelist is in the form:
{'file': [ "site", "filter" ] }
 2008-11-06 00:36:24 +13:00
Ray
2bc04ea17b Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:

	pyfpdb/fpdb_import.py
 2008-11-05 05:59:08 -05:00
Ray
9c49913b9c Merge branch 'master' of git://git.assembla.com/fpdb-eric 2008-11-05 05:50:41 -05:00
Ray
b0be7c5b71 cleanup and new get/set for db parameters 2008-11-05 05:49:05 -05:00
Worros
093302e76d Fix(?) problem with HUD only starting after 2 hands have been entered. 
Import code will now import_file_dict() on every file it initially finds that was modified in the last minute.

Not perfect, as a lot of hands can take longer than that.
 2008-11-05 10:39:27 +13:00
eblade
2ecfbf6c2d fpdb_import: auto-import bases it's decisions to check files on file-size changes rather than mtime - could you guys check it out in nix and other poker sites, and tell me if that breaks anything? 
HUD: if update() errors due to not enough stat windows being available (ie, your broken site converter tells us we have a 6 max table, but there are people in seats 7-10), it will re-assess the table as a 10-max
add StatWindow.relocate(x,y)
 2008-11-04 05:02:41 -05:00
Worros
79ddee8971 Add converter attribute to support additional sites 2008-11-04 22:40:03 +13:00
Ray
0f10f87373 changes to make consolidated config files happier 2008-11-02 22:58:55 -05:00
eblade
b5ec60f5fa forgot to commit configuration.py last time 2008-11-02 05:20:25 -05:00
eblade
e154bdd8f4 Add "hudprefix" and "hudsuffix" properties to each of the "STAT" nodes in the config, will display them before/after stats on the HUD, as appropriate. 
(note that due to the use of a table in the hud display, it can get a little.. ugly.. looking)

Add "playername" to list of available stats

MIGHT close huds when poker table is closed in Nix. It doesn't in Windows, but it should.
 2008-10-31 14:34:41 -04:00
eblade
6eca3fdce7 merge in latest ray changes, replace excessive exception handling with a couple of if blocks in get_default_colors - there were definite errors in there not getting cauhgt due to the exception handling 2008-10-30 05:30:29 -04:00
eblade
3f7347d8f6 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2008-10-30 00:05:15 -04:00
eblade
cf2c7e4267 add lines with "($0 in chips)" to list of things to ignore, as a player with no chips cannot possibly be in the hand, and the lines often contain blank usernames on p4e, which are breaking the parser. 2008-10-30 00:03:28 -04:00
Ray
8165e0fb33 Merge branch 'master' of git://git.assembla.com/fpdboz 2008-10-29 22:37:55 -04:00
Ray
f26baac94c added some configuration accessors for Hud.py and some cleanup 2008-10-29 22:37:05 -04:00
Worros
3f6e4fc3bf Merge branch 'master' of git://git.assembla.com/free_poker_tools 
Conflicts:

	pyfpdb/Hud.py
 2008-10-29 23:46:04 +09:00
Worros
87c82df4b2 Merge branch 'master' of git://git.assembla.com/free_poker_tools 
Conflicts:

	pyfpdb/Hud.py
 2008-10-29 23:35:47 +09:00
Ray
81e787221a Merge branch 'master' of git://git.assembla.com/fpdb-eric 2008-10-28 09:37:54 -04:00
Ray
174b7ecfa0 permission changes only 
Please enter the commit message for your changes.
 2008-10-28 09:37:11 -04:00
eblade
6f65f3eadb Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 
Conflicts:
	pyfpdb/Hud.py

Carl was right, the differences were trivial (comment markers mostly)
 2008-10-28 07:30:22 -04:00
Ray
9f84cc93a7 edits to get the stacked window mods working with X 2008-10-27 12:56:09 -04:00
Worros
5809f28daf Merge branch 'master' of git://git.assembla.com/fpdb-eric 2008-10-27 20:14:38 +09:00
Worros
56d80d785c HUD chmod 2008-10-27 20:14:08 +09:00
eblade
64dbe3237d add "hudopacity" to site config, valid settings are potentially from 0.00 to 1.00 2008-10-27 07:12:04 -04:00
eblade
5f15a4f928 Configuration.py: add "bgcolor" and "fgcolor" to <site> node 
HUD: table hud and stat windows respect "bgcolor" and "fgcolor" on a per site basis
Tables: force tw.number to be an int in Unix
 2008-10-27 06:29:39 -04:00
eblade
2bde12a6cf remove set keep above on stat windows 2008-10-27 03:13:04 -04:00
eblade
70bdc0bcb4 fix for re-parenting to work in nix, remove decorations from table hud main window 2008-10-27 03:12:12 -04:00
eblade
051f04b69f trying to get parenting of stats windows to work in nix. 2008-10-26 15:51:12 -04:00
Worros
a1499db849 Fix return type of tables_by_name discovery for posix 2008-10-26 20:13:30 +09:00
eblade
628f71cf3d fix return value for same function i just thought i fixed but didn't all the way 2008-10-26 06:49:47 -04:00
eblade
a1c6fa1dc6 Fix posix discover by name typo/i'm a dummy error 2008-10-26 06:09:29 -04:00
eblade
d07fe6c5c6 move re-parenting code back into windows-only topify_window() function, as it is not 100% system independent (more like 99%) 2008-10-26 05:39:43 -04:00
eblade
7b604e3bec Table HUD window now child of poker table window 2008-10-26 05:34:36 -04:00
eblade
0cd57facda Merge branch 'master' of git://git.assembla.com/fpdboz.git 
Fix accessing the decoder from the wrong object, causing the hud to not work, it should work again. yay.
 2008-10-25 05:36:18 -04:00
Worros
389d9361b9 Update Graph Viewer to use config file, fill Entry with player_name field from the config. 2008-10-25 14:57:29 +08:00
Worros
c48b2f3057 Remove load_default_profile function. 
All references to load default profile were removed when Ray merged the config files.

Deletes function and all references to it.
 2008-10-25 14:45:39 +08:00
Worros
81a6d5f972 Revert label from Ray - Alpha6+ back to Alpha8+ 2008-10-25 14:24:10 +08:00