eblade
fe4087d929
Merge branch 'master' of git://git.assembla.com/free_poker_tools.git
2009-02-27 13:38:26 -05:00
eblade
701079fe35
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2009-02-27 13:37:08 -05:00
Matt Turnbull
9254be66a1
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-02-27 18:29:43 +00:00
Matt Turnbull
a2f6578848
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2009-02-27 18:29:36 +00:00
Ray
167ea98b8b
Eliminate erronious multi huds on same table in some cases.
2009-02-27 12:42:49 -05:00
Ray
e45c42b172
Correct mistaken removal of stderr redirect.
2009-02-27 10:36:45 -05:00
eblade
4c0b709c22
fix for error if totalprofit = 0 (new player)
2009-02-26 22:01:35 -05:00
Ray
55d61fd1a5
Merge branch 'master' of git://git.assembla.com/mctfpdb
2009-02-26 12:02:14 -05:00
Ray
20514bd0cb
Merge branch 'master' of git://git.assembla.com/fpdboz
...
Conflicts:
pyfpdb/GuiBulkImport.py
pyfpdb/Hud.py
2009-02-26 12:01:18 -05:00
Ray
af906352fc
Minor changes.
2009-02-26 11:55:51 -05:00
Ray
baefbb5a07
Cleanup in GuiBulkImport, trivial change to Tables.
2009-02-26 11:53:31 -05:00
Matt Turnbull
0773818831
set -> list
2009-02-26 16:50:45 +00:00
Matt Turnbull
31b37f3746
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-02-26 16:50:27 +00:00
Worros
3fba85456c
Fix button regex
2009-02-27 01:26:50 +09:00
Matt Turnbull
ca57a5a5ff
set -> list
2009-02-26 16:04:08 +00:00
Matt Turnbull
da602b2908
temp
2009-02-26 15:36:23 +00:00
Worros
6d862cff52
addPlayerCards done - now need to print it
2009-02-27 00:35:15 +09:00
Worros
7f1fd2ca38
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-02-26 23:32:41 +09:00
eblade
9557117a16
add "totalprofit" stat
2009-02-26 09:27:59 -05:00
Ray
333cbdbf6d
Speed and reliability changes (+cleanup) to aux window interface.
2009-02-25 23:35:15 -05:00
eblade
c7541d9f14
return appropriate tuple from import_fpdb_file on file error
2009-02-25 23:17:36 -05:00
eblade
560cb1a543
fpdb_import runUpdated() will now remove files that were found to be newly missing on it's most recent pass from it's list of files to check
2009-02-25 22:44:03 -05:00
Matt Turnbull
0986e36648
work in progress!
...
- command line options
Try the following
./Everleaf --help
cat everleaf.txt | ./Everleaf -i - -o -
Try using -i -, and pasting in a hand. Be aware it needs an EOF
<ctrl>-d (unless you specify --follow, which isn't done yet)
- HHC is a thread
- hand gametypes per hand
- lots of stupid little things just to cause trouble
- added logging
Not yet done:
- tail -f mode
- integration into fpdb_import. Two options for grand plan here:
1) recently modified files get a HHC filter attached
when the HHC runs out of pipe it waits
runUpdated finds modified files and notifies the thread
2) the thread follows independently, when it runs out of input it
sleeps and then tries again at intervals
I like both, 1) involves bigger changes to fpdb_import whilst with 2) we
just point the existing fpdb_import code at the filter output (the way
we currently do filtering has to be altered though)
Comments welcome of course.
2009-02-26 00:59:36 +00:00
eblade
7ebf27c07e
add site config option "use_frames", set to "True" to get frames
2009-02-25 15:25:58 -05:00
eblade
3c9f5537ea
import should stop erroring out and crashing if a file it wanted to read has been deleted
2009-02-25 12:40:39 -05:00
Worros
440602198f
Fix(?) HeroCards regex for stud
2009-02-26 01:48:41 +09:00
Worros
59136c70d1
Merge branch 'master' of git://git.assembla.com/mctfpdb
2009-02-26 01:24:15 +09:00
Worros
354a67c0e4
Some bringin code for stud/razz
2009-02-26 01:23:46 +09:00
Worros
a71be6ddd3
Add stud/razz ante for FullTilt converter
2009-02-26 00:45:46 +09:00
Matt Turnbull
d5b7b17b21
bugfix
2009-02-25 15:16:18 +00:00
Matt Turnbull
e5489056ff
less broken, please check sanity
2009-02-25 14:59:11 +00:00
Matt Turnbull
65c34a7377
keeping Everleaf uptodate with FullSteamAhead changes
...
Also, made static regexes class-wide, so compile once on import
2009-02-25 14:35:28 +00:00
Matt Turnbull
abf489f0c6
need re.MULTILINE and not to have syntax errors
2009-02-25 14:14:42 +00:00
Matt Turnbull
bb4eece2f7
Merge branch 'master' of git://git.assembla.com/fpdboz
...
Only seemed to conflict the [ --> \[ in the HeroCards re
Conflicts:
pyfpdb/FulltiltToFpdb.py
2009-02-25 12:36:45 +00:00
Worros
d500a9f9c5
More Razz - First pass through hh that doesn't crash
2009-02-25 21:34:05 +09:00
Matt Turnbull
8cccce512d
regexs start at start of lines
2009-02-25 12:34:01 +00:00
Worros
8b9b77edb9
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-02-25 20:40:55 +09:00
Matt Turnbull
a324dc4c7e
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-02-25 11:32:14 +00:00
Matt Turnbull
a5b7b8202a
tiny changes
2009-02-25 11:32:03 +00:00
eblade
cda897608c
EverleafToFpdb: should at least recognise Stud, once the HandInfo regex is fixed. Not that it'll do anything good with it.
...
HHC: return doing nothing but printing a warning message to output, if determineGameType() returns None
2009-02-25 06:01:44 -05:00
Worros
a6df1b6461
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-02-25 19:35:54 +09:00
Worros
3d9026da2c
More razz updates
2009-02-25 19:32:12 +09:00
Matt Turnbull
baa5b2e8b5
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-02-25 10:26:25 +00:00
Worros
dd6c23ad85
Move markStreets outside of if statement in main processing loop
2009-02-25 02:12:45 +09:00
Worros
a8a870548e
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2009-02-25 02:08:06 +09:00
Worros
a4f0e9a1fd
Fulltilt nlhe working, more razz stuff
...
Everleaf still broken - need to create/move button regex to new abstract
method
2009-02-25 02:05:51 +09:00
Worros
7fd90ce760
Thinko - use right regex
2009-02-25 01:27:10 +09:00
Worros
b38c62367a
Preliminary razz support for Fulltilt
...
Breaks stuff
2009-02-25 01:17:25 +09:00
Ray
c535dc7f24
Cleaner intermediate print during autoimport.
2009-02-24 10:54:02 -05:00
Worros
bca9fb15cf
Note in code re: os.walk
2009-02-24 22:46:05 +09:00
eblade
163842e379
Merge branch 'master' of git://git.assembla.com/free_poker_tools.git
2009-02-23 22:48:28 -05:00
Ray
f1530860d2
Fixed problem with unreliable fav_seat placement.
...
Eliminated special query to get actual seat by
incorporating in to stat_dict query. Provided for
graceful skipping of hands when there is an error
in a query in the read_stdin() thread. Left
intermediate prints for use of others.
2009-02-23 21:33:23 -05:00
eblade
b2ee8fa0ce
add a couple of missing commas
2009-02-23 07:56:33 -05:00
Worros
a4911b8b9e
More syntax error
2009-02-23 21:56:29 +09:00
eblade
4a12d5e9a7
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2009-02-23 07:53:29 -05:00
Worros
5aecfb8e30
Oops. fix syntax error
2009-02-23 19:24:21 +09:00
Matt Turnbull
03f89ee439
for some reason my GuiBulkImport was missing get_vbox()
...
Added a combobox for selecting a filter
But import brokea bit
2009-02-23 01:03:18 +00:00
eblade
89fde673e2
should detect FL games (need to implement way to actually not continue processing FL since we don't support it currently)
2009-02-22 18:03:19 -05:00
eblade
482ad798aa
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2009-02-22 18:01:51 -05:00
Worros
1c1adfaf08
Preliminary support for Everleaf PLO?
2009-02-22 18:21:49 +09:00
Worros
232c0df33a
determineGameType fixed for FTP, PLO working
2009-02-22 18:07:11 +09:00
Worros
baae7af5e0
Remove a tonne of debug, neaten output
2009-02-22 14:37:38 +09:00
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