Commit Graph

2746 Commits

Author SHA1 Message Date
grindi
25923b02d1 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-08-12 19:58:29 +04:00
Worros
116141b833 Merge branch 'master' of git://git.assembla.com/fpdb-eric
Conflicts:
	pyfpdb/HandHistoryConverter.py
2009-08-12 22:53:49 +08:00
Worros
0baabb0368 Merge branch 'master' of git://github.com/grindi/fpdb-grindi
Conflicts:
	pyfpdb/HandHistoryConverter.py
2009-08-12 22:51:49 +08:00
Worros
cfd7b40ab6 Merge branch 'master' of git://repo.or.cz/fpbd-bostik
Conflicts:
	pyfpdb/HandHistoryConverter.py
2009-08-12 22:49:18 +08:00
Worros
5a4bcf3997 Add streetXPot and showdownPot to hhc insert
totalPot not actually calcuated yet, and valued need to be converted from Decimal() to cents
2009-08-12 22:21:54 +08:00
Worros
483334b899 Fix Absolute plugin from recent change 2009-08-12 18:34:17 +08:00
grindi
442d96b862 Removed hack in FTP parser 2009-08-12 14:30:54 +04:00
Eric Blade
7dc635670d Merge branch 'master' of git://git.assembla.com/free_poker_tools.git
Conflicts:
	pyfpdb/HandHistoryConverter.py
	pyfpdb/SQL.py
2009-08-12 04:26:42 -05:00
Eric Blade
f31f2e442e Merge branch 'master' of git://git.assembla.com/fpdboz.git
Conflicts:
	pyfpdb/HandHistoryConverter.py
