Worros
20221b1121
Merge branch 'master' into siteneutral
...
Conflicts:
pyfpdb/HUD_config.xml.example
pyfpdb/fpdb_save_to_db.py
pyfpdb/fpdb_simple.py
2009-04-10 00:38:27 +08:00
Ray
6866f409ce
Fix regression importing some Stars tournaments.
2009-04-09 09:21:52 -04:00
Ray
1b1185da17
Integrate 4bet fix from Steffen. Doesn't break-not tested on 4bets.
2009-04-05 13:46:41 -04:00
Ray
ac93a2cb77
Change to allow import of HHs exported from PT Stud.
2009-04-03 12:51:58 -04:00
eblade
2b97b4e635
i'm apparently retarded today
2009-03-28 12:47:46 -04:00
eblade
1de35b2f01
merge error indentation fix
2009-03-28 12:30:57 -04:00
eblade
f54da25d2b
Merge branch 'master' of git://git.assembla.com/fpdboz.git
...
Conflicts:
pyfpdb/GuiBulkImport.py
pyfpdb/fpdb_simple.py
2009-03-28 12:27:45 -04:00
Worros
0528aa74db
Properly escape player names
2009-03-29 00:07:00 +09:00
eblade
eb514902ee
fix some weird things from the patch from runenes,
...
re-replace recognisePlayerIDs(), new one converts all names to UTF-8 prior to processing, as apparently there are problems with dicts using unicode keys, and deals iwth database escaping issues.
2009-03-27 16:52:27 -04:00
Ray
c8d80eef19
Revert Eric's change that failed on special chars in player name.
...
Should be able to get the new player id from connction.insert_id().
2009-03-27 13:21:33 -04:00
Worros
0b3b7f66d6
Merge branch 'master' into siteneutral
...
Conflicts:
pyfpdb/fpdb_import.py
pyfpdb/fpdb_parse_logic.py
pyfpdb/fpdb_simple.py
2009-03-28 00:54:13 +09:00
eblade
2681b517a7
super hyper-speed version of recognisePlayerIDs() only makes 1-3 database queries per hand instead of between 2 and 30, worst case.
2009-03-27 01:19:04 -04:00
eblade
c3517bd53b
make use of the fact that an empty list is False, and use extend() to copy an array instead of doing it by hand
2009-03-26 18:28:03 -04:00
eblade
a210453cd2
cleanup ParseNames fix dumb error in parsepositions cleanup
2009-03-26 17:27:52 -04:00
eblade
cb542d9b3e
stripEOLspaces = rstrip, cleanup filterCrap some more, cleanup ParseActionType, should no longer count lines with player names containing "bets" or "raises" as an action, parseHandStartTime no longer uses an infinite loop, parsePositions cleaned up, parseWinLine cleaned up, recognisePlayerIDs cleaned up
2009-03-26 17:20:08 -04:00
eblade
3e6fccd34d
managed to knock checkPositions down to a single line :)
2009-03-26 15:11:24 -04:00
Worros
4e212787df
Merge branch 'master' into siteneutral
2009-03-25 13:09:21 +09:00
Ray
60ffb0896e
Make isWinLine find low pots.
2009-03-24 11:23:33 -04:00
Worros
c673897fa3
Merge branch 'master' into siteneutral
...
Conflicts:
pyfpdb/fpdb_import.py
pyfpdb/fpdb_save_to_db.py
pyfpdb/fpdb_simple.py
2009-03-24 21:46:18 +09:00
eblade
dca1ea7554
fix for filterAnteBLindFold to return it's value
2009-03-23 23:49:09 -04:00
Ray
2c492ed0f6
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-03-23 23:49:04 -04:00
Ray
aebbae8ed0
Change str 0 to int 0 in card translating.
2009-03-23 22:58:13 -04:00
eblade
364a25773e
Merge branch 'master' of git://git.assembla.com/mctfpdb.git
2009-03-23 20:59:53 -04:00
eblade
2f4783b50b
mucked: present() = show(), moved a line out of a loop
...
fpdb_simple: fix cardMap to understand "0", for stud games
2009-03-23 17:13:32 -04:00
Matt Turnbull
ff3409abf3
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-03-22 16:59:06 +00:00
Matt Turnbull
56fe94219d
This index is used for every insert to check if it is a dupe. Test
...
confirms it's useful : see the last two graphs of
http://fpdb.wiki.sourceforge.net/postgresql+tuning
2009-03-22 14:56:13 +00:00
Matt Turnbull
3f879ddb3d
psql drop fk hang: seemed to be caused by having more than one
...
connection to the db open. Made GuiBulkImport use the importer's
connection instead of its own. It still has the one given to it by
fpdb.py. I really don't know. Perhaps it needed a commit.
2009-03-21 21:38:32 +00:00
Worros
e9853c1ff2
Make previous executemany() function the default
2009-03-22 04:07:08 +09:00
Matt Turnbull
411715c44d
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-03-21 18:02:22 +00:00
Worros
208176077e
Add test code for executemany function
2009-03-22 02:59:47 +09:00
Matt Turnbull
a7bace7ddc
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-03-21 17:46:47 +00:00
Matt Turnbull
50f775e793
More sensible prints when dropping psql indexes
2009-03-21 17:46:16 +00:00
Worros
8ebcd7b68a
Fix crash on Stars tourney import
...
If importing a tourney and the line was marked as crap this test crashed
the importer
2009-03-22 02:17:48 +09:00
Worros
ae4704b8dc
First working(?) version of siteneutral import
2009-03-21 21:23:51 +09:00
Worros
444e780f29
Merge branch 'master' into siteneutral
...
Conflicts:
pyfpdb/fpdb_import.py
pyfpdb/fpdb_parse_logic.py
pyfpdb/fpdb_simple.py
2009-03-20 00:27:08 +09:00
eblade
f552ab2470
more cleanup of junk
2009-03-19 03:52:18 -04:00
eblade
593691301b
move some junk around classifyLines, as it will normally run into the first stuff first, allowing us to shorten the execution for smaller hands
2009-03-19 03:40:40 -04:00
eblade
375e0ed7c9
fpdb_parse_logic: fix possible breakage i might've made to tournament parse
...
fpdb_simple: more usage of 'any' operator where appropriate
2009-03-19 03:30:44 -04:00
eblade
e4ac034774
extensive use of any() in WTSD WMSD calcs
2009-03-18 23:48:23 -04:00
eblade
f823db4eef
generateHudCacheData: fix the code for identifying cutoff, button, sb, bb
2009-03-18 23:27:15 -04:00
eblade
4830b72121
more cleanup
2009-03-18 22:31:39 -04:00
eblade
8b933bbd7b
fpdb_import: formatting cleanup
...
fpdb_simple: significant performance enhancements likely in checkPositions, convertCardValuesBoard, filterCrap, float2int, isActionLine, isWinLine
2009-03-18 21:22:04 -04:00
Ray
48c2c36de6
Put index dropping back in for postgres.
2009-03-17 11:18:55 -04:00
Ray
bc2277af74
Comment out index dropping for postgres--prevent hang.
2009-03-16 18:23:45 -04:00
Worros
3aaf5b9716
Merge branch 'killftp' into siteneutral
...
Conflicts:
pyfpdb/fpdb_simple.py
2009-03-13 11:09:19 +09:00
eblade
f268ab79a2
about 50 more range->xrange
2009-03-10 16:01:35 -04:00
Worros
264b188633
[KILLFTP 5/x] Remove references to the named site "PokerStars" or
...
"Full Tilt Poker"
2009-03-10 23:03:02 +09:00
Worros
58445c0a1b
[KILLFTP 2/x] More ftp specific code removal
2009-03-10 22:03:18 +09:00
eblade
b64213e6c5
bulk change range to xrange
2009-03-09 06:41:02 -04:00
eblade
30f8c8ed07
range->xrange bs
2009-03-09 06:18:12 -04:00
eblade
3c00915861
modernize syntax in classifyLines()
2009-03-09 05:56:41 -04: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
9cd88c0399
Comment patch: FTP HH headers
2009-01-30 13:23:09 +09: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
Matt Turnbull
5db308e1b2
execute permission on HUD_run_me.py
...
removed huge chunk of duplicate code in fpdb_simple.py (strange git
problem -- first 300 lines or so were duplicated in a pull)
2009-01-10 01:46:23 +00:00
Matt Turnbull
18db8a39c6
Merge branch 'master' of git@git.assembla.com:mctfpdb
2009-01-08 19:03:45 +00:00
eblade
ff3d6c75b8
Merge branch 'master' of git://git.assembla.com/mctfpdb.git
2009-01-07 12:36:09 -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
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
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
eblade
653cf9847d
allow position 8 in hud cache
2008-12-18 20:38: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
eblade
eec9c94342
merge from carl
2008-12-15 22:46:31 -05: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
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
2796a95669
Merge branch 'master' of git://github.com/sqlcoder/fpdb-sql
2008-12-14 22:09:17 +00:00
Ray
5afc411cad
Fix the "(deep)" error on FTP.
2008-12-14 15:10:59 -05: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
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
sqlcoder
167c0de3b5
include antes in hudcache totalProfit figure
2008-12-13 02:02:07 +00:00
Ray
6c6e7fa793
Fixed mucked cards import for stud games--AGAIN.
2008-12-12 12:16:19 -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
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
sqlcoder
4dc15bfd94
pulled and merged from fpdboz
2008-12-07 23:38:33 +00: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
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
a1ed9603f3
Revert debug changes made while working with Eric
2008-12-04 15:52:24 +09:00
sqlcoder
160db08689
calc totalprofit for hud
2008-12-03 23:14:03 +00:00
sqlcoder
a824814c0a
sqlcoder initial updates
2008-12-02 00:15:50 +00: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
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
Ray
37cd869209
fix reading of mucked cards for stud games
2008-11-14 13:10:17 -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
steffen123
49151a92bf
p142 - commented tourney summary parsing as it fails on me. this is alpha9
2008-11-10 02:02:12 +00:00
steffen123
56c928ccdc
p141 - support new PS UTC timestamps
2008-11-07 20:26:03 +00: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
steffen123
bc15025be5
p135 - updated tv
2008-10-15 18:20:33 +01:00
steffen123
96664d009c
p130 - stud/razz tourneys run again, but completely unverified (like holdem/omaha tourneys
...
changed fpdb_import slightly to not die if a file had 0 stored hands
2008-10-09 07:17:18 +01:00
steffen123
14eb29f702
p129 - fixed stud river in HudCache generation
...
PrintPlayerHud... now uses bigbet rather than bigblind to determine gametype.
2008-10-09 06:15:50 +01:00
steffen123
5dfa5061cf
p128 - corrected 2 bugs in PrintHand.py. finished stud blackbox testdata.
2008-10-09 05:30:09 +01:00
steffen123
bc76d4baf0
p127 - fixed stud importer bugs missing hole cards and added one blackbox hand verification for studhilo.
2008-10-09 05:04:31 +01:00
steffen123
f1c94dac3e
p119 - fixed bug that sawFlop/Turn/River/CBChance/etc gets miscalculated if someone is allin using the new all-in parsing
...
moved most of known bugs to wiki roadmap (not actually online yet since sf seems to malfunctioning..)
2008-10-06 05:19:55 +01:00