Commit Graph

773 Commits

Author SHA1 Message Date
Worros
1c1adfaf08 Preliminary support for Everleaf PLO? 2009-02-22 18:21:49 +09:00
Worros
232c0df33a determineGameType fixed for FTP, PLO working 2009-02-22 18:07:11 +09:00
Worros
baae7af5e0 Remove a tonne of debug, neaten output 2009-02-22 14:37:38 +09:00
Worros
3febe073cc Make FullTilt wrk with new importer 2009-02-22 12:42:16 +09:00
Ray
2ebb026543 Cleanup in HUD_main and HUD.py to simplify.
HUD_run_me no longer needed but not removed.
2009-02-21 18:19:49 -05:00
eblade
0dc63746f9 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-02-21 11:20:28 -05:00
Worros
40ccefe105 Separate collected and collectees for output 2009-02-22 01:17:06 +09:00
Worros
cf52ee4822 Fix blinds output
Changes self.posted to be a list of lists.
[[p1, "small blind"][p2, "big blind"][p3, "big blind"][p4, "both"]]
2009-02-22 00:22:25 +09:00
eblade
560bead1d3 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-02-21 09:39:33 -05:00
Worros
76688ed1c2 Fix regex for posting both blinds
Partially fix output:

neslein: posts small blind [$ 0.05 USD]
dokiprogym: posts big blind [$ 0.10 USD]
EricBlade: posts both blinds [$ 0.15 USD]
Tilting2: posts big blind [$ 0.10 USD]

becomes:

neslein: posts small blind $0.05
dokiprogym: posts big blind $0.10
Tilting2: posts big blind $0.10
EricBlade: posts big blind $0.10

EricBlade should post .15
2009-02-21 23:26:37 +09:00
Worros
d196b80a60 Deal with case 'no small blind and walk in bb' 2009-02-21 22:31:57 +09:00
Worros
5c6793d373 Add sanity check to HHC
Make sure input file and output file are different so we dont overwrite
the source.
2009-02-21 22:06:10 +09:00
eblade
9fa6d05528 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-02-21 07:46:20 -05:00
Worros
420c4fec69 Add 'Uncalled bet' line to output of new converter 2009-02-21 21:37:47 +09:00
eblade
45d2e5cedd Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-02-21 06:44:14 -05:00
Worros
e8d90bd705 Fix for table names with '-' in them 2009-02-21 20:42:16 +09:00
eblade
4baa9835f9 fix my last patch to use os.path.sep instead of hardcoded "\\" 2009-02-21 06:25:12 -05:00
Worros
36568075fe Add output line for main import code
Main import should probably read summary, meh
2009-02-21 20:24:11 +09:00
Worros
22c9fd6acb Adds command line operation to file.
Only supports a single file at the moment
2009-02-21 20:05:17 +09:00
eblade
6fc903b504 contingency plan in case you refer to the filename iwthout it's full pathname, ie manual conversion 2009-02-20 17:22:36 -05:00
eblade
506f0fd751 add folder with date-name to outputfilename for everleaf converter (uses whatever the prior folder name in the path was, regardless of if it's a date or not, but normally it would be a date) 2009-02-20 16:54:42 -05:00
eblade
824f6a3129 Merge branch 'master' of git://git.assembla.com/mctfpdb.git
Conflicts:
	pyfpdb/HandHistoryConverter.py
2009-02-20 15:58:00 -05:00
Matt Turnbull
2b13d38da6 fixed keyword arg before non keyword arg bug from last commit 2009-02-20 18:02:23 +00:00
Matt Turnbull
483e177346 Explicit matching of player names
About the only place where we are guaranteed to get all the players'
names correctly is in the seating plan in the hand header. We extract
the names and build a regex that matches only the names. We only do this
if the current regex is out of date, to avoid recompiling them too
often.
I also did away with self.rexx because it seemed unnecessary and was
difficult to work with.
2009-02-20 16:29:52 +00:00
eblade
b8f88661f3 Add comment to Hand.py, around addCollectPot(). Please look at that, Matt. 2009-02-20 03:33:25 -05:00
eblade
c02f5dbaeb Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-02-20 03:26:12 -05:00
Worros
81c92f9599 Revert last change and try alternate
Assumes that the player names cannot have a ':' or a ' ' in them
2009-02-20 17:22:58 +09:00
eblade
fe5045b14f hand error in checkPlayerExists will tell you why it failed 2009-02-20 02:44:06 -05:00
Worros
65821dbd2b Remove debug line that slipped thorugh in last commit 2009-02-20 16:42:57 +09:00
Worros
77591788e4 Minor regex update for raises in Everleaf 2009-02-20 16:38:13 +09:00
eblade
f0dc69250c Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-02-20 02:30:41 -05:00
Worros
e5ab933659 Fix major bug in fpdb_import
Hat tip to Eric
2009-02-20 16:06:22 +09:00
eblade
71b47c237a Merge branch 'master' of git://git.assembla.com/fpdboz.git
Conflicts:
	pyfpdb/HandHistoryConverter.py
2009-02-19 16:59:28 -05:00
eblade
14cf64f81b HHC will return without generating python errors if given an empty input, commented out echoing the input 2009-02-19 16:56:37 -05:00
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