2009-08-12 04:24:04 -05:00
Eric Blade
bfec6916f6 trying to get my new install of git to freaking work 2009-08-12 04:09:04 -05:00
grindi
dd17155aa9 Fixed bug 7 ( http://trac-git.assembla.com/free_poker_tools/ticket/7 ) 2009-08-12 12:47:18 +04:00
grindi
0aed2c2461 Party hhc: fixes 2009-08-12 11:18:42 +04:00
Mika Bostrom
185f9660c5 Use same locale conversion everywhere
It is not enough to use actual system locale in just one spot if all
the other encodings are hard-coded to latin1. Now that we have the real
locale available, do all string conversions [.encode($locale)] with
that.
2009-08-12 10:00:23 +03:00
Mika Bostrom
89dccac169 Merge branch 'master' of git://git.assembla.com/free_poker_tools
Conflicts:
	pyfpdb/GuiTableViewer.py
2009-08-12 08:30:31 +03:00
Mika Bostrom
35cd58545a More generic locale use, I hope
Instead of assuming conversion is from latin1, use locale information
2009-08-12 08:26:06 +03:00
Matt Turnbull
222d713169 too much changes to go into master 2009-08-12 01:46:39 +01:00
grindi
56a6d77e9c Hand: added ante support 2009-08-12 03:48:48 +04:00
grindi
433d0948ec Merge branch 'master' of git://git.assembla.com/fpdboz 2009-08-12 02:43:10 +04:00
grindi
70e8a49b10 Merge branch 'master' of git://git.assembla.com/free_poker_tools
Conflicts:
	pyfpdb/HandHistoryConverter.py
2009-08-12 02:39:33 +04:00
grindi
1107d9c6be Party hhc: removed trailing spaces, fixes 2009-08-12 02:35:34 +04:00
Ray
d69ab83ee5 Fix encoding problem in the written Stars HHs. 2009-08-11 17:43:28 -04:00
grindi
9d193f236e Hand: removed trailing spaces 2009-08-12 01:13:07 +04:00
Worros
6b4d065f9e Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-08-12 00:05:21 +08:00
grindi
2e60586e65 Party hhc: fixes and one fat hack 2009-08-11 19:46:21 +04:00
Worros
836cba6594 Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-08-11 20:56:43 +08:00
Worros
24e5c2252d Fix inserting into Gametypes 2009-08-11 20:52:07 +08:00
grindi
a67368cc5a Added hh path normalization
Slashes '/' in hh path can lead to import errors on non-posix systems
Path normalization eliminates this problem
2009-08-10 20:10:39 +04:00
grindi
dc3c721884 Party hhc: fixes and refactoring 2009-08-10 18:17:13 +04:00
grindi
3d227a42cd Party hhc: fixed after Matt's refactoring ^_^ 2009-08-10 01:45:55 +04:00
grindi
dfac9dfeb1 Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-08-10 00:39:52 +04:00
grindi
4c449059ed HUD: added max seats submenu 2009-08-10 00:26:24 +04:00
Matt Turnbull
bd12fc6410 fixes.. 2009-08-09 20:22:23 +01:00
Matt Turnbull
9f2834488c merged with carl, fixed conflict in hhc 2009-08-09 20:10:14 +01:00
Matt Turnbull
2510cc66c9 default fairly taciturn logging.conf 2009-08-09 20:03:43 +01:00
grindi
f00a6ebfd2 Party hhc: removed "max seats" recognition 2009-08-09 22:03:15 +04:00
grindi
8ef03b0697 Party hhc: added nl, pl and omaha hi support 2009-08-09 19:54:35 +04:00
Matt Turnbull
a32d4e053a FulltiltToFpdb handles canceled hands
Better exception handling during parsing
FpdbParseEcxeption takes an optional HID
Stripped pointless __init__s from *ToFpdb subclasses
Logging now has logging.conf config - default is to log only INFO to
file but easily changed to DEBUG for devel work
2009-08-09 15:19:43 +01:00
Ray
7882e735aa Removed support for the ptrackS database type. File is big enough.
ptrackS is the PokerTracker Stud database. An early version of the
HUD supported that db.
2009-08-09 09:29:44 -04:00
grindi
730c82bc95 Party hhc: added max seats recognition 2009-08-09 16:38:55 +04:00
grindi
ebbb2afcd3 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-08-09 16:31:33 +04:00
grindi
c042bea181 Improved table-by-name recognition for non-latin window titles
What i mean:
  u'1464739' in 'Speed #1464739 -  \xc1\xcb \xd5\xee\xeb\xe4\xe5\xec' -> Exception
  u'1464739' in 'Speed #1464739 -  \xc1\xcb \xd5\xee\xeb\xe4\xe5\xec'.decode('cp1251') -> True
2009-08-09 16:24:31 +04:00
Mika Bostrom
b1281385ec Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-08-09 14:27:05 +03:00
eblade
f431a63070 badHangs -> badHands 2009-08-08 15:58:30 -04:00
Worros
d6529ab42f Import Hand.insert() work
storeHand updated, almost works, just violating some NOT NULL contraints
2009-08-09 01:59:44 +08:00
Ray
0a1e6e57b5 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-08-08 09:29:41 -04:00
Worros
a24fe93612 Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-08-08 21:25:57 +08:00
Ray
b3e6b1e510 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-08-08 09:21:17 -04:00
grindi
5c468d0a38 Added party hh path into HUD_config.xml.example 2009-08-08 15:47:58 +04:00
Worros
a70bd9742d Add Gametype insert
Almost done, need to convert 0.25 to 25 for the database - Lookup?
2009-08-08 16:43:52 +08:00
Worros
5550166f37 Start of storeHand from HHC code
Currently cant actually insert as we need the fk gametypeid
2009-08-08 16:15:36 +08:00
grindi
e748f4e2a1 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-08-08 12:09:45 +04:00
grindi
88d67dc429 Fixed folder couldn't be displayed error in BulkImport 2009-08-08 12:07:30 +04:00
Worros
679393e78d Minor change to insertPlayer() 2009-08-08 14:59:23 +08:00
Worros
cbc010155d Add commented out sqlite db option to example config 2009-08-08 13:58:56 +08:00
Worros
4ef4d22c94 Add back in sqlcoders changes for sqlite - fix Grapher 2009-08-08 13:56:53 +08:00
Worros
1dcecf4ae3 Merge branch 'master' of git://git.assembla.com/fpdb-eric
Conflicts:
	pyfpdb/fpdb_simple.py
2009-08-08 13:10:25 +08:00
Worros
470d34c65c Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-08-08 13:06:41 +08:00
Worros
150d8f7160 Revert "Make sure the db connection is encoded using utf8"
This reverts commit 2c9982cfff.
2009-08-08 13:02:29 +08:00
Worros
08a70b75f2 Fix insertPlayer so that it works again 2009-08-08 12:33:25 +08:00
eblade
4445881bfe somehow a call to get_cursor() got turned into just a db pass .. and removed the debug code in recogniseplayerids 2009-08-07 17:18:51 -04:00
sqlcoder
d905b6e780 revert a line of code to avoid unicode name mangling problems until there's time to fix it properly ... 2009-08-07 21:18:44 +01:00
eblade
43b41e88f4 Merge branch 'master' of git://git.assembla.com/fpdb-sql.git
Conflicts:
	pyfpdb/fpdb_simple.py
2009-08-07 04:55:08 -04:00
Ray
26016bffb7 Correctly parse fpp tournaments. 2009-08-06 19:27:52 -04:00
sqlcoder
d292cd18d4 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-08-07 00:12:22 +01:00
sqlcoder
59cfcea95d Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-08-07 00:07:32 +01:00
sqlcoder
16319ea039 stop error when switching back from threads to 0 threads 2009-08-07 00:06:11 +01:00
sqlcoder
126dfd7331 get hudcache update to work for sqlite - hud now working! 2009-08-07 00:04:44 +01:00
sqlcoder
c0ddaad2e5 remove test for msql drivers 2009-08-06 21:12:50 +01:00
sqlcoder
0850721ecc fix problem when using more recent gtk libraries (each refresh was adding an extra chart to the existing one) 2009-08-06 20:36:11 +01:00
sqlcoder
6de41be9c9 mainly sqlite fixes, also removed not null on many hudcache columns 2009-08-06 20:31:46 +01:00
grindi
25be578e7d Fixed imported hands accounting 2009-08-06 21:26:55 +04:00
eblade
c6747785e2 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-08-06 12:27:38 -04:00
grindi
30ae9da2df Fixed hung up on incorrect hand history 2009-08-06 19:15:55 +04:00
grindi
054abfc178 Merge branch 'party'
Conflicts:
	pyfpdb/Database.py
	pyfpdb/Hand.py
	pyfpdb/PartyPokerToFpdb.py
2009-08-06 18:44:03 +04:00
grindi
21d10673d5 Party hhc: cleaned 2009-08-06 18:11:17 +04:00
Worros
56ea7c6eab Add incomplete version of PartyPoker plugin 2009-08-06 21:14:52 +08:00
Worros
d043368c88 Prep for PartyPoker plugin add 2009-08-06 20:54:39 +08:00
grindi
a1cdd76778 Party hhc: fixed cash 2009-08-06 16:39:14 +04:00
grindi
ce43ab4d52 Party hhc: now it has to work with tournaments 2009-08-06 16:09:33 +04:00
eblade
f65e4e005a aptofpdb: remove debugging print
guiautoimport: import traceback
fpdb_simple/GuiPlayerStats: deal with multiple sites with players with matching names
HUD_main: error file is again HUD-error not fpdb-error-log.
2009-08-06 07:23:57 -04:00
eblade
a7f857a90c Revert "Make sure the db connection is encoded using utf8"
This reverts commit 2c9982cfff.
2009-08-06 02:11:26 -04:00
eblade
afc4c026f9 Tables: change how the case insensitivity is done, so we don't crap out on Everleaf 2009-08-06 02:10:49 -04:00
eblade
42109ec4e4 Tables: windows table title searching now case insensitive 2009-08-06 00:12:49 -04:00
eblade
2e698bb1d4 Merge branch 'master' of git://git.assembla.com/fpdboz.git
Conflicts:
	pyfpdb/AbsoluteToFpdb.py
2009-08-06 00:00:29 -04:00
eblade
2685608294 bump atofpdb siteid
configuration should not error if 'site' is empty (ie when running from command line)
guiplayerstats won't auto-load default report
hud should work from command line
2009-08-05 23:57:26 -04:00
Worros
b75583c784 Add Absolute to HUD config example 2009-08-06 11:41:51 +08:00
Worros
a37adde67e Catch up to Eric - fix markStreets regex 2009-08-06 11:30:21 +08:00
Ray
71aaf62c40 Fix my last fix of previous commit. 2009-08-05 23:25:43 -04:00
Ray
ee01deb852 Fix problem with previous commit. 2009-08-05 23:20:28 -04:00
Worros
c35132463c Add absolute hhc to example file 2009-08-06 10:59:44 +08:00
Worros
5f5825e30b Add additional siteids to default data insert 2009-08-06 10:18:48 +08:00
eblade
f85e7cb230 AbsoluteToFpdb: convert cards 10s to Ts, etc
fpdb_import: clear updatedsize, updatedtime, pos_in_file lists, so we can attempt multiple imports on same file, rather than just getting error when trying.
2009-08-05 21:35:01 -04:00
Worros
2a3a5f0601 Merge branch 'master' of git://git.assembla.com/free_poker_tools
Conflicts:
	pyfpdb/Database.py
2009-08-06 09:20:10 +08:00
eblade
34c469ab3a Add AbsoluteToFpdb.py
Database: Add Absolute to sites
GuiPlayerStats: set avgseats to False
Hand: Add Absolute to SITEIDS list
fpdb_import: check for presence of settings['dropHudCache'] before testing it, to keep command line import from erroring
2009-08-05 21:07:16 -04:00
Ray
76938de104 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-08-05 19:28:30 -04:00
Ray
095d1ee3dc Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-08-05 19:28:16 -04:00
Ray
74d64eca9b Uncomment the new lines to calculate some stats. 2009-08-05 19:11:46 -04:00
Ray
3d1f02a627 Prototyping some stats calculations. 2009-08-05 19:08:53 -04:00
sqlcoder
736e94609f display importing message, and make it blue 2009-08-05 22:57:13 +01:00
grindi
aa62dc47c9 Impoved cards parsing 2009-08-06 00:09:52 +04:00
grindi
ebe652d49e Added PartyPoker into Database.py 2009-08-05 20:58:25 +04:00
grindi
cefd1e38e4 First "compiling" version 2009-08-05 20:15:11 +04:00
eblade
91e6783869 GuiBulkImport: bump max thread counter to 32 .. 2009-08-04 21:36:30 -04:00
eblade
9656db0b80 Merge branch 'master' of git://git.assembla.com/fpdb-sql.git 2009-08-04 20:22:25 -04:00
eblade
eae278f40c Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-08-04 19:57:06 -04:00
sqlcoder
cc9992509c some more refinements on drop option handling, still can't get 'importing' message to display 2009-08-04 23:18:37 +01:00
sqlcoder
b7a718d786 some more sqlite work 2009-08-04 23:17:31 +01:00
sqlcoder
fe62e78c5b mods for sqlite 2009-08-04 22:06:03 +01:00
sqlcoder
fb695098ea remove unused getLastInsertId function 2009-08-04 21:50:53 +01:00
sqlcoder
dde35fa65b implement getlastrowid for sqlite 2009-08-04 21:48:03 +01:00
sqlcoder
61d2a83779 add hudcache option to Bulk Import tab 2009-08-04 21:41:04 +01:00
eblade
cf3c7276a7 add bat/py for making an exe. exe errors with "can't find module cairo". no idea how to fix. 2009-08-04 16:20:14 -04:00
sqlcoder
4e72f476f3 one line change to enable the number of threads choice 2009-08-04 20:00:59 +01:00
Worros
2c9982cfff Make sure the db connection is encoded using utf8
This has an issue with my current code, but may cause other issues.

Keeping to a 1 line change incase we need to revert at some point in future.
2009-08-04 18:30:39 +08:00
Worros
5e66e48b75 Some comments and cleanup to the recent Player insert code 2009-08-04 18:22:29 +08:00
Worros
7050df10c2 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-08-04 08:34:21 +08:00
eblade
541c61c152 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-08-03 18:18:48 -04:00
Ray
8165453728 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-08-03 14:29:09 -04:00
sqlcoder
5a94f16d16 fix typo in column name 2009-08-03 19:15:36 +01:00
Ray
a6d1a41752 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-08-03 13:13:18 -04:00
Ray
bbf02c7ee3 Added correct cp1252 symbols for Euros and GBP. 2009-08-02 23:50:44 -04:00
Worros
47595ecfef Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-08-03 09:35:37 +08:00
Worros
6781d97539 Remove debug message 2009-08-03 09:35:22 +08:00
sqlcoder
745baf139f Sorry guys. Added some error checking and discovered a bug in the mysql index creation - I've fixed it and imports don't degrade anything like they used to now. I've just imported 15K hands at 20+/second when it used to be down at 5/sec after 10K hands or so. 2009-08-03 01:30:51 +01:00
sqlcoder
1a63c62cf1 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-08-02 22:50:31 +01:00
sqlcoder
8e0519708e fix bugs and move hud stat config to HUD_main.py so that GUI can set it 2009-08-02 13:00:55 +01:00
eblade
1bd8419510 merge from carl 2009-08-02 07:14:31 -04:00
Worros
ff2cca361c New insert player function for HHC import
Added getSqlPlayerIDs to Database.py - returns a hash {playername:sqlid}

Function uses a caching hash in Database.py to reduce the number of round trips to the database needed just to fetch the player ids for later inserts.

Need to do a performance comparison on a larger import.
2009-08-02 12:19:33 +08:00
Worros
40a0fe428b Variable name change - hhc is better imho 2009-08-02 11:03:35 +08:00
Worros
129d09796e Fix HUD_config.xml.example to have correct stat names 2009-08-02 10:19:45 +08:00
sqlcoder
d04f0efe94 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-08-01 23:29:49 +01:00
sqlcoder
cffe57dfa3 pass sql list through to importer from fpdb.py 2009-08-01 23:29:00 +01:00
sqlcoder
e2dde5c3e3 fix aggregate query and stop hud queries being executed whenever anything created a db connection 2009-08-01 23:15:04 +01:00
Ray
83fbbc6332 Finished prep for Stars HH format change.
All currency symbols are maintained in dicts that are class
variables. The currency symbols are compiled in to the regexs.
I.e., "\$?" no longer appears in any of the regexs. Will have
to be updated with actual Euro symbol and tested against live
HHs when Stars makes the change.
2009-08-01 11:51:37 -04:00
sqlcoder
1d2df984de New helper prog to create batch files in windows. Creates a separate .bat file for each GTK dir on PATH so that user can try each one out 2009-08-01 12:47:07 +01:00
sqlcoder
4dd9a8877d restart python if running an old version and 2.5 or 2.6 is available on PATH (Windows) 2009-08-01 12:45:10 +01:00
sqlcoder
fed180d945 set allow threads option to false 2009-08-01 00:37:13 +01:00
sqlcoder
921812f5e4 add config var at top of file to allow threaded option 2009-08-01 00:08:41 +01:00
sqlcoder
fbab3c7e24 make sure handsid is always returned and show size of queue when threaded 2009-08-01 00:07:31 +01:00
sqlcoder
e9873d38a5 fix sleep() call 2009-08-01 00:06:07 +01:00
sqlcoder
0756345f3e allow nulls in handsplayer fields so that stud can import (but most fields are missing) 2009-07-31 22:49:46 +01:00
sqlcoder
3b9fa3b177 add useful (hopefully) exception handler 2009-07-31 22:34:26 +01:00
sqlcoder
f3a4a8b0d0 fix previous merge 2009-07-31 22:30:41 +01:00
sqlcoder
8d77b961d7 merge from eric @6df03cb... 2009-07-31 22:07:27 +01:00
sqlcoder
36f09ebc82 merge from ray @f5ba0b5b7... 2009-07-31 21:58:39 +01:00
sqlcoder
70b1f5320b Merge branch 'master' of git://git.assembla.com/fpdboz 2009-07-31 21:30:20 +01:00
sqlcoder
b503626c2b add db writer threading 2009-07-31 21:24:21 +01:00
sqlcoder
36de79140c round hands/sec and show some traceback info in exception handler (v useful) 2009-07-31 20:12:29 +01:00
Mika Bostrom
f60416502d Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-07-31 08:26:50 +03:00
eblade
6df03cb234 HUD_main: if new hand id int is not available, we can't print it, so that generates a second error, double fault
fpdb_import: ok, we're keeping two lists now, one with updated st_size and one with m_time.  grrr.
2009-07-31 01:15:28 -04:00
eblade
6e8232f623 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-07-31 00:40:46 -04:00
eblade
047b5d94d9 move constant dicts/lists from functions to global vars, so they aren't loaded every time the function is run 2009-07-31 00:40:31 -04:00
eblade
21b859f244 remove error handler on hudcache rebuild menu, if it errors we should know about it 2009-07-31 00:15:25 -04:00
eblade
85c635d1da remove error handler on Load Profile menu opt (menu opt doesn't work anyway, so it doesn't error) 2009-07-31 00:13:51 -04:00
Ray
fd2ad9b192 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-07-31 00:06:07 -04:00
Ray
5660b77355 Delete uneeded intermediate prints. 2009-07-30 23:44:59 -04:00
Ray
29366d3bb6 Ugly fix to prevent importing from failing due to undef positions array. 2009-07-30 23:42:57 -04:00
eblade
f5ba0b5b7f Database: insert missing HandToWrite.payin_amounts var
EverleafToFpdb: remove DEBUG XXXXXXX line
FulltiltToFpdb: pass on converting tournament hands
Hand: add Hand.fee var that Database is looking for
fpdb_import: clean up file update scan code, queue files that have changed in the last 60 seconds for the next importer pass, instead of locking it up reading them now (not that this does anything since FT no longer updates the mtime until it closes the table, but maybe it works with Stars or others)
2009-07-30 21:50:08 -04:00
eblade
c400fd9ba7 FTtoFpdb: default buyin to $0.00+$0.00 and level to 0, they don't seem to be in the FT hh 2009-07-30 20:56:39 -04:00
eblade
3ce0f91b27 useless change of a comment just to test my rss output 2009-07-30 19:53:44 -04:00
Ray
4cc3cc2272 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-07-30 18:11:14 -04:00
Ray
eafc77ff92 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-07-30 18:11:08 -04:00
Ray
1820e71054 Started on supporting expected HH change--rewrote GameType regex.
This version should work with the expected HH format for $ tables
only. I abstracted the ISO currency codes and currency symbols
out of the regex so they only need to be maintained in 1 place.
I didn't apply the change to everywhere "\$" appears, in case
comments are negative.
2009-07-30 18:06:13 -04:00
eblade
2c7e00f02a fpdb_import: use stat_info.st_size instead of stat_info.st_mtime to determine hh file updates 2009-07-30 17:29:57 -04:00
eblade
98e376a956 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-07-30 15:28:41 -04:00
Mika Bostrom
74d571a938 Merge branch 'master' of git://git.assembla.com/free_poker_tools
Conflicts:
	pyfpdb/Database.py
	pyfpdb/fpdb_db.py

Reverted to upstream versions
2009-07-30 10:47:38 +03:00
Worros
68ac5ff554 Q&D hack to fix FTP file reads after update
Contributed by grindi on 2+2 http://forumserver.twoplustwo.com/showpost.php?p=12156328&postcount=166

Removes u'\xff\xfe' from the end of file if they exist.
2009-07-30 12:13:45 +08:00
Worros
73e6666cbc Add auto folder creation to HHC
Contributed by grindi on 2+2 http://forumserver.twoplustwo.com/showpost.php?p=12156328&postcount=1666

Creates the sub folders of hhArchiveBase for placing the converted files in.
2009-07-30 11:40:16 +08:00
Ray
e36b300271 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-07-29 10:35:01 -04:00
Ray
835c4ad0cf Added encodeCard() to Card.py. 2009-07-29 10:33:42 -04:00
sqlcoder
c2f79ddc24 refine mysql index drop/creation, but redundant as have left Erics new commands in - mysql crawls with 10k hands! get postgres :-) 2009-07-29 07:57:18 +01:00
sqlcoder
38ee98e492 pass sql list from fpdb through guibulkimport to fpdb_import 2009-07-29 06:37:06 +01:00
sqlcoder
9c62ecb80e debug move to Database.py and move last part of mainparser into Database.py 2009-07-29 06:17:51 +01:00
sqlcoder
298de5dc15 move most stuff from fpdb_db.py to Database.py and simplify db connections in fpdb_import 2009-07-28 23:58:10 +01:00
sqlcoder
3cc5ed8024 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-07-28 21:25:07 +01:00
sqlcoder
12e1da0a5e add lock_for_insert routine but comment out for now (hangs) 2009-07-28 21:19:31 +01:00
eblade
47f27cf31f fpdb.py: Add "Recreate HUD Cache" to Database menu
fpdb_db.py: Junk the dropping of indexes/FKs for MySQL INNODB in favor of just telling MySQL to ignore them.  Not sure if that works for other MySQL engines or other Database softwares.
2009-07-27 17:28:06 -04:00
sqlcoder
5d5a6ed39d comment out a debug message and 1 char change to output message 2009-07-27 22:02:37 +01:00
Ray
2adef78269 Get rid of intermediate prints. 2009-07-27 15:41:42 -04:00
eblade
b27b697ec6 GuiBulkImport: fix indentation error
Hand: fix Pot __str__ to support infinite side pots
2009-07-27 14:25:24 -04:00
eblade
31f8db1788 Long-handed out the logic in twoStartCards, the shortcuts were killing it somewhere, added short-circuit into it for pairs, fixed order cards are returned in for offsuit cards in twoStartCardString.
*Note: I think someone should fix the "Hand Breakdown" chart to not include "Seats" in it's criteria, if "Show Number of Players" is not checked. ?
2009-07-26 18:00:12 -04:00
sqlcoder
f45038673c more moves into Database.py, better exception handling, store hudcache stats for holdem tourneys (some maybe no use? it's a start anyway - need to add NL/FL switch on Filter) 2009-07-26 01:42:09 +01:00
eblade
308cfb1e56 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-07-25 13:08:21 -04:00
eblade
656792ff5c make command line bulk import not drop indexes. 2009-07-25 13:00:54 -04:00
sqlcoder
859d18734c minor corrections to output messages 2009-07-25 17:39:06 +01:00
Ray
0c36ab0bda Add simple __main__ to Card.py, so I can remember how it works. 2009-07-25 11:58:43 -04:00
Ray
c3a408766d Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-07-25 11:36:00 -04:00
Ray
8e04ca316d Catch up with recent changes in HHC and Hand. 2009-07-25 11:34:13 -04:00
sqlcoder
495885e49c _x (where x is a single digit) at the end of a stat name in hud_config.xml now indicates the number of decimal places to display in the HUD. Some stats renamed slightly to remove the _ before last character of name. 2009-07-23 23:15:02 +01:00
Ray
ba42a7c453 Get rid of debuggin output. 2009-07-22 19:27:12 -04:00
Ray
9f0d54a1f7 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-07-22 19:22:26 -04:00
Ray
94a030922a Clean up handling of mixed games on FTP. 2009-07-22 19:21:00 -04:00
sqlcoder
9c9202b539 remove debug statement 2009-07-22 20:22:20 +01:00
sqlcoder
ab004b8284 only update psycopg2 extensions when using it 2009-07-22 20:19:41 +01:00
Ray
0291fcf489 Fix a problem when there is a comma in the BI for FTP stud games. 2009-07-22 14:43:13 -04:00
Ray
b963ac0a3d Correct detection of hero in FTP stud games. 2009-07-22 14:06:05 -04:00
Ray
e7441021f2 Fix problem with detecting max on FullTilt. 2009-07-22 13:51:48 -04:00
Ray
9d803957cb Detect mixed games in FTP HH. Fix typos. 2009-07-22 10:24:29 -04:00
Ray
3e0b0e0873 Allow parsing of play money tables and fix some typos. 2009-07-22 08:54:30 -04:00
Ray
37a5f2d83b Fix problem when someone times out and folds before posting. 2009-07-22 08:53:03 -04:00
sqlcoder
f69281e2fd finish hudcache rebuild code which speeds up bulk imports nicely - turn off permanently via allow_hudcache_rebuild in fpdb_import.py. Also some more moves into Database.py and cosmetic stuff 2009-07-21 22:26:23 +01:00
sqlcoder
ab413faab9 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-07-21 21:34:19 +01:00
Ray
0002043087 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-07-21 11:08:15 -04:00
sqlcoder
58957e78e6 fix typo that blew up when 2 side pots present 2009-07-20 22:31:24 +01:00
sqlcoder
0670637abc Merge branch 'master' of git://git.assembla.com/fpdboz 2009-07-20 22:26:40 +01:00
Ray
af19c3f365 Fix a bug in the Action regex. Thanks Carl. 2009-07-20 14:27:03 -04:00
Ray
10f454ae77 Guess maxseats when not supplied by SiteToFpdb. 2009-07-20 10:01:51 -04:00
Ray
00aeda5667 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-07-19 16:50:22 -04:00
sqlcoder
b9d462c175 make graphviewer use Database.py 2009-07-19 21:19:58 +01:00
sqlcoder
0fecdfb2d7 make positional stats use Database.py 2009-07-19 18:28:13 +01:00
sqlcoder
ceaedebcd9 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-07-19 14:31:36 +01:00
sqlcoder
fb4ad79803 use someone else's interprocess locking code instead of python locks/semaphores - needs testing in Linux 2009-07-19 12:28:17 +01:00
Worros
d546557ef7 Make new db insert code "usable"
Next step, make the players insert. Function doesn't exist at the moment and crashes when NEWIMPROT set to true
2009-07-19 15:45:18 +08:00
Worros
e113a1e692 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-07-19 11:29:18 +08:00
Worros
36f4da0adf Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-07-19 11:28:59 +08:00
Ray
cbbf820eb5 Add support for tournaments. 2009-07-18 21:33:00 -04:00
Ray
c5cffc2326 Allow add* to take amounts with commas. 2009-07-18 21:31:39 -04:00
sqlcoder
3352f608cf take global lock while doing imports 2009-07-18 23:01:18 +01:00
sqlcoder
6a69bf512e use python locks instead of db locks for global lock 2009-07-18 22:21:29 +01:00
sqlcoder
9d9f850753 use Database.py in GuiPlayerStats 2009-07-18 20:46:50 +01:00
sqlcoder
a1e0e0539a add queries for player stats 2009-07-18 20:41:20 +01:00
sqlcoder
96376e7421 fine tune player stats 2009-07-18 20:39:01 +01:00
sqlcoder
cdd94d512f improve handling of hud_style options 2009-07-18 18:29:06 +01:00
Worros
8386dd594e Add empty function prepInsert 2009-07-18 19:02:55 +08:00
Ray
52ecc64505 Update to work with recent Hand.py changes. 2009-07-17 17:07:53 -04:00
Worros
34932c14ee Add index parameter to Plugins
Change constructor to HHC to accept an index arg, so that file reads can seek
2009-07-17 17:45:22 +08:00
Worros
61b0b8f4fe Prep work for inserting directly from HHC 2009-07-17 17:16:06 +08:00
Ray
26a1996353 Change Pot object to support variable currency symbol. 2009-07-16 12:13:24 -04:00
Worros
152f16c7a0 Make euros print as $ in writeHand.
fpdb_simple avoidance at the moment.
2009-07-16 13:54:41 +08:00
Ray
6cd6b2d1dd Merge branch 'master' of git://git.assembla.com/fpdboz 2009-07-16 01:00:44 -04:00
Worros
0d5af4c974 Make Win2day client use updated readHeroCards api 2009-07-16 12:58:39 +08:00
Ray
2fa3781349 Make euros print as $ in writeHand. 2009-07-16 00:54:09 -04:00
Ray
88d4f2ee05 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-07-16 00:32:29 -04:00
Worros
d8df3ea11a Possible fix for 2.6 versions of Matplotlib
Long standing issue with multiple plots being added to a single canvas.

Calling canvas.draw() appears to be the "correct" way to do this in pythin 2.6

Need someone to test if this still works in python 2.5
2009-07-16 11:46:52 +08:00
Ray
52fcbd7966 Remove completed TODOs(plenty left!). Remove obsolete comments. 2009-07-15 23:40:07 -04:00
Ray
b5b0b6a7b7 Get rid of hard wired $ in writeHand.
Replace with appropriate symbol based on ring, tournament, play,
etc.
2009-07-15 23:04:16 -04:00
Ray
889aea48b6 Make the board in the summary of flop games print in the right order. 2009-07-15 22:30:41 -04:00
Ray
e0dc556a67 Clean up some methods previously commented out. 2009-07-15 22:15:20 -04:00
Ray
3253d5a234 Get stud shown cards right in writeHand(). 2009-07-15 22:11:23 -04:00
Ray
12db3c0d55 Add a space to make stud holecard printing perfect. 2009-07-15 21:46:45 -04:00
Ray
427999b69c Correctly write stud holecards in writeHand(). 2009-07-15 21:22:07 -04:00
Ray
32a1c322d4 Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:
	pyfpdb/PokerStarsToFpdb.py
2009-07-15 13:36:00 -04:00
Worros
b92feee021 Revert Matts change for sqlite until fixed.
Previous syntax failed to insert the required line into TourneyTypes
2009-07-15 23:58:34 +08:00
Ray
bd2db98612 Housecleaning. Refactoring writeHand() = not finished. 2009-07-15 11:50:27 -04:00
Ray
0e76c3a676 Fix findHeroCards() for empty streets. 2009-07-15 11:48:58 -04:00
Worros
ec9ce544ca Fix if database hasn't been created yet.
Still broken on my setup, but at least fpdb now starts
2009-07-15 23:32:17 +08:00
Worros
83f21e822d Merge branch 'master' of git://git.assembla.com/mctfpdb
Conflicts:
	pyfpdb/fpdb_db.py
2009-07-15 23:09:25 +08:00
Worros
cd2ec0c74f Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-07-15 22:52:09 +08:00
Mika Bostrom
9a98d7ac07 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-07-15 16:56:35 +03:00
Worros
521e17f856 Add some boilerplate stuff for Boss Media/Win2day plugin 2009-07-15 12:22:46 +08:00
Matt Turnbull
35a5cffb77 Working on PS HORSE file now.. 2009-07-15 00:26:53 +01:00
Matt Turnbull
79ca83c95a Merge from ray, minor conflicts 2009-07-15 00:20:26 +01:00
Ray
021b9934ea Fix writing of mixed tournament hands. Other minor changes. 2009-07-14 19:18:38 -04:00
Matt Turnbull
70f271ef78 location of test PS horse hh 2009-07-15 00:15:04 +01:00
Matt Turnbull
806d61ae23 log line 2009-07-15 00:14:25 +01:00
Matt Turnbull
b252e350d6 fix my breakage.. 2009-07-14 23:34:47 +01:00
Ray
599aee6393 Fix parsing of tournaments of mixed games. 2009-07-14 10:55:39 -04:00
Mika Bostrom
96f0c77920 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-07-14 14:11:39 +03:00
Matt Turnbull
dc6a1c45f9 sqlite - connecting and (re)creating some tables 2009-07-14 00:04:10 +01:00
Worros
79d0ba35b0 Initial commit of BossMedia importer.
Contributed by Thomas Wigele (twigele gmail com - star-fox on sourceforge)

Sample HH - http://www.pastebin.ca/1490652
2009-07-14 06:39:49 +08:00
Worros
7683334e36 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-07-14 05:00:48 +08:00
Ray
31dd10b5e6 Make writehand() to work for tournament/mixed/play$ games.
Also refactored the writing of the first 2 lines in writehand().
2009-07-13 16:22:23 -04:00
Ray
d79ea0e6e5 Fixes for Mixed and Play Money games. 2009-07-13 16:21:20 -04:00
Ray
dd1b442122 Rationalized holecards for stud and draw games.
Cards are now lists of cards rather than sets. Removed some
game-specific methods and replaced with general methods.
Let the superclass handle some stuff.
2009-07-13 00:37:51 -04:00
Ray
3234f89aad Rationalized hole card format for flop games.
Also updated writehand() so flop hands are written OK.
This breaks stud and draw--fixing them now.
2009-07-12 16:01:02 -04:00
Ray
e294314e25 Fix: hand.maxseats has to be and int. 2009-07-12 13:14:50 -04:00
Ray
d8820ae1f7 Allow parsing of tournaments, draw and play money.
Sorry about the massive commit. There are still numerous bugs
parsing non-holdem hands and writehand() is broken for all
but holdem cash games.
2009-07-11 13:44:32 -04:00
Ray
4e952de825 Remove intermediate print. 2009-07-07 14:15:36 -04:00
Ray
56bd7b37ba Parse Stars tournaments for flop and stud games.
Tournaments are not correctly written in writehand(). Nor are
stud games.
2009-07-07 13:48:43 -04:00
Worros
c3d463b689 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-07-07 21:28:54 +08:00
Ray
21d2276679 Get rid of intermediate hand obj print. 2009-07-06 12:01:39 -04:00
Ray
4ae8b123ce Fix game type for non-Mixed games. 2009-07-06 12:00:16 -04:00
Mika Bostrom
b7ca7a77a7 Work around error with no database
Instead of blindly trusting that SELECT ... works, use try-catch to get
around errors when the database doesn't have the tables yet.
2009-07-06 09:01:49 +03:00
Ray
799aa41c1e Correct handling of open/closed stud hole cards. 2009-07-05 23:44:53 -04:00
Mika Bostrom
dd4aeffa4f Remove obnoxious error window
Do we really need that annoying error note about table viewer not
working any longer? It's useless with postgres backend anyhow, so might
as well kill it off entirely.
2009-07-06 00:18:46 +03:00
Mika Bostrom
14dc35ef81 Fix initial run with postgres
Simplify error check, so that regardless of how the table name is
mangled, we now catch just the meaningful part.

When trying to obtain the lock, make sure that there is no transaction
block open (which tends to happen on error-paths); flush the database
connection before requesting exclusive lock.
2009-07-06 00:15:37 +03:00
Mika Bostrom
d3373add8b Fix most annoying typo in Postgres case
The error message from postgres contains the said table as written in
original command. 'Players' != 'players', indeed. Now software can at
least start with postgres and an empty database.
2009-07-06 00:00:32 +03:00
Mika Bostrom
105e868864 Catch local connection config
If database backend is Postgres and the connection is over domain
socket, the only values in <database> node are:
    * db_name
    * db_server
    * db_type

Now, for some reason the config reader unconditionally creates "tidy"
string representations for all possible keys. This means that
host, user and password are all empty strings (''), and not even
NoneType entities.

To catch the case for postgres, simply treat empty host the same as
undefined host.
2009-07-05 23:33:09 +03:00
Ray
8f2350f861 Set dealt flag when reading holdem hero cards. 2009-07-05 11:47:18 -04:00
Ray
c4cc6bd1aa Make WriteHand for holdem report mucked cards. 2009-07-04 15:28:20 -04:00
Ray
a35b1a8b3c Make WriteHand for stud report mucked hand. 2009-07-04 15:19:46 -04:00
Ray
f323447313 Get shown and mucked cards for stud games. 2009-07-04 14:35:20 -04:00
Worros
89b410a766 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-07-04 14:51:55 +08:00
Ray
23a4ca34c8 Fix bug preventing some shown cards from being read. 2009-07-03 20:41:08 -04:00
Ray
0636a290f7 Get mixed game info and put it in gameType structure. 2009-07-03 19:28:32 -04:00
Ray
9d7c370449 Get mucked cards from Stars flop games. __str__ method for Hand. 2009-07-03 18:59:50 -04:00
Ray
3c2c328f5a Fix for PokerStars NewVPP tables. 2009-07-03 13:23:30 -04:00
Ray
7d97365fbf Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-07-02 10:11:23 -04:00
Ray
97520bfee9 Fix call to StoreHands for stud games. 2009-07-01 13:55:12 -04:00
Ray
4394c7beb3 Fix to convert stud hands. 2009-07-01 13:53:30 -04:00
Ray
2cfe7f2ccc Fix bug--get correct player id in Flop_Mucked tool tip. 2009-07-01 08:29:37 -04:00
Worros
7351749b7a Merge branch 'master' of git://git.assembla.com/fpdb-sql
Conflicts:
	pyfpdb/Hand.py
2009-07-01 09:21:21 +08:00
sqlcoder
b45fceac21 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-06-30 22:20:21 +01:00
sqlcoder
56ef131bed use 1 or 2 Database methods instead of the underlying fpdb_db methods (more to do) 2009-06-30 22:18:15 +01:00
sqlcoder
cb1a4d2d0a add wrappers for fpdb_db methods (plan is to move the fpdb_db methods into Database) 2009-06-30 22:00:55 +01:00
sqlcoder
04b9dd9126 use Players table for global lock because Database.init() tries to access Hands 2009-06-30 21:58:59 +01:00
Ray
a3f233ca07 Comment out a DEBUG print. 2009-06-30 14:21:06 -04:00
Ray
3e90f42e89 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-06-30 11:51:20 -04:00
Ray
71d673f64f Added Hello_Seats to Hello.py. Demo of Aux_Seats class. 2009-06-30 11:45:14 -04:00
Ray
a8b8ff2f4d More on Aux_Seats class. This seems to work OK. 2009-06-30 11:43:47 -04:00
Worros
3c438a9298 Make site selection behave like other options 2009-06-30 18:32:58 +08:00
Worros
5611f115cd Remove DEBUG line that wasn't supposed to make the last commit 2009-06-30 18:32:30 +08:00
sqlcoder
a3e6c2696f use Database instead of fpdb_db 2009-06-28 19:19:32 +01:00
sqlcoder
dc7a3fb88e finish removal of store_board_cards() 2009-06-28 18:56:18 +01:00
sqlcoder
cb323d2d63 remove unused queries 2009-06-28 17:20:41 +01:00
sqlcoder
a2db28ebf2 create Database instance in import to pass into parser - will eventually replace fpdb_db 2009-06-25 23:14:32 +01:00
sqlcoder
9b4e47df9a comment out debug message 2009-06-25 23:10:37 +01:00
Ray
7f7ad2a13e Further on Aux_Seats interface. Works. Not ready for prime time. 2009-06-25 10:07:40 -04:00
sqlcoder
9b50987d0c add sql param to Database constructor - aim is to have just one SQL instance passed around and to use Database for db connections and methods 2009-06-23 23:44:37 +01:00
sqlcoder
84cc951045 comment out database creation wrongly included from my dev code 2009-06-23 22:05:22 +01:00
sqlcoder
2f0c7e8167 make load_profile reload HUD_config.xml and update status bar 2009-06-23 20:45:11 +01:00
Ray
2f8918ebc9 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-06-23 10:25:12 -04:00
Ray
24b7af5703 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-06-23 10:23:05 -04:00
Ray
0bf39dbcf6 Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:
	pyfpdb/fpdb_import.py
2009-06-23 10:04:23 -04:00
Ray
8cdac24517 Subclass Aux_Seats from Aux_Windows. Flop_mucked now a Aux_Seats. 2009-06-23 09:56:29 -04:00
sqlcoder
0afd8e2e70 use do_connect() instead of connect() 2009-06-22 23:43:11 +01:00
sqlcoder
1456104382 make graph viewer use its own db connection 2009-06-22 23:30:54 +01:00
sqlcoder
456ddb3e91 use do_connect() instead of connect() and remove settings parameter (config includes them) 2009-06-22 23:19:03 +01:00
sqlcoder
45a9358cbd set defaults for unused params to allow new calls without needing to set them 2009-06-22 23:16:34 +01:00
sqlcoder
699f79722b add time print for positional stats tab 2009-06-22 22:05:28 +01:00
sqlcoder
45c78b8a5f Merge branch 'master' of git://git.assembla.com/fpdboz 2009-06-22 21:43:59 +01:00
sqlcoder
1fbb7d166c remove redundant code 2009-06-22 21:41:41 +01:00
sqlcoder
ac30e912c7 smarten up positional stats tab (still needs configurable columns) 2009-06-22 21:39:14 +01:00
Ray
287394c97d Use xpad and ypad from game element. 2009-06-20 10:01:52 -04:00
Ray
462ff87596 Add xpad and ypad to site and game elements. Cleanup some defaults. 2009-06-20 09:43:05 -04:00
Worros
22ff98d7c9 Remove passthrough section from import_file_dict 2009-06-20 14:02:03 +08:00
Worros
706ce46a9f Boardcards for Hands table in new importer 2009-06-20 07:58:53 +08:00
Worros
d00031edf7 Add get_last_insert_id() to Database API 2009-06-20 06:22:57 +08:00
Worros
864e37ddc8 Remove empty file 2009-06-20 05:38:33 +08:00
Worros
2569eeddc8 Remve legacy storeHudCache function 2009-06-20 05:37:30 +08:00
Worros
2b3e507a3c Factor out some common code 2009-06-20 05:33:33 +08:00
Ray
c9572129a6 Fix passing settings in import chain. 2009-06-19 16:48:42 -04:00
Worros
f1921bebde Move functions from fpdb_save_to_db into Database.py
Doesn't actually do much cleanup.

Intend on moving all db functions into Database.py and fpdb_db.py and
providing and API, the functionality of fpdb_simple et all to shift into
the HHC
2009-06-20 04:15:52 +08:00
Ray
a998a6dc6e Merge branch 'master' of git://git.assembla.com/fpdboz 2009-06-19 16:10:44 -04:00
Ray
a307081574 More for Flop_Mucked with 0-52 encoding. 2009-06-19 15:51:56 -04:00
Ray
e00887b865 Make Flop_Mucked work with the 0-52 card encoding. 2009-06-19 15:47:26 -04:00
sqlcoder
fdf4b65136 pass all settings through so that a new one can be used to skip updating hudcache (not used yet) 2009-06-20 03:21:24 +08:00
Worros
966fba2165 Fix parameter being passed to Sql __init__ db_server not db_backend 2009-06-20 01:17:06 +08:00
Worros
a47ff7fb9b Fix case sensitivity in test for Hands table before dropping 2009-06-20 00:58:41 +08:00
Worros
ccd2112c8a Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-06-20 00:41:24 +08:00
Worros
e66c73ca14 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-06-20 00:41:13 +08:00
Ray
053bfb9cee Remove intermediate print from previous commit. 2009-06-19 09:43:49 -04:00
Ray
afddc130a5 Fix minor error in writing seen hole cards. 2009-06-19 09:39:17 -04:00
Ray
0f5d5a16f8 Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-06-19 09:11:21 -04:00
Matt Turnbull
620576ba21 more html output 2009-06-19 07:21:35 +01:00
Matt Turnbull
44aed2c95f populate hands.boardcards 2009-06-19 07:04:57 +01:00
sqlcoder
2b240efd0a unimportant fix to storehudcache2 2009-06-18 20:29:02 +01:00
Ray
a6a98a750f Clean up changes to use 0-52 card encoding. 2009-06-18 14:11:53 -04:00
sqlcoder
8bbd21fa6a hide error when a window has non UTF-8 char in title 2009-06-17 23:05:20 +01:00
sqlcoder
7664373648 use fpdb_db for db connection 2009-06-17 23:03:43 +01:00
sqlcoder
dcaf6fed27 apologies - looks like I missed this out of my last release :-( 2009-06-17 21:43:30 +01:00
Ray
42f2b73c1a Get rid of some intermediate print. 2009-06-17 14:26:16 -04:00
Ray
63efc13cc9 Make Stud_Mucked work with the new card encoding scheme. 2009-06-17 14:24:16 -04:00
Ray
4a6c257b0f get_cards query now works directly with the 0-52 card encoding scheme. 2009-06-16 23:00:46 -04:00
Worros
d247b32b1b Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-06-17 10:18:31 +08:00
Worros
4d2aecc17b Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-06-17 10:18:13 +08:00
Ray
bb633fd435 Correctly pass cl options to HUD_main in Windows. 2009-06-16 20:04:06 -04:00
Ray
c4659ce5ef Untangle settings and backend changes. 2009-06-16 09:55:23 -04:00
Matt Turnbull
2a7a275e3a some stan to write an HTML hand 2009-06-16 00:29:44 +01:00
Matt Turnbull
574a286e0c round amounts to 2 dp 2009-06-15 22:30:58 +01:00
Matt Turnbull
2e08c6f9b3 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-06-15 22:21:40 +01:00
Matt Turnbull
14fbae1b54 get cards out 2009-06-15 22:21:27 +01:00
Ray
b1ea38bea9 Add -c config cl option. Fpdb passes cl options to HUD. 2009-06-14 23:14:53 -04:00
Ray
a5ac2dcf75 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-06-13 09:25:04 -04:00
Worros
a9df7d09c1 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-06-13 13:49:49 +08:00
eblade
d3d95b643d Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-06-12 13:09:15 -04:00
Ray
49a04af0c5 Add stud8 to PokerStars HH conversion. 2009-06-12 12:29:17 -04:00
eblade
93172a1a03 remove the loop from the other topify function (doesn't look like we've needed that in there in months.. oops) 2009-06-12 02:30:14 -04:00
eblade
c63e0ab461 Q&D change for old Hud code to remove the loop from one topify_window(), as we found out how to get it when working on the new Hud stuff 2009-06-10 14:11:20 -04:00
eblade
eb37de3594 fix get_geometry to use the correct parameters to IsWindow and GetWindowRect (too much error trapping will create pitfalls), use main_window.window instead of window_foreign_new() to get gdkhandle for gtkwindow, remove process enumeration in topify() for windows 2009-06-10 13:47:07 -04:00
eblade
6e63e2a5e9 fix some junk related to determining window height/width, b_width and tb_height, comment out the window_foreign_new() that's screwing up the window right now 2009-06-10 12:58:14 -04:00
Worros
ed9f02b113 Revert "pass all settings through so that a new one can be used to skip updating hudcache (not used yet)"
This reverts commit b935a5ad67.
2009-06-10 20:48:33 +08:00
Worros
e212bbd751 Remove unused file 2009-06-10 18:19:49 +08:00
eblade
bde0c7bb08 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-06-10 03:17:02 -04:00
Ray
9b5f8c53bc Changes to allow importing of razz hands. Tables not fully populated. 2009-06-09 19:06:20 -04:00
sqlcoder
b935a5ad67 pass all settings through so that a new one can be used to skip updating hudcache (not used yet) 2009-06-09 22:55:18 +01:00
sqlcoder
680e5c2f89 use new more flexible function to decide whether to drop indexes 2009-06-09 22:22:10 +01:00
sqlcoder
9d87e35082 fix quit option and postgres/windows connecting after last merges 2009-06-09 21:38:30 +01:00
Ray
eea4656f47 Should now run on windows--but not work correctly. 2009-06-09 16:38:26 -04:00
eblade
09ab42f31c Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-06-09 14:22:31 -04:00
Ray
dd80468f5f Fix a whitespace problem. 2009-06-09 14:18:56 -04:00
eblade
1dd1e1eca5 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-06-09 14:06:13 -04:00
Ray
f3103cc82a Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:
	pyfpdb/Database.py
	pyfpdb/fpdb_db.py
	pyfpdb/fpdb_save_to_db.py
2009-06-09 14:01:15 -04:00
eblade
52c2411360 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-06-09 11:22:08 -04:00
Worros
8a55b2ebd9 Remove merge line 2009-06-09 23:10:11 +08:00
Worros
ed1d9cd229 Fix tests 2009-06-09 23:08:18 +08:00
eblade
82af869974 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-06-09 11:04:09 -04:00
Worros
1d6aed3250 Fix datetime.strptime v time.strptime issue 2009-06-09 22:53:09 +08:00
Worros
c3d2c5a2be Merge branch 'master' of git://git.assembla.com/free_poker_tools
Conflicts:

	pyfpdb/Database.py
	pyfpdb/SQL.py
	pyfpdb/fpdb_db.py
	pyfpdb/fpdb_save_to_db.py

Also fix datetime issue with Everleaf
2009-06-09 22:48:48 +08:00
eblade
868c573643 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-06-09 10:14:00 -04:00
Ray
06a62927fc Merge branch 'master' of git://git.assembla.com/fpdboz 2009-06-08 10:17:11 -04:00
Ray
4ef4260342 Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:
	pyfpdb/Database.py
	pyfpdb/SQL.py
	pyfpdb/fpdb_db.py
	pyfpdb/fpdb_save_to_db.py
2009-06-08 10:16:34 -04:00
Worros
8e1404032b Fix last patch 2009-06-08 22:13:42 +08:00
Worros
d8dffb193f Merge branch 'master' of git://git.assembla.com/mctfpdb
Conflicts:

	pyfpdb/fpdb.py
2009-06-08 19:20:01 +08:00
Worros
f1b887502c Merge branch 'master' of git://git.assembla.com/fpdb-sql
Conflicts:

	pyfpdb/fpdb_db.py
2009-06-08 19:18:58 +08:00
Worros
4f555e2d8f Hand.insert() update - low hanging fruit 2009-06-08 18:19:55 +08:00
sqlcoder
fce9941b0c add position capability to playerstats tab 2009-06-08 00:17:48 +01:00
Matt Turnbull
9b8bc1a593 re-enable insertion of boardcards 2009-06-07 22:45:46 +01:00
Matt Turnbull
0489d6fa48 Get boardcards and add them if they aren't 0x 2009-06-07 22:44:50 +01:00
Matt Turnbull
d8cf0619ac use datetime instead of time 2009-06-07 22:39:19 +01:00
sqlcoder
0a7c340656 Added timing info for index drop/create. Some small mods to output during import (obviously just change any you don't like) 2009-06-07 22:21:58 +01:00
Matt Turnbull
95a7ab8e48 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-06-07 21:58:00 +01:00
Matt Turnbull
c1e4c083fe premerge 2009-06-07 21:57:56 +01:00
Matt Turnbull
1a2d124b77 premerge 2009-06-07 21:57:13 +01:00
sqlcoder
e662279acd remove parameter to analyzeDB() (error in previous release) 2009-06-07 20:49:35 +01:00
sqlcoder
7e8b80948c move index etc functions from fpdb_simple.py into fpdb_db.py 2009-06-07 20:45:09 +01:00
sqlcoder
45a303eb25 make global lock work (do nothing) if hands table doesn't exist 2009-06-07 20:07:18 +01:00
Ray
35c5438c3c Fast hudcache fix not previously comitted. 2009-06-06 11:20:11 -04:00
Ray
109727e764 Postgres changes for unicode. 2009-06-06 11:17:49 -04:00
Ray
0008a9ede3 Mode change to Stats.py. 2009-06-06 11:06:49 -04:00
Ray
795d26ddf1 Fix prev commit of this file. 2009-06-06 10:50:28 -04:00
Worros
56f2112403 Add a few temporary comments 2009-06-06 19:26:33 +08:00
Worros
a9055049fe Fix HUD query under linux.
Case sensitive
2009-06-05 23:13:41 +08:00
Worros
9091efa230 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-06-05 09:11:25 +08:00
Ray
7f7a298bcb merging, I think 2009-06-04 16:52:07 -04:00
sqlcoder
b016c496f2 fix handling of global lock when re-creating tables 2009-06-04 20:27:15 +01:00
Ray
5013a07fc0 Minor change for postgres connection--not tested w/remote db. 2009-06-02 10:59:54 -04:00
Ray
9826138744 Correctly hand remote and local postgres dbs. Use get_db_parmeters(). 2009-06-01 18:27:56 -04:00
Ray
441b300cff Add db-type to get_db_parameters(). doh! 2009-06-01 18:26:20 -04:00
Worros
44cb8efb2c Add reminder for id caching 2009-06-01 22:21:40 +08:00
Worros
3e49e87842 Begin moving query functions into fpdb_db function
No idea whether the code actually works
2009-06-01 20:53:42 +08:00
Worros
a261517175 Add additional siteids to db, move player select function 2009-06-01 17:14:31 +08:00
Ray
069aa025e4 Fixes for importing and HUD with the postgres db. 2009-05-31 21:25:36 -04:00
Worros
21e7e010bd Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-06-01 07:51:04 +08:00
sqlcoder
5b96769de3 implement global lock by locking hands table 2009-05-31 21:59:01 +01:00
sqlcoder
be61b2d253 change quit option to standard 'Quit' 2009-05-31 21:53:10 +01:00
sqlcoder
de98ff67dd try to improve reliability of index/fk dropping in postgres and add warnings (not errors) when problems occur 2009-05-31 21:06:33 +01:00
sqlcoder
c741d720a0 add date filter to player stats 2009-05-30 22:38:54 +01:00
sqlcoder
2eb86784fe change BB heading to bb (numbers are in big blinds not Big Bets) 2009-05-30 22:33:08 +01:00
Worros
0c0832b9d3 Bump db version number 2009-05-31 02:56:08 +08:00
eblade
2e4c792bbe Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-05-30 12:04:43 -04:00
eblade
f1230c459c Apparently I made a comment and a change that I didn't realise before 0.11, and forgot to commit. oopsie. 2009-05-30 12:02:31 -04:00
Matt Turnbull
94370a653c fix conflicts 2009-05-30 16:40:27 +01:00
Worros
3b72a334a1 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-05-29 10:35:02 +08:00
sqlcoder
d44b093144 put debug message back in, this point should not be reached 2009-05-28 22:40:58 +01:00
sqlcoder
91bb9fc65f Tidy up alignment and expanding of cells in Player Stats window 2009-05-28 20:45:25 +01:00
sqlcoder
e0e4eb4c3c add date filter to positional stats 2009-05-28 19:54:32 +01:00
Worros
a9dac26381 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-05-28 22:32:34 +08:00
sqlcoder
060c102843 changes to store date in hudcache.stylekey and display all-time / session / n days stats in hud 2009-05-27 23:34:10 +01:00
sqlcoder
afee4ddb8c minor cosmetic change to autoimport button 2009-05-27 22:25:29 +01:00
sqlcoder
d41a8beacd add self. to variable reference and comment out debug message 2009-05-27 22:21:22 +01:00
Worros
3892b3789d Session breakdown Proof of Concept
Only prints some of the session breakdown to stdout at the moment,
otherwise is a copy of PlayerStats with a bunch of stuff commented out.

Looks like:

DEBUG: len(times) 337
DEBUG: len(diffs) 336
DEBUG: len(index[0]) 2
DEBUG: index [54 88]
DEBUG: index[0][0] 54
Hands in session    0:   54  Start: 22/03/2009 07:04 End: 22/03/2009
07:49 Total: 2669
Hands in session    1:   33  Start: 24/03/2009 17:10 End: 24/03/2009
17:35 Total: 1482

I think the Total number has an index incorrect at the moment.
2009-05-26 16:10:27 +08:00
sqlcoder
013bd0a4e3 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-05-25 22:46:25 +01:00
sqlcoder
90b886e77f another parameter fix to the fpdb.py gui update 2009-05-25 21:30:37 +01:00
Worros
962ce03fea Fix storeHudCache callers 2009-05-25 09:31:36 +08:00
Worros
ab98965b77 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-05-24 19:15:52 +08:00
sqlcoder
e7532ea497 fix typos in control keys in last release 2009-05-23 22:06:41 +01:00
sqlcoder
061ff083a6 get rid of warning message when starting fpdb 2009-05-23 21:42:26 +01:00
sqlcoder
f0b4d82fa5 always release locks when db work finished 2009-05-23 23:33:40 +08:00
sqlcoder
d811c6b656 add rollback to release locks when db reads are finished 2009-05-23 23:31:56 +08:00
sqlcoder
0b29286c9d fix 3bet stat bug in storeHudCache2 2009-05-23 23:26:03 +08:00
sqlcoder
75221f0b6a oops, missed out the key change in previous commit 2009-05-23 23:24:29 +08:00
sqlcoder
06b1ce002f fix sql to work in postgres 2009-05-23 09:47:50 +01:00
Worros
539fdcb070 Merge branch 'master' of git://git.assembla.com/fpdb-sql
Conflicts:

	pyfpdb/Card.py
2009-05-22 09:23:10 +08:00
sqlcoder
203dcb44ae copy storehudcache2 into storehudcache, keeping the extra copy for more changes ... 2009-05-21 23:29:34 +01:00
sqlcoder
ee9d69ae5e more minor cosmetic changes 2009-05-21 23:09:11 +01:00
sqlcoder
a9963a6a47 try to improve look of autoimport tab 2009-05-21 23:00:46 +01:00
sqlcoder
07247de030 changes to allow hud to use stylekey and aggregate stats query 2009-05-21 21:27:44 +01:00
sqlcoder
d986966332 prevent error when trying to close HUD that has already gone 2009-05-21 20:30:18 +01:00
sqlcoder
985d2c28d4 add styleKey to hudcache 2009-05-21 18:43:32 +01:00
sqlcoder
0651e89e2e add try-except blocks and correct spelling 2009-05-21 18:02:42 +01:00
sqlcoder
fcc6cf5d4f updated comment 2009-05-21 18:02:11 +01:00
Ray
f55460341d New table handling stuff and demo.
Not working for windows and not currently used by HUD_main.
2009-05-21 11:13:39 -04:00
Worros
dc8affb8c3 Quick comment add before checking out 0.11 2009-05-21 23:02:50 +08:00
Worros
4819fc28e5 Fix omaha hudCache update 2009-05-21 22:14:49 +08:00
sqlcoder
eda23de609 stop storehudcache from breaking with hudcache changes (storehudcache2 is better) 2009-05-21 12:19:52 +01:00
sqlcoder
828b23510f add rollback to release locks (we should create a set transaction read_only method in fpdb_db) 2009-05-21 11:23:50 +01:00
sqlcoder
399bfd98c6 fix unimportant typo in print 2009-05-21 11:14:47 +01:00
sqlcoder
cf8b6c7e92 several db changes and a fancy playerstats window, now to tidy the code up a bit .... 2009-05-21 04:26:00 +01:00
sqlcoder
93f643a958 fix error when choosing unimplemented menu option 2009-05-20 23:21:50 +01:00
sqlcoder
cee4cade3e Add hotkeys for stats windows and pass main window into guiplayerstats 2009-05-20 09:58:38 +01:00
sqlcoder
b3b99778c9 make player stats use new single detailed query and format the output in python ready for more detailed stats 2009-05-17 22:59:09 +01:00
sqlcoder
e2137a596a screwed up previous release using branches, this should work now (added hc fields as well as hp, made new fields NULLable, use 3b not 3b4b fields), next job calculate some of these fields ... 2009-05-17 17:26:05 +01:00
Worros
a5884ff7ae Fix createHandsActionTable 2009-05-17 12:41:47 +08:00
sqlcoder
339f48582c add more stat fields to db 2009-05-17 00:06:53 +01:00
sqlcoder
6495346874 Add new seatsep display flag 2009-05-10 23:11:30 +01:00
sqlcoder
aba5b94847 add new SeatSep display flag for filter, re-order some code with possible aim of using one function instead of 2 similar blocks of code for breakdown and totals 2009-05-10 23:06:35 +01:00
sqlcoder
fe806ccea1 update playerstats for new avgseats column and seats filter (is this window redundant now?) 2009-05-10 22:59:35 +01:00
sqlcoder
3e805f03b1 correct avg seats calculation, select limits in reverse order, i.e. highest first 2009-05-10 22:37:02 +01:00
sqlcoder
a4302b61a9 make gui hide new seats part of filter, refine empty query test 2009-05-10 22:30:26 +01:00
sqlcoder
199a91ea99 add rollback to release locks taken in postgres 2009-05-09 23:18:58 +01:00
sqlcoder
b7ee425558 add seats to filters and stats queries 2009-05-08 22:41:09 +01:00
sqlcoder
527232595b change import time calc 2009-05-07 21:24:53 +01:00
sqlcoder
4ffc028bbc oops, missed out the key change in previous commit 2009-05-07 21:24:06 +01:00
sqlcoder
9fe2fc902d make psycopg2 return unicode strings and go back to new recognisePlayerIDs() very similar to @885f0a023 2009-05-07 21:17:14 +01:00
sqlcoder
47dad738dd work around unicode problem with windows and postgres - use old version of recognisePlayerIDs 2009-05-05 23:57:20 +01:00
sqlcoder
0ad2b06e97 Add all/none checkboxes for limits, tidy up stats tables some more 2009-05-04 23:14:33 +01:00
sqlcoder
de98d5dd15 remove surplus db variable and debug mysql problem in previous commit 2009-05-04 20:36:11 +01:00
sqlcoder
f9a769ebd3 add summaries to position stats and allow choice of levels 2009-05-04 20:12:41 +01:00
sqlcoder
119a20a2ab Merge branch 'master' of git://git.assembla.com/fpdboz 2009-05-04 02:14:35 +01:00
sqlcoder
87f2dde961 add 3bet to stats pages and make column and heading choices configurable by editing lists in the init code 2009-05-04 02:10:05 +01:00
Worros
885f0a0232 Fix indentation error from sqlcoder 2009-05-03 19:21:21 +08:00
sqlcoder
f0a7775591 add totals lines, enable refresh button to view other players 2009-05-03 10:49:00 +01:00
sqlcoder
e60c254204 add rollback() to make sure db locks are released 2009-05-03 01:46:18 +01:00
sqlcoder
fddb29b3b8 add steal stat to positional stats and fix for postgres 2009-05-03 01:31:15 +01:00
sqlcoder
1b82ad7f65 re-fix a couple of errors from previous merges 2009-05-03 01:24:10 +01:00
sqlcoder
5111eb1a8f remove redundant db variable 2009-05-02 21:39:48 +01:00
sqlcoder
79b3dba2dd add steal stat to playerstats 2009-05-02 21:32:47 +01:00
sqlcoder
882f19a34d removed redundant db variable 2009-05-02 21:07:52 +01:00
sqlcoder
7d28f70a98 pull and merge from fpdboz 2009-05-02 21:02:26 +01:00
sqlcoder
2c991ad2d0 sql and cursor execute bugfixes to make it work with postgres 2009-05-02 00:28:53 +01:00
sqlcoder
a466201285 fix tab error on inserted line - change to spaces 2009-04-29 23:27:53 +01:00
sqlcoder
d6ebd9352d pull from Ray (I think this was release 0.11) 2009-04-29 23:05:29 +01:00
sqlcoder
fd804f4431 added a few more stats with no decimal places 2009-04-30 00:17:25 +08:00
Worros
6504cd38a6 use lower case for keys into stat_dict as postgres returns column names in lower case
Conflicts:

	pyfpdb/Database.py
2009-04-30 00:16:39 +08:00
sqlcoder
d28bdf7c60 added a few more stats with no decimal places 2009-04-28 22:47:05 +01:00
Worros
f6311276a7 Remove some merge noise 2009-04-28 14:50:50 +08:00
sqlcoder
2efc6f1c8e use lower case for keys into stat_dict as postgres returns column names in lower case 2009-04-27 21:29:02 +01:00
sqlcoder
d2c978d7f5 steal stat fixes to match pokertracker 2009-04-27 10:52:06 +08:00
sqlcoder
326f29b5b6 always release locks when db work finished 2009-04-27 10:47:22 +08:00
sqlcoder
d9d8043888 add rollback to release locks when db reads are finished 2009-04-27 10:45:49 +08:00
sqlcoder
064a7a6de6 fix 3bet stat bug in storeHudCache2 2009-04-27 10:40:59 +08:00
sqlcoder
3c815ed0e8 steal stat fixes to match pokertracker 2009-04-26 22:20:24 +01:00
sqlcoder
6cee8b7a97 always release locks when db work finished 2009-04-26 21:47:28 +01:00
sqlcoder
b266b48c33 add rollback to release locks when db reads are finished 2009-04-26 21:38:04 +01:00
sqlcoder
85b03ef720 fix 3bet stat bug in storeHudCache2 2009-04-26 21:31:05 +01:00
Worros
ee1186bd57 Add ability for Filters to hide() panes
Also add ability to register a callback and name 2 buttons on hte left
panel
2009-04-17 12:44:43 +08:00
Worros
1939979e3c Make Grapher work with limits 2009-04-14 21:31:29 +08:00
Worros
dd563aab39 Merge branch 'siteneutral'
Conflicts:

	pyfpdb/GuiGraphViewer.py
2009-04-11 20:16:37 +08:00
Worros
15e31eccb2 Make player and positional stats use Filters 2009-04-11 20:07:50 +08:00
Worros
d16bb0ac8b Make Grapher use new Filters object 2009-04-11 19:14:32 +08:00
Worros
2550a0b0e0 Add preliminary filters file 2009-04-11 17:11:13 +08:00
Worros
ead50c5ff8 Add a couple of queries for GUI building 2009-04-11 17:10:57 +08:00
Worros
15d7e1fab5 Add a couple of queries for GUI building 2009-04-11 17:10:00 +08:00
Worros
cf637a4ce6 Make Grapher use get_supported_sites() properly 2009-04-11 14:41:48 +08:00
Worros
76d7b63b81 Make Grapher use get_supported_sites() properly 2009-04-11 14:38:46 +08:00
Worros
702cb5851a Oops - revert converter removal 2009-04-11 11:14:01 +08:00
Worros
b1aade624f Change default window size because it bugged me 2009-04-11 04:28:54 +08:00
Worros
2bc564e292 Remove draw from supported list.
Olld import code doesn't support draw yet, this patch prevents the bulk
importer from crashing if you have a draw hh file in the list
accidentally.
2009-04-11 04:18:10 +08:00
Worros
5a842c52fa Add <hhcs> section to example config and remove converter from <site>
Change to make building GUI easier from config.
2009-04-11 04:16:36 +08:00
Worros
86fb5a0906 Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-04-11 03:52:34 +08:00
Worros
584c658590 Forgot the converter line in merge 2009-04-11 03:51:45 +08:00
Worros
e44ee1e439 Merge branch 'master' of git://git.assembla.com/mctfpdb into siteneutral 2009-04-10 02:57:16 +08:00
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
Worros
5a737624c9 Merge branch 'master' of git://git.assembla.com/free_poker_tools
Conflicts:

	pyfpdb/fpdb_simple.py
2009-04-10 00:19:32 +08:00
Ray
6866f409ce Fix regression importing some Stars tournaments. 2009-04-09 09:21:52 -04:00
Ray
fdabe29ea2 Fix stats aggregation and simplify HUD_main.py. 2009-04-08 16:43:40 -04:00
Ray
460102c3f5 Version 0.11 2009-04-07 10:44:06 -04:00
Ray
a2862c9712 Minor change to allow proper detection of FTP tables. 2009-04-06 23:45:56 -04:00
Ray
a1b2874878 Fix regression in naming HUDs that caused inconsistent killing. 2009-04-06 23:42:36 -04:00
Ray
87efd2cc8d Minor edits in HUD_config.xml.example. 2009-04-06 23:40:06 -04:00
Ray
cd2b2aaf42 Comment out some intermediate print. 2009-04-06 11:03:51 -04:00
Ray
683190a261 Updated example config to work with recent code changes. 2009-04-06 10:34:14 -04:00
eblade
63a6fd2abd Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-04-06 04:19:23 -04:00
eblade
fbc2054610 Merge branch 'master' of git://git.assembla.com/mctfpdb.git 2009-04-06 04:18:14 -04:00
Worros
3109dd5f50 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-04-06 08:12:56 +08:00
Ray
9b9d2f0570 Changed "Full Tilt" to Full Tilt Poker" 2009-04-05 14:40:22 -04:00
Ray
1b1185da17 Integrate 4bet fix from Steffen. Doesn't break-not tested on 4bets. 2009-04-05 13:46:41 -04:00
Matt Turnbull
a4ed3a2e68 (No function) Note about matching "FullTiltPoker" 2009-04-04 15:12:45 +01:00
Ray
ac93a2cb77 Change to allow import of HHs exported from PT Stud. 2009-04-03 12:51:58 -04:00
eblade
0eab0ad813 Merge branch 'master' of git://git.assembla.com/mctfpdb.git 2009-04-02 16:48:30 -04:00
Matt Turnbull
b2ac60de82 tailhands also had the wrong regex. Corrected. 2009-04-02 21:20:41 +01:00
Matt Turnbull
d81627da3f Really fix handcount bug? 2009-04-02 21:16:36 +01:00
eblade
e880fb8954 add a giant tooltip temporarily to the popup stats window 2009-04-02 05:02:24 -04:00
Matt Turnbull
ed3b09967d test_PokerStars typo, test_fpdb_simple uncommented some stuff and made
it work in pytest
2009-04-01 23:28:48 +01:00
eblade
c4c8529057 Merge branch 'master' of git://git.assembla.com/mctfpdb.git 2009-03-31 14:18:45 -04:00
eblade
775fc67bf0 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-03-31 14:17:51 -04:00
Matt Turnbull
5cd5ad8fa6 Fix bug I introduced that caused empty hands corresponding to splits
between hands (blank lines) to be 'processed' by HHC in Everleaf, PS and
FTP converters.
2009-03-31 07:44:19 +01:00
Worros
d470507a51 Fix +x on bulk importer, quick fix for Stars HU file error 2009-03-31 11:38:10 +08:00
Ray
84b6aa230b intermediate print 2009-03-30 15:53:10 -04:00
eblade
9dbbd23688 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-30 14:27:31 -04:00
Ray
f5d7764571 Remove another comprehension not working as expected in kill() 2009-03-30 11:59:07 -04:00
Ray
5505ebdec2 Remove comprehension and replace with loop in reposition_windows(). 2009-03-30 11:49:20 -04:00
eblade
fdd8eddcbf Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-30 03:15:21 -04:00
Ray
fb4e818ed2 get_sites now returns only enabled sites--enabled is the default in Config. 2009-03-29 23:40:03 -04:00
Worros
2129faa46b Add UltimateBetToFpdb
Copy from current PokerStarsToFpdb with minor regex updates. Still
untested
2009-03-30 06:39:21 +08:00
Worros
93d2b50867 Merge branch 'master' of git://git.assembla.com/free_poker_tools
Conflicts:

	pyfpdb/fpdb_save_to_db.py
2009-03-29 23:18:00 +08:00
Ray
a109687ac4 Fixed some 'True' v True problems. 2009-03-29 10:08:33 -04:00
Worros
04f293384c Really make fastStoreHudCache false by default 2009-03-29 21:47:09 +08:00
Worros
961c1795fa Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-03-29 21:37:40 +08:00
Matt Turnbull
f3ee865721 Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:

	pyfpdb/PokerStarsToFpdb.py
 - this fails py.test
2009-03-29 12:27:00 +01:00
Matt Turnbull
4bccc0fd28 some datetime tests for stars 2009-03-29 12:20:04 +01:00
eblade
e99badf69d add one to seat adjustment index in update_table_position 2009-03-28 14:31:44 -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
Matt Turnbull
d079fea634 Stars has two spaces in header - "...#handid: gametype..." 2009-03-28 15:18:10 +00:00
Worros
0528aa74db Properly escape player names 2009-03-29 00:07:00 +09:00
Worros
ae2835cd6b GuiBulkImport cli breakage fix 2009-03-28 22:24:40 +09:00
Worros
5139b88538 utf8 fix to db connection
Change mysql connection type to use_unicode.
2009-03-28 20:51:54 +09:00
Worros
bdd615ede9 utf8 fix to db connection
Change mysql connection type to use_unicode.
2009-03-28 20:32:30 +09:00
Worros
95add13731 No passthough converter in siteneutral 2009-03-28 19:39:13 +09:00
Worros
f6ca8c1bc1 GuiBulkImport cli breakage fix 2009-03-28 19:38:37 +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
1d45137502 Change fastStoreHudCache = False as default Import parameter. 2009-03-27 13:26:01 -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
710893b186 Fix merge breakage 2009-03-28 00:54:30 +09: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
Ray
503262d398 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-03-27 11:34:47 -04:00
Ray
d6fe2cac81 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-03-27 11:34:11 -04:00
Worros
2e687acf9a Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-03-27 23:55:08 +09:00
Worros
b92022fecd Fix call to get_db_parameters 2009-03-27 23:53:44 +09:00
Worros
7f0185d417 More fixes to allow dbnames other than fpdb 2009-03-27 23:49:22 +09:00
Worros
1be81ced66 Allow dbname to be something other than fpdb
Patch from Rune Nesheim to allow the dbname to be specified on the
command line
2009-03-27 22:53:01 +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
3c14055244 more very minor cleanup 2009-03-26 19:17:00 -04:00
eblade
465f27af4d mostly spacing cleanup 2009-03-26 18:55:16 -04:00
eblade
c91244cdad just edit an old comment 2009-03-26 18:38:13 -04:00
eblade
de60d51dcf some use of not instead of comparing to blank lists 2009-03-26 18:32:25 -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
eblade
b80a068795 per python docs http://docs.python.org/library/stdtypes.html, use != for not equal, rather than not x == y 2009-03-26 14:57:40 -04:00
eblade
6d4c812b51 do that iteration in relocate_windows the proper way 2009-03-26 12:11:07 -04:00
eblade
94a10bbfcf Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-26 11:15:01 -04:00
eblade
4341222994 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-03-26 09:48:05 -04:00
Ray
c5e05f812a Merge branch 'master' of git://git.assembla.com/fpdb-eric
Conflicts:
	pyfpdb/Hud.py
2009-03-25 19:59:59 -04:00
eblade
7c0d2eb6c6 weird, fix bug in window tracking 2009-03-25 19:33:01 -04:00
Ray
ceba4be73f More fixing of previous commit. 2009-03-25 17:48:43 -04:00
Ray
29bd0c2a7a Back out mucked window dragging changes. 2009-03-25 17:22:28 -04:00
Ray
01bc1cebf1 Fix numerous typos/bugs in previous commit. 2009-03-25 16:46:06 -04:00
Ray
9146758c5e Make flop_mucked windows follow the table on Windows. 2009-03-25 15:42:16 -04:00
Worros
74d9f14945 Make CET timezones work with Stars hands 2009-03-25 19:34:40 +09:00
Worros
20dd3e1aec Make CET timezones work with Stars hands 2009-03-25 18:35:19 +09:00
Worros
4e212787df Merge branch 'master' into siteneutral 2009-03-25 13:09:21 +09:00
Worros
7377561808 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-03-25 07:54:35 +09:00
eblade
21f352b05b Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-24 18:00:10 -04:00
Ray
a404f0f3ee Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-03-24 17:54:23 -04:00
Ray
60ffb0896e Make isWinLine find low pots. 2009-03-24 11:23:33 -04:00
Matt Turnbull
aca5dc9ed0 Parse another PokerStars datetime.
Make tail work:
  -log instead of print inode # change detected,
  -make sure splitter regexes have groups around them
  -fix a bug
  -increase buffering size to something >> a single hand

Conflicts:

	pyfpdb/HandHistoryConverter.py
2009-03-24 14:58:14 +00:00
Worros
b74f6dd58a Add new test 2009-03-24 23:27:43 +09:00
Worros
497354d4f4 Make BulkImport work only with HHCs
Added new section to config for converters for ease of creating the gui.

Removed the section in the site line for filter and supported games
2009-03-24 22:58:45 +09: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
42f2cb049d add set_focus_on_map calls to hud window creation, doesn't seem to do much, but feels correct 2009-03-24 06:04:00 -04:00
eblade
d168618b4b try to squeeze a few more cycles out .. seems to not be locking up anymore, though i could be running good on that right now 2009-03-24 05:55:07 -04:00
eblade
d4165a5109 ongoing effort to squeeze a couple more cpu cycles out of the hud creation process 2009-03-24 05:19:20 -04:00
Ray
d26e3d735b Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-03-24 01:47:17 -04:00
eblade
65e2087062 fix fix 2009-03-24 00:30:27 -04: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
Ray
3b04c1baac Fix bug in accessing mucked cards in stud games. 2009-03-23 22:50:54 -04:00
eblade
364a25773e Merge branch 'master' of git://git.assembla.com/mctfpdb.git 2009-03-23 20:59:53 -04:00
eblade
c844454d8d Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-03-23 20:57:30 -04:00
eblade
a863743974 move move() under the line where position to move to is stored, instead of calculating position twice in two lines 2009-03-23 19:22:04 -04:00
Ray
4fc2286dfa Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-03-23 17:18:29 -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
Ray
34fdc549fd Merge branch 'master' of git://git.assembla.com/fpdboz 2009-03-23 16:40:24 -04:00
Ray
e99ec0cd71 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-03-23 11:09:05 -04:00
Worros
5e5e79f08a Fix typo 2009-03-23 22:18:22 +09:00
eblade
6ff4997d87 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-23 05:15:20 -04:00
eblade
2bffdf25f2 comment 2009-03-23 05:14:53 -04:00
Ray
ffb1f926d9 Better way to keep up with window positions. 2009-03-22 14:05:58 -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
285c7d8824 have to supply argv to main() as a list, splitting on whitespace won't
work if you supply an argument like a path with a space in it.
2009-03-22 14:53:10 +00:00
Worros
6e021ea3a4 Remove old graph queries from file 2009-03-22 18:56:51 +09:00
Worros
40c17cffaa Recognise deep 6 tables at Full Tilt 2009-03-22 18:52:30 +09: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
eblade
a59c1e5a45 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-03-21 15:16:51 -04:00
Worros
e9853c1ff2 Make previous executemany() function the default 2009-03-22 04:07:08 +09:00
eblade
390df21623 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-03-21 15:03:03 -04: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
Worros
999a2b9b5f Remove debug statement 2009-03-22 02:57:37 +09:00
Worros
2747b079ed Fix saveActions to True by default 2009-03-22 02:52:41 +09:00
Matt Turnbull
2669471f6c Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-03-21 17:47:55 +00: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
38b0fc7157 Add all functional site importers to Bulk import gui 2009-03-22 02:20:56 +09: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
eblade
0db3fc337b Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-21 13:08:27 -04:00
Ray
969f5cc265 Make shift-middle-click work as intended. 2009-03-21 12:54:51 -04:00
Worros
495c39ef69 Merge branch 'master' into siteneutral
Conflicts:

	pyfpdb/fpdb_import.py
	pyfpdb/fpdb_save_to_db.py
2009-03-22 01:41:50 +09:00
Worros
1e788621a5 Merge branch 'master' of git://git.assembla.com/mctfpdb
Conflicts:

	pyfpdb/FulltiltToFpdb.py
2009-03-22 01:35:03 +09:00
Worros
86d350984e Dodgy 6 max fix to FTP converter 2009-03-22 01:31:36 +09:00
Worros
2675a681b8 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-03-22 01:31:05 +09:00
eblade
f870d4c283 Merge branch 'master' of git://git.assembla.com/mctfpdb.git 2009-03-21 12:06:00 -04:00
eblade
cb34be8454 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-21 12:04:18 -04:00
Ray
39db65b65d Fix bug in defaults of import params + bug in printing same. 2009-03-21 11:38:17 -04:00
Matt Turnbull
239330ae7b filterCrap after checking if hand is in db
refactor GuiBulkImport : add main() so that it can be called from
interactive shell (for profiling purposes).
2009-03-21 15:34:23 +00:00
Matt Turnbull
451a9b3ab1 GuiBulkImport: import directories from cmdline. Basically now does what
CliFpdb should do, but reads most settings from xml config.
2009-03-21 14:27:49 +00:00
Worros
ae4704b8dc First working(?) version of siteneutral import 2009-03-21 21:23:51 +09:00
eblade
7f6128af8d Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-21 05:51:30 -04:00
Worros
863e4f353b Merge branch 'master' into siteneutral 2009-03-21 13:36:02 +09:00
Worros
93b0e65549 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-03-21 13:30:57 +09:00
Ray
847fd5f6c1 Tool tips for FlopMucked. 2009-03-20 19:32:02 -04:00
Ray
d59016f249 Button clicking for FlopMucked. 2009-03-20 19:28:57 -04:00
Ray
72c0cdfa52 Needed to make previous commit work. 2009-03-19 20:58:40 -04:00
Worros
98df6f74a9 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-03-20 08:41:35 +09:00
Ray
33055f7f86 Hello_menu demo added to Hello.py module. 2009-03-19 16:10:18 -04:00
Ray
75a94299f9 Make sure HUD_main gets community cards for AWs to use. 2009-03-19 13:18:50 -04: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
Matt Turnbull
82e540066c Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-03-19 13:41:17 +00:00
Matt Turnbull
cbba16feaf comment 2009-03-19 13:41:05 +00:00
Worros
a8e14f3c89 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-03-19 21:20:00 +09:00
eblade
0e89adc1db clean up some more ugly 2009-03-19 04:12:42 -04: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
c6179a1b85 fix typo 2009-03-18 22:05:01 -04:00
eblade
5b532180a3 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git
Conflicts:
	pyfpdb/fpdb_save_to_db.py
2009-03-18 21:39:12 -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
530462cc72 Fix for too large mucked windows on Windows. 2009-03-18 21:05:29 -04:00
eblade
1b626271ee fpdb_save_to_db: minor cleanup 2009-03-18 17:15:21 -04:00
eblade
a424a9c77d fpdb_parse_logic: cleanup 2009-03-18 17:07:32 -04:00
Matt Turnbull
e9fd354115 handinfo 2009-03-18 16:52:18 +00:00
Ray
8009281e5a More fixing of import options. 2009-03-18 12:32:34 -04:00
eblade
4c67cad27a Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-18 11:52:49 -04:00
eblade
a5770722ad Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-18 11:52:24 -04:00
Ray
e67f715f27 Another silly screw up. 2009-03-18 11:37:36 -04:00
Ray
e485a9c035 Fix silly cut/paste problem. 2009-03-18 11:34:43 -04:00
eblade
4e62a25d03 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-18 10:58:37 -04:00
Ray
48c2c36de6 Put index dropping back in for postgres. 2009-03-17 11:18:55 -04:00
eblade
74ef867bb2 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-17 05:27:14 -04:00
Ray
466f6c09c2 Make a whole bunch of config defaults work as desired. 2009-03-16 23:34:00 -04:00
eblade
42db4f03ee Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-16 21:18:22 -04:00
Ray
067373b128 Fixed defaults for saveActions and fastStoreHudCache. 2009-03-16 21:07:11 -04:00
eblade
a93718f953 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-16 21:00:56 -04:00
eblade
8e5396295d some silly cleanup 2009-03-16 20:52:50 -04:00
eblade
80c3922bc0 remove pyc, merge with everyone else
remove some useless junk in fpdb.display_tab()
2009-03-16 18:35:56 -04:00
Ray
bc2277af74 Comment out index dropping for postgres--prevent hang. 2009-03-16 18:23:45 -04:00
Ray
66e734588c Fix extra lines in previous commit. 2009-03-16 18:00:57 -04:00
eblade
fc411d6df7 Merge branch 'master' of git://git.assembla.com/mctfpdb.git 2009-03-16 17:50:59 -04:00
eblade
b79734167d Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-03-16 17:49:34 -04:00
eblade
4e8a347692 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-16 17:46:26 -04:00
Worros
629d48ad9d Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-03-16 08:24:08 +09:00
Ray
6d292c50d9 Use saveActions and fastStoreHudCache in fpdb_import, etc. 2009-03-15 17:40:01 -04:00
Ray
6f927e6b7b saveActions and fastStoreHudCache added to import element. 2009-03-15 15:54:22 -04:00
Ray
9fca5a75b2 Allow saving of aux_window layouts. 2009-03-15 15:27:47 -04:00
Matt Turnbull
08dae30f1f Ensure both holecards are known (holdem) or all four (omaha) before
printing a 'shows hand' line : not ideal, but legacy importer chokes
otherwise
2009-03-15 16:51:50 +00:00
Matt Turnbull
cfbdff5159 add -x command line option to specify converter
usage:
./GuiBulkImport -q -f lala.txt -x EverleafToFpdb
2009-03-15 16:50:59 +00:00
Worros
40d98b11d9 PokerStarsToFpdb - PLO parsing update 2009-03-15 14:32:52 +09:00
Worros
c0d7724921 Merge branch 'master' into siteneutral 2009-03-15 12:39:37 +09:00
Worros
b77bbed8a2 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-03-15 12:37:07 +09:00
Ray
e0a406e66d Make Configiuration.py executable. 2009-03-14 12:54:52 -04:00
Ray
5348737819 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-03-14 12:54:11 -04:00
Worros
22ff84852b Kludge maxseats for Stars 2009-03-15 00:30:38 +09:00
Matt Turnbull
51444f2ac4 print a showdown section if anyone showed any kind of hand (obv logic
not 100%, people can show cards without a showdown, but legacy importer
expects cards there, right?)

slight change to get through the horse test file
2009-03-14 15:02:23 +00:00
Worros
faf19215e8 Make Hand initable without a hhc
Proof of concept code in test_PokerStars.py
2009-03-14 23:01:40 +09:00
Matt Turnbull
6e01ebaee2 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-03-14 14:00:47 +00:00
Matt Turnbull
c1a7c45966 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-03-14 13:45:40 +00:00
Matt Turnbull
547ffd0e41 tiny output bugs fixed. 2009-03-14 13:45:09 +00:00
Worros
d847a71c6e Move addDiscard from upper class to specialised DrawHand 2009-03-14 22:23:30 +09:00
Worros
a5ceeece3a Added note about renamed test file
Also changed name of Bike test file so I can tell what it is from ls
2009-03-14 22:18:30 +09:00
Matt Turnbull
2caddfe97a Merge branch 'master' of git://git.assembla.com/fpdboz 2009-03-14 12:48:13 +00:00
Matt Turnbull
822546da7b blinds can be all in. 2009-03-14 12:44:14 +00:00
Worros
42e23ae449 Merge branch 'calcstats' 2009-03-14 21:21:04 +09:00
Worros
b41afcd076 Add stub insert and select methods to Hand class 2009-03-14 21:19:20 +09:00
Worros
d212d81e03 Add variables for most HudCache stats and add optional arg to Hand
Will almost certainly need to change all of the data structures in the
variables as they are only for a single player
2009-03-14 20:40:27 +09:00
Worros
311e79c6e6 Quick note on test file.
Intend on keeping better notes on test files so we can verify in testing
at some point
2009-03-14 20:03:28 +09:00
Worros
04b43e3b95 Add preliminary Badugi support
Done to flesh out what DrawHand will look like
2009-03-14 19:48:34 +09:00
eblade
6eb489c3a5 Merge branch 'master' of git://git.assembla.com/fpdboz.git
Conflicts:
	pyfpdb/Hud.py
2009-03-14 03:56:43 -04:00
Worros
d389706e85 Revert dodgy import line 2009-03-14 11:21:23 +09:00
Worros
9cdfa5f279 Remove 3rd arg from Hud module loader
Mea culpa
2009-03-14 11:06:47 +09:00
eblade
79d9bd6d58 make third parameter to importName() optional 2009-03-13 18:09:25 -04:00
eblade
69c026bd29 remove "import Utils" 2009-03-13 18:05:27 -04:00
Worros
d3103f099e Make Stars Badugi recognised 2009-03-14 06:42:20 +09:00
Worros
93acab5bcb Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-03-14 06:20:53 +09:00
Worros
3683a82e0f Merge branch 'master' into siteneutral 2009-03-14 05:32:16 +09:00
eblade
d35184cc79 Merge branch 'master' of git://git.assembla.com/fpdboz.git
Conflicts:
	pyfpdb/fpdb_import.py
2009-03-13 16:10:44 -04:00
Worros
bbdbe7e47d Remove TODO for previous patch 2009-03-14 05:10:13 +09:00
eblade
2ad252ded6 Merge branch 'master' of git://git.assembla.com/mctfpdb.git 2009-03-13 16:07:38 -04:00
Worros
6ebab06981 Make converters dynamically loadable in autoimport
Adds 1 restriction to the HHC sub classes, the classname must be the
same as the filename - ToFpdb.py

FulltiltToFpdb.py must contain a hhc class named Fulltilt
EverleafToFpdb.py must contain a hhc class named Everleaf
2009-03-14 05:00:12 +09:00
Worros
875f218379 Move it back again, found another way 2009-03-14 04:23:36 +09:00
Worros
321e38a16f Move 'plugin loader' to Utils file so HUD and Importer can share 2009-03-14 03:10:53 +09:00
Worros
f4e3c8de28 Remove lookupLimitBetSize() - appears to no longer be necessary 2009-03-14 02:51:10 +09:00
Matt Turnbull
21376c0b62 slight change in logic, I hope the this is right:
if win & show : player showed [x] and won $
elif win: player won $
elif folded: player folded
else: if shown: player showed [x] and lost...
      else: player mucked
2009-03-13 16:50:46 +00:00
Matt Turnbull
771a95fe32 if holecards can be infered from summary line, indicate that they were
'shown' so that they can be output in summary line
2009-03-13 16:45:32 +00:00
eblade
a5b9ea860d fix runUpdated() to not freak out if a file disappears on it 2009-03-13 06:21:48 -04:00
eblade
382ed4b067 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-03-13 06:14:43 -04:00
Worros
a7f7113705 Make determineGameType return 'tour' of currency is T$ 2009-03-13 18:45:15 +09:00
Worros
3aaf5b9716 Merge branch 'killftp' into siteneutral
Conflicts:

	pyfpdb/fpdb_simple.py
2009-03-13 11:09:19 +09:00
Ray
f0413a66f5 Fix moved method, but didn't change reference. 2009-03-12 17:58:12 -04:00
Ray
46f246e27d Change a rogue xrange back to range. 2009-03-12 17:51:29 -04:00
eblade
104ca5fd9e Merge branch 'master' of git://git.assembla.com/fpdboz.git
Conflicts:
	pyfpdb/fpdb_import.py
2009-03-12 13:27:06 -04:00
eblade
9caa8b9361 Merge branch 'master' of git://git.assembla.com/mctfpdb.git
Conflicts:
	pyfpdb/fpdb_import.py
2009-03-12 13:23:32 -04:00
Worros
81df5a8919 Add Full Tilt flhe o supported games 2009-03-13 02:21:31 +09:00
Ray
3a6c80825d Merge branch 'master' of git://git.assembla.com/fpdboz 2009-03-12 13:19:28 -04:00
Worros
d8a689b9fe Quick fix 2009-03-13 02:18:34 +09:00
Ray
2ac4e26337 Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:

	pyfpdb/Database.py
2009-03-12 12:13:03 -04:00
Worros
2d849c69e7 Refactor HHC call a bit, make sure out_fh gets closed 2009-03-13 00:31:29 +09:00
Worros
c523fce123 Merge branch 'master' of git://git.assembla.com/mctfpdb
Conflicts:

	pyfpdb/fpdb_import.py
2009-03-12 22:57:43 +09:00
Worros
73d643b753 Merge branch 'master' of git://git.assembla.com/fpdb-eric
Conflicts:

	pyfpdb/Database.py
2009-03-12 22:52:48 +09:00
Worros
0bd2ecc2fe Merge branch 'master' of git://git.assembla.com/free_poker_tools
Conflicts:

	pyfpdb/Database.py
	pyfpdb/Mucked.py
2009-03-12 22:48:46 +09:00
Matt Turnbull
76e467a5d4 get rid of thread 2009-03-12 12:24:23 +00:00
Worros
27a0db56bb Add test file for betfair 2009-03-12 20:01:41 +09:00
Worros
63a4d3f605 Fix test_fpdb_simple.py's tests 2009-03-12 19:51:03 +09:00
Worros
2bb4593672 Compare determineGameType to readSupportedGames
Allows us to parse the header (and test it) and still skip the file.

May produce empty files in autoimport...
2009-03-12 19:43:28 +09:00
Worros
bb2104e5f8 First successful Betfair import 2009-03-12 18:38:48 +09:00
Worros
8126972731 Betfair update. Now doesn't crash on test file.
Board and Hero cards are read. Actions all appear to be failing.
2009-03-12 18:23:20 +09:00
Worros
19ec7662e1 BetfairToFpdb - HandInfo regex 2009-03-12 17:26:15 +09:00
Worros
76ca6beab0 Update Betfair importer a bit
No longer crashes on test file, but doesn't actually import anything
yet.
2009-03-12 15:17:46 +09:00
eblade
02c5cfb39e remove call to hhc.processFile as someone removed that function 2009-03-12 01:18:31 -04:00
eblade
fbbd2c4d5c asdfsadfsadfasdfsadf 2009-03-12 00:10:34 -04:00
Matt Turnbull
cd3d4ef835 no longer 'safely' appends -- will now overwrite out_path. 2009-03-12 03:58:42 +00:00
Matt Turnbull
ff675fb3ae import working? 2009-03-12 03:15:34 +00:00
eblade
9d7395a61c unbreak psuedo-recursion 2009-03-11 23:10:31 -04:00
Ray
6bf7be6ae5 Merge branch 'master' of git://git.assembla.com/fpdb-eric
Conflicts:

	pyfpdb/Configuration.py
	pyfpdb/Database.py
2009-03-11 22:46:28 -04:00
eblade
27e0df2a24 Merge branch 'master' of git://git.assembla.com/fpdboz.git
Conflicts:
	pyfpdb/Configuration.py
	pyfpdb/Database.py
2009-03-11 22:41:43 -04:00
Ray
1fb6e5bfeb Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:

	pyfpdb/Database.py
	pyfpdb/Mucked.py
2009-03-11 22:36:10 -04:00
Worros
c582507b9f Quick fix for typo - Fixes FTP Razz import 2009-03-12 10:49:16 +09:00
Worros
0dfcac19fb Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-03-12 08:56:21 +09:00
eblade
509192d23e call update_table_position() immediatly after creating a hud mainwindow, so that we can be sure we have both X/Y set on all platforms 2009-03-11 17:12:35 -04:00
Matt Turnbull
89bb8e3d69 stars stud sometimes says 'brings-in', 'brings in', 'brings in low'
fewer negative rakes appearing.
2009-03-11 18:40:17 +00:00
Ray
8887ea7099 A start on saving aux_win layouts. More to come. 2009-03-11 14:12:56 -04:00
eblade
23c1e0c405 add 3/6 FL to Everleaf table 2009-03-11 12:56:38 -04:00
Matt Turnbull
0058f47775 fulltilt razz. is this complete? can you check whether it imports? 2009-03-11 16:51:58 +00:00
Worros
c2d7822dfc Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-03-12 00:57:14 +09:00
Matt Turnbull
dba348edf3 detect horse:omaha hilo
also appears to parse regression-test-files/stars/omahaHL.txt
2009-03-11 14:42:49 +00:00
Matt Turnbull
ccb9bc07a7 small t tilted me 2009-03-11 14:37:31 +00:00
Matt Turnbull
cfbf57dd1b if dont have site and BB in lookupLimit table, just halve them for
sb,bb. Should work for higher limits almost always anyway, and there are
a finite number of ulimits which we should already have in the table
2009-03-11 14:33:07 +00:00
Worros
71c5e1300d Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-03-11 23:12:22 +09:00
Worros
fb141fd85d Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-03-11 23:09:55 +09:00
Matt Turnbull
904c108813 people who put in blinds or antes are also counted as actors preflop 2009-03-11 14:07:38 +00:00
Matt Turnbull
1bbb2f2769 here you go 2009-03-11 14:05:38 +00:00
Worros
bd792142bd Convert RegressionTest.py into test.py format.
Still doesn't work and i'm confused
2009-03-11 23:05:36 +09:00
Worros
3a9657df5f Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-03-11 22:02:31 +09:00
Worros
eb61313fcd Remove debug message 2009-03-11 22:01:43 +09:00
eblade
375c2555a2 still fixing convert_cards.. god i'm retarded lol 2009-03-11 06:38:17 -04:00
eblade
52db43cd6b fix my further screwed up convert_cards function.. 2009-03-11 06:31:47 -04:00
Matt Turnbull
b64c4f301e action regex not so simple.
-really- need test_Everleaf to catch this sort of thing
2009-03-11 01:46:46 +00:00
eblade
f45716e67e Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-10 20:32:53 -04:00
Ray
ffdf66b676 new cards file 2009-03-10 20:31:09 -04:00
eblade
f2a6c9c361 tell us what kind of database error happened if hud database errors 2009-03-10 20:19:54 -04:00
eblade
1653dcf34c fix error i made in convertcards 2009-03-10 20:19:33 -04:00
eblade
388525ed30 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git
Conflicts:
	pyfpdb/Database.py
2009-03-10 19:31:42 -04:00
eblade
42cc948cac make sure we set self.hand in HUd create() as well as in update() 2009-03-10 19:23:28 -04:00
eblade
cc5b73bb2e add 50c/1 1/2 2/4 stakes FLHE to lookup table 2009-03-10 18:50:40 -04:00
Matt Turnbull
22df50327a Everleaf stud hands are passed if not instantiated with debugging=True
(this is default from cmdline but not from fpdb_import)
Eerleaf gametype tests... added one.
Everleaf action fixed to capture bet amounts, I hope. The 'complete to'
has a problematic . at the end, so we must handle
[ $ 1.40 USD ]
[ $ 1 USD ]
$1.40.
$1. (haven't seen this one yet)
Sorry I've kind of destroyed the sanityCheck thing, some of it belongs
in fpdb_simple where the paths are made. I've retained check for
in_path!=out_path.
2009-03-10 21:49:23 +00:00
eblade
f268ab79a2 about 50 more range->xrange 2009-03-10 16:01:35 -04:00
Matt Turnbull
66ee3e87a8 Treated complete as a call & raise? Make sense?
Had to feck around with action regex though :/
2009-03-10 18:20:14 +00:00
Matt Turnbull
f714b25487 everleaf stud markstreets, antes, bringin
todo: completes
todo: strange pot bug :( maybe go away if we add bringin completes or
something
fulltilt: warning if bringin not found
2009-03-10 17:25:49 +00:00
Matt Turnbull
2c2d912c6e Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:

	pyfpdb/EverleafToFpdb.py
	pyfpdb/Hand.py
	pyfpdb/HandHistoryConverter.py
2009-03-10 16:52:18 +00:00
Matt Turnbull
2c44d634f9 commit, time to pull carl's ftp stud stuff 2009-03-10 16:17:54 +00:00
Worros
88cadd36ad Fix Everleaf to start parsing 7 Card Stud games
Still missing readAntes
2009-03-11 00:57:13 +09:00
Worros
e87118e9ae Make PLO work on Everleaf again 2009-03-11 00:14:23 +09: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
161485e44e [KILLFTP 4/x] paper bag fix caused iun patch 1.
This code needs replacing
2009-03-10 22:09:32 +09:00
Worros
14b58d6ad5 [KILLFTP 3/x] Fix screwup from patch 1 2009-03-10 22:03:19 +09:00
Worros
58445c0a1b [KILLFTP 2/x] More ftp specific code removal 2009-03-10 22:03:18 +09:00
Worros
72dff55f6f [KILLFTP 1/x] Tear out FTP specific hand import code 2009-03-10 22:03:18 +09:00
Matt Turnbull
0dc1bafdeb gameinfo changes to fit db spec in docs/
some temporary bits, broken commit do not use.
2009-03-09 23:03:17 +00:00
Matt Turnbull
ebcfebbc2f gameinfo changes, to fit better with db spec in docs folder
tests
2009-03-09 23:01:58 +00:00
Matt Turnbull
f9817a7e1a Merge branch 'master' of mt@192.168.1.5:src/mctfpdb 2009-03-09 22:59:07 +00:00
Matt Turnbull
250505f13b Merge commit 'carl/master' 2009-03-09 22:28:47 +00:00
Matt Turnbull
ddaf2575e0 git complaining have to commit 2009-03-09 22:28:35 +00:00
Worros
9427c97f4c Start of card selection filter
Doesn't display yet
2009-03-10 01:41:36 +09:00
Ray
6314c5a7cc Display community cards. 2009-03-09 11:41:58 -04:00
Ray
3d6bd0eb46 New query: get common cards for mucked card display. 2009-03-09 11:37:34 -04:00
Worros
b062ed6e70 Add query from Eleatic Stranger on 2+2
Preliminary query for analysing hole cards
2009-03-10 00:34:07 +09:00
Ray
7d7bf80024 Export button is not sensitive until graph is created. 2009-03-09 10:21:40 -04:00
eblade
b64213e6c5 bulk change range to xrange 2009-03-09 06:41:02 -04:00
eblade
5f1e5d0996 revert to ray's Configuration.py 2009-03-09 06:40:38 -04:00
eblade
60e66dcf31 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git
Conflicts:
	pyfpdb/Configuration.py
2009-03-09 06:31:13 -04:00
Worros
7f63ef7cfe Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-03-09 19:23:00 +09:00
Worros
d6b5f5d019 Merge branch 'master' of git://git.assembla.com/fpdb-eric
Conflicts:

	pyfpdb/Configuration.py
2009-03-09 19:22:54 +09: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
eblade
7a6684699a remove string concat from fairly highly used convert_cards() func 2009-03-09 05:06:36 -04:00
Worros
023fe50bb0 Change default file (about to switch to another branch) 2009-03-09 17:50:09 +09:00
eblade
9dab2899f7 code optimization wrt string addition, map(), xrange() 2009-03-09 04:23:57 -04:00
eblade
66e05d08b1 make use of python's bizarre conditional assignment 2009-03-09 03:47:25 -04:00
eblade
635d59b25d use some lambda map/filter calls where they make sense instead of for loops
localize some variables in the HUD update function
2009-03-08 16:28:09 -04:00
eblade
1b6337365f eliminate some string addition, change calls from range() in HUD to xrange() 2009-03-08 15:39:55 -04:00
Worros
b679fddfd2 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-03-08 14:18:20 +09:00
Worros
da88e1b20c Merge branch 'master' of git://git.assembla.com/mctfpdb
Conflicts:

	pyfpdb/EverleafToFpdb.py
	pyfpdb/FulltiltToFpdb.py
2009-03-08 14:09:16 +09:00
Ray
1a417441f6 First commit of Mucked_Flop. Works, but needs polish. 2009-03-07 20:44:10 -05:00
Ray
5f60cfde7c Add get_aux_locations. 2009-03-07 17:02:51 -05:00
Worros
b07823b372 Merge branch 'futz' from Matt
Conflicts:

	pyfpdb/EverleafToFpdb.py
	pyfpdb/FulltiltToFpdb.py
	pyfpdb/Hand.py
	pyfpdb/HandHistoryConverter.py
2009-03-08 00:43:33 +09:00
Worros
dee2c63a5d Syntax cleanups and optimisations 2009-03-07 23:35:52 +09:00
Worros
17609ce71b Minor mods to Grapher to try and resolve issue with multiple plots being
added
2009-03-07 18:23:30 +09:00
Worros
c505e98bcf Player regex interface updates from monkeyfutz 2009-03-07 18:06:52 +09:00
Ray
753754c924 Allow Aux_windows to have layouts and some cleanup. 2009-03-06 21:46:34 -05:00
Matt Turnbull
ca6f6e513b message 2009-03-06 18:10:04 +00:00
eblade
d81a701ec2 fix kill hud not killing popups, fix some popup bugs 2009-03-05 21:27:12 -05:00
Matt Turnbull
426b5c2db5 had a go at PokerStars -> PokerStars conversion...
fpt : bugfix
hand : DrawHand class, moved discardCards there
is 'studhi' = '7 Card Stud' in PokerStars string? was playing with
Natalie HORSE file
2009-03-06 01:24:38 +00:00
Ray
baa8d145ae Delay getting game type to support mixed games. 2009-03-05 20:10:56 -05:00
eblade
a34c90dee3 git still pisses me off 2009-03-05 18:43:00 -05:00
eblade
fc855995c7 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git
Conflicts:
	pyfpdb/Hud.py

git is really pissing me off
2009-03-05 18:38:10 -05:00
eblade
4f1697d390 HHC: fix missing second arg to determineGameType 2009-03-05 10:17:17 -05:00
Ray
e9861e18c8 Fix error when no aux_windows are specified. 2009-03-05 10:12:31 -05:00
Matt Turnbull
1e047b6998 Don't error gruesomely when someone exports nonexistant graph
sys.path[0] to get basepath of fpdb script
2009-03-05 12:31:56 +00:00
eblade
98e0a096d2 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-05 00:04:03 -05:00
Matt Turnbull
75dcf002f9 Configuration: _getframe(0) so that GuiAutoImport can run standalone
(stack not deep enough to go one deeper)
fpdb_import: Everleaf plumbing back in place.
GuiAutoImport.py: run standalone.
2009-03-05 01:12:15 +00:00
Ray
6667f4cddb Merge branch 'master' of git://git.assembla.com/fpdboz 2009-03-04 20:08:20 -05:00
Ray
30ac181a36 New file: Hello.py. Aux_window examples. 2009-03-04 20:07:09 -05:00
Ray
a6d70e6e13 More tuning of the aux_window interface. 2009-03-04 20:04:23 -05:00
Worros
50a1ec1ccf Add logging function from futz 2009-03-05 01:46:01 +09:00
Worros
87d9dbcf25 Merge branch 'master' of git://git.assembla.com/fpdb-eric
Conflicts:

	pyfpdb/EverleafToFpdb.py
2009-03-05 01:07:42 +09:00
Worros
740fe92914 rename hand.string to hand.handText
Few other minor updates to match monkeyfutz
2009-03-05 00:10:08 +09:00
Worros
e8552023da Whitespace and comment updates from monkeyfutz 2009-03-04 23:29:13 +09:00
eblade
4d09686309 hud_main window resizes to smallest possible size whenever a hud is removed from the list (pls test in nix guys tnx) 2009-03-04 08:17:23 -05:00
Worros
dd6a912aa7 Merge branch 'master' of git://git.assembla.com/mctfpdb into futz 2009-03-04 12:40:17 +09:00
Matt Turnbull
7049a959ec I attempted to merge monkeyfutz into master.
Let me know how you get on.
I just remembered autoimport probably broken at this point, I have
changed the way HHC is called and only been testing standalone
filtering..
Just try it and then git checkout ^HEAD

Merge branch 'monkeyfutz'

Conflicts:

	pyfpdb/EverleafToFpdb.py
	pyfpdb/FulltiltToFpdb.py
	pyfpdb/Hand.py
2009-03-03 18:45:02 +00:00
Matt Turnbull
703fa40073 Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:

	pyfpdb/Hand.py
2009-03-03 12:24:42 +00:00
Worros
81279a0c9e Fix col align 2009-03-03 20:43:16 +09:00
eblade
1c79ecf82c Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-03-03 06:36:57 -05:00
Worros
86101c522c GuiPositionalStats.py
New tab, output cols aren't labelled properly but we appear to have
something sane
2009-03-03 20:32:01 +09:00
eblade
9ebabc79dd fix my misspelling of the maxseats var 2009-03-02 19:51:18 -05:00
Matt Turnbull
36befa43a8 More futzing
- made it so that Hand.__init__ calls the hhc readX methods in the right
  order for that kind of Hand (Stud or Holdem/Omaha)
- hhc.readX methods then callback Hand.addX methods
Why? WHY! I hear you ask. Actually I can see there's very little gain,
sorry about that; but it sort of makes sense. Now you just make the
right kind of Hand, give it the text and the right kind of HHC filter,
and it makes itself.
- apart from that, biggest actual thing done is probably in adding
  player cards for stud hands -- revamped and made it really clear (I
think) whats happening (see FullTilt.readStudPlayerCards)
When I run FullTiltToFpdf.py it goes through all the hands.
- Still have some print statements, have been changing them to
  logging.debug or logging.info as I come across them.
  You may find "tail -f logging.out" useful
Actually I'm not at all convinced about the use of logging except that
you can redirect it to stderr quite easily and then set the threshold
for what gets logged quite easily, so that might be a plus.
- Oh and the subclassing of Hand is getting clearer.
2009-03-02 21:48:30 +00:00
Worros
25ae39d7b5 Minor fixups: set->list and FullTilt lookup table 2009-03-03 00:10:15 +09:00
Matt Turnbull
5c26bb028d Merge branch 'master' into monkeyfutz
Everleaf converts hands
Moved process hand logic into the hand subclass that knows what it
wants, it calls back to the hhc (which knows about the format) to populate itself

Conflicts:

	pyfpdb/EverleafToFpdb.py
	pyfpdb/Hand.py
	pyfpdb/HandHistoryConverter.py
2009-03-01 23:22:47 +00:00
eblade
3018483a6f changes to lookup list for sb/bb in flhe 2009-03-01 15:58:12 -05:00
eblade
dc458b1c19 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-03-01 13:33:46 -05:00
Worros
d4cc5d4182 Initial fix for Everlead limit games
Only one entry in the lookup table at the moment, need to collect data
and expand for all known limits
2009-03-02 01:52:52 +09:00
Worros
3cf8239cc9 Fix bug inmporting Everleaf PLO 2009-03-01 23:05:21 +09:00
Worros
ca9ed06351 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-03-01 22:44:03 +09:00
Ray
5ba8d3b95d Fix missing argument in call to kill_hud. 2009-02-28 18:46:54 -05:00
Ray
5bf7d9038a Fix bug in autoclosing HUDs on windows. 2009-02-28 15:19:01 -05:00
eblade
4ca4e11591 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-02-28 14:23:57 -05:00
eblade
7a7eb25529 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-02-28 14:22:06 -05:00
eblade
aecb6092d0 fix missing self. 2009-02-28 14:21:59 -05:00
Ray
b3fb9e954d Fix clobber of db object. 2009-02-28 11:31:24 -05:00
Worros
09d577214b Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-02-28 13:08:27 +09:00
Worros
e5c65fe036 Fix Everleaf HandInfo regex to support limit 2009-02-28 12:45:44 +09:00
Worros
c0400f6c66 Fix Everleaf GameInfo regex to detect FL
Added regression test mechanism while at it
2009-02-28 12:34:41 +09:00
Ray
d44c90aec7 Temp fix to HUD crashing when closed table is updated.
Also fixes popups not closing correctly.
General cleanup in the HUD closing code. Closing a HUD
is now managed by the HUD_Main object--this should ensure
that no objects are left dangling.
2009-02-27 19:47:52 -05:00
Ray
e85a531f6a Fix missing "self." in previous commit. 2009-02-27 14:27:57 -05:00
Matt Turnbull
7087ede374 temp commit 2009-02-27 18:42:53 +00:00
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
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