Commit Graph

1608 Commits

Author SHA1 Message Date
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
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
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
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