evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,197 Commits 1 Branch 0 Tags 14 MiB
f55cd5569d
Commit Graph

4655 Commits

Author SHA1 Message Date
steffen123
c52767ea41 it now records and displays fold stats (not too thoroughly tested) 2010-06-04 02:29:31 +08:00
steffen123
30d7f0dc2a moved fold stats so that the file no longer indicates that they're not done 2010-05-28 19:12:02 +02:00
steffen123
300e5fbbed it now records and displays fold stats (not too thoroughly tested) 2010-05-28 02:31:04 +02:00
steffen123
12e89306b5 dirty but working patch to make it load utf8 files (specifically, FTP) 2010-05-27 22:01:17 +02:00
Mika Bostrom
b482148d2a Kill trailing whitespace 2010-05-24 09:26:19 +03:00
Mika Bostrom
2503cd1b6c Fix what looks like a thinko 
The stat 'fold_f' probably should do a "float(foo)/float(bar)" division
because there is no function called "fold"
 2010-05-13 06:57:59 +03:00
Worros
9ac46c8c92 Add to Stars limit lookup table. 2010-04-23 17:09:08 +08:00
Worros
6e60314926 First part of making FTP archive files work 2010-04-23 11:49:57 +08:00
gimick
c871d7fc2f gimick - Do not set CBChance if there has been a donkbet 2010-04-23 11:49:31 +08:00
Worros
d11623c736 Update Session viewer based on Socratic comments 2010-04-23 11:39:52 +08:00
Worros
c0ebc4b7cf Update to Session viewer 
Fix a couple of crashers

- Make sure last session in list is displayed correctly
- Actually calculate hands/hour (Thanks Socratic)
- Make graph display the correct number of sessions
 2010-04-22 23:22:28 +08:00
Worros
5aadf643be Add '2' to the Lim_Blinds lookup table 
Fixes Dogs import issue.
 2010-04-23 00:36:12 +08:00
Worros
3dd5f92a3c Add logging for two areas, fix RAZZ v Razz issue 
Add ERROR conditions for determineGameType failing, and raise a FpdbParseError in each case
 2010-04-23 00:33:24 +08:00
Worros
6ba7621f2a Fix 'errors' stat in importer 
Instead of:
GuiBulkImport done: Stored: 32  Duplicates: 0   Partial: 0  Errors: 32 in 0.530081987381 seconds - 0/sec

We have:
GuiBulkImport done: Stored: 0   Duplicates: 0   Partial: 0  Errors: 32 in 0.530081987381 seconds - 0/sec
 2010-04-23 00:28:30 +08:00
sqlcoder
c265df2ffa Merge branch 'master' of git://git.assembla.com/fpdboz 2010-04-15 21:28:31 +01:00
Worros
b14bed4e9b Fix last patch - add pass 2010-04-15 15:48:57 +08:00
Worros
81c731b42e Fix for CBet stat 
Patch from bbtgaf@googlemail.com aka gimick

DerivedStats.betStreet() was only functioning if the player was the first person to act on a street.

If the player was checked to the function would exit as False before ever finding the player
 2010-04-15 14:51:20 +08:00
Eratosthenes
c32f95ebf3 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-04-02 11:38:32 -04:00
Eratosthenes
98f0cd3743 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-04-02 11:38:21 -04:00
Worros
fb6af1fe75 Fix for PT-Stud exported Stars HH's 
Exports files as 'RAZZ LIMIT' instead of 'Razz Limit'
 2010-03-30 13:04:39 +08:00
sqlcoder
757c241241 move HH_bulk_path from general section to hhBulkPath in import section 2010-03-21 12:19:55 +00:00
sqlcoder
e87e6294c8 return time in filter dates, adjusted using day_start from general config, update playerstats to use this 2010-03-21 11:40:32 +00:00
sqlcoder
a478331988 change button name to differentiate from filter refresh 2010-03-20 18:20:40 +00:00
sqlcoder
395f80eac6 fix sqlite position stats again 2010-03-20 18:12:23 +00:00
sqlcoder
b8a4d97ed6 add guesstimate of daylight savings time to UTC conversion (Stars doesn't tell us if DST or not) 2010-03-16 22:32:31 +00:00
sqlcoder
c2d05cdfbb Merge branch 'master' of git://git.assembla.com/fpdboz 2010-03-15 21:51:50 +00:00
sqlcoder
ef36e260e5 prepare for change to store time in UTC 2010-03-15 21:51:39 +00:00
sqlcoder
a4a4eaa87b add general section to configuration. currently includes default bulk import path and start of day offset 2010-03-15 21:48:25 +00:00
Worros
3c67d5f286 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-03-15 18:22:07 +08:00
sqlcoder
a10f7c144e allow log viewer to view all 4 log/error files 2010-03-09 22:36:03 +00:00
sqlcoder
88670a6a2d Merge branch 'master' of git@github.com:sqlcoder/fpdb-sql 2010-03-09 21:47:02 +00:00
Eratosthenes
d294501c4c Make more exe files in py2exe_setup. 2010-03-09 12:47:50 -05:00
sqlcoder
6117eb64c8 remember separator position when refresh is clicked 2010-03-08 22:47:44 +00:00
sqlcoder
04acf25416 don't display headings for bottom table when it can't be calculated 2010-03-08 22:32:09 +00:00
sqlcoder
2e83e91ba5 add having clause to sqlite version of guistats query 2010-03-08 22:31:07 +00:00
sqlcoder
b153e7c30d create db automatically if using sqlite 2010-03-07 11:00:22 -05:00
sqlcoder
014ddedc01 create db automatically if using sqlite 2010-03-07 10:30:56 +00:00
Worros
950b037b39 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2010-03-05 12:03:40 +08:00
Worros
14d2861cdd Re-enable 'variance' for sqlite. 2010-03-05 11:55:00 +08:00
Worros
a698b2e16d PlayerStats: Fix sorting in # Hands col 
Patch from Almer Visser.

Using %d causes Gtk to order as a string rather than a number.

Convert to %1.0f and issue disappears.
 2010-03-04 12:10:28 -05:00
Eratosthenes
519494878e Don't try to find out blinds for stud games. 2010-03-04 11:50:03 -05:00
Worros
6c05bac1d0 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2010-03-04 19:48:40 +08:00
Worros
b893d6a00d Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-03-04 19:48:21 +08:00
Worros
0e707c19f8 PlayerStats: Fix sorting in # Hands col 
Patch from Almer Visser.

Using %d causes Gtk to order as a string rather than a number.

Convert to %1.0f and issue disappears.
 2010-03-04 17:50:51 +08:00
Eratosthenes
a3cab472b1 Clean up guessMaxSeats. 2010-03-03 15:08:00 -05:00
Eratosthenes
2452293c1e Fix problem with old (pre 2010) HHs. 2010-03-03 13:05:06 -05:00
Eratosthenes
17b02c1cd9 Fix for missing TTYPE in HandInfo. 2010-03-03 12:57:30 -05:00
Eratosthenes
4272ee36a2 Change for new HH format. Still work to do here. 2010-03-03 00:42:13 -05:00
Eratosthenes
12c08f6aa5 Delete xwininfo stuff. Reinstall Xlib stuff. 2010-03-02 23:12:55 -05:00
Eratosthenes
1c276915d8 Merge branch 'master' of git://github.com/kangaderoo/fpdb-kangaderoo 2010-03-02 16:05:11 -05:00
Gerko de Roo
1e11109e1f Support for new Hand History format for Party Poker 
Don't have enough 'old' HH to test
 2010-03-02 21:55:32 +01:00
Gerko de Roo
4c37877c7f Uncalled bet needs to be subtracted from the collectees. 
the self.collectees is used in the derived stats.
The uncalled part of the bet was added to the players profit.
 2010-03-02 21:44:07 +01:00
Eratosthenes
859e6c7536 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-03-02 10:43:00 -05:00
Worros
6a17609040 FullTilt: Playernames can be 2 chars long 
Found a hand history where the playername was 'OG'. The parser assumed player names were a minimum of 3 characters.
 2010-03-02 15:51:40 +08:00
Eratosthenes
444ec73f1d Update for changes to Tables.Table() call. 2010-03-01 19:26:45 -05:00
Eratosthenes
6daf238241 Add readme.txt to the exe. 2010-02-28 22:20:09 -05:00
Eratosthenes
83d74505c4 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-28 11:49:13 -05:00
Gerko de Roo
7bf5bc5938 Merge branch 'master' of git://git.assembla.com/fpdb-sql.git 2010-02-28 10:54:06 +01:00
sqlcoder
14a7784124 oops, forgot to add this in earlier commit 2010-02-28 08:53:44 +00:00
Worros
085f46d3da Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-28 12:28:58 +08:00
Eratosthenes
8e8444d8f2 Comment out intermediate print. 2010-02-27 16:59:00 -05:00
sqlcoder
6a6d1b1b2c fix 3bet stat (was being set to false if someone else 4bet) 2010-02-27 18:41:30 +00:00
sqlcoder
4ed82b1f18 comment out DEBUG print 2010-02-27 15:47:24 +00:00
sqlcoder
daeee37b6b default dbname option is overriding 'default=true' selection in config file 2010-02-27 13:56:19 +00:00
Worros
9505cdc497 Merge branch 'master' of git://github.com/kangaderoo/fpdb-kangaderoo 2010-02-27 15:45:56 +08:00
Worros
2fb151fdc8 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2010-02-27 15:45:42 +08:00
Gerko de Roo
9b93cd42e3 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2010-02-26 18:20:04 +01:00
Gerko de Roo
2c0f280165 Merge branch 'master' of git://git.assembla.com/fpdb-sql.git 2010-02-26 18:19:47 +01:00
Eratosthenes
aca5682daf Get rid of erroneous error message. 2010-02-25 21:32:49 -05:00
Eratosthenes
5c0e4cb0c2 Use correct dirs for database and log. 2010-02-25 20:28:41 -05:00
Eratosthenes
5d560e1252 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-25 16:02:49 -05:00
sqlcoder
70bb9d687d add commented out 'explain query plan' to go with previous commit 2010-02-25 20:57:28 +00:00
sqlcoder
134a13bf29 create indexes on hudcache in sqlite 2010-02-25 20:43:15 +00:00
Eratosthenes
b15a51d42e Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-25 10:16:22 -05:00
sqlcoder
a26dfa09f2 automation: prompt for gtk dir location and copy files and dirs - resulting dir should be ready for distribution (once zipped up) 2010-02-24 22:21:13 +00:00
Eratosthenes
04e8f117d5 Revert "Trivial refactor of get_stats_from_hand for readability." 
This reverts commit 03880bbc63.
 2010-02-24 17:06:36 -05:00
sqlcoder
6ac76d2d9b remove earlier bracket change that screwed stats up - it seemed necessary then but I can't figure out why now 2010-02-24 21:25:19 +00:00
Eratosthenes
03880bbc63 Trivial refactor of get_stats_from_hand for readability. 2010-02-24 10:28:12 -05:00
Gerko de Roo
9dac1f1b84 When all players are selected in player stats 
The site filter settings were bypassed.

This fix only selects all players from selected sites
 2010-02-23 18:55:09 +01:00
Worros
8c08a6fcc5 Merge branch 'master' of git://github.com/kangaderoo/fpdb-kangaderoo 2010-02-23 09:41:37 +08:00
Eratosthenes
38535b4ece Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-22 11:46:56 -05:00
sqlcoder
09801cd00e first go at db maintenance window, turned off for now 2010-02-20 18:59:49 +00:00
sqlcoder
141b88ecfd stop hudcache updating again when importing duplicate hands 2010-02-20 17:49:03 +00:00
Eratosthenes
21396e101e Create saveStarsHH option in import. 2010-02-20 11:55:52 -05:00
Eratosthenes
ae59fa715b Correctly pass dbname to config. Clean some pylint complaints. 2010-02-20 11:24:07 -05:00
sqlcoder
ebf2205859 display popup if error parsing config file 2010-02-20 10:27:58 +00:00
Eratosthenes
a9ec972ba5 Clean some pylint errors and obsolete TODOs. 2010-02-19 20:14:34 -05:00
Eratosthenes
c33575911d Don't make folders or files for Stars format HHs. 2010-02-19 17:50:45 -05:00
Gerko de Roo
af6dbc8d5f Copied same dead blind procedure from Pokerstars to Full Tilt 2010-02-18 22:32:53 +01:00
Gerko de Roo
aceb94d260 Oops... Lookup is only for ring games.... 2010-02-18 22:24:25 +01:00
Gerko de Roo
6272c057b9 Pokerstar Big and Small blind for limit games now derived 
form lookup table.
This also needs to be done for PokerStars, don't know for the other sites....
 2010-02-18 22:12:01 +01:00
Eratosthenes
97ec91c165 Revert fix removing the creation of folders for converted HHs. 2010-02-18 16:00:12 -05:00
Gerko de Roo
0294e4fdbb Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-02-18 21:47:14 +01:00
Gerko de Roo
8c46d3bde5 Merge branch 'master' of git://git.assembla.com/fpdb-sql.git 2010-02-18 17:28:27 +01:00
Eratosthenes
641617955b Merge branch 'master' of git://git.assembla.com/fpdboz 2010-02-18 11:08:24 -05:00
Gerko de Roo
35a604dcc6 Add support for posting dead small blind 2010-02-18 16:39:51 +01:00
Gerko de Roo
a27bc45f6d fix for dead blinds and antes in the player stat calculation 
Posted dead blinds messed up the rake and profit calculation
in the player stats.
This fix should also work for antes
The fix has been done for omaha and holdem game types (without antes)
I don't have draw or stud hands to check this
 2010-02-18 16:17:08 +01:00
Gerko de Roo
e9f359f838 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-02-18 16:07:14 +01:00
sqlcoder
0cafb75c59 finish previous undo 2010-02-17 23:29:50 +00:00
sqlcoder
c31a2f6cef undo earlier 're-fix' that broke things 2010-02-17 21:44:05 +00:00
sqlcoder
55b6e1ee92 change button text 2010-02-17 21:18:38 +00:00
sqlcoder
074a4e751e make sure filter releases any db locks it has 2010-02-17 19:25:04 +00:00
Worros
773ba71499 Change blind semantics slightly to improve accounting. 
This should improve the case where a second small blind is added.

The player committing the second sb still has a 1xsb accouting error
 2010-02-17 19:57:26 +08:00
sqlcoder
797f04aaab fix problem with position stats in sqlite 2010-02-16 23:13:12 +00:00
sqlcoder
78dc7ab468 improve sawshowdown stat 2010-02-15 23:37:34 +00:00
sqlcoder
4993b6619e improve position set routine to cover folding to BB and missing SB 2010-02-15 22:57:59 +00:00
sqlcoder
feeb70594a re-fix steal stats 2010-02-15 22:54:02 +00:00
Worros
44d994303c Add comment regarding accounting error 2010-02-16 00:42:13 +08:00
Worros
fcd0ba3dd1 PokerStarsToFpdb: allow a second small blind to be posted 
If a player sits out a sb in a cash game they can post it after the button

There is still an accounting error in the way we calculate the returned bet.
 2010-02-16 00:34:18 +08:00
Worros
c0e0c3e596 Add comment to Bulk import 
Too lazy to stash
 2010-02-15 23:26:23 +08:00
sqlcoder
0ea95363fa only use M.Nk format for hand numbers > 10000 2010-02-14 23:29:20 +00:00
sqlcoder
6026d5bcb3 PokerStarsToFpdb.py 2010-02-14 23:27:34 +00:00
sqlcoder
d637c2a89c improve steal calc 2010-02-14 23:26:47 +00:00
Worros
d37f301b10 Revert "a wtsd fix, but figures looks further out if anything now. see riterman in FLHE_6max_sawflop_wrong.txt for an example where street1seen is still not set" 
This reverts commit 6814538594.
 2010-02-15 00:01:36 +08:00
Worros
857c7f524d PokerStarsToFpdb - regex fix for actions 
sqlcoder had a hh file containing

"playername: folds " - ie with a space on the end.
 2010-02-14 23:54:19 +08:00
sqlcoder
6814538594 a wtsd fix, but figures looks further out if anything now. see riterman in FLHE_6max_sawflop_wrong.txt for an example where street1seen is still not set 2010-02-14 12:50:44 +00:00
Gerko de Roo
0af9bcd998 Merge branch 'master' of git://git.assembla.com/fpdb-sql.git 2010-02-14 03:22:02 +01:00
Eratosthenes
51e88dbadd Don't make empty files for Stars format HH. 2010-02-13 18:23:59 -05:00
Gerko de Roo
466988ea4a Tournement support for PartyPoker 2010-02-13 22:44:00 +01:00
Gerko de Roo
0db3cecf65 Action Reg_ex updated 
Due to the added end of line marker to eliminate playersnames
that start with card, all-in actions are no longer supported.
 2010-02-13 20:41:01 +01:00
sqlcoder
65a0c36781 use original config instance, improve hero_id handling (think this fixes auto-import empty db problem?) 2010-02-13 17:26:47 +00:00
sqlcoder
906c9e0bc9 tighten up logging in hud 2010-02-12 08:18:42 +00:00
sqlcoder
a93562c229 make fpdb and hud write separate log files, refine py2exe some more 2010-02-10 23:33:50 +00:00
sqlcoder
0449c06e29 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2010-02-10 19:39:01 +00:00
sqlcoder
b55c6023c7 add info to log about major errors 2010-02-10 19:38:44 +00:00
Eratosthenes
e0dd7f5ae1 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-09 18:52:18 -05:00
Eratosthenes
965adc7b27 Add EXEC_PATH to constants. 2010-02-09 18:51:37 -05:00
sqlcoder
4e89b1b000 more py2exe refinements 2010-02-09 22:54:04 +00:00
sqlcoder
d3cb41bed1 do rename to pyfpdb, user still needs to move it into fpdb-0.12... dir manually 2010-02-09 09:14:36 +00:00
sqlcoder
6df8bddc62 undo stupid param name change (need to change all the calls as well if doing it) 2010-02-08 23:38:18 +00:00
sqlcoder
333ae224d4 add some comments 2010-02-08 23:02:08 +00:00
sqlcoder
7294d2e5c0 make sure log dir is created, refine py2exe operation 2010-02-08 22:43:15 +00:00
Worros
9f27ddabad Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2010-02-08 11:17:56 +08:00
Mika Bostrom
94ab5849fa Modify display of 'n' in HUD for large numbers 
When sample size grows to larger than 1000, use "X.Yk" notation to
show the approximate value.
 2010-02-07 20:10:26 +02:00
Eratosthenes
800bffd1be Merge branch 'master' of git://git.assembla.com/fpdboz 2010-02-07 11:43:38 -05:00
Eratosthenes
da3b8076c7 Merge branch 'master' of git://git.assembla.com/fpdb-sql 
Conflicts:
	pyfpdb/py2exe_setup.py
 2010-02-07 11:43:28 -05:00
Eratosthenes
3626401096 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2010-02-07 11:40:48 -05:00
sqlcoder
9201364055 fix bugs in error reporting (not helpful if the error logging causes errors\!) 2010-02-07 11:21:50 +00:00
Worros
b996a884de PokerStarsTo? Fpdb: Fix subtle bug in re_Action 
The bet action could become multiline greedy if there was a playername starting with 'card' in the next line.

"""
danny purse: bets $0.50
cardjunkie25: calls $0.50
"""

Would match "danny purse: bets $0.50\ncard", and the rest of that line would be ignored.

Added '$' to the end of the regex to make sure that it is limited to 1 line
 2010-02-07 19:21:32 +08:00
Worros
ee66abfecc Revert "PokerStarsTo Fpdb: Fix subtle bug in re_Action" 
This reverts commit ac51876200.
 2010-02-07 19:19:00 +08:00
Worros
ac51876200 PokerStarsTo Fpdb: Fix subtle bug in re_Action 
The bet action could become multiline greedy if there was a playername starting with 'card' in the next line.

"""
danny purse: bets $0.50
cardjunkie25: calls $0.50
"""

Would match "danny purse: bets $0.50\ncard", and the rest of that line would be ignored.

Added '$' to the end of the regex to make sure that it is limited to 1 line, and wrap 'cards' as a group.
 2010-02-07 19:08:23 +08:00
sqlcoder
fbeaa5590f move run_fpdb.bat up a directory to /fpdb/ 2010-02-07 01:06:36 +00:00
sqlcoder
ef26c05181 be more tolerant of errors when translating for gui, add encode exception handlers 2010-02-06 23:12:11 +00:00
Eratosthenes
8794a075e7 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-06 16:32:37 -05:00
sqlcoder
4ecd713dab forgot to add the new .bat file 2010-02-06 21:29:17 +00:00
Eratosthenes
bfe25b0ff2 Merge branch 'master' of git://git.assembla.com/fpdb-sql 
Conflicts:
	pyfpdb/GuiAutoImport.py
	pyfpdb/py2exe_setup.py
 2010-02-06 15:34:57 -05:00
Eratosthenes
120d05f9cd Changes for py2exe exe. 2010-02-06 14:55:48 -05:00
sqlcoder
f1d4f08d1c trivial change to output dir name 2010-02-06 19:00:30 +00:00
sqlcoder
a3ec32b7b9 change print to log 2010-02-06 18:59:33 +00:00
sqlcoder
8b28427ff9 use log instead of print 2010-02-06 18:46:27 +00:00
sqlcoder
d9fddd6595 miniscule print change 2010-02-06 18:07:48 +00:00
sqlcoder
d25611dd38 get py2exe working better - nice :-) 2010-02-06 18:07:00 +00:00
sqlcoder
49e4a7db69 change a few prints to logs 2010-02-06 18:06:21 +00:00
sqlcoder
1e832952dd add newline in error reporting message 2010-02-06 15:55:32 +00:00
sqlcoder
752e5ad088 make sure fpdb icon works in py2exe 2010-02-06 12:27:15 +00:00
sqlcoder
4d74437845 run HUD_main.exe if running fpdb.exe (created by py2exe) 2010-02-06 10:33:00 +00:00
sqlcoder
4a0fcd62a0 sqlite seems to perform ok for me 2010-02-06 10:28:17 +00:00
Eratosthenes
8a2c24ceff Merge branch 'master' of git://git.assembla.com/fpdboz 2010-02-05 23:21:55 -05:00
Eratosthenes
8aa18b95d8 Changes to make running py2exe exe happy. 2010-02-05 23:19:58 -05:00
Eratosthenes
4df991517e Changes to make the py2exe exe happy. 2010-02-05 23:13:53 -05:00
Eratosthenes
08078cfee4 Configure for python 2.5. Add icon for fpdb.exe. 2010-02-05 23:03:55 -05:00
Eric Blade
5c26fee853 handle mysql error on close if connection was timed out 2010-02-05 08:58:47 -05:00
Worros
ac458386da Add config path to test2.py display 2010-02-05 21:29:07 +08:00
Worros
e0a125faf0 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-05 17:32:05 +08:00
Worros
ab693e3b3c test_PokerStars.py - Fix calls to HHC. 
sqlcoder added config as a parameter to HHC and Hand
 2010-02-05 11:51:12 +08:00
