Commit Graph

1205 Commits

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