Worros
fde72003f7 test2.py - Add more tests 
Added most imports, and printed some formatted output for assiting diagnosis of new user installs
 2010-02-05 11:44:27 +08:00
Worros
afde406cc9 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2010-02-05 11:01:52 +08:00
sqlcoder
ef2a8aca14 remove duplicate db calls which were slowing the hud down 2010-02-04 23:37:45 +00:00
sqlcoder
4d45bd39d3 make enabled sites come first in drop-down (i.e. more chance of the default being the one you want) 2010-02-04 23:08:09 +00:00
Eric Blade
c10665935f stop clobbering search_string in TableWindow::__init__ . Thanks Ray! 2010-02-04 16:33:21 -05:00
Eratosthenes
9dfa0967b8 Correct data files. 2010-02-04 13:08:26 -05:00
Worros
b2e409ae00 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-04 00:36:51 +08:00
Eratosthenes
8c1ce3df7d Merge branch 'master' of git://git.assembla.com/fpdboz 2010-02-03 11:17:10 -05:00
Worros
1cefb2e857 Fix playername siteid insert 
From Gerko on mailing list:
> I just did a trial. Use bulkimport for a single Pokerstars file
> switch setting and bulkimport a single Full tilt file.
> When screening the db all players in the database show the same siteId
> (2 for pokerstars)
> Or the other way if the first site was Full Tilt.

The Lambda function wasn't initialising the lambda function correctly.
 2010-02-03 23:48:39 +08:00
Eratosthenes
5c6d4e4744 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-02-03 10:37:54 -05:00
Worros
33455cb1ac PokerStars: Fix tablename regex to allow a # 
Occasionally Stars throws up a cash table that looks like

PokerStars Game #22920951206:  Triple Draw 2-7 Lowball Limit ($0.10/$0.20) - 2008/12/14 17:44:00 ET
Table 'T #252691988' 6-max Seat #2 is the button

a # was previously excluded from the regex.
 2010-02-03 21:52:44 +08:00
Eratosthenes
7e5e9ed93a Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-03 08:40:16 -05:00
Eratosthenes
7aa67c38b1 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2010-02-03 08:40:02 -05:00
sqlcoder
864454f31c change 2 commits to 1, may help sqlite stop locking up 2010-02-03 01:03:36 +00:00
sqlcoder
e3679a99fb fix steal calcs 2010-02-03 00:48:45 +00:00
sqlcoder
fece7c9147 move fpdb-error-log and HUD-error to APPDATA, renamed as fpdb-errors.txt and HUD-errors.txt to be consistent 2010-02-02 21:53:03 +00:00
Eric Blade
76f9517655 WinTables will no longer accept trying to attach to "FPDBHUD" titled windows 2010-02-02 14:54:27 -05:00
Eric Blade
e88d745e7d Merge branch 'master' of git://git.assembla.com/fpdb-sql.git 2010-02-02 10:51:22 -05:00
Eric Blade
6e30bb2067 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-02-02 10:48:17 -05:00
Eratosthenes
8c81761c1b Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-01 18:38:23 -05:00
Eratosthenes
aea7db22e3 Options for logging level and version. Not connected yet. 2010-02-01 18:37:36 -05:00
sqlcoder
96d0e0f181 fix key error and add filter to logging.conf 2010-02-01 22:56:40 +00:00
sqlcoder
d4248706e4 remove surplus get_logger calls, tidy up log messages some more 2010-02-01 22:31:00 +00:00
sqlcoder
86330e536a tidy up logging so that log isn't created in /fpdb/log/ unless it is being used 2010-02-01 21:03:51 +00:00
sqlcoder
7e5f63ce89 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-02-01 19:49:57 +00:00
Eratosthenes
2a9c00953a Merge branch 'master' of git://git.assembla.com/fpdb-eric 2010-02-01 10:47:49 -05:00
Eratosthenes
03967fc227 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-02-01 10:47:35 -05:00
Eratosthenes
f406ba293e Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-01 10:47:26 -05:00
Eric Blade
eff216919d Everleaf: Change "EUR"(old) to "EURO"(new), still doesn't seem to allow eur import (is that because my site config is set for usd ?) 2010-02-01 09:57:28 -05:00
Eric Blade
81ff8e632c remove my misunderstanding of how compileplayerregexs worked 2010-02-01 09:41:33 -05:00
Eric Blade
e3be7db2a0 fix bug i introduced that caused everleaf cash hands to fail 2010-02-01 09:17:42 -05:00
Eric Blade
1656a0e6d1 Everleaf: adjust Everleaf regexs to support tournaments, add error printing on failure of compilePlayerRegexs, add ring omahahilo pl and tour hold nl to supported games list, determine tournament number/table number from processing filename, fix getTableTitleRe 2010-02-01 08:51:06 -05:00
Eric Blade
27f95c51b2 whitespace 2010-02-01 08:48:28 -05:00
Eric Blade
9cf75f7303 fix getTableTitleRe calling in HUD_main:read_stdin, to use site_name (currently processing site name) instead of "site" which was always last site_name on list 
(this may break some people's HHC's, now that it works right)
 2010-02-01 08:47:55 -05:00
sqlcoder
a06aac6da8 correct case in SQL 2010-02-01 08:22:14 +00:00
Worros
12a9cd2e3e Fix case-sensitive MySQL tables on Linux 2010-02-01 16:06:09 +08:00
Worros
c46c4b05d4 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-01 16:04:17 +08:00
sqlcoder
9f3c5924b0 oops! missed out SQL.py from last release 2010-02-01 07:59:09 +00:00
Worros
6179823d92 Fix test harness after fpdb_db removal 2010-02-01 14:47:04 +08:00
Eratosthenes
428d228de8 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-01-31 22:56:01 -05:00
sqlcoder
e4c6419074 try to improve tourney handling in filter (now displays buyin, but this is not yet used by playerstats when fetching stats 2010-02-01 00:17:55 +00:00
sqlcoder
264b75b5b0 fix some sqlite and unicode issues (thanks to Gerko) 2010-01-31 23:46:51 +00:00
Eratosthenes
3102ff733f Merge branch 'master' of git://git.assembla.com/fpdb-eric 2010-01-31 14:16:39 -05:00
Eratosthenes
c7a9942f3a Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-01-31 14:16:21 -05:00
Eratosthenes
64bfa9cd52 Import mucked cards. 2010-01-31 13:37:59 -05:00
sqlcoder
002a84ba5a set rotating logs to max 5 files of 100MB each 2010-01-31 12:31:49 +00:00
sqlcoder
6f0ea2580b display dialog when .example config has been copied, this could work 'out-of-the-box' if the user already has gtk?? 2010-01-31 12:24:32 +00:00
sqlcoder
bbc84fef14 comment out debug message 2010-01-31 12:22:24 +00:00
sqlcoder
f7b402bcdb remove execute from permissions on some files in last commit 2010-01-31 11:27:37 +00:00
sqlcoder
5e9486aa3d config changes for logging: logs rotate and go to APPDATA, hud_config now goes in /fpdb/ if they must use it but logging.conf stays in /pyfpdb/. TODO: Some logging still into /fpdb/log/ 2010-01-31 11:25:24 +00:00
sqlcoder
cc5f77e950 fix windows problem starting hud 2010-01-31 11:16:42 +00:00
Eratosthenes
121d05596d Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-01-30 14:55:31 -05:00
Eratosthenes
6d9cdd9587 Fix problem where Qc is not encoded correctly. 2010-01-30 14:54:46 -05:00
sqlcoder
e0c5f52d0f uncommented sqlite unicode fix (fix only tested on Windows XP, cp1252) 2010-01-30 11:11:21 +00:00
sqlcoder
9932025271 move sqlite charset fix to Configuration.py from Database.py, make separate not_needed variables in Charset.py in case we want to update them separately 2010-01-30 11:05:34 +00:00
sqlcoder
d147187a71 add extra comment/suggestion 2010-01-29 23:36:39 +00:00
sqlcoder
a7d4c6243a add assignment (but commented out) that fixes unicode probs for me with sqlite 2010-01-29 23:29:37 +00:00
Eric Blade
72b890c561 add "HUD Test mode" checkbox to bulk import, doesn't currently do anything. intent is to make the program auto open a dummy window for a hud to attach to, so we can bulk import files to investigate hud issues 2010-01-29 17:45:49 -05:00
Eric Blade
f7ac36f3bb add getTableTitleRe to everleaf filter, doesn't seem to work 2010-01-29 17:44:58 -05:00
sqlcoder
2e970baa82 remove sqlite specific test to skip unicode encoding 2010-01-29 22:29:14 +00:00
Eric Blade
e56cb24ed1 to_utf8 returns what was passed in if unicode() errors because it's already encoded 2010-01-29 12:01:51 -05:00
Worros
23e0611978 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-01-29 17:20:57 +08:00
sqlcoder
52a176fd0a tidy up filter, add ability to refresh (eg after importing more gametypes) 2010-01-29 09:12:08 +00:00
Worros
a23d96e85d Add Carbon back in as default data. 
Also add PKR
 2010-01-29 17:00:37 +08:00
Worros
17bc9af88e Merge branch 'master' of git://github.com/kangaderoo/fpdb-kangaderoo 
Conflicts:
	run_fpdb.py
 2010-01-29 13:01:38 +08:00
Gerko de Roo
bacca69c49 Default graph created for empty data query 2010-01-29 12:33:15 +08:00
Eric Blade
e29491c25c use getpreferredencoding() instead of getdefaultlocale() to get LOCALE_ENCODING, default to cp1252 if it comes back with US-ASCII (Mac) 2010-01-28 20:29:43 -05:00
Eric Blade
725fb04bb8 Merge branch 'master' of git://git.assembla.com/fpdb-sql.git 
Conflicts:
	pyfpdb/Configuration.py
	pyfpdb/Database.py
 2010-01-28 16:28:23 -05:00
Eric Blade
f5d61b5bfc Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2010-01-28 16:25:47 -05:00
Eric Blade
8673cc3437 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-01-28 16:25:04 -05:00
Eratosthenes
7570db60f6 Make the StudMucked not crash with newimport. 2010-01-28 14:37:45 -05:00
Worros
28a7d1e353 Hopefully fully fix the FTP playername parsing. 
Split hand text for FTP, as the regex matches the player names incorrectly, and differentiating the lines is non-trivial.

The split should ensure that only the first version is available
 2010-01-28 23:38:52 +08:00
Worros
cee610d401 Add Carbon bits to example config file 2010-01-28 22:11:04 +08:00
Worros
ad75bedbf1 CarbonToFpdb.py - Converter for Carbon poker 
Currently only supports NLHE cash games. Further hand hstories required.

Plugin contributed by Matthew Boss.
 2010-01-28 21:36:02 +08:00
Eric Blade
3381527afc raise FpdbHandDuplicate error on duplicate insert attempt, catch it in import_file_dict, increment duplicates count 2010-01-28 05:56:17 -05:00
Eric Blade
d36ac3f927 rename DuplicateError to FpdbHandDuplicate, add matching FpdbHandError and FpdbHandPartial (not sure where to implement catching those though) 2010-01-28 05:55:06 -05:00
Eric Blade
2be8b9d33b get fpdb icon from absolute path instead of relative to cwd 2010-01-28 05:19:39 -05:00
Eric Blade
997483f909 make import timer work again 2010-01-28 05:19:19 -05:00
Eric Blade
803fcec6dc make hud_main call with full path in windows, as has been done in unix 2010-01-28 04:45:33 -05:00
Worros
7c90102677 Preliminary Carbon functions. 
- Add the SITEID for Carbon

- Add function addAllIn():
"For sites which record "all in" as a special action, which can mean either "calls and is all in" or "raises all in".
"
 2010-01-28 15:13:49 +08:00
Eratosthenes
92e20bcd12 Add more chars to player name in prev commit. 2010-01-27 23:16:11 -05:00
Eratosthenes
d50e70fdd4 Another fix of FTP playername reg ex. 2010-01-27 20:10:07 -05:00
sqlcoder
1df418c8e4 create fpdb dir if required, improve sqlite performance :-) 2010-01-27 23:48:39 +00:00
Worros
a9f2a261d4 Regex fix for Fulltilt player names 
"Seat 7: moletrapper collected ($2.50)"
vs
"Seat 7: moletrapper ($2.50)"

The regex update should match the second and not the first.
 2010-01-28 01:44:14 +08:00
Gerko de Roo
6f78749ebd Default graph created for empty data query 2010-01-27 18:37:23 +01:00
Worros
cd05c1da48 Remove unused variable 2010-01-28 01:36:42 +08:00
Gerko de Roo
92b5a43a22 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-01-27 16:46:45 +01:00
Eratosthenes
2ad7e430a2 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-01-27 09:49:14 -05:00
Eratosthenes
2adf0158a4 Merge branch 'master' of git://git.assembla.com/fpdb-sql 
Conflicts:
	pyfpdb/Database.py
	pyfpdb/PartyPokerToFpdb.py
 2010-01-27 09:48:31 -05:00
Eratosthenes
080b7f80c9 Compile the " collected" reg ex. 2010-01-27 09:23:12 -05:00
Worros
929e182a28 FulltiltToFpdb: Fix tourney player matching for players sitting out 2010-01-27 18:20:48 +08:00
Worros
8dea509245 FulltiltToFpdb: partially fix player ids 
_mysql_exceptions.IntegrityError: (1062, "Duplicate entry 'romatrifon (small blind) showed -1' for key 'name'")

Previous regex was matching past the name.
 2010-01-27 18:02:30 +08:00
sqlcoder
e82d276cf9 pull and merge from carl (nothing changed) 2010-01-27 08:56:51 +00:00
Eratosthenes
d75e5e3920 Fixed typos, pylint complaints, and obsolete TODOs. 2010-01-27 01:10:58 -05:00
Eratosthenes
30de5142db Ugly fix to ugly edge case where winner voluntarily showed cards. 2010-01-27 00:57:58 -05:00
Eratosthenes
e0d11fe9a3 Fix problem with finding HHs for utf-16 files. 2010-01-27 13:10:50 +08:00
Gerko de Roo
6c5c479ee8 Autocomplete Hero names only lists the valid names for that pokersite 
SiteID list needed to be filled before the Hero field was filled.
 2010-01-27 13:04:21 +08:00
Worros
fb7aae9186 clean-up code to get playerId in gui-stats and gui-graphs 
Conflicts:

	pyfpdb/GuiGraphViewer.py
 2010-01-27 13:04:13 +08:00
Gerko de Roo
241dc1e717 Fixed limit and freeroll support for Partypoker tourney's 2010-01-27 11:33:15 +08:00
Eratosthenes
1ec6a36ece Merge branch 'master' of git://git.assembla.com/fpdb-sql 
Conflicts:
	pyfpdb/Configuration.py
	pyfpdb/Database.py
 2010-01-26 20:13:21 -05:00
sqlcoder
5a9836862f sqlite mods, made sqlite the default in HUD_config.xml.example - works (roughly) straight out of the box 2010-01-27 00:48:02 +00:00
sqlcoder
11bc48e126 merge fpdb_db.py into Database.py 2010-01-26 23:54:04 +00:00
sqlcoder
47baee65f9 add tourneyid to hands table (REQUIRES REIMPORT) and fix sqlite db access 2010-01-26 22:46:48 +00:00
Gerko de Roo
f5c910bff0 clean-up code to get playerId in gui-stats and gui-graphs 2010-01-26 23:36:38 +01:00
Gerko de Roo
b248270135 Sorting routine caused errors when sorted on gametype, 
since it used the starthand sort routine
 2010-01-26 23:34:08 +01:00
sqlcoder
de2b807c9b refine hud_config handling some more (copies .exmaple to proper dir) 2010-01-26 21:54:58 +00:00
sqlcoder
5c88c6b0ad put database directory next to HUD_config.xml file 2010-01-26 21:02:37 +00:00
Mika Bostrom
ff9305924c Use proper encoding name 
When system is unicode, the second item in locale.getdefaultlocale() is
"UTF8", not "utf-8".
 2010-01-26 20:31:11 +01:00
Gerko de Roo
88cf6ec3a5 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-01-26 20:29:19 +01:00
Gerko de Roo
4814c30d8f Autocomplete Hero names only lists the valid names for that pokersite 
SiteID list needed to be filled before the Hero field was filled.
 2010-01-26 20:25:04 +01:00
Gerko de Roo
12c93ea9a6 Support for same hero name on multiple sites also implemented in GuiGraph 2010-01-26 20:20:17 +01:00
Eratosthenes
7d7ba94da1 Fix problem with finding HHs for utf-16 files. 2010-01-26 10:56:07 -05:00
Mika Bostrom
7f04ed88f4 Use proper encoding name 
When system is unicode, the second item in locale.getdefaultlocale() is
"UTF8", not "utf-8".
 2010-01-26 08:01:46 +02:00
Eratosthenes
7683590898 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:
	pyfpdb/Configuration.py
 2010-01-25 12:06:11 -05:00
Eratosthenes
90ea33c74b Needs to be executable. 2010-01-25 12:04:21 -05:00
Mika Bostrom
12367d6f37 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-01-25 19:03:21 +02:00
Worros
896de37d0d Fix hudCache update semantics 2010-01-26 01:00:22 +08:00
Mika Bostrom
b58edb53ae Write charmap-related errors directly to stderr 
This change is needed to skip a nasty behaviour: if the string triggered
a decoding error, it will trigger one *AGAIN* if the string is printed
to console. By writing directly to sys.stderr we skip the
locale/conversion issues and get the troublesome string directly in a
file where it is stored as a raw sequence of octets.
 2010-01-24 21:28:08 +01:00
Mika Bostrom
2c7287c351 Add new encoder 
This encoder is used to handle input from HH conversion, which needs to
end up as UTF-8 in the database. Switch the open-coded routine from
Database.py to this common routine so all encodings now take place in
the same file.
 2010-01-24 21:27:40 +01:00
Mika Bostrom
860b5737b7 Use common encoding routine everywhere 
The string/locale manipulation in Database.py was open-coded and did not
use Charset.to_utf8() like the rest of the code.
 2010-01-24 21:27:35 +01:00
Mika Bostrom
85c9070ec8 Write charmap-related errors directly to stderr 
This change is needed to skip a nasty behaviour: if the string triggered
a decoding error, it will trigger one *AGAIN* if the string is printed
to console. By writing directly to sys.stderr we skip the
locale/conversion issues and get the troublesome string directly in a
file where it is stored as a raw sequence of octets.
 2010-01-24 22:17:03 +02:00
Mika Bostrom
33277ce68b Add new encoder 
This encoder is used to handle input from HH conversion, which needs to
end up as UTF-8 in the database. Switch the open-coded routine from
Database.py to this common routine so all encodings now take place in
the same file.
 2010-01-24 21:11:46 +02:00
Mika Bostrom
6dcec48005 Use common encoding routine everywhere 
The string/locale manipulation in Database.py was open-coded and did not
use Charset.to_utf8() like the rest of the code.
 2010-01-24 19:59:49 +02:00
Gerko de Roo
73ae88e47a Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-01-24 13:37:27 +01:00
Worros
dbaad2d430 Remove NEWIMPORT variable. 
No going back now :)
 2010-01-24 13:36:21 +01:00
Mika Bostrom
c36c60155c Use a different "unicoder" for db strings 
It seems that running encoder.encode() on a latin1/latin9 string results
in, yes a bloody UnicodeDecodeError. Decode error on .encode()...
Really. This way the modification from non-unicode string to real
unicode appears to work better.
 2010-01-24 13:35:10 +01:00
Worros
fde2f1f710 Fix Charset import got Grapher 2010-01-24 13:30:02 +01:00
Mika Bostrom
cc3811b8aa Add missing import 
GuiPlayerStats.py didn't import the new Charset module but tried to use
the functions.
 2010-01-24 13:24:26 +01:00
Gerko de Roo
7737720aa8 Conflicts: 
pyfpdb/Charset.py
 2010-01-23 16:35:57 +01:00
Mika Bostrom
3a03bc51a2 Some character set improvements 
The strings (names) as stored in database should always be UTF-8;
whatever the display locale is, we then need to convert from the storage
encoding to session encoding. When making database queries with players
names in them, the names must be reconverted to UTF-8.
 2010-01-23 16:34:24 +01:00
Gerko de Roo
53153bd00a Fixed limit and freeroll support for Partypoker tourney's 2010-01-23 16:32:32 +01:00
Gerko de Roo
81b9b51707 HUD fix for tournaments. Table name storage. 2010-01-23 23:18:39 +08:00
Gerko de Roo
b888f82a53 All game selection boxes default enabled 2010-01-23 23:05:40 +08:00
Gerko de Roo
6cb956c5fd HUD fix for tournaments. Table name storage. 2010-01-23 11:17:14 +01:00
Gerko de Roo
9100ba814c All game selection boxes default enabled 2010-01-23 10:01:36 +01:00
Worros
9d6707f18f Fix Charset import got Grapher 2010-01-23 15:30:48 +08:00
Worros
2538f61906 Remove erronous comment 2010-01-23 15:22:22 +08:00
Worros
74115dcd47 Fix comment layout - had a \t 2010-01-23 15:20:17 +08:00
Worros
6b38976edc Add left-2click option to hide stat windows. 
Gerko, so I assume others don't have a middle mouse button.
 2010-01-23 14:38:53 +08:00
Gerko de Roo
d3f17f3fb7 game selector for graphs added. 
exception caught for games selector for player stats
 2010-01-23 14:34:34 +08:00
Worros
29e705f337 Remove NEWIMPORT variable. 
No going back now :)
 2010-01-23 13:37:41 +08:00
Eratosthenes
358de81f3b Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:
	pyfpdb/Configuration.py
	pyfpdb/Database.py
 2010-01-22 20:55:13 -05:00
Gerko de Roo
3cd51ca990 Added freeroll support for Pokerstars 2010-01-22 23:42:44 +01:00
Worros
98e4b598ed Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2010-01-23 02:18:42 +08:00
Worros
c88ccd1140 Remove unused convert_cards() 2010-01-23 02:18:20 +08:00
Gerko de Roo
261daf6003 game selector for graphs added. 
exception caught for games selector for player stats
 2010-01-22 18:36:21 +01:00
Gerko de Roo
fdc5a0a635 Added close on double click for a stat window 
Just in case you don't have a mouse with middle button
 2010-01-22 15:38:33 +01:00
Mika Bostrom
9aa52ce6a8 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:
	pyfpdb/Card.py

Resolve by removing stray empty lines
 2010-01-22 09:24:19 +02:00
Gerko de Roo
4ada389f86 Changed the card positions and mucked card 
positions to relative positions.
 2010-01-21 21:14:49 +01:00
Mika Bostrom
91cd2d2599 Remove erroneous encoding 
This string should not be encoded, it seems.
 2010-01-21 22:05:24 +02:00
Mika Bostrom
29d5204bee Add missing import 
GuiPlayerStats.py didn't import the new Charset module but tried to use
the functions.
 2010-01-21 21:52:22 +02:00
Mika Bostrom
04c345ae1f Use a different "unicoder" for db strings 
It seems that running encoder.encode() on a latin1/latin9 string results
in, yes a bloody UnicodeDecodeError. Decode error on .encode()...
Really. This way the modification from non-unicode string to real
unicode appears to work better.
 2010-01-21 21:46:14 +02:00
Mika Bostrom
dd12da302d Merge branch 'good' 
Conflicts:
	pyfpdb/test_PokerStars.py

Resolve by copying sorrow's version on top-
 2010-01-21 21:34:54 +02:00
Mika Bostrom
dda00b6b10 Catch character encoding errors 2010-01-21 21:31:19 +02:00
Mika Bostrom
a841603460 Some character set improvements 
The strings (names) as stored in database should always be UTF-8;
whatever the display locale is, we then need to convert from the storage
encoding to session encoding. When making database queries with players
names in them, the names must be reconverted to UTF-8.
 2010-01-21 21:24:55 +02:00
Mika Bostrom
e915b0b62c Allow to bypass codec 
If the system (display) locale is UTF-8, there is no need to encode to
either direction. In fact, running the .encode() routine appears to
mangle a valid UTF-8 string to a worse condition, effectively breaking
it.
 2010-01-21 21:23:13 +02:00
Gerko de Roo
eb6e60f578 New 'master' clone of git://git.assembla.com/fpdboz.git 2010-01-21 19:15:25 +01:00
Mika Bostrom
34bf2bd8e9 Use better function name 2010-01-21 18:12:45 +02:00
unknown
ea423f6b2c added a game selector to the player stats. 2010-01-21 14:14:24 +08:00
Worros
4187561e66 Whitespace fixes to Card.py 2010-01-21 14:12:17 +08:00
Gerko de Roo
ef4f5289bb Solved some merge issues --> Cards.py 
Issues Pokerstars when playing heads-up on ring games,
   being both on button and small blind now supported
   !!if not solved the winnings of the (button, small blind) is stored as rake!!
Post both small and big blind when re-entering ring games solved
 2010-01-21 14:07:46 +08:00
Mika Bostrom
cd71778975 Fix name display in HUD popup 
The names are stored in UTF-8, so simply converting the name from UTF-8
to Configuration.LOCALE_ENCODING before putting the string in tooltip is
enough. Neat.
 2010-01-21 13:56:50 +08:00
sqlcoder
41877097c9 fix twostartcards to handle 22 and unknowns properly 2010-01-21 13:49:45 +08:00
Mika Bostrom
7ec58ad5c2 Fix name display in HUD popup 
The names are stored in UTF-8, so simply converting the name from UTF-8
to Configuration.LOCALE_ENCODING before putting the string in tooltip is
enough. Neat.
 2010-01-19 19:26:31 +02:00
Mika Bostrom
cb172e15ae Fix name display in HUD popup 
The names are stored in UTF-8, so simply converting the name from UTF-8
to Configuration.LOCALE_ENCODING before putting the string in tooltip is
enough. Neat.
 2010-01-19 19:25:36 +02:00
Mika Bostrom
7f568a52b9 Merge branch 'newstats' into good 2010-01-16 13:56:20 +02:00
Worros
3f0dfd2b26 Fix enumerate() 2010-01-16 13:55:01 +08:00
Eratosthenes
98e6566fc6 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2010-01-15 11:58:50 -05:00
Eratosthenes
4460f19608 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-01-15 11:58:39 -05:00
Eratosthenes
3f9fce0775 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:
	pyfpdb/PartyPokerToFpdb.py
 2010-01-15 11:58:27 -05:00
Worros
776405982b Quick fix for hud 2010-01-15 21:24:37 +08:00
Worros
5c0d695055 [NEWIMPORT] Almost all remaining stats 
All conversions from Grigorij

street0_3BChance
street0_3BDone
street0_4BChance
street0_4BDone
stealAttemptChance
stealAttempted
foldBbToStealChance
foldBbToStealChance
foldSbToStealChance
foldedSbToSteal
foldedBbToSteal

3Bet, 4Bet in Stud does appear to work.

Unable to test steal in Stud games, all example hands in micros do not have a chance (I believe)
 2010-01-15 20:07:50 +08:00
Worros
150b1891d6 [NEWIMPORT] setPositions(), fix aggr function 
PFR now actually works
 2010-01-15 20:04:59 +08:00
Worros
95aa993903 [NEWIMPORT] setPositions(), fix aggr function 
PFR now actually works
 2010-01-15 20:03:26 +08:00
Worros
ecf1c6b878 [NEWIMPORT] Almost all remaining stats 
All conversions from Grigorij

street0_3BChance
street0_3BDone
street0_4BChance
street0_4BDone
stealAttemptChance
stealAttempted
foldBbToStealChance
foldBbToStealChance
foldSbToStealChance
foldedSbToSteal
foldedBbToSteal

3Bet, 4Bet in Stud does appear to work.

Unable to test steal in Stud games, all example hands in micros do not have a chance (I believe)
 2010-01-15 19:42:24 +08:00
Worros
700a68bcc8 [NEWIMPORT] calcCheckCallRaise() 
Modify function from Grigorij to calculate check/call
 2010-01-15 18:29:16 +08:00
Worros
bad744fd80 [NEWIMPORT] setPositions(), fix aggr function 
PFR now actually works
 2010-01-15 13:50:46 +08:00
sqlcoder
012b5bc72c fix twostartcards to handle 22 and unknowns properly 2010-01-13 23:40:25 +02:00
sqlcoder
6594431277 fix twostartcards to handle 22 and unknowns properly 2010-01-12 22:10:59 +00:00
sqlcoder
62935664c8 set stats color to fgcolor 2010-01-02 11:05:58 +08:00
Eric Blade
1287ab95e7 stupid windows git newline mangling 2010-01-01 20:53:27 -05:00
Eric Blade
798ce94c48 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-01-01 20:53:07 -05:00
sqlcoder
8cb73b822c set stats color to fgcolor 2010-01-01 22:57:25 +00:00
Worros
cd88de7c7e [NEWIMPORT] Copy in Alchemy files from Grigorij's alchemy branch 2009-12-30 15:44:48 +08:00
Mika Bostrom
478b82587d Store names as UTF-8 
The names should be always in UTF-8 encoding. At least for PostgreSQL
the encdoding of the database comes from the time of running 'initdb'
(which is different from 'createdb') and if the encoding was selected or
set to something else at that time, the following error will occur:

  File ".../pyfpdb/Database.py", line 1630, in <lambda>
    self.pcache = LambdaDict(lambda  key:self.insertPlayer(key, siteid))
  File ".../pyfpdb/Database.py", line 1661, in insertPlayer
    c.execute (q, (site_id, _name))
  File "/usr/lib/python2.5/encodings/iso8859_15.py", line 12, in encode
    return codecs.charmap_encode(input,errors,encoding_table)
UnicodeEncodeError: 'charmap' codec can't encode character u'\u2122' in
position 10: character maps to <undefined>

This happens because 'name' is a regular string as opposed to a valid
unicode object. By forcing the string to unicode and encoding it in
UTF-8 the error goes away. In my case the database encoding was
ISO-8859-15 (latin9) but any other "wrong" encoding would trigger the
same problem.

This is a relatively common problem in python.
 2009-12-29 13:05:03 +08:00
Worros
4800f2515f Update HUD_config.xml 
- Change default Holdem stat window layout to 3x3, add some more colouring
- Fix tab breakage from Gerko.
 2009-12-28 22:09:06 +08:00
Worros
c7aca0a32e Update HUD_config.xml 
- Change default Holdem stat window layout to 3x3, add some more colouring
- Fix tab breakage from Gerko.
 2009-12-28 22:03:26 +08:00
Gerko de Roo
1cf464283f Hmm forgot the color reset to default. 
There must be a better methode
 2009-12-28 10:41:22 +08:00
Gerko de Roo
6efccd9067 Hmm forgot the color reset to default. 
There must be a better methode
 2009-12-28 10:41:04 +08:00
Worros
3f3d8ac54a Fix tab spacing from Gerkos recent patch 2009-12-28 10:22:44 +08:00
Worros
805d35c3fd Fix tab spacing from Gerkos recent patch 2009-12-28 10:21:31 +08:00
Gerko de Roo
eb226c0026 Added color highlight for stats window. 
high and low threshold and color can be set in the xml file
 2009-12-28 10:17:01 +08:00
Gerko de Roo
2cd57e826d Added color highlight for stats window. 
high and low threshold and color can be set in the xml file
 2009-12-28 10:16:48 +08:00
Gerko de Roo
3553bdaf71 search string for table detect changed 2009-12-28 10:14:04 +08:00
Gerko de Roo
f66b8307d3 search string for table detect changed 2009-12-28 10:04:33 +08:00
Worros
0e318e6d9f [NEWIMPORT] Commit currnetly failing test - sawShowdown 
It would appear that all-in pre-flop doesn't flag sawShowdown.

Also modified the query to select street0Aggr, as that appears to be wrong at the moment
 2009-12-26 17:18:05 +08:00
Worros
9f2f015fd0 New test for all-in preflop. 
Test still fails - need to sort out an issue with database placement
 2009-12-26 12:25:05 +08:00
Worros
1245a0cab3 New test file - All-in pre flop 2009-12-26 12:24:41 +08:00
Worros
624ab07f85 New test for all-in preflop. 
Test still fails - need to sort out an issue with database placement
 2009-12-26 12:23:20 +08:00
Worros
1bcb6736eb New test file - All-in pre flop 2009-12-26 10:07:33 +08:00
Worros
46e91e1a0f [NEWIMPORT] Remove a couple of unused functions 2009-12-25 18:55:13 +08:00
Worros
0adf0a7b18 [NEWIMPORT] updateHudCache update. 
Fix a couple of bugs:
    position != 2 its = 'M'
    actually commit changes to hud
 2009-12-24 01:12:39 +08:00
Worros
a0475aa4db [NEWIMPORT] Add function to update hudcache for Hand 2009-12-23 23:14:34 +08:00
Worros
a2d0657b3a [NEWIMPORT] Remove unused functions 
Move old HudCache update over in preparation for fixing
 2009-12-23 13:56:18 +08:00
Worros
6e9153c25c [NEWIMPORT] Copy Grigorij's code from Alchemy 
Copied some of Grigorij's code verbatim for calculating additional stats, still needs adapting.

Also reorder some functions so the corresponding files are more mergeable in future.
 2009-12-23 13:30:12 +08:00
Eric Blade
932695b40f Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-12-22 13:36:52 -05:00
Worros
355225fc25 [NEWIMPORT] Remove test_fpdb_simple 2009-12-22 23:03:05 +08:00
Worros
d8a87b92d4 [NEWIMPORT] Make hudcache rebuild only happen no call to hud 2009-12-22 22:15:27 +08:00
Worros
284693e95e [NEWIMPORT] Rebuild hudcache after hand is committed 2009-12-22 22:02:36 +08:00
Worros
4d8d678d64 [NEWIMPORT] Make seek into autoimport function 
Now that the legacy import path is gone, enable the index for HHC
 2009-12-22 21:40:37 +08:00
Worros
ae55a89d7f Remove reference to fpdb_simple 2009-12-22 20:22:05 +08:00
Worros
0898ddf8a1 [NEWIMPORT] HandsPlayers.startCards 
Dodgy function just to get things kinda working again.
 2009-12-22 17:30:49 +08:00
Worros
a3be99bcf6 [NEWIMPORT] HandsPlayers.startCards 
Dodgy function just to get things kinda working again.
 2009-12-22 17:20:07 +08:00
Worros
1b82f20411 [NEWIMPORT] Remove legacy code. 2009-12-22 14:44:35 +08:00
Worros
262eb5200d Add LOCALE static to Configuration 2009-12-22 13:49:22 +08:00
Worros
02453ce3c0 Move locale variable to Configuration 2009-12-22 13:47:33 +08:00
Worros
af1b516b23 Merge branch 'master' into stats 
Conflicts:
	pyfpdb/DerivedStats.py
	pyfpdb/fpdb_import.py
 2009-12-22 13:47:26 +08:00
Worros
b71e485252 PokerStarsToFpdb - Add comment on parsing tourney buy-in 2009-12-21 16:10:44 +08:00
Worros
7b7865e794 Merge branch 'master' of git://git.assembla.com/fpdb 2009-12-21 11:16:25 +08:00
Worros
babf0a039a PartyPoker - No Disconnect fix 
Fix from Neko on 2+2

http://forumserver.twoplustwo.com/showpost.php?p=15495528&postcount=2374

"Finally got around to checking this out. Seems great so far. I had issues with some of my party hands that were on No Disconnect protect tables but adding the No DP regex in the PartyToFpdb hand converter seems to have fixed it for me."
 2009-12-21 09:21:41 +08:00
steffen123
d5608fa7a7 support PS tourneys with euro buyin 2009-12-20 12:01:26 +00:00
Eric Blade
6683967091 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-12-19 04:31:16 -05:00
Eratosthenes
a12e9fe1b2 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-12-18 21:41:44 -05:00
Worros
d5de93da28 [NEWIMPORT] Syntax fix 2009-12-19 10:07:53 +08:00
Worros
9012c74db7 [NEWIMPORT] Fix syntax to be 2.5 compatible. 
Python 2.6 enumerate() function contains a useful 'start' paramater,
apparently this did not exist in 2.5.

Patch frim Mika Bostrom
 2009-12-18 13:33:56 +08:00
Worros
2b7d34c484 [NEWIMPORT] Fix syntax to be 2.5 compatible. 
Python 2.6 enumerate() function contains a useful 'start' paramater,
apparently this did not exist in 2.5.

Patch frim Mika Bostrom
 2009-12-18 13:32:09 +08:00
Worros
a2947c8707 [NEWIMPORT] Add stubbed variable to insert 2009-12-18 10:28:28 +08:00
Worros
975eb360ef [NEWIMPORT] Add stubbed variable to insert 2009-12-18 10:27:43 +08:00
Worros
1093b1e43c Remove dead code 2009-12-18 10:27:09 +08:00
Worros
ba8f61d14a Add ability to import Stars archive files. 
PokerStars support can provide a HH archive. The format is similar but not the same as a a standard hh format as it contains an additional line "Hand #X" between each hand.

Patch adds an option -s to GuiBulkImport, which when specified will strip these lines out and continue parsing.
 2009-12-17 18:50:40 +08:00
Worros
26fc0b5928 Add ability to import Stars archive files. 
PokerStars support can provide a HH archive. The format is similar but not the same as a a standard hh format as it contains an additional line "Hand #X" between each hand.

Patch adds an option -s to GuiBulkImport, which when specified will strip these lines out and continue parsing.
 2009-12-17 18:42:50 +08:00
Eric Blade
b25dedbf5e Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-12-17 04:07:25 -05:00
Worros
22f98ab1c5 Add some code to kinda detect hand cancellation 
hhc.readHandInfo(self)
hhc.readPlayerStacks(self)
hhc.compilePlayerRegexs(self)
hhc.markStreets(self)

Is the order, the first correctly failing regex is markStreets
 2009-12-17 16:00:24 +08:00
Worros
1fb99e4595 Add test hand - Hand cancelled 2009-12-17 15:59:29 +08:00
Worros
f03a9c287f Add some code to kinda detect hand cancellation 
hhc.readHandInfo(self)
hhc.readPlayerStacks(self)
hhc.compilePlayerRegexs(self)
hhc.markStreets(self)

Is the order, the first correctly failing regex is markStreets
 2009-12-17 15:53:12 +08:00
Worros
209c4f94fa Merge branch 'master' into stats 2009-12-17 13:33:39 +08:00
Worros
f7616c6ee8 [NEWIMPORT] Move hud call to after database commit 
HUD still doesn't quite work, but getting closer - suspect hud_cache rebuild isn't happening
 2009-12-17 02:24:57 +08:00
Worros
1f70a9ad8a [NEWIMPORT] Fix thinko on insertPlayer 
Was returning the player name instead of id in the case where the player exists in the database, but wasn't cached already

Removing some merge gunge too
 2009-12-17 01:55:48 +08:00
Worros
80c324c8e1 [NEWIMPORT] Add a commit at the end of the fpdb_import cycle 2009-12-17 00:40:36 +08:00
Worros
5c0323c842 Add PartyPoker 10 seat hud layout to example file 2009-12-17 00:12:53 +08:00
Worros
826ca4b2c7 [NEWIMPORT] 'correct' the type for wonWhenSeenStreet1 2009-12-16 23:11:08 +08:00
Worros
52d1ce1402 [NEWIMPOR] Fix insert type for wonAtSD 2009-12-16 22:58:54 +08:00
Worros
c50addf867 [NEWIMPORT] Fix startCash fix 2009-12-16 22:48:38 +08:00
Worros
353fec235f [NEWIMPORT] Convert start stack to cents 2009-12-16 22:41:48 +08:00
Worros
1d53196568 Fix loal variable scope bug 
Never have been quite sure of local variable scope using python indentation, this didn't appear to affect anyone until a poster on 2+2
 2009-12-16 20:04:10 +08:00
Worros
be0cb6fc2a Fix a couple of typos 2009-12-15 22:56:18 +08:00
Eric Blade
7ca08899c5 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-12-15 06:08:30 -05:00
Worros
a18b3a9cfb Merge branch 'master' into stats 2009-12-14 19:03:23 +08:00
Worros
4746ddb33d Fix thinko in stub 2009-12-14 19:03:01 +08:00
Worros
2ca866398f Merge branch 'master' into stats 2009-12-14 18:02:08 +08:00
Worros
56c5521e6a [NEWIMPORT] Move HandsPlayers insert statement into SQL.py 2009-12-14 18:01:24 +08:00
Worros
fb92ee2941 [NEWIMPORT] Stub remaining HandsPlayers stats 2009-12-14 17:52:08 +08:00
Carl Gherardi
7d45d40d16 Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-12-14 16:47:10 +08:00
Carl Gherardi
6b45723b09 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-12-14 16:46:57 +08:00
Carl Gherardi
cf6e818ae5 [NEWIMPORT] Enable NEWIMPORT by defaul 2009-12-14 16:45:08 +08:00
Eratosthenes
0592b1c2c0 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-12-13 12:38:17 -05:00
Mika Bostrom
20de6fe730 Clean up about window 
Remove duplicates
 2009-12-13 16:12:29 +02:00
sqlcoder
69168ff868 unwind change that stopped mysawshowdown being set unless all-in (which I hardly ever am, since I play limit ... so my WtSD was displaying as 0) 2009-12-13 12:57:46 +00:00
sqlcoder
05d0d02df4 reload profile after editing Prefs if no other tabs are open, otherwise suggest restart 2009-12-13 12:55:15 +00:00
Carl Gherardi
e08afeecb1 [NEWIMPORT] Move database prep into prepInsert 2009-12-13 13:48:17 +08:00
Carl Gherardi
40cbb55f7f [NEWIMPORT] Enable printInsert, disable hud pipe 2009-12-13 13:47:14 +08:00
sqlcoder
4cc1c4cfe6 add name to nodes 2009-12-12 12:09:58 +00:00
sqlcoder
c7e11a8cc3 default guiprefs window to larger size 2009-12-12 12:08:48 +00:00
sqlcoder
ab89f9f603 show message dialog if pg connect fails 2009-12-12 09:51:07 +00:00
Mika Bostrom
fcf14f9100 Merge own master 2009-12-10 06:47:13 +02:00
Mika Bostrom
835fc98f6f Cosmetic fix 
About -> Credits takes a list of strings in .set_authors() as opposed to
a single string. Now the credit popup looks about right.
 2009-12-10 06:41:15 +02:00
Eric Blade
e221c9c0f6 Merge branch 'master' of git://git.assembla.com/fpdb-sql.git 2009-12-09 21:36:34 -05:00
Eratosthenes
ea60cda961 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-12-09 20:25:44 -05:00
Eratosthenes
e85608ee52 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-12-09 20:25:36 -05:00
Eratosthenes
bb9f5553ce Merge branch 'master' of git://git.assembla.com/fpdboz 2009-12-09 20:25:25 -05:00
sqlcoder
fc95de82f4 logviewer: avoid memory-mapped files, make it work when opened a second time 2009-12-09 21:58:56 +00:00
Eric Blade
5e7bd33cd0 no changes here 2009-12-08 17:48:52 -05:00
sqlcoder
bbaecc1697 add package version info to About dialog 2009-12-08 22:17:55 +00:00
sqlcoder
50e63a8131 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-12-07 22:55:32 +00:00
sqlcoder
68835dd9b8 tidy up log viewer some more 2009-12-07 22:55:12 +00:00
Worros
09b0e02c37 Add Makefile and a couple of test HH's 2009-12-07 12:14:19 +08:00
Worros
5f67fc8220 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-12-07 12:10:56 +08:00
Worros
a3192e77f2 Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-12-07 12:10:43 +08:00
Worros
49576b5eb3 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-12-07 12:09:05 +08:00
Worros
cd5b5b468c Forgot to add actual test file 2009-12-07 12:07:43 +08:00
Worros
0061bd0644 [NEWIMPORT] Add call to HUD for auto import 
Make sure the matching db_handid is recorded in the Hand object for later use
 2009-12-06 23:02:07 +08:00
Worros
909c2bd0fc Add test for Stars sawShowdown. 
Test currently fails in the old import code and passes on NEWIMPORT

Tests for uncalled allin bet on river, which has been erronously marked as showdown previously
 2009-12-06 22:57:27 +08:00
Worros
8f787b2d44 Make test file use real database. 
Please note this could be destructive
 2009-12-06 22:56:29 +08:00
Worros
4d38488f26 [NEWIMPORT] Fix sawShowdown stat 2009-12-06 22:52:45 +08:00
sqlcoder
63f04908be add simple test scripts for python and gtk 2009-12-06 14:17:22 +00:00
Mika Bostrom
128fa2f356 Enclose dict key lookup in try-except block 
Some recent changes moved the dictionary access outside try-except block
again. Widen the block enough again.
 2009-12-06 14:08:27 +02:00
Eratosthenes
c3c36e1e53 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-12-05 19:16:42 -05:00
Eratosthenes
b483686019 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-12-05 19:16:36 -05:00
sqlcoder
66b4ed35e5 add refresh button to log viewer 2009-12-05 22:48:41 +00:00
sqlcoder
18b0a47555 move print message to log 2009-12-05 22:20:44 +00:00
sqlcoder
85242f13cb fix bug with hud stats, must use ORDER BY in the selects 2009-12-05 21:59:42 +00:00
sqlcoder
2934c32132 limit number of lines displayed in log viewer 2009-12-05 20:31:37 +00:00
sqlcoder
2d8c44110c refine log viewer 2009-12-05 20:10:00 +00:00
sqlcoder
72303bf900 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-12-05 15:55:06 +00:00
sqlcoder
6826d0157a create gui option to view the log 2009-12-05 15:54:49 +00:00
Worros
61840e73c6 Add beginings of test for sawShowdown - unfinished. 
Some sort of weird commit problem going on. Conmmitiing to work on htat
 2009-12-05 20:18:47 +08:00
Worros
c40d665700 Newimport - comments for a getPosition function. 
Decided that I needed some test functions before I kick on
 2009-12-05 20:15:28 +08:00
Eratosthenes
a1bdf68dc2 Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-12-04 12:16:38 -05:00
Eratosthenes
2863edf1df Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-12-04 12:16:26 -05:00
Eratosthenes
193944799d Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-12-04 12:16:17 -05:00
Eratosthenes
6987cf6584 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-12-04 12:16:10 -05:00
Worros
ee205c3b29 [NEWIMPORT] Partially fix number of hands parsed reporting 2009-12-04 17:56:56 +08:00
sqlcoder
c9b9927315 fix new timing code so it actually works\! 2009-12-03 21:02:05 +00:00
sqlcoder
cd65aae374 allow legend box to work in python 2.5 2009-12-03 20:20:42 +00:00
sqlcoder
9dd09fe8a1 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-12-03 20:14:12 +00:00
Eric Blade
6195397c88 fix typos.. durrr 2009-12-03 12:52:57 -05:00
Eric Blade
adadb7defa slight optimizations 2009-12-03 12:51:10 -05:00
Eric Blade
3248cb60f2 added checks to see if player has folded when processing wether they've seen streets/showdown (corrects problem of player calling someone's short all in and it not counting as having seen showdown) 2009-12-03 12:35:00 -05:00
Eric Blade
f05b521d6f comment out some prints, apparently mysqlcoder and my editors do not agree well with each other on spacing. 2009-12-03 07:24:12 -05:00
Eric Blade
81adfff93b Add some basic error handling at the very beginning of startup, to deal with missing imports and such, update about box 2009-12-03 07:22:33 -05:00
Eric Blade
2120257aee whitespace.. sorry guys. 2009-12-03 07:21:24 -05:00
Eric Blade
86449333c0 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-12-03 06:30:08 -05:00
Worros
b7d9a843bd Add PLO test file for Betfair, update test to import it 2009-12-03 17:45:04 +08:00
Worros
247af28f7e Add a HH anonymiser 
Usage:
python Anonymise.py -i regression-test-files/tour/Stars/Flop/NLHE-USD-MTT-5r-200710.txt

At least works for Stars at the moment
 2009-12-03 17:26:40 +08:00
Worros
76163733ee Repair recent damage to Options 2009-12-03 16:46:10 +08:00
sqlcoder
ffb59570d2 merge from carl 2009-12-02 15:23:05 +00:00
sqlcoder
5e3c920e16 add timing info to log 2009-12-02 15:17:31 +00:00
Mika Bostrom
a0a6207810 Fix profit graph query 
At least postgresql requires to have grouping by hp.sawShowdown as well
 2009-12-02 12:29:48 +02:00
Eric Blade
deb2f87bcc Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-12-02 05:14:49 -05:00
Worros
8d95835afe Remove annotate from graph. 
Legend box is smarter and looks better imho
 2009-12-02 14:07:06 +08:00
Worros
395f19b5fb Add showdown/non-showdown winnings to Grapher 2009-12-02 14:02:06 +08:00
Eratosthenes
b5e64fd747 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-12-01 10:26:14 -05:00
Eratosthenes
f2947ce730 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-12-01 10:26:00 -05:00
Eric Blade
abf132c719 Merge branch 'master' of git://git.assembla.com/fpdb-sql.git 
Conflicts:
	pyfpdb/Database.py
 2009-12-01 08:03:25 -05:00
Eric Blade
bec343abfd argh at whitespace churn, do i have my editor settings screwey? 
trap error 2003 on mysql connect (same as 2002, but for tcp)
 2009-12-01 06:58:33 -05:00
grindi
45eccb0697 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-12-01 11:11:34 +03:00
sqlcoder
f7ed06d071 improve rebuild hudcache and indexes dialogs 2009-11-30 21:43:29 +00:00
Eratosthenes
ef6d46b458 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-11-30 10:30:36 -05:00
Eratosthenes
9ced37a859 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:
	pyfpdb/Configuration.py
 2009-11-30 10:30:11 -05:00
Eric Blade
9953e76c9e trap IOError on hud pipe write when hud closed without autoimport stopping, turn off hud 2009-11-30 09:51:47 -05:00
Eric Blade
8c8fdba7c8 ttime = float with us to ms resolution 2009-11-30 09:08:30 -05:00
Eric Blade
284b0c1f38 fix return tuple in import_file_dict, fix text from autoimport to actually show up in autoimport window 2009-11-30 08:14:03 -05:00
Worros
fc20330f2b [NEWIMPORT] Don't actually writeHand on NEWIMPORT 2009-11-30 15:11:00 +08:00
Worros
f30b3a6117 Oops - actually add NEWIMPORT const to Configuration 2009-11-30 14:41:07 +08:00
Worros
36dda2174b Move NEWIMPORT into config 
Fix test_PokerStars test to catch exception when importing with the legacy importer
 2009-11-30 14:33:32 +08:00
Worros
152933ed49 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-11-30 14:23:37 +08:00
Worros
71c2fea1ca Add query object to test 2009-11-30 14:22:58 +08:00
Worros
bb38d7e1dd [NEWIMPORT] Clean up HandsPlayers.cardX fetching 2009-11-30 14:20:48 +08:00
Eric Blade
67beb4bd9f add textview to autoimport window for dropping status/info messages on, just call it's AddText func to get it there 2009-11-29 23:52:36 -05:00
Eric Blade
3439523de8 Merge branch 'master' of git://git.assembla.com/fpdb-sql.git 2009-11-29 22:02:49 -05:00
Worros
db5e321fe0 Fix obvious typo 2009-11-30 10:53:15 +08:00
Worros
aed892139d Add -i option for input file 2009-11-30 10:52:28 +08:00
Eratosthenes
76680e8511 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:
	pyfpdb/Configuration.py
	pyfpdb/HUD_main.py
 2009-11-29 19:56:32 -05:00
sqlcoder
00c85aa62d add rebuild indexes option to Database menu (can we put tooltips over these menu options?) 2009-11-29 23:02:45 +00:00
sqlcoder
8221e86757 turn off hud seats restriction as default 2009-11-29 18:14:04 +00:00
sqlcoder
78004a2e76 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-11-29 17:37:19 +00:00
sqlcoder
65b372570f add some comments 2009-11-29 17:36:37 +00:00
sqlcoder
432a39b172 better icon for tab close buttons 2009-11-29 17:36:22 +00:00
Eric Blade
bab3ad6ca9 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-11-29 12:28:14 -05:00
Eric Blade
3f140ab157 exception traceback in idle_func in create_hud 2009-11-29 12:25:02 -05:00
Worros
a667fe37be Merge branch 'master' of git://repo.or.cz/fpbd-bostik 
Conflicts:
	pyfpdb/HUD_main.py
 2009-11-29 18:08:47 +08:00
Worros
8d10cbcd5e test_PokerStars - Add test for 5 card draw 2009-11-29 17:10:14 +08:00
Worros
a6a3217bbc Fix draw parsing finally? 2009-11-29 16:54:15 +08:00
Worros
39f27bc781 test_PokerStars: Add 2-7 Lowball test 2009-11-29 15:28:32 +08:00
Worros
9071640182 Fix Draw parsing 2009-11-29 15:22:46 +08:00
Worros
f5d8f153b5 Start of fixes to draw parsing 2009-11-29 14:40:32 +08:00
Worros
e93412f12d Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-11-29 11:44:26 +08:00
sqlcoder
c77ae39077 add close buttons to tabs 2009-11-28 23:36:54 +00:00
sqlcoder
db3371a202 use notebook widget to show proper tabs 2009-11-28 22:00:44 +00:00
sqlcoder
cce1545024 add gui stuff to test, stop crash if xml.dom.ext not present 2009-11-28 21:11:52 +00:00
sqlcoder
7f40d9dd3a change default for min_seats to 0 in case hc.activeSeats is zero 2009-11-28 11:48:06 +00:00
Mika Bostrom
2f742e371b Use wider try-except block 
The 'temp_key' table name in hud_dict can vanish between DB roundtrips.
Enclose all three lines within try-block.
 2009-11-28 10:59:44 +02:00
Mika Bostrom
6dec7f38f3 Fix a stupid syntax error 
Use python's format-string syntax.
 2009-11-27 22:21:45 +02:00
Worros
a13ae41134 Fix MySQL startup error: 2002 
2002, "Can't connect to local MySQL server through socket '/var/run/mysqld/mysqld.sock' (2)"
 2009-11-27 20:19:43 +08:00
Eric Blade
41c963baa9 look at all that whitespace churn.. sorry my git just acts weird. it's gitty. 2009-11-27 02:09:06 -05:00
sqlcoder
b60895a89f merge from carl 2009-11-26 22:35:50 +00:00
sqlcoder
6037f17fb9 added seats options to hud menu 2009-11-26 22:24:24 +00:00
sqlcoder
65fe163379 add ability to display hud stats by number of seats at table (All / Custom / Exact) 2009-11-26 21:28:05 +00:00
Mika Bostrom
df6d9a0a56 Fix missing checks before .set_active() 
Some validity tests were still missing. Also, typofix:
self.cbFl -> self.cbFL
 2009-11-26 23:07:58 +02:00
Worros
0368992289 Add test config used by py.test 2009-11-27 00:19:31 +08:00
Worros
8371ed244a test_PokerStars - add test Stud files and import 
Also add commented out tests for Draw games
 2009-11-27 00:12:57 +08:00
Worros
411d4ac792 test_PokerStars - Add NLHE-USD-MTT-5r-200710.txt 
Commented out for the moment, it has never parsed in old or new code.
 2009-11-26 22:52:27 +08:00
Worros
5b5216bbe2 Fix test_PokerStars.py 2009-11-26 22:41:42 +08:00
Worros
b794d20f6d Make sqlite :memory: work again 2009-11-26 22:02:48 +08:00
Worros
9e7e22ffa1 Start of in tree HH archive 2009-11-26 17:00:22 +08:00
Worros
ac96d88a8c Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-11-26 10:01:53 +08:00
Worros
c9901c3106 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-11-26 10:01:39 +08:00
sqlcoder
9d754e5e4b make sure db locks are released 2009-11-25 20:55:58 +00:00
Mika Bostrom
cb9e2cb6e7 Try to fix two HUD main hangs 
The main HUD process can hang due to unhandled exceptions, which
occurred in two separate situations:

1. Table window is closed and HUD instance killed before auto-importer
knows about it
2. Sometimes the threading can jam

These changes attempt to counter the effect of race-conditions. The
dictionary key (table name) is properly tested at the beginning of
update/create block, *but* there are two short round-trips to database
before the key is used. While these occur, the HUD instance can vanish
and thus get its key removed from the dictionary.

Also, when Tables.Table() is created, it will be populated on-demand,
and have child attributes only when such are found from the system. The
new table code pulls in data from actual windows. Again, there is a
query involved and while it runs, the table may have vanished. This
ended up as an error in this call:

foo = gtk.gdk.window_foreign_new(table.number)

The object 'table' is valid (not None) but it has been populated only
after actual table window was killed. Therefore it may not have .number
attribute, which raised an AttributeError. Now the presence of
table.number attribute is tested before the object can be sent to
create_HUD().
 2009-11-25 20:31:02 +02:00
Eric Blade
0b4f5acec1 some weird whitespace churning, and again comment out "sending hand to hud" message 2009-11-25 08:22:14 -05:00
Mika Bostrom
5435c164f9 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-11-25 14:40:50 +02:00
Worros
aee9a7339c [NEWIMPORT] Stop duplicate hands from crashing import 2009-11-25 16:29:30 +08:00
Worros
83f06c35cc [NEWIMPORT] HandsPlayers.CBet stats 2009-11-25 14:59:29 +08:00
Mika Bostrom
8d64a720c4 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-11-25 08:50:08 +02:00
Worros
30332d2132 Remove forced assert 2009-11-25 10:27:54 +08:00
Worros
1b2a45b77e Prefs: Fix display when a comment node exists in config 2009-11-25 09:06:01 +08:00
sqlcoder
339a0133a9 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-11-24 19:51:21 +00:00
sqlcoder
02fd6d6bd0 add Preferences option on File menu 2009-11-24 19:50:48 +00:00
sqlcoder
c856824145 fix bug in save() and simplify it. Add get_doc() method 2009-11-24 19:46:57 +00:00
Mika Bostrom
48930e1679 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-11-24 19:42:39 +02:00
Worros
a87a145c28 [NEWIMPORT] HandsPlayers.streetXCalls and streetXBets 
Pretty sure the bets stat is wrong
 2009-11-25 00:57:14 +08:00
Worros
3bb1656603 [NEWIMPORT] Add HandsPlayers.wonAtSD 2009-11-24 23:23:21 +08:00
Worros
9203e0b0d8 [NEWIMPORT] HandsPlayers.sawShowdown added 2009-11-24 23:14:43 +08:00
Worros
dc1b0d2e38 [NEWIMPORT] Calculate wonWhenSeenStreet1 
Won is defined as 'collected money from the pot'

Seen street 1 does not require vpip on street 0
 2009-11-24 21:58:27 +08:00
Eric Blade
9bf5017ff1 re-enable exception handling in idle_func() now that i know what we could expect to trap reasonably. Deal in update() with what might happen if update_table_position() fails 2009-11-24 06:08:43 -05:00
Worros
e9a858e4cd Make DEBUG = False in DerivedStats 2009-11-24 17:55:00 +08:00
Worros
48c395565e [NEWIMPORT] Add HandsPlayers.totalProfit 
Grapher now works after import yay
 2009-11-24 17:29:54 +08:00
Worros
d65ee55b64 [NEWIMPORT] Calculate rake, make card calculation holdem only 
Stud card fetching still terminally broken
 2009-11-24 16:44:46 +08:00
Worros
d617f1c4e0 [NEWIMPORT] Update Database.storeHandsPlayers 2009-11-24 16:39:59 +08:00
Worros
ef9abd2948 Force all output from HHCs to by utf8 2009-11-24 11:21:55 +08:00
Eratosthenes
c1f599d555 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:
	pyfpdb/Configuration.py
	pyfpdb/HUD_main.py
 2009-11-23 19:41:47 -05:00
Eratosthenes
ad91c0a526 Changes for logging. 2009-11-23 19:34:40 -05:00
Eratosthenes
bdc3248597 Changes for new logging scheme. 2009-11-23 19:32:19 -05:00
Eratosthenes
2da6e44a75 Changes for improved logging. 2009-11-23 19:29:56 -05:00
Eric Blade
a735ab67b2 stuck an error print in wintables if self.window doesn't exist 2009-11-23 10:24:38 -05:00
Eric Blade
32e7a28d2c Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-11-22 16:44:22 -05:00
Eric Blade
3e7a0ef53c remove all occurences of assigning sys.argv 2009-11-22 16:40:56 -05:00
Worros
34e7fb0459 [NEWIMPORT] Fix HandsPlayers.cardX init 2009-11-23 00:20:51 +08:00
Worros
943e188a4d [NEWIMPORT] Hole card data for flop games 
Take some code from Grindi to calculate playersAtStreetX and streetXRaises
 2009-11-23 00:05:23 +08:00
Worros
1650b76ea5 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-11-22 13:07:49 +08:00
Eric Blade
64d9a3582b No longer mess with sys.argv (messing with system variables is a bad thing, right), use argv to determine pathname of executeable as sys.path[0] is just the first component of the path. also all database errors except MySQL reporting "Access Denied" should now crash FPDB, so someone can fill those into Exceptions, and into the fpdb_db and the fpdb files. 
Process: get crash info, add exception info to Exceptions.py, catch generic database exception in fpdb_db.py (around the connect line), throw correct Fpdb exception, then catch it in fpdb.py and do the appropriate thing on the GUI end.
 2009-11-22 00:00:23 -05:00
Worros
d08e9a1ea3 Add support for UTF-8 HH type. 
Able to parse and import an EUR hh file
 2009-11-22 12:34:11 +08:00
Mika Bostrom
d2c25b6d28 Fix simple error in filter code 
Other parts test that the object is valid before calling
.set_active(); follow convention to eliminate needless errors
 2009-11-21 23:51:18 +02:00
Worros
14ccde73a2 Fix Playerstats for Pot Limit 
Still broken for cap games. Need a more flexible mechanism for this
 2009-11-21 11:16:08 +08:00
Worros
8d2b315fc8 Fix PL in Graph viewer 
Grapher still doesn't support the cap games, that code could use some cleanout.
 2009-11-21 11:11:31 +08:00
Worros
348420f30d Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-11-20 21:28:05 +08:00
Worros
4d4387bd94 Removing second layer of try: 
Killing until we figure out what it was supposed to catch
 2009-11-20 15:11:58 +08:00
Mika Bostrom
615d1ea8a6 Add default style keys 
It seems there is some weird way for stylekeys to remain unset. Catch
the special case and have a way to see why this happens.
 2009-11-20 08:48:49 +02:00
Worros
eedffdf472 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-11-20 09:11:46 +08:00
sqlcoder
6eba4a5544 fix a merge problem and replace to_char() for sqlite, player stats now working in sqlite :-) 2009-11-19 22:19:41 +00:00
Worros
5ba4dbb0e7 Clean DerivedStats.py 2009-11-19 17:54:00 +08:00
Worros
ea323d0d22 Fix mod() test for sqlite 2009-11-19 17:33:12 +08:00
Worros
33592fbc4e Add math function for sqlite - may still be broken 2009-11-19 17:24:22 +08:00
Worros
eadd7c045c Adding broken mod() test 2009-11-19 17:22:53 +08:00
Worros
571cbe07a0 Add test functions for SQLite 
Added test for VARIANCE()

Added test for floor()
 2009-11-19 15:28:48 +08:00
Worros
29d135da1b Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-11-18 13:52:41 +08:00
sqlcoder
04c09af7b2 tidy up aggregation code, NOTE: renamed some aggregation config to try and make meaning clearer, updated aggregation description in .example 2009-11-17 21:47:43 +00:00
sqlcoder
289922e43a Merge branch 'master' of git://git.assembla.com/fpdboz 2009-11-17 20:48:06 +00:00
Worros
36fe5d2617 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-11-18 00:14:21 +08:00
Eratosthenes
e10db69a9c Merge branch 'master' of git://git.assembla.com/fpdboz 2009-11-16 19:49:12 -05:00
Eratosthenes
812998704d Yet another try to fix missing X windows. Using xwininfo. 2009-11-16 15:35:58 -05:00
Eratosthenes
55f1ebedd9 Another possible fix to missing windows. 2009-11-16 13:04:25 -05:00
Eratosthenes
4abfc0093f test print 2009-11-16 11:48:31 -05:00
Eratosthenes
d592e85375 Possible fix of not finding windows in X. 2009-11-16 11:20:44 -05:00
Eratosthenes
3ef23852a6 Update Tables_Demo to work with new XTables/TableWindow format. 2009-11-16 10:00:26 -05:00
Worros
5b02153b43 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-11-16 15:34:23 +08:00
Worros
c9b9c848be Add aggregate function VARIANCE() for sqlite 2009-11-16 15:19:24 +08:00
Eratosthenes
4e78dd8d93 Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-11-13 22:02:16 -05:00
Eratosthenes
85f488e9cb Fix pretty print test. 2009-11-11 16:25:31 -05:00
Eratosthenes
a5b0de5ed2 Fix problem with .example overiding HUD_config. 2009-11-11 16:20:43 -05:00
Eratosthenes
65393492cf Get logging.conf and matplotlib datafiles. 2009-11-09 22:02:50 -05:00
Eratosthenes
1b980e7cad Fix merge gone wrong. 2009-11-09 19:31:32 -05:00
Eratosthenes
5021cae297 Clean up logging changes. 2009-11-09 19:30:23 -05:00
Eratosthenes
b637247871 Fix for logging changes. 2009-11-09 19:24:46 -05:00
sqlcoder
9bbca552ea Merge branch 'master' of git://git.assembla.com/fpdboz 2009-11-09 20:44:05 +00:00
Eratosthenes
c8b7608bc1 Delete intermediate prints. Small fix to make py2exe happy. 2009-11-08 23:16:56 -05:00
Eratosthenes
e6b71d86bb Should be HUD_config.xml.example, not HUD_config.xml 2009-11-08 23:00:15 -05:00
Eratosthenes
0bbbc7222b First go at rationalizing config paths and logging defaults. 2009-11-08 22:53:10 -05:00
Eratosthenes
b33fd03754 Added Configuration.py exe and HowTo use. 2009-11-08 22:51:15 -05:00
Eratosthenes
efb0768b97 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:
	pyfpdb/SQL.py
 2009-11-08 22:50:47 -05:00
grindi
d888b7d463 Party hhc: cleand, added getTableTitleRe 2009-11-08 23:09:14 +03:00
grindi
dbaf4dbdbc Make msgs about parse errors more verbose 
+ fix small bug in FpdbParseError
 2009-11-07 22:01:30 +03:00
grindi
9dd600702a Moved window title re to HHC classes 
Just redefine function getTableTitleRe in coresponding hhc for custom re
 2009-11-07 20:30:47 +03:00
grindi
f99c4baa8b Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-11-07 15:35:21 +03:00
Worros
15ea852d76 Extend the tablename field in sql to 22 characters 2009-11-07 10:17:28 +08:00
Eratosthenes
99e4211e5d Integrate new table handling code. 2009-11-06 17:34:42 -05:00
grindi
fd085ecb4d Fixed another aux bug 2009-11-07 00:46:50 +03:00
grindi
c4d3789657 Fixed: aux save layout doesn't work 
Bug maker, look at
http://docs.python.org/tutorial/classes.html#generator-expressions
(...for...) returns generator rather than tuple
 2009-11-06 23:47:31 +03:00
Worros
5c7cce090e [NEWIMPORT] Added street0VPI to HandsPlayers 
Also fixed last patch for streetXSeen
 2009-11-06 19:30:50 +08:00
Worros
006d7164ea [NEWIMPORT] Insert streetXSeen col into HandsPlayers 2009-11-06 19:13:52 +08:00
Worros
5aef7b6054 [NEWIMPORT] Insert winnings column into HandsPlayers 2009-11-06 18:39:59 +08:00
Eratosthenes
2d890be3c8 Get the tableName right for tournaments. 2009-11-05 11:27:33 -05:00
Worros
bea6bf2d6b Merge branch 'master' of git://git.assembla.com/fpdb-mme 
Conflicts:
	pyfpdb/Configuration.py
 2009-11-05 12:22:05 +08:00
Worros
5d6138e2a8 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-11-05 12:16:32 +08:00
fpdb-mme
4a6213e32e now sample code it works as expected 
grrr, soewhere down the line the exception got swallowed. this is evil!!!

-x must die
 2009-11-05 01:26:32 +01:00
fpdb-mme
2199d165f1 removed unconditional exception handling + kwarg max should be int 2009-11-05 01:21:32 +01:00
fpdb-mme
14200c5a50 simplified code a bit 2009-11-05 00:39:42 +01:00
fpdb-mme
7a602846ff combed over Config.get_tv_parameters() 
there was a bit much of unconditional exception handling

note: some parts of the application call Config.get_tv_parameters()
but afaics the actual parameters are never used anywhere. so maybe
its leftover code. someone drop a note if or not to remove tv related
stuff
 2009-11-05 00:34:02 +01:00
fpdb-mme
5a8f794057 simplified Config.get_supported_sites() 2009-11-05 00:11:43 +01:00
fpdb-mme
7e8ed08a28 simplified Config.get_aux_windows() 2009-11-04 23:58:48 +01:00
fpdb-mme
5c656625fd combed a bit over Config.get_default_font() 2009-11-04 23:41:09 +01:00
fpdb-mme
efefae4941 fix: db_type is actually db_server 2009-11-04 19:01:12 +01:00
fpdb-mme
c60dfda64c put in former logging setup again, removed excepthook 2009-11-04 18:58:01 +01:00
fpdb-mme
6d54da1c49 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:
	pyfpdb/Configuration.py
	pyfpdb/SQL.py

note:hopefully got the merge right
 2009-11-04 18:34:28 +01:00
unknown
ab1c37ead2 IndexError -> KeyError .. doh. 2009-11-04 10:46:36 -05:00
unknown
98981059cd Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-11-04 02:58:13 -05:00
Worros
cc89433ba8 Merge branch 'master' of git://git.assembla.com/fpdb-eric 
Conflicts:
	pyfpdb/Configuration.py
 2009-11-04 14:44:25 +08:00
Eratosthenes
3265766c77 Cleanup of HUD_main prior to integrating newTables code. 2009-11-03 21:52:40 -05:00
Eratosthenes
0a563cad53 Added get_table_info method. 2009-11-03 21:51:10 -05:00
unknown
51da6fb687 cleaner 2009-11-03 15:29:05 -05:00
unknown
a5de7c9b6b cleanup 2009-11-03 15:14:20 -05:00
unknown
d008eceaef mostly formatting cleanups 2009-11-03 15:06:48 -05:00
unknown
0759ded78f fix typo 2009-11-03 14:43:12 -05:00
unknown
a6b7292943 mostly None checkings fixed (== to is != to is not) 2009-11-03 14:30:52 -05:00
unknown
7667a39ded cleanup 2009-11-03 14:04:22 -05:00
unknown
6bf1824ee7 clarify where some logged or printed messages were coming from exactly 2009-11-03 13:56:26 -05:00
unknown
0e6254ce0d basic cleanup 2009-11-03 13:49:16 -05:00
fpdb-mme
9063d9749c removed all occurences of db_type/db-type 2009-11-03 19:18:51 +01:00
unknown
9ec1eb48e1 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-11-03 11:08:57 -05:00
fpdb-mme
92f98e9f51 added an application wide exception handler 2009-11-03 16:09:58 +01:00
fpdb-mme
944d48d7ef refactored logging setup 
removed fallback to '/usr/share/python-fpdb/logging.conf' if
'logging.conf' could not be found in the current directory.
1. this looked redundant, 2. usually only root has write access
to /usr/share/*

ok or not?
 2009-11-03 15:35:20 +01:00
fpdb-mme
50bafadcb1 we throw an exception now if the user supplies an unsupported database backend 
note: checked all refences. i think we can raise savely without breaking stuff. it is only
used in Database.py on get_backend_name(), raising an exception anyways if the backend
is unknown
 2009-11-03 15:17:48 +01:00
fpdb-mme
62c915928d - added a global const to config to point to "database" directory 
- adjusted fpdb_db.py to make use use of this const
 2009-11-03 10:50:13 +01:00
Worros
f276ad4dfa Merge branch 'master' of git://git.assembla.com/fpdb-mme 
Conflicts:
	pyfpdb/Configuration.py
 2009-11-03 17:25:54 +08:00
sqlcoder
c02e6365e7 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-11-02 20:52:55 +00:00
fpdb-mme
a18091161a added a note and some thoughts for review 2009-11-02 10:29:10 +01:00
unknown
2589d2ecd3 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-11-02 04:28:24 -05:00
Worros
28ca49d592 Fix GuiSessionStats.py for sqlite 
Fix based on solution from Eleatic Stranger on 2+2
 2009-11-02 17:23:50 +08:00
fpdb-mme
9e94f44fa7 started defining some application wide consts. these consts (more to come 
if my approach is accepted) are used all over the fpdb and should always be
taken from one place
 2009-11-02 10:06:54 +01:00
fpdb-mme
34bbc45cb8 whitespace 2009-11-02 09:55:08 +01:00
fpdb-mme
fb76540df6 added a TODO: 
if the user may passes '' (empty string) as database name via command line, his choice is ignored
when we parse the xml we allow for ''. there has to be a decission if to allow '' or not
 2009-11-02 09:54:16 +01:00
fpdb-mme
d3eeeef2e8 fpdb can not handle the case where no database is defined in xml, so throw a ValueError for now 2009-11-02 09:45:53 +01:00
fpdb-mme
612d6607a1 fix: FpdbError is not defined, use ValueError instead 2009-11-02 09:40:16 +01:00
fpdb-mme
3a7d159d52 sorry, whitespace was messed up, have to find a better way to convert 2009-11-02 09:38:27 +01:00
fpdb-mme
8f2a2c20cc tried my best to write a clearer comment + simplified finding out of what the selected database is 2009-11-02 09:29:58 +01:00
fpdb-mme
cb16dde365 typo 2009-11-02 09:16:18 +01:00
fpdb-mme
10343c0ef4 fixed Database.db_selected attribute. it was always be boolean True if the attribute was not set in the <database> tag 
+ it is more readable using keyword arguments explicitely
 2009-11-02 09:14:57 +01:00
fpdb-mme
75b8c4943a rewrote fix_tf() helper function to string_to_bool(). this represents better is what it actually does. 
comments stated that the function was some kind of fix for xml.dom, but XML is unaware
of python types by intention ;-)
 2009-11-02 09:09:23 +01:00
fpdb-mme
d59f1eb720 added a comment what Config.supported_databases holds for readability 2009-11-02 08:52:46 +01:00
fpdb-mme
d9a120a2c6 removed superfluous try ..except clause. Database.__init__() was not doing any sanity checks, 
so the try ..except clause was only covering exceptions we are actually interested in
 2009-11-02 08:48:07 +01:00
fpdb-mme
01b56919ca we take all <database> tags from xml instead of taking all <database> tags contained in <supported_databases> 
added a note on this
 2009-11-02 08:40:34 +01:00
fpdb-mme
62ee67c071 under certain circumstances attribute Config.db_selected could end up being undefined. 
this could cause later code relying on it failing in strange ways.
 2009-11-02 08:30:24 +01:00
Worros
f4aa5f1fe1 First fix for sqlite in PlayerStats 
Fix courtesy of Eleatic Stranger on 2+2 - Page still does not work, need to find an sqlite equivalent to to_char() and variance()
 2009-11-02 13:38:36 +08:00
fpdb-mme
0225987826 added basic support to add databases present in *.xml to our manager 
notes:
- i dont do too much error checking on input, guess this should be done in Configuration.py
 2009-11-01 20:07:41 +01:00
fpdb-mme
f5d2f5a2dc fix: according to doctests os_independend_kill() is supposed to return None 2009-11-01 09:58:14 +01:00
fpdb-mme
6fcf81e566 bugfix: InterProcessLock.locked() was broken cause InterProcessLock.aquire() no longer raises SingleInstanceError 
- fixed InterProcessLock.locked()
- fixed doctests

notes:

- doctests run ok on linux with InterProcessLockFcntl and InterprocessLockSocket
- doctests fail on linux/wine with InterprocessLockWin32 when trying to aquire the lock held by the process created on the fly.
   just a guess ..maybe the mutex is not released automatically when terminating the process. does native win32 guarantee
   this?
 2009-11-01 09:51:00 +01:00
fpdb-mme
bcbafc160d millions of changes, highlights: 
- started validating user input on create/add database
- implemented fuctionality to create sqlite databases
- never worked with sqlite,, you can not create multiple dbs in one file, so removed db attr again
- a nice todo list

Signed-off-by: fpdb-mme <jUrner@arcor.de>
 2009-11-01 07:36:18 +01:00
unknown
cb0c7430e6 add comment at point in Configuration where we would need to add support for saving new table layouts. 2009-11-01 01:54:59 -04:00
unknown
cdc310dcb6 if HUD is told to create for a layout that doesn't exist in the config file, it will pick a 9 or 10 max layout and use it's positions, which you can then move the windows around, and save, and it should be saved in the right spot. 2009-11-01 01:23:07 -04:00
unknown
64ee502239 here's the HHC patch i forgot to add on last commit 2009-10-31 21:25:27 -04:00
unknown
868a0b5bf0 getting stud tourney to not crash import: 
fix call to storeHudCache in Database to use handStartTime rather than the undefined hand_start_time; stub out store_hands_players_stud_tourney as it looks like it was never updated to use current database setup. result: hud works, no longer crashes import, presumably does not store any hand info though.
HHC base guessMaxSeats returns existing value of maxseats if some prior code has set it somewhere already
 2009-10-31 21:25:13 -04:00
unknown
2bb35fc802 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-10-31 20:19:19 -04:00
unknown
a944ba7cd3 comments edit 2009-10-31 20:06:16 -04:00
grindi
97d2052cbe Party hhc tiny fixes 2009-10-31 17:53:31 +03:00
grindi
5e6899a29e Print out actual exception when import fails. Python 2.5 compatible 2009-10-31 17:48:48 +03:00
grindi
19b46e8444 Revert "Revert "Print out actual exception when import fails"" 
This reverts commit ce0e2c139b.
 2009-10-31 17:46:11 +03:00
grindi
066cf12eb6 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-31 17:44:28 +03:00
fpdb-mme
2ae58f8947 databases can now be activated by user 
++ refactoring

Signed-off-by: fpdb-mme <jUrner@arcor.de>
 2009-10-31 12:12:17 +01:00
Worros
d5604e0e73 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-10-31 08:57:04 +08:00
Worros
ae7e721ede Merge branch 'master' of git://git.assembla.com/fpdb-mme 2009-10-31 08:56:36 +08:00
Worros
ce0e2c139b Revert "Print out actual exception when import fails" 
This reverts commit 626ff49eb4.

Turns out this commit is python 2.6 syntax
 2009-10-31 08:55:54 +08:00
fpdb-mme
604395b868 bit of refactoring + sqlite needs database too 
Signed-off-by: fpdb-mme <jUrner@arcor.de>
 2009-10-30 16:48:51 +01:00
fpdb-mme
a3a72712ac again, many many changes + still ugly code 
Signed-off-by: fpdb-mme <jUrner@arcor.de>
 2009-10-30 14:23:27 +01:00
Worros
c56f9c28fd Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-10-30 14:37:05 +08:00
Worros
3f09bf3d65 Merge branch 'master' of git://git.assembla.com/fpdb-mme 2009-10-30 14:36:42 +08:00
Worros
636727ebb6 Start of Partouche support, shift NEWIMPORT functions 2009-10-30 14:35:45 +08:00
fpdb-mme
2a878d0a83 many changes 
Signed-off-by: fpdb-mme <jUrner@arcor.de>
 2009-10-29 19:32:41 +01:00
grindi
d05f0480a4 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-10-29 11:49:52 +03:00
grindi
faa95ca26e Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-29 11:49:09 +03:00
Worros
a872769b2b Fix cli to Everleaf 2009-10-29 16:37:33 +08:00
Worros
626ff49eb4 Print out actual exception when import fails 2009-10-29 13:17:17 +08:00
Worros
d80360b3bb Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-10-29 12:28:48 +08:00
Ray
645be07667 Make DS.py friendlier to stud and draw. 2009-10-28 22:00:05 -04:00
unknown
02e8154710 remove error trap on read_stdin() - please fix bugs instead of relying on error trap 
some reformatting in Tables.py, as well as some new debug prints to deal with some potential issues. Add code to deal with potential problems in Win x64, that are biting me at random.  Not finished, but the problems stopped happening so can't continue.
 2009-10-28 19:53:31 -04:00
unknown
37af499bc6 Merge branch 'master' of git://git.assembla.com/fpdb-sql.git 2009-10-28 17:41:35 -04:00
unknown
83051d1f4a Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-10-28 17:41:27 -04:00
unknown
dcbc7d7203 fix format of line 2009-10-28 17:40:25 -04:00
sqlcoder
16eb0b1e1f small changes for sqlite 2009-10-28 20:12:03 +00:00
grindi
c7410d6fc8 Fix config's default values for hud colors 
00000 -> #000000
FFFFF -> #FFFFFF
 2009-10-28 19:03:04 +03:00
grindi
5a972ad292 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-10-28 18:48:46 +03:00
grindi
65e1e33c88 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-28 18:48:35 +03:00
grindi
e18a1f2f93 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-28 18:48:20 +03:00
Worros
159c39245f Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-10-28 10:14:19 +08:00
Mika Bostrom
677ec5551c Merge branch 'master' into good 2009-10-27 19:48:00 +02:00
Mika Bostrom
9886b61840 Tray icon click toggles window visibility 
Many of the tools that place an icon in systray allow to toggle the
application visibility by left-clicking on the icon. Why not follow
suit?
 2009-10-27 19:45:52 +02:00
Worros
57f05ba2fb Merge branch 'master' of git://git.assembla.com/fpdb-mme 2009-10-28 00:21:13 +08:00
Worros
6cb16df055 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-10-28 00:20:44 +08:00
Ray
e829ec56ef Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-27 11:43:55 -04:00
unknown
269bc0b7a3 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-10-27 11:05:31 -04:00
unknown
7bd7b5b053 add todo to remind me 2009-10-27 11:01:45 -04:00
Mika Bostrom
fe53e8c8a7 Merge branch 'master' into good 2009-10-27 15:28:40 +02:00
Mika Bostrom
15980877dd Typofix in status icon load 2009-10-27 15:28:11 +02:00
Mika Bostrom
e25e4cf9b3 Use custom tray icon instead of GTK stock 
Use the "Anonymous Cards" image from openclipart.org
(http://openclipart.org/media/files/Anonymous/12230)

This same image is used in other new FPDB icons, but the combinations
with looking-glass don't look good in systray. This icon is plain enough
to work properly even when scaled really small.
 2009-10-27 15:24:49 +02:00
fpdb-mme
e732b74956 too many changes to remember 
Signed-off-by: fpdb-mme <jUrner@arcor.de>
 2009-10-27 11:04:24 +01:00
sqlcoder
998c80b7d0 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-27 08:45:58 +00:00
fpdb-mme
30103c5cb2 second try... 
Signed-off-by: fpdb-mme <jUrner@arcor.de>
 2009-10-27 09:01:06 +01:00
Mika Bostrom
879506cee4 Merge branch 'master' into good 2009-10-27 06:26:25 +02:00
Mika Bostrom
cba416e27a Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-10-27 06:26:04 +02:00
Mika Bostrom
ca8182c37d Merge branch 'master' into good 2009-10-27 06:08:19 +02:00
Mika Bostrom
fcaa1030b6 Merge branch 'master' of git://trac-git.assembla.com/fpdb-sql 2009-10-27 05:53:47 +02:00
Worros
9144c7ae68 Revert "Merge branch 'master' of git://git.assembla.com/fpdb-mme" 
This reverts commit 1f07fa9a14.
 2009-10-27 11:28:27 +08:00
sqlcoder
d2cf8e9bc9 attempt at making system tray icon go away when quitting 2009-10-26 22:26:22 +00:00
sqlcoder
fabec1604a stop warnings when importing from fpdb.py 2009-10-26 21:59:41 +00:00
sqlcoder
6b280d7db9 stop warning message from set_cell_data_func 2009-10-26 21:38:04 +00:00
sqlcoder
da64e336d7 allow sorts on both grids 2009-10-26 21:12:57 +00:00
Ray
0ac559a2db Add a comment to a comment. 2009-10-26 16:50:17 -04:00
Ray
fd31ecc0bf Minor problem with rogue merge info in HHC.py. 2009-10-26 11:19:44 -04:00
Mika Bostrom
7b6581de7d Merge branch 'master' into good 2009-10-26 17:09:06 +02:00
Worros
6b7b46754c Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-10-26 23:00:08 +08:00
Mika Bostrom
35b24fa002 Remove a stray conflict marker 2009-10-26 16:53:18 +02:00
Ray
14115b759e Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-10-26 10:10:05 -04:00
Ray
9d42b46459 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-26 10:09:57 -04:00
Mika Bostrom
27fa27f370 GTK signal handlers need to return True/False 
Since we deal with minimize/expose/show/hide routines ourselves, we
don't want these signals passed any further.

NOTE: if no return type is specified, it is automatically None which
usually is translated to False. That might trigger some weird behaviour,
up to and including rare and hard to reproduce GTK crashes.
 2009-10-26 13:29:32 +02:00
Mika Bostrom
bb6b2ab9a2 Fix session timestamp range 
PostgreSQL does automatic argument conversion/formatting when dealing
with timestamps. This simplification allows the session stats to be
generated with PostgreSQL as db backend.
 2009-10-26 12:55:23 +02:00
Mika Bostrom
73262e808c Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-26 12:18:37 +02:00
Mika Bostrom
70426a70a0 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-10-26 12:12:56 +02:00
Worros
9360bd6894 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-26 17:27:29 +08:00
unknown
22b3d5de7f should minimize to tray in windows. windows 7's tray doesn't like it much, but it'll get over it for now 2009-10-26 05:03:25 -04:00
Worros
115c44e7b1 Move session stats query into SQL.py 2009-10-26 16:39:37 +08:00
sqlcoder
a87bcbb43a allow sort on all cols, tidy up some more details 2009-10-26 08:38:45 +00:00
Worros
e0c193b77d Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-10-26 14:41:11 +08:00
Worros
1f07fa9a14 Merge branch 'master' of git://git.assembla.com/fpdb-mme 
Conflicts:
	docs/tabledesign.html
	pyfpdb/CarbonToFpdb.py
	pyfpdb/Configuration.py
	pyfpdb/Database.py
	pyfpdb/EverleafToFpdb.py
	pyfpdb/FpdbSQLQueries.py
	pyfpdb/GuiAutoImport.py
	pyfpdb/GuiBulkImport.py
	pyfpdb/GuiGraphViewer.py
	pyfpdb/GuiPlayerStats.py
	pyfpdb/GuiTableViewer.py
	pyfpdb/HUD_config.xml.example
	pyfpdb/HUD_main.py
	pyfpdb/HandHistoryConverter.py
	pyfpdb/Hud.py
	pyfpdb/Mucked.py
	pyfpdb/SQL.py
	pyfpdb/Stats.py
	pyfpdb/Tables.py
	pyfpdb/fpdb.py
	pyfpdb/fpdb_db.py
	pyfpdb/fpdb_import.py
	pyfpdb/fpdb_parse_logic.py
	pyfpdb/fpdb_simple.py
	pyfpdb/upd_indexes.sql
 2009-10-26 14:40:11 +08:00
unknown
f15bb627c0 add trayicon, minimize to tray by default (doesn't work quite right on windows) 2009-10-26 01:36:29 -04:00
Worros
71eb683a3d Make cash cols sortable. 
After sqlcoders effort this appears to work
 2009-10-26 12:16:20 +08:00
sqlcoder
69b3c5a339 improve sorting but still not quite working right 2009-10-26 00:33:33 +00:00
Mika Bostrom
1dda03fda0 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-25 21:40:55 +02:00
Worros
0b049a128b Make green in PlayerStats darker 2009-10-25 20:51:46 +08:00
Worros
73e8544117 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-25 20:49:39 +08:00
unknown
0a084d1110 remove try..finally block in HUD_update idle_func function, move return to after the threads_leave() call, HUD now works in Win 7 2009-10-25 08:27:55 -04:00
unknown
3b54fab9e0 remove the exception handler in kill_hud() i think sqlcoder put it in - it doesn't help because the exception isn't a python exception, it's a GTK exception. (looks like a bug in GTK.. not that they'll ever acknowledge anything) 2009-10-25 07:34:07 -04:00
grindi
aff69287ff Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-25 14:23:08 +03:00
grindi
b4200f9f51 Tiny fix 2009-10-25 14:22:49 +03:00
fpdb-mme
1efdd7fc68 add DatabaseManager 2009-10-25 10:22:06 +01:00
fpdb-mme
0b0312d1ee Signed-off-by: fpdb-mme <jUrner@arcor.de> 
initial commit
 2009-10-25 00:13:35 +02:00
sqlcoder
b1d65dbadd default all values in hud_params when not passed into get_stats_from_hand 2009-10-24 20:01:24 +01:00
sqlcoder
d39a34686e tidy up main() output 2009-10-24 12:41:51 +01:00
sqlcoder
11f50765c9 fix main 2009-10-24 12:16:26 +01:00
Worros
914f930c5b GuiSessionViewer update. 
Getting closer - added player and date tests. Not convinced the data coming back is koshur though - got a $3600 day in the middle of my data
 2009-10-23 15:01:02 +08:00
Worros
a2309f704c More GuiSessionViewer updates 
Getting closer to a decent layout
 2009-10-23 13:50:06 +08:00
Worros
397f654789 GuiSession viewer update. 
Still broken, got the math right in preparation for candlestick graph
 2009-10-22 14:09:36 +08:00
Mika Bostrom
6ec309a685 Provide extra path for mucked cards image 
Modified:
* Mucked.py

When running from outside source tree, the image containing mucked
cards' faces could not be loaded. Provide an extra path to load from.
 2009-10-22 08:44:45 +03:00
Mika Bostrom
616c07a4eb Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-21 20:29:44 +03:00
Mika Bostrom
b8f19741e0 Fix packaging issues 
Affected files:
* Configuration.py
* Database.py
* HandHistoryConverter.py
* fpdb_import.py

and setup.py to a lesser extent.

Logging requires a configuration file when initialising the class. If we
are executing from outside the source tree, this file is not present.
Catch config parser's error and try to provide the logging config file
from debian package path.

Update symlink target to match python-support from latest Debian and the
oncoming Ubuntu versions.
 2009-10-21 20:24:46 +03:00
Worros
58707d2022 Update GuiSessionViewer. 
Still horribly broken, but on its way
 2009-10-21 17:22:47 +08:00
Worros
4f754fa881 Add some prep work for sorting the stats page 2009-10-20 12:06:29 +08:00
Worros
b39f766941 Color cash columns in red and green 2009-10-19 19:39:46 +08:00
sqlcoder
6a029ccfa7 comment out debug statement 2009-10-19 00:36:31 +01:00
sqlcoder
2c7a853b3f keep heading on screen when scrolling stats windows 2009-10-19 00:36:08 +01:00
sqlcoder
35cc1b1314 fix mysql code for new stats options 2009-10-19 00:15:11 +01:00
sqlcoder
4b7aadd325 fix starting hand order 2009-10-18 23:19:26 +01:00
sqlcoder
c1a998b7d8 add all player (and min hands) ability to stats window 2009-10-18 22:56:10 +01:00
sqlcoder
6453154ef6 prepare for all players display 2009-10-18 17:18:07 +01:00
sqlcoder
0ccc204c89 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-18 12:19:42 +01:00
sqlcoder
5beb033547 debug session stats 2009-10-18 12:19:22 +01:00
Worros
cfc854ab50 Fix some bugs in BetfairToFpdb. 
As reported by tchaz on 2+2:

http://forumserver.twoplustwo.com/showpost.php?p=13870274&postcount=1960

Using the only sample file I have for Betfair, it appears there is still and accounting error
 2009-10-18 07:56:34 +08:00
Worros
639036871b HUD_config.xml.example update 
Added Betfair to default config - copied Party.

Also went through and cleaned up whitespace in that file at the same time - tabs to spaces, cleaned trailing spaces.
 2009-10-18 07:54:41 +08:00
sqlcoder
7bd388613d Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-15 23:02:57 +01:00
sqlcoder
ac50cf85ca update comments on aggregation 2009-10-15 23:02:50 +01:00
Worros
ceaa78bdc8 Add usage message to GuiBulkImport cli 
I keep forgetting the format for Full Tilt cli import
 2009-10-15 15:23:47 +08:00
Worros
c3bc165a90 Add comment to DerivedStats 2009-10-15 15:13:09 +08:00
Worros
7a9237b707 GuiBulkImport - make cli version print out import stats 2009-10-15 15:12:08 +08:00
Worros
2e2531c0e4 Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-10-15 14:55:21 +08:00
Mika Bostrom
019440a71b Merge branch 'master' into good 
Conflicts:
	pyfpdb/Configuration.py
	pyfpdb/HUD_config.xml.example
 2009-10-15 09:06:31 +03:00
Worros
2d9b92af90 Make GuiBulkImport allow multi-file select 2009-10-15 11:57:42 +08:00
Mika Bostrom
54d309f797 Minor fixes to hud setup code 2009-10-14 19:33:19 +03:00
Worros
16d1f43c7e [NEWIMPORT] HandsPlayers.streetXAggr insert. 2009-10-14 23:55:51 +08:00
Mika Bostrom
a232a94eb1 Try to make hud more configurable 
Modified files:
* Configuration.py
* HUD_config.xml.example
* HUD_main.py

Instead of tweaking aggregation settings directly in code, make the
values configurable through HUD_config.xml; use the newly created
<hud_ui> element for this. Retain coding convention and key-value
names as they are.
 2009-10-14 16:04:09 +03:00
Worros
7b2c1fa243 [NEWIMPORT] Minor update, use DerivedStats.getStats() 2009-10-14 20:28:07 +08:00
Worros
2350474d38 [NEWIMPORT] Start of HandsPlayers insert 2009-10-14 20:20:17 +08:00
Worros
f0f2bcda14 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-14 12:06:01 +08:00
Worros
1fc015b09f [NEWIMPORT] Move db insert into SQL.py (store_hand) 2009-10-14 12:05:17 +08:00
sqlcoder
4d92e3d2a0 update graph viewer to work with enhanced filter 2009-10-13 23:06:09 +01:00
sqlcoder
4b0a399ffd stop fpdb.py accessing fpdb_db directly 2009-10-13 21:53:51 +01:00
sqlcoder
785e3d63a2 add 'is db running' printed message when pg db connect fails 2009-10-13 21:52:13 +01:00
Worros
843bd754f6 [NEWIMPORT] Prep insert functions 
Cleaned up storeHandsPlayers and added storeHudCacheNew

Haven't decided on the data structures to be passed in as yet so the functions only insert the bare minimum and have a list of commented out variables
 2009-10-13 17:42:02 +08:00
Worros
4d04a4b1db [NEWIMPORT] Take a copy of generateHudCache for DerivedStats 
Commented out, should give a good basis for generating the stats from Hand class
 2009-10-13 17:30:49 +08:00
Worros
f4887235a0 [NEWIMPORT] Fix Hand import so it runs 
Also comment out some debug
 2009-10-13 15:58:05 +08:00
Worros
00a8593631 Fix table re-create bug in fillDefaultData 2009-10-13 14:12:25 +08:00
Worros
1d0177f6d4 [NEWIMPORT] Finish up Hand import 
Decided to leave streetXRaisesN alone for the moment
 2009-10-13 14:04:19 +08:00
Worros
e7a7229dc0 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-13 13:22:08 +08:00
sqlcoder
aaba84de19 Add ring/tourney radio button to filter 2009-10-12 23:02:20 +01:00
Worros
035b71b018 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-12 10:20:22 +08:00
sqlcoder
181294ddf4 tidy up Filters and PlayerStats layout a bit 2009-10-11 23:36:26 +01:00
sqlcoder
b14fd2553c add some debug for session stats - I think there is a bug in here somewhere that makes it include too many hands sometimes ... 2009-10-11 23:34:05 +01:00
sqlcoder
b8be20f551 show nl and fl limits separately in filter 2009-10-11 22:44:52 +01:00
Eric Blade
d4cbed121d fix indentation errors 2009-10-09 07:39:05 -04:00
Eric Blade
8eeac34fce Merge branch 'master' of git://git.assembla.com/fpdb-sql.git 2009-10-09 07:35:12 -04:00
Eric Blade
05ccca63ad Merge branch 'master' of git://git.assembla.com/fpdboz.git 
Conflicts:
	pyfpdb/fpdb.py
 2009-10-09 07:34:13 -04:00
Eric Blade
ee864033ee Add exception for not being able to connect to MySQL, make use of it to pop up an error box 2009-10-09 07:31:25 -04:00
Worros
6d0ec5d831 [NEWIMPORT] Add playersAtStreetX to insert 2009-10-08 18:13:13 +08:00
Worros
cf6c3c8ad0 [NEWIMPOR] Fix playersVpi from last patch 
Oops - forgot to add the argument
 2009-10-08 18:07:54 +08:00
Worros
31f48c4932 [NEWIMPORT] Calculate playersAtStreetX 
Untested code.

Still missing playersAtShowdown, haven't looked to see if hand.actionStreets contains showdown.
 2009-10-08 18:01:49 +08:00
sqlcoder
7d708a327c try to fix aggBBmultItemAll error 2009-10-07 23:45:59 +01:00
Worros
024618235f Clean up variables in DerivedStats 
Doesn't look like they are going to be used like that
 2009-10-07 14:15:12 +08:00
Worros
fdef5b12d9 Add playersVpi to NEWIMPORT code 
Untested at the moment, moved the code from Hand.py into DerivedStats.
 2009-10-06 18:30:52 +08:00
Worros
94af5b1ea8 Fix order bug for seats in NEWIMPORT 2009-10-06 12:08:20 +08:00
Worros
230eb32615 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-06 11:11:58 +08:00
sqlcoder
8851b141a2 add dropdown to player name in filter 2009-10-05 22:12:35 +01:00
sqlcoder
7149de3aa2 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-10-05 20:41:10 +01:00
sqlcoder
7900ebcebe Tell user what is happening on startup 2009-10-04 17:46:04 +01:00
sqlcoder
5e3644d8d9 make separate hud menus for player and opponents stats 2009-10-04 12:26:37 +01:00
Ray
971a282383 Merge branch 'master' of git://git.assembla.com/fpt_fpdb 2009-10-03 21:09:21 -04:00
sqlcoder
5a0c83b60a debug session stats 2009-10-03 23:11:45 +01:00
Mika Bostrom
f6eb365b3c Add the default box text to example config 
Now that the text on HUD's box is configurable, move the default text
from code to default/sample config.
 2009-10-03 21:18:49 +03:00
Mika Bostrom
14122770ef Make hud's menu-area text configurable 
By default the hud positions a little box on top-left corner of each
table. Make the text in this box user-modifiable without touching the
source.

Most likely useful for active users and those who play with smaller
tables. On shrunk table the default box may cover some of the players'
cards.
 2009-10-03 21:18:39 +03:00
Mika Bostrom
c77e143436 Add the default box text to example config 
Now that the text on HUD's box is configurable, move the default text
from code to default/sample config.
 2009-10-03 21:10:09 +03:00
Mika Bostrom
18cc51ba7a Make hud's menu-area text configurable 
By default the hud positions a little box on top-left corner of each
table. Make the text in this box user-modifiable without touching the
source.

Most likely useful for active users and those who play with smaller
tables. On shrunk table the default box may cover some of the players'
cards.
 2009-10-03 21:05:41 +03:00
Mika Bostrom
a1d5f2292f Merge branch 'master' of git://trac-git.assembla.com/fpdb-sql 2009-10-03 00:57:25 +03:00
sqlcoder
61f384a886 improve stats menu in HUD some more 2009-10-01 23:16:20 +01:00
sqlcoder
b0037e545a improve stats menu on hud 2009-10-01 21:40:14 +01:00
Worros
d36d8f4249 From 7d5a3e81a5d41298ab1fa4d57bef25862a167350 Mon Sep 17 00:00:00 2001 
From: lucktard <ntogden@gmail.com>
Date: Wed, 30 Sep 2009 12:16:06 -0500
Subject: [PATCH] Detect and import capped 6 max hands on FullTilt

and

From b35d23aba38935406cf1522ae07a49cd441318b3 Mon Sep 17 00:00:00 2001
From: lucktard <ntogden@gmail.com>
Date: Wed, 30 Sep 2009 12:21:34 -0500
Subject: [PATCH] Detect deep 6 max tables for HUD on FT
 2009-10-01 10:49:59 +08:00
Mika Bostrom
e4969820b8 Merge branch 'master' of git://trac-git.assembla.com/fpdb-sql 2009-09-30 20:27:17 +03:00
sqlcoder
2b7a42bf1d fix bug for tourneys in new code, modify part of hud menu to use checkmenuitems 2009-09-29 23:34:52 +01:00
Mika Bostrom
432c24173e Merge branch 'master' of git://trac-git.assembla.com/fpdb-sql 2009-09-29 09:11:33 +03:00
sqlcoder
16f8fffd68 add separate hud config for user and allow some user config in HUD menu (opponents still only via editing HUD_main.py) 2009-09-28 23:59:17 +01:00
Mika Bostrom
5260f5c384 Merge branch 'master' of git://trac-git.assembla.com/fpdb-sql 
Conflicts:
	pyfpdb/Database.py

Resolve by reverting to sqlcoder's version; it uses the nice insert in
fillDefaultData for each case now and having the DB backends separate
might be good for the foreseeable future.
 2009-09-28 18:07:08 +03:00
sqlcoder
cb9a972eda add aggregation options to hud menu 2009-09-28 00:51:09 +01:00
sqlcoder
b6ea02fd43 improve tourney importing 2009-09-28 00:44:55 +01:00
sqlcoder
db861292a5 use False for boolean so it works in postgres as well as mysql 2009-09-27 23:42:00 +01:00
sqlcoder
d6414d211b allow separate hud options on each table and add aggregate options to main table menu 2009-09-27 21:23:00 +01:00
sqlcoder
7f47a753db cosmetic change to comment 2009-09-27 21:21:26 +01:00
sqlcoder
8353d0739b improve hudcache recalc when db is empty and avoid mysql long int problem 2009-09-27 13:36:45 +01:00
sqlcoder
01c33c26f8 fix tourneytypes insert for postgres again 2009-09-27 12:47:21 +01:00
sqlcoder
8d01caa30f try to work around Everleaf problem where winning hole cards not always shown - derive from winning hand where possible 2009-09-27 12:21:22 +01:00
sqlcoder
d5a1523e59 fix startCard calcs 2009-09-27 11:40:39 +01:00
sqlcoder
9a7d7267ff remove print 2009-09-27 10:42:33 +01:00
sqlcoder
6f75719ffe refine hero's player id derivation in empty db's 2009-09-27 02:06:07 +01:00
sqlcoder
c1711c4e2e refine new date option on hudcache rebuild 2009-09-27 01:42:26 +01:00
sqlcoder
b054a9c09a fix params when creating Database instance 2009-09-27 00:06:06 +01:00
sqlcoder
e75d915120 allow hudcache rebuild to only start Hero's stats from chosen date :-) 2009-09-26 23:32:44 +01:00
sqlcoder
518fd9e039 merge from Eric 2009-09-26 11:45:05 +01:00
sqlcoder
ea74862a5a start changes to allow different hud choices for hero and opponents 2009-09-26 11:30:12 +01:00
sqlcoder
3d301718ae create/alter unique indexes and change inserts into tourneytypes and tourneysplayers 2009-09-25 23:10:58 +01:00
sqlcoder
c519756a49 look for sqlite db in 'database' dir, create dir first if required 2009-09-25 20:18:13 +01:00
sqlcoder
a67830d92e 2 changes: move recognisePlayerIDs from fpdb_simple into Database, and make index on siteTourneyNo on Tourneys table unique and refine store_tourneys function to handle this 2009-09-24 02:12:04 -04:00
Mika Bostrom
6f536d29e7 Fix import on PostgreSQL 
Database.py : fillDefaultData()

Remove manual 'id' from INSERT command. In database schema,
TourneyTypes.id is a primary key and thus autoincrement. In postgres,
autoincrements are implemented as sequences - inserting a value
"manually" bypasses the sequence generation, which resulted in a
remarkably weird error.

Namely, upon the first hand to import, the insert fails due to primary
key violation. The default value from an unused sequence is 1, but a
row with such an id already exists.

The solution is to create the single row of default data values with
unspecified TourneyTypes.id, hence allowing postgres to generate the
correct id from the sequence. This way the import works again.
 2009-09-24 07:08:32 +03:00
sqlcoder
daeefd7d8a hide regular exception when closing hud 2009-09-23 23:04:38 +01:00
sqlcoder
23f56ea2ae 2 changes: move recognisePlayerIDs from fpdb_simple into Database, and make index on siteTourneyNo on Tourneys table unique and refine store_tourneys function to handle this 2009-09-23 23:03:34 +01:00
Mika Bostrom
df71dcf2c7 Fix knockout variable type 
fpdb_parse_logic.py : recogniseTourneyTypeId()

The column in table is of type 'boolean' but the default value was
integer '0'; this triggered an error
 2009-09-23 23:44:57 +03:00
Mika Bostrom
00f8b34fff Simplify database creation 
Database.py : fillDefaultData()

Sql-coder had fixed the default data insert, and in the process changed
the default type ID. Since his works in general case, I can remove my
modifications.
 2009-09-23 23:36:17 +03:00
Worros
a20bfe0921 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-09-23 13:22:45 +08:00
Worros
4e361e383c Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-09-23 13:22:35 +08:00
sqlcoder
e080ec3fd1 further fix to tourneytypes insert for postgres 2009-09-22 22:08:42 +01:00
sqlcoder
455e92e6f6 fix tourneytypes insert for postgres 2009-09-22 22:04:05 +01:00
sqlcoder
b0677545e0 remove UNSIGNED from postgres create table statement 2009-09-22 21:54:01 +01:00
sqlcoder
5c92d6ac02 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-09-22 21:46:50 +01:00
Worros
89f86dd32b Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-09-22 12:35:11 +08:00
Mika Bostrom
1351cd6dd9 Use cleaner syntax in fillDefaultData 2009-09-21 15:31:19 +03:00
sqlcoder
6357f22f11 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-09-20 22:52:05 +01:00
Worros
2cea6f01b9 Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-09-19 19:25:01 +08:00
Worros
577beed942 Prep new function - commented out for the moment 2009-09-19 19:24:07 +08:00
Mika Bostrom
e54c45b7d1 Fix database creation with Postgres 
* Database.py : fillDefaultData()

PostgreSQL has a rather annoying (mis)feature when dealing with boolean
data types: raw 1/0 input as integer is not automatically cast to
boolean values. Instead, one must use one of several other ways of
signifying true/false.
http://www.postgresql.org/docs/8.4/static/datatype-boolean.html
documents the available and understood formatting.

Fix by special-casing PostgreSQL and making all boolean values fed as
strings, '1' for true and '0' for false.
 2009-09-19 11:44:06 +03:00
Mika Bostrom
84dc9652df Fix table creation for Postgres 
PostgreSQL does not have an UNSIGNED specifier in its language.
Mysql's "TINYINT UNSIGNED" is postgreSQL's "SMALLINT" which is a bit
inconvenient but apart from annoying, not a problem.
 2009-09-19 11:10:07 +03:00
Eric Blade
3f0ede67ee fix a small error that caused deletion of your hud_config when saving.. oopsie 2009-09-17 05:26:06 -05:00
Eric Blade
226153f15f Revert "FTtoFPDB: readBlinds: cleanup exception handler" 
This reverts commit 0938afb882.

Conflicts:

	pyfpdb/FulltiltToFpdb.py
 2009-09-16 01:40:43 -05:00
Eric Blade
05267db38a i hate git, i hate git, yes i do 2009-09-16 01:36:34 -05:00
Eric Blade
fbceb6d7af bypass the changes made in readBlinds which somehow broke the hell out of stuff 2009-09-16 01:28:28 -05:00
Eric Blade
7ed5d0972e use with..as for file reading/writing, as we don't need 2.4 compat anyway right? 2009-09-16 01:26:19 -05:00
Eric Blade
ded05cb290 put the regex search back into the try: in FT readBlinds() because it broke FL games somehow 2009-09-16 00:54:29 -05:00
Eric Blade
2095f3c899 use with..as for file reading/writing, as we don't need 2.4 compat anyway right? 2009-09-16 00:13:42 -05:00
Eric Blade
0938afb882 FTtoFPDB: readBlinds: cleanup exception handler 
also deal with finishPositions not being accurate, by printing a message to that effect, instead of crashing an import
 2009-09-15 23:32:23 -05:00
Eric Blade
ba1513847b clean up exception handling in Configuration and imports in GuiGraphViewer 2009-09-15 23:30:59 -05:00
Eric Blade
bcecf643f2 cleanup imports section and spacing in fpdb_db 2009-09-15 22:10:37 -05:00
Eric Blade
ba663c231c cleanups 2009-09-15 22:04:37 -05:00
Eric Blade
a566d52b9a cleaning cleaning cleaning.. keep them coders cleaning.. cleaning cleaning cleaning.. 2009-09-15 21:26:10 -05:00
Eric Blade
23acfbd642 deal with KeyErrors in update() in a vaguely intelligent fashion 2009-09-15 21:25:26 -05:00
Eric Blade
2790a623af import, code, exception cleanups 2009-09-15 21:07:31 -05:00
Eric Blade
e4772dcb74 init vars used in load_clicked, comment out the exception handler that was single handedly stopping virtually all errors in the import process from showing up 2009-09-15 21:06:43 -05:00
Eric Blade
a1783a37cb reflow init_hud_stat_vars exception handling 2009-09-15 21:04:00 -05:00
Eric Blade
d6c5309aa3 clean up some module import code in fpdb_import 2009-09-15 20:10:18 -05:00
Eric Blade
8b19750b1f == None to is None (PEP 8, Style Guide for Python Code) 2009-09-15 19:27:25 -05:00
Eric Blade
4374b6c810 remove Database:__init__ parameters for db_name and game, as there was a comment right next to them # db_name and game not used anymore 2009-09-15 18:49:34 -05:00
Eric Blade
b0616a7d2c as soon as a stat window is clicked on, with any button, bring it forward. this seems to almost completely solve the insane focus-wobbling in windows 2009-09-13 15:08:23 -05:00
PassThePeas
16d53f1502 Patch for HUD and FTP tourneys 
modified:   Hand.py
	- writeTableLine : adds the tourneyNo in tourney context
	modified:   Tables.py
	- discover_nt_by_name : add filter for HUD and chat windows
 2009-09-12 23:14:55 +02:00
Ray
e69cbc30ea Merge branch 'master' of git://git.assembla.com/fpt_fpdb 2009-09-11 10:05:22 -04:00
Ray
bd3f73bd58 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-09-11 10:05:08 -04:00
Ray
2b0c59eee9 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-09-11 10:04:57 -04:00
Eric Blade
7283d09b4d replace "trying *codepage*" message to console with an error message only if none of our specified codepages is successful 2009-09-11 00:38:20 -05:00
Eric Blade
715b14f81a moved timeout_add that calls do_import outside of the for loop, so it's only created once per autoimport start, not once per site. fix addImportFile to ignore files that don't exist (not sure how they'd get there, but just in case), fixed exception looking for fpdb_simple.DuplicateError to look in it's actual location at Exceptions.DuplicateError 2009-09-11 00:12:46 -05:00
Eric Blade
1f9dd8f8e9 HHC/fpdb_import: throw in some calls to gtk.main_iteration(False) 
GuiBulkImport: replace "Importing" label with actual progressbar (does not use percentages, simply an activity bar)
 2009-09-09 22:10:55 -05:00
Eric Blade
993199c010 add sqlcoder to about 2009-09-09 21:04:38 -05:00
Eric Blade
705210a96d use the "proper" gtk.AboutDialog() for About ... meh 2009-09-09 20:57:16 -05:00
Eric Blade
345e328795 Add Set HH Archive Directory option to Import menu on main, call it if user selects "no" on "create hh directory" prompt 2009-09-09 20:26:44 -05:00
Eric Blade
ae04f5562a Configuration::Import keeps track of it's node, added function to Configuration::Config to set the Import's hhArchiveBase 2009-09-09 20:21:27 -05:00
Eric Blade
2bf3aaa1bc most of the unimplemented stuff goes to warning_box() instead of to log/stdout. Implemented About (via warning_box, w/e) 2009-09-09 18:36:55 -05:00
Eric Blade
2397a59483 add warning_box func to fpdb, add validate_config func, checks existence of hhArchiveBase, pops up warnings if not present 
hhc traps errors creating folders, need to learn how to make it fail properly afterwards.
 2009-09-09 18:20:50 -05:00
Eric Blade
6238e2f896 spacing 2009-09-09 17:41:32 -05:00
Eric Blade
28450b1b8a remove tons of useless comments from fpdb.py - documentation should say something that isn't blazingly obvious by looking at the code 2009-09-09 05:01:03 -05:00
Eric Blade
e681fe4958 little cleanup 2009-09-06 23:07:40 -05:00
Eric Blade
fec805c9d3 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-09-06 23:07:13 -05:00
PassThePeas
49ce7de254 Patch for HandsPlayers.TourneyTypeId not being null (even in ring context) for hudcache / Extend tourneyName size in TourneysTable 2009-09-07 00:18:10 +02:00
Worros
9e30336acc Remove BOM from AbsoluteToPoker.py 2009-09-06 22:40:27 +08:00
Eric Blade
1b5c70007c Merge branch 'master' of git://git.assembla.com/mctfpdb.git 2009-09-05 03:55:56 -05:00
Ray
88d33dd4f4 Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-09-04 18:08:06 -04:00
Matt Turnbull
b40132e961 db can be specified in cmd line option again 2009-09-04 22:12:35 +01:00
Ray
d80318d950 Fix small case sensitive bug. 2009-09-04 16:43:55 -04:00
Eric Blade
e7d43ceaca fix taskbar listing of fpdb hud 2009-09-04 14:14:38 -05:00
Ray
f8a899bcfb Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-09-04 10:31:41 -04:00
Eric Blade
97a62933e4 remove logging.out from the git tree 2009-09-04 06:51:05 -05:00
Eric Blade
9fa57b6014 Database: re-write and fix drop_tables 
Exceptions: add FpdbDatabaseError
SQL: default all tourneytypeids to 1
fpdb_import: import error tuples set to right size
 2009-09-04 06:49:46 -05:00
Eric Blade
9a44a2efef Merge branch 'master' of git://git.assembla.com/fpdboz.git 
Conflicts:
	pyfpdb/HandHistoryConverter.py
 2009-09-04 05:11:01 -05:00
Eric Blade
a7dd023616 some error cleanup 2009-09-04 05:09:03 -05:00
Worros
4f98b29b26 Merge branch 'master' of git://git.assembla.com/fpt_fpdb 
Conflicts:
	pyfpdb/Database.py
 2009-09-04 12:45:49 +08:00
PassThePeas
91ebbe79e1 Last part of core tourney import 
Database.py : tStoreTourneyPlayers and tUpdateTourneysHandsPlayers implemented
HandHistoryConverter.py : fix for 0-byte summary files
SQL.py : new queries
Tourney.py : cleanup stdout
 2009-09-04 02:01:41 +02:00
Matt Turnbull
cad5149c0e Only errors to stderr and console. 2009-09-03 22:40:06 +01:00
Eric Blade
844a01318a cleanup to hud window creation, menu creation, deal properly with calls to the timeout function when we're not ready for it yet, simplify the "topify" methods, hopefully fix some focus problems 2009-09-03 09:35:59 -05:00
Worros
b52ceb3f90 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-09-03 21:37:57 +08:00
Eric Blade
b7495395e8 crlf churn i think 2009-09-03 02:46:22 -05:00
Eric Blade
18e03311e6 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-09-03 02:45:49 -05:00
Worros
c350d62089 Fix typos 2009-09-03 15:44:28 +08:00
Eric Blade
59a1cef821 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-09-03 02:44:11 -05:00
PassThePeas
4853b888a6 Correct oddity : self.status = status = self.getPlayersPosit... and status unused 2009-09-03 07:51:05 +02:00
Worros
b4ccc7f45c Add guards around numpy in GuiSessionViewer for windows users 2009-09-03 11:29:30 +08:00
PassThePeas
025c81b1e1 Tourney parsing : payinAmounts, countRebuys, countAddons and countKO are now defined by player (instead of being attached to the Tourney for Hero) 2009-09-03 02:11:38 +02:00
PassThePeas
d28f56db18 Tourney import : tRecognizeTourney implemented (search, update or insert a Tourney 2009-09-02 22:55:47 +02:00
PassThePeas
4a0b2274f8 Tourney parsing : Use of "Decimal" insted of float2int / Handle amounts in cents four Tourney Object 2009-09-01 23:46:46 +02:00
Worros
c80bb3ac3f sys.exit() in Hand.addShownCards() has to be wrong 2009-09-01 18:35:40 +08:00
PassThePeas
b00a58249f Tourney import : tRecogniseTourneyType implemented 
modified:   Database.py
	* tRecogniseTourneyType : implemented
	modified:   FulltiltToFpdb.py
	* buyin, fee, rebuyAmount, addOnAmount : converted using fpdb_simple.float2int
	modified:   SQL.py
	* Added queries for Database.tRecogniseTourneyType (getTourneyTypeIdByTourneyNo modified to return all data, getTourneyTypeId and insertTourneyTypes added)
 2009-09-01 02:35:52 +02:00
Eric Blade
6568281589 Hand: will give you a proper message to the console if it can't figure out what your datetime passed to it is 2009-08-31 03:19:23 -05:00
Eric Blade
891ed0295f Absolute: Add support for HORSE Holdem, attempts to determine table name from filename if it can't find it in the hand 2009-08-31 03:18:00 -05:00
Ray
3e2974c716 First try of py2exe setup file. fpdb.exe and HUD_main.exe work. 
Some todos in the source.
 2009-08-30 19:40:18 -04:00
PassThePeas
3323d25ce7 Patch for handsplayers.tourneyTypeId and preparation for Tourney import 
modified:   Database.py
		* correct the HandsPlayers.tourneyTypeId entry (null for omaha/he ring games, correct value instead of 1 or null for omaha/he & stud tourneys)
		* add prototypes and description of new methods to store Tourneys info
	modified:   Tourney.py
		* add calls to new methods in Tourney.insert
 2009-08-31 01:30:28 +02:00
Eric Blade
63741468d0 removing "sending hand to hud" debug message 2009-08-30 12:45:02 -05:00
Eric Blade
d39fe74284 Merge branch 'master' of git://git.assembla.com/mctfpdb.git 2009-08-30 12:44:36 -05:00
Matt Turnbull
fe72b6edad do not require sqlalchemy, except for sqlite 2009-08-29 20:16:27 +01:00
Eric Blade
bd7f3de3d7 Conflicts: 
pyfpdb/fpdb_import.py
 2009-08-29 06:54:20 -05:00
Matt Turnbull
d2380ba738 merge from futz2 branch 2009-08-28 18:24:51 +01:00
Matt Turnbull
a9fb82d3b9 even more like eric's 2009-08-28 07:49:21 +01:00
Matt Turnbull
13dcaae591 Exceptions, Eric style (lost in merge) 2009-08-28 07:43:12 +01:00
Matt Turnbull
09350e8f52 Database.py - need os. Hand.py - encoding, and writeHTML doesn't need fh 2009-08-28 01:22:08 +01:00
Eric Blade
637bdcbdfc fix #17, Absolute Poker antes and even-amount stakes now parse 2009-08-27 10:27:19 -05:00
Eric Blade
2ae6790421 fix popup window (if your configuration is correct anyway) 2009-08-27 07:41:43 -05:00
Eric Blade
079ce989cc Tables: add " - Table " to ignore strings, so we don't attach to Absolute chat windows 2009-08-27 04:28:59 -05:00
Eric Blade
f91e6d1d69 AbsoluteToFpdb: fix for HU and FL tables (need to verify data coming in for PL and NL tables now, as that required code changes to blind handling as well), also likely fixes bug #14 where HU NL hands would not convert properly (also still need to test) 2009-08-27 02:29:44 -05:00
PassThePeas
0217e2320c DB Model changes to prepare for Tourney Summary import 
modified:   Database.py
		* fillDefaultData : queries that inserts the default line into TourneyTypes rewritten (simplified to take into account the columns that have "new" DEFAULT attribute)
	modified:   SQL.py
		* createTourneyTypesTable query modified : some existing columns are now created with a default values, new columns added
		* createTourneysTable query modified : new columns added
		* createTourneysPlayersTable query modified : new columns added
 2009-08-27 01:41:04 +02:00
PassThePeas
b85f8ec155 Some fixes in FTP summary parsing and preparations for summary import in DB. No behaviour change expected 
modified:   FulltiltToFpdb.py
	* Tourney Summary File parsing : add support for Madness tourneys
	* HH file parsing : enhance Tourney topline parsing to retrieve some info (HU, Rebuy, KO, Turbo, ...) and store it into Hand object
	modified:   Hand.py
	* Some attributes added to store tourney specific info
	modified:   SQL.py
	* Add a new request (getTourneyTypeIdByTourneyNo) to help finding a tourney already in db (preparation for Tourney Summary import)
	modified:   Tourney.py
	* Attribute tourneyComment added
	modified:   fpdb_parse_logic.py
	* Change parameters in call of fpdb_simple.recogniseTourneyTypeId
	modified:   fpdb_simple.py
	* recogniseTourneyTypeId : signature changed to allow for the search of a tourney id already in db prior to searching for tourneyTypeId
 2009-08-26 01:13:34 +02:00
Ray
cb8bc13ceb Allow self.codepage to be a list of codecs to try. 2009-08-23 19:40:39 -04:00
Ray
2e0c743671 Detect and skip HHs flagged as partial. 2009-08-23 15:02:00 -04:00
Ray
4065eebabe Merge branch 'master' of git://git.assembla.com/fpt_fpdb 2009-08-21 19:31:58 -04:00
Ray
0c4c0d34e7 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-08-21 19:31:32 -04:00
PassThePeas
4a1dd26db3 First attempt to parsing summary files from FTP 
modified:   FulltiltToFpdb.py
		* Modified re_HandInfo regex to take into account Matrix Tournament Hands Histories
		* Add Regex for Tourney Summaries files parsing
		* New methods : readSummaryInfo, determineTourneyType, getPlayersPositionsAndWinnings

	modified:   HandHistoryConverter.py
		* Add a Tourney object in the attributes to allow storing the summary info retrieved and the ability to hand it over after parsing
		* Add a new attribut parsedObjectType (string : "HH" or "Summary")
		* In follow = False mode : read the first line to swicth between HH & Summary parsing
		* TO DO : Deal with parsing summary files in follow = True mode
		* New methods added : isSummary, getParsedObjectType (to be called in fpdb_import), readSummaryInfo : abstract (to be implemented in each specific HHC), getTourney (returns the new attribute)

	new file:   Tourney.py
		* New object
		* Lots of attributes regarding the tourney info (buy-in, fee, entries, speed, Rebuy/add-on info, starting chips, KnockOut info, isHeadsUp, isShootout, isMatrix, ...
		* List of players with finishing positions (when available) and winnings (when available)
		* Methods :
		  ** addPlayer(self, rank, name, winnings)
		  ** incrementPlayerWinnings(self, name, additionnalWinnings): used for KO tourneys when KO occured (for Hero only)
		  ** calculatePayinAmount : unused yet, should be necessary for DB storage
		  ** some Hand methods copied that are still to be done including : assemble and insert
		  ** TO DO : write the insert method for the object to be stored in DB. This will have to deal with the fact that the DB write can occur both before (Bulk Import) or after the HH file info has been stored (tourney might or might not already exist)

	modified:   fpdb_import.py
		* import_file_dict modified :
		  ** after the construction of the hhc, it now calls the new getParsedObjectType method of HHC in order to know what has been parsed by the HHC
		  ** If it's a hand history file (actual expected behaviour) : do as before
		  ** If it's a summary file, gets the tourney object that has been built from the hhc and calls the insert method on it (similar to NEWIMPORT=True for HH)
 2009-08-22 00:09:34 +02:00
Eric Blade
8420e22038 add in Ante RegEx for Absolute .. hopefully it works, but I don't have the roll there to play holdem with Antes to find out 2009-08-21 05:57:04 -05:00
Eric Blade
d5d0c9aee3 add "rebuy" button to TT 2009-08-21 00:48:26 -05:00
Eric Blade
832b7fe4db add first revision of my TournamentTracker idea, actually based on the HUD_main program :) 
fix SummaryEverleaf to be a little more friendly to being imported and accessed from other modules
TournamentTracker pops open an Edit Window when you add a tournament, but I don't know how to actually populate it with Edit boxes yet
 2009-08-21 00:42:19 -05:00
Eric Blade
629159c785 rename Summary-Everleaf to SummaryEverleaf, as I've discovered you can't import a module with a "-" in it's filename 2009-08-21 00:23:07 -05:00
Ray
4a794f7f7a Merge branch 'master' of git://git.assembla.com/fpt_fpdb 2009-08-20 12:21:59 -04:00
Eric Blade
1ecafb7f42 push test Summary-Everleaf program to obtain information about Everleaf tournaments from HTTP 2009-08-19 23:42:10 -05:00
Eric Blade
677b0a5e35 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-08-19 05:59:50 -05:00
Eric Blade
fafbda8053 add proper returns for our mouse-button callbacks in HUD, also trap events for focus change, which doesn't entirely solve the focus issues, but does lessen them for me 2009-08-19 05:59:44 -05:00
PassThePeas
e403c18780 Patch the readPlayerStacks : different behaviours between tourney and ring hands 
modified:   FulltiltToFpdb.py
In tourneys, players sitting out are considered as in the hand. That's not the case in ring games.
 2009-08-18 21:17:00 +02:00
Worros
0877e428ef Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-08-18 18:46:15 +08:00
Worros
4cc08763fc Add query getPlayerIdBySite 2009-08-18 18:44:47 +08:00
grindi
b8af93efb5 Merge branch 'master' of git://git.assembla.com/fpt_fpdb 
Conflicts:
	pyfpdb/FulltiltToFpdb.py
 2009-08-18 13:47:11 +04:00
sqlcoder
1640ab3cfc attempt to stop a KeyError problem (problem patching up the symptoms rather than fixing the cause) 2009-08-17 21:51:13 +01:00
Eric Blade
9f89340881 timeout in startbutton reset resets to Stop or Start as appropriate 2009-08-16 14:30:52 -05:00
PassThePeas
c5aedf321f Modification to FulltiltToFpdb.py mostly for tourneys contexts 
modified:   FulltiltToFpdb.py
- Sitting out players are no longer considered out of a hand (in a tourney context, they can act even if out at the beggining of the hand)
- re_CollectPot modified to take into account Tournament context (no $ in the pot)
- Try to read buy-in/fee from topline in Tournament context
- Deal with commas in pot size (readCollectPot)
 2009-08-16 20:01:36 +02:00
grindi
15c854d368 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-08-16 20:07:19 +04:00
Eric Blade
8bba1fd932 structured Exceptions a bit more like most python apps seem to do it (and as suggested in the manual) 2009-08-16 07:32:56 -05:00
Eric Blade
d495606f2a GuiAutoImport: 
do_import: change label of Stop button when running an import, to provide a visual indicator
 startClicked: refactor so only the Pipe Open is inside the exception handler, since that should be the only thing in there that we need to ignore an exception from.
 2009-08-16 05:30:11 -05:00
Eric Blade
aa0610dcfa fpdb: remove error trap on "Recreate Tables" menu option - trapping should be much more localized. 2009-08-16 04:46:41 -05:00
grindi
e7dc9ed586 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-08-16 13:40:28 +04:00
Eric Blade
a90415bc84 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-08-16 04:23:49 -05:00
Eric Blade
b26f4a09ce Absolute: support Pot Limit and Fixed Limit ("Normal" as they call it) 
Configuration: Only trap the thrown error when checking for existence of site default paths, if not found set path to a reasonable ERROR message instead of "default"
 2009-08-16 04:22:22 -05:00
grindi
6133d0f9bb Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-08-16 02:07:54 +04:00
Matt Turnbull
29a0ad85c7 full path to logging.config, small fix in Configuration.Database string repr 2009-08-15 22:36:14 +01:00
grindi
40b8ce799b Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-08-15 21:53:34 +04:00
Ray
46085cba5d Repair missing line in regex, comment out skipping tournaments. 2009-08-15 13:30:31 -04:00
Worros
6648036399 Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-08-15 23:38:54 +08:00
Mika Bostrom
b79f0ddccf Actually call position update on reposition 
Forgot to commit the call that does hud and aux window repositioning
 2009-08-15 14:36:08 +03:00
Worros
dede86521a Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-08-15 19:06:39 +08:00
Worros
ecad66f7d8 Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-08-15 19:06:18 +08:00
Mika Bostrom
53eaee4d7c Fix mucked cards' position update 
When menu->reposition is called, only the HUD windows were moved to
their new positions. The auxiliary windows used for mucked cards
remained where they were at the time the HUD instance was created. This
caused mucked cards to appear in wrong places after the poker table was
moved.

Split positioning code in Mucked.py to its own method. Now the same
routine that moves HUD windows to their new places also invokes code
to reposition auxiliary windows.

Now the mucked cards are displayed at correct screen coordinates too.
 2009-08-15 10:44:04 +03:00
grindi
2cfbb07cd1 Merge branch 'experimental' 
Conflicts:
	pyfpdb/Hand.py
 2009-08-12 22:04:41 +04:00
grindi
bdfc6ef83f Unified locale handling. 
Added support for importing filenames containig non-latin symbols
 2009-08-12 21:55:19 +04:00
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