evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,151 Commits 1 Branch 0 Tags 14 MiB
9f64602338
Commit Graph

3692 Commits

Author SHA1 Message Date
steffen123
90c81cb4ee move method from TF to F 2010-07-27 18:25:27 +02:00
steffen123
9006a7f45b remove another dupe method from TourneyFilters 2010-07-27 18:24:07 +02:00
steffen123
84df9ad567 remove more duplicate methods from TourneyFilters 2010-07-27 18:21:43 +02:00
steffen123
c996a11ed6 move method from TourneyFilters to Filters 2010-07-27 18:17:25 +02:00
steffen123
20ebd040c1 remove some methods in TourneyFilters that are identical in Filters 2010-07-27 18:16:46 +02:00
steffen123
e0b194ddf0 minor cleanup 2010-07-27 17:43:47 +02:00
steffen123
5b432bcd99 GUI: remove obselete and broken table viewer 2010-07-27 15:48:19 +02:00
steffen123
71df9b06dd HUD: make it work again after my previous overzealous removal of HP.TTid 2010-07-23 04:45:57 +02:00
steffen123
1f933563ee EVERLEAF: add comment where to get tourney info 2010-07-23 04:03:35 +02:00
steffen123
7f25cf6da8 DB: allow NULL for TT.currency/buyin/fee for when this info is not available 2010-07-23 04:00:25 +02:00
steffen123
a2243c8542 EVERLEAF: remove comment about converting to ET - we do not want to do that! 2010-07-23 03:55:45 +02:00
steffen123
de8b9e89c5 FTP: fix import 2010-07-23 02:07:49 +02:00
gimick
dfca631280 py2exe script update 2010-07-22 22:21:46 +01:00
steffen123
3759af4902 GUI: update version indicator to include "plus git" again 2010-07-22 22:59:53 +02:00
steffen123
4eefd15175 GUI: update version for snapshot 2010-07-22 21:18:55 +02:00
steffen123
61034680fe GUI: indicate that TPS is only for mysql right now 2010-07-22 21:18:20 +02:00
steffen123
ad28168d02 DB/TOUR: remove HandsPlayers.tourneyTypeId 2010-07-22 21:03:01 +02:00
steffen123
b73ee36602 Merge branch 'sqlcoder' 2010-07-22 20:28:25 +02:00
steffen123
7063bc8905 TOURNEY: stop it from creating new TT for each tourney 2010-07-22 20:23:27 +02:00
steffen123
a6c43cdca7 TOUR: a trivial fix, a trivial change, and a few debug prints 2010-07-22 19:26:11 +02:00
Eratosthenes
ba66f85f8a Merge branch 'master' of git://git.assembla.com/fpdboz 2010-07-22 13:26:03 -04:00
Eratosthenes
8de59c0400 Merge branch 'master' of git://git.assembla.com/fpdb 2010-07-22 13:25:45 -04:00
Worros
72f395bab0 Merge branch 'master' of git://git.assembla.com/fpdb 
Conflicts:
	pyfpdb/FulltiltToFpdb.py
 2010-07-22 10:49:22 +08:00
Worros
6da2c6de82 Merge branch 'master' of git://github.com/kangaderoo/fpdb-kangaderoo 
Conflicts:
	pyfpdb/FulltiltToFpdb.py
 2010-07-22 10:48:22 +08:00
Eratosthenes
902a4ad722 Merge branch 'master' of git://git.assembla.com/fpdb 
Conflicts:
	pyfpdb/FulltiltToFpdb.py
 2010-07-21 22:45:14 -04:00
steffen123
d169733adf GUI: update version display for -git 2010-07-22 02:23:07 +02:00
steffen123
fe345c7cf3 Merge branch 'master' of git://github.com/kangaderoo/fpdb-kangaderoo 
Conflicts:
	pyfpdb/FulltiltToFpdb.py

conflict had obvious resolution
 2010-07-22 01:11:52 +02:00
Eratosthenes
21981a921b Merge branch 'master' of git://github.com/kangaderoo/fpdb-kangaderoo 
Conflicts:
	pyfpdb/FulltiltToFpdb.py
 2010-07-21 18:52:43 -04:00
Eratosthenes
64d76855f1 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:
	pyfpdb/py2exe_setup.py
 2010-07-21 18:46:34 -04:00
Eratosthenes
4ef31a02e1 Another tiny change to get in sync. 2010-07-21 18:43:45 -04:00
Eratosthenes
0e6aa16e41 catch up a minor changecatch up a minor change.. 2010-07-21 18:40:33 -04:00
Gerko de Roo
50422ee8e3 Patch for the new date display for Full Tilt for tourney(s). 
(Havent checked on ring games... Broke on Full Tilt...)
Current the old an the new is supported:
old: bla bla, Table 800 - 15/30 - No Limit Hold'em - 4:44:59 ET - 2010/07/18
new: bla bla, Table 19 - 15/30 - Pot Limit Omaha Hi - 13:43 ET - Wed, July 21, 2010
 2010-07-21 23:04:24 +02:00
sqlcoder
61fb3df695 some work on guidatabase and turn it on 2010-07-19 21:36:45 +01:00
sqlcoder
2a0fbcca4c clear auto import player cache when re-creating db 2010-07-18 16:21:27 +01:00
sqlcoder
73b7729530 quit no longer needed now importer cache is being cleared (may need to clear auto import player cache as well?) 2010-07-18 16:17:40 +01:00
steffen123
7c3c0a26f4 Merge branch 'gimick' 2010-07-18 02:06:07 +02:00
steffen123
dfacdbea7a Merge branch 'sqlcoder' 2010-07-18 02:03:40 +02:00
gimick
46e4e92246 reapply 585fd2feb2 - Update graph and session queries to identify ring games 
accidentally reverted at 45210f0668, sorry, didn't spot it before push
 2010-07-17 18:56:23 +01:00
gimick
9939aa4a0e Log viewer - fixes for column sorting 2010-07-17 18:19:16 +01:00
gimick
45210f0668 Revert "Update graph and session queries to identify ring games" 
This reverts commit 585fd2feb2.
 2010-07-17 16:52:10 +01:00
steffen123
f0d9ae0cc6 DUMP: add expected file for empty DB 2010-07-17 05:14:05 +02:00
steffen123
7f2364cf1d DUMP: change format slightly 2010-07-17 05:13:38 +02:00
steffen123
139dfbafb5 CLEANUP: move dump db file saving stuff into fpdb.pyw 2010-07-17 05:11:09 +02:00
steffen123
71108cdc9b TOURNEY: since we can detect added amount, set it to 0 if we dont 2010-07-17 04:37:15 +02:00
steffen123
a463d82f5b IMAP: add two more fields to config 2010-07-17 03:48:21 +02:00
steffen123
337fc353c8 rename RingFilters back to Filters 2010-07-17 03:39:31 +02:00
steffen123
7f2f630186 GUI: add some warnings and further info to HUD configurator 2010-07-17 03:09:55 +02:00
steffen123
59294a7b94 TIMES: record Hands.importTime as UTC instead of localtime 2010-07-17 03:01:09 +02:00
steffen123
794f0a0374 GUI: change hotkey to start/stop autoimport to alt+a 2010-07-17 02:45:52 +02:00
steffen123
656986826f TOURNEY: record added/addedCurrency 2010-07-17 02:35:02 +02:00
steffen123
90ceafda6d DB: Added TT.added, addedCurrency 2010-07-17 02:19:12 +02:00
steffen123
c23a1388fc GUI: HUD configurator fully working, dont even need to restart fpdb 2010-07-17 00:23:48 +02:00
steffen123
5bf7937f9e CLEANUP: remove trivial commented out method 2010-07-16 21:57:32 +02:00
steffen123
ef91cb5ad1 GUI: HudConfigurator displays all stats now and reads selections 2010-07-16 21:56:44 +02:00
steffen123
66ac9b27d6 comment out some broken code, add TODO for it 2010-07-16 21:33:36 +02:00
steffen123
d95fcfe5d0 GUI: HudConfigurator shows combo boxes for stats 2010-07-16 21:00:29 +02:00
steffen123
f6232004ad PSS: PS summary import now supports non-ascii playernames in sqlite 2010-07-16 20:37:53 +02:00
steffen123
71f8fb5ef1 GUI: have default selections and fix locking in HudConfigurator 2010-07-16 20:32:01 +02:00
steffen123
a1f422cbe4 GUI: second HudConfigurator dia with grid for comboboxes 2010-07-16 20:27:43 +02:00
steffen123
f56a003242 GUI: start of HUD stat configurator: select parameters 2010-07-15 03:32:10 +02:00
steffen123
a8edb976f8 FTP: fix to make it store Hand.startTime as UTC rather than ET 2010-07-15 02:19:58 +02:00
steffen123
d65b6e55c8 TOURNEY: fix recording of Hands.tourneyId, allow it to be NULL 2010-07-15 02:08:59 +02:00
steffen123
18dc3f29ff TOURNEY: fix category recording for PS summary import 2010-07-15 01:58:54 +02:00
steffen123
10a94fa441 IMAP: fix a silly mistake I made earlier 2010-07-15 01:53:46 +02:00
steffen123
3d37006bbc rename ImapSummaries to ImapFetcher to better reflect its scope 2010-07-15 01:53:22 +02:00
steffen123
32ae817a2a remove IMAPEmailFetcher as ImapSummaries has a superset of features 2010-07-15 01:49:04 +02:00
steffen123
9e004e8962 DB: remove default row for TT, allow HP.ttId to be NULL and remove default 2010-07-15 01:18:36 +02:00
steffen123
ebf16c6aa9 TOURNEY: store HandsPlayers.tourneysPlayersId 2010-07-15 00:27:57 +02:00
steffen123
6a8f3ff68b TOURNEY: createOrUpdateTourneysPlayers now updates fields as needed 2010-07-14 23:05:37 +02:00
steffen123
ced3e8ac72 TOURNEY: rename a query 2010-07-14 22:44:10 +02:00
steffen123
85cc5a5471 TOURNEY: DB.createOrUpdateTourney fills in missing fields now 2010-07-14 22:36:07 +02:00
sqlcoder
3657327566 clear player cache when recreating database 2010-07-14 21:07:20 +01:00
steffen123
40088d6cf3 rename DB.createOrUpdateTourneyType to createTourneyType since TTs are static 2010-07-14 21:07:19 +02:00
steffen123
2734dcb85a GUI: mention mailing lists on start page 2010-07-14 20:58:37 +02:00
steffen123
2bd11661e3 for now revert "comment out close of fpdb after db recreate, I don't see how it helps" 
I could reproduce the bug so until its fixed I want to keep the quit-on-recreate
This reverts commit 45fa170758.
 2010-07-14 18:54:31 +02:00
steffen123
79043988c2 Merge branch 'sqlcoder' 2010-07-14 18:52:33 +02:00
steffen123
5cd78b608b DB: add TourneyTypes.rebuyFee and addOnFee 2010-07-14 01:49:55 +02:00
steffen123
35bb8a4490 POLISH: add notice about time to dump DB 2010-07-14 01:48:08 +02:00
steffen123
1329101794 POLISH: add notice about long time to recreate dialogue 2010-07-14 01:46:32 +02:00
sqlcoder
397e87b800 autoimport passes filenames to fpdb_import as unicode, so make bulk import do this as well so that add_import_file() always gets same type 2010-07-13 23:12:50 +01:00
sqlcoder
b07505d367 tidy up closedown 2010-07-13 21:23:32 +01:00
sqlcoder
6661610429 comment out debug msg 2010-07-13 21:22:40 +01:00
sqlcoder
d78d69e9f4 miss out fl/pl/nl checkbox if no relevant hands 2010-07-13 21:19:18 +01:00
sqlcoder
02e1a71592 fix broken graphing 2010-07-13 20:21:34 +01:00
sqlcoder
c36e87a24d big merge from steffen 2010-07-13 20:20:46 +01:00
steffen123
256d027eca PSS: calculates timezone out of start and end time now 2010-07-13 21:17:40 +02:00
steffen123
522a745ead REFACTOR: move timezone changing method to HHC so it can used by other parsers 2010-07-13 20:37:06 +02:00
steffen123
b8968591c5 TPS: display limitType and category 2010-07-13 20:21:05 +02:00
steffen123
8ebea1a5ce PSS: now records game category and limit type 
Not for mixed games - again, I need examples
 2010-07-13 20:17:15 +02:00
steffen123
8db0445d71 IMAP: close server connection when done 2010-07-13 18:04:53 +02:00
steffen123
d4e54e6aae POLISH: it can now quit when it wasn't able to connect to DB 2010-07-13 18:04:26 +02:00
steffen123
1d571cabee windows: by sqlcoder, fixes importing files with greek characters 2010-07-12 18:04:30 +02:00
steffen123
c3077d5d66 Merge carls latest fixes 2010-07-12 16:53:14 +02:00
steffen123
d208d627a4 stop sqlite&postgres from doing except _mysql.... 
sqlite gives another error on quit unfortunately
 2010-07-12 16:48:12 +02:00
steffen123
04ec51d7c1 DB: Fix capitalisation of Gametypes table in SQLite 2010-07-12 11:00:50 +02:00
Worros
585fd2feb2 Update graph and session queries to identify ring games 2010-07-12 18:41:28 +10:00
steffen123
32e1cb7b7f another fix for the introduction of TT.limitType 2010-07-12 10:20:53 +02:00
Worros
627c044b6f Fix grapher so that only cash limits show up 2010-07-12 18:19:01 +10:00
steffen123
8d5e339973 make Filters work inspite of new tt.limitType 2010-07-12 08:17:36 +02:00
steffen123
78d7d1b941 comment out duplicate query 2010-07-12 08:13:09 +02:00
sqlcoder
b52110d45f change tabs to spaces 2010-07-11 19:00:27 +01:00
sqlcoder
45fa170758 comment out close of fpdb after db recreate, I don't see how it helps 2010-07-11 18:53:26 +01:00
sqlcoder
1d263c8139 fix call to db.connected() 2010-07-11 18:36:45 +01:00
sqlcoder
26642557a1 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-07-11 15:20:41 +01:00
steffen123
519c49904a CLEANUP: remove FpdbSQLQueries as its been migrated elsewhere 2010-07-11 14:49:19 +02:00
steffen123
79282270fb DUMP: fix dumpDB Gametypes, add Backings 2010-07-11 14:33:27 +02:00
steffen123
d53b3e1b4a DB: add backings table, fix a couple of log entries 2010-07-11 12:47:28 +02:00
steffen123
9283d7b579 some fixes for handStart rename, fixes for TT.category/limitType, 
dumpDatabase method and menu entry
 2010-07-11 09:47:05 +02:00
steffen123
5fee5136a9 DB: renamed Hands.handStart to Hands.startTime for consistency 2010-07-11 08:05:54 +02:00
steffen123
d739773908 GUI: display config file location in about dialogue 2010-07-11 07:39:19 +02:00
steffen123
822c592db8 DB: add category and limitType to TourneyTypes 2010-07-11 06:42:37 +02:00
steffen123
cfb0a3f3d5 remove default value and allow null for Hands.rush 2010-07-11 06:37:25 +02:00
steffen123
17b3b77022 TPS: correct spent display for PSFP games 2010-07-11 06:08:57 +02:00
steffen123
5ae650e8b7 reduce imports in RingFilters 2010-07-11 06:01:44 +02:00
steffen123
be671859e7 create superclasses for Gui*PlayerStats and *Filters 2010-07-11 05:58:00 +02:00
steffen123
e526501384 rename GuiPlayerStats to GuiRingPlayerStats and Filters to RingFilters 2010-07-11 05:49:58 +02:00
steffen123
6038342de7 TPS displays profit/tourney 2010-07-11 05:35:41 +02:00
steffen123
7bf7463705 TPS displays currency and fee now 2010-07-11 05:28:43 +02:00
steffen123
ed096b6872 TPS displays ROI% 2010-07-11 05:22:36 +02:00
steffen123
33760fae9c TPS displays ITM% 2010-07-11 05:11:43 +02:00
steffen123
913fa7d7d8 fix formatting and add tourneycount to TPS 2010-07-11 04:59:31 +02:00
steffen123
9815ac976b display buyin and sitename rather than TT.id 2010-07-11 04:47:15 +02:00
steffen123
7ddb032205 display unknownRank in tourney player stats 2010-07-11 04:37:48 +02:00
steffen123
8232085be9 display 1st/2nd/3rd in tourney player stats 2010-07-11 03:42:48 +02:00
steffen123
8e9d588322 first version of Tourney Player Stats works 2010-07-11 03:13:58 +02:00
steffen123
d3c57ee9fc repair playerstats 2010-07-11 03:13:30 +02:00
steffen123
c58ade20b3 fix PS summary player/winnings/rank recording 2010-07-11 02:27:48 +02:00
steffen123
7925747213 now records winnings for finishers in unfinished tourneys 2010-07-11 02:07:03 +02:00
steffen123
87fbd56091 imports still playing tourney's TP, but not winnings of finishers 2010-07-11 01:55:15 +02:00
steffen123
ae2c32f902 imports still running tournaments, except for TourneysPlayers 2010-07-11 01:39:52 +02:00
steffen123
6a3587e92e failed attempt at making SQLite accept non-ASCII player names for this 2010-07-11 00:37:32 +02:00
steffen123
604e242349 handle FPP and added money tourneys, general currency improvements 2010-07-11 00:37:25 +02:00
steffen123
86a1f86b51 tourney query returns key information - now just need to display it 2010-07-10 23:21:36 +02:00
steffen123
043c3b5bca fix import of PS FPP tourneys 2010-07-10 23:08:05 +02:00
steffen123
eb976203c4 intermediate commit for tourney stats 2010-07-10 22:24:32 +02:00
steffen123
4efd9dc2fb fix import of normal tourneys and ring hands 2010-07-10 21:29:07 +02:00
steffen123
b9762b0486 change remainder of fpdb.pyw to indicate source of lock 2010-07-10 21:11:59 +02:00
steffen123
bf96e5103b ignore "Match Round" part of first line of HH 2010-07-10 20:39:43 +02:00
steffen123
e9346f6b82 make it record source of lock holding, print if required 
this is mostly intended for devs
 2010-07-10 20:10:04 +02:00
steffen123
ca61189706 added TourneyTypeCount to DB Stats window 2010-07-10 19:39:05 +02:00
steffen123
ec0db8b7cc change version indicator to sth more appropriate 2010-07-10 16:40:10 +02:00
steffen123
4c1b0e3f96 add extra enter to start screen 2010-07-10 16:24:32 +02:00
steffen123
97fbc7606c another intermediate commit for tourney stats 2010-07-10 06:23:47 +02:00
steffen123
b1e41a54ec intermediate commit on the way to tourney stats 2010-07-10 05:19:50 +02:00
steffen123
dc67197e23 change starttime to startTime 2010-07-10 02:30:42 +02:00
steffen123
25893c9610 GuiTourneyPlayerStats (mostly copied from GuiPlayerStats) works without data 2010-07-10 02:09:58 +02:00
steffen123
4c00ef19cc implement simple DB stats - Hand and tourney count 2010-07-10 02:07:47 +02:00
steffen123
00e156beba removed some unused stub methods 2010-07-09 22:09:33 +02:00
steffen123
bc85c7fe8d removed unimplemented menu entry abbreviations 2010-07-09 20:47:58 +02:00
steffen123
4d17bd65e1 remove unimplemented menu entry create/del DB user 2010-07-09 20:46:45 +02:00
steffen123
29d1120bf1 removed unimplemented menu entry session replayer 2010-07-09 20:43:01 +02:00
steffen123
ef98564d72 remove unimplemented hand replayer and player details menu entries 2010-07-09 20:32:49 +02:00
steffen123
36b90ba654 remove unimplemented auto rate menu entry 2010-07-09 20:30:57 +02:00
steffen123
a724102dbc remove unimplemented edit profile menu entry 2010-07-09 20:29:44 +02:00
steffen123
d138c3b4e1 create subclasses for guiplayerstats and filters 2010-07-09 04:47:33 +02:00
steffen123
a97342ec2e expand config example with the new email section 2010-07-09 01:20:31 +02:00
steffen123
9cb47b4195 stop it from dying on fpdb summary files (by commenting out the whole section) 2010-07-09 01:10:06 +02:00
steffen123
310c7a2947 PS Summary now stores rank, winnings, etc. into TourneysPl. 2010-07-09 01:07:22 +02:00
steffen123
5b64ad771a it now stores entries, prizepool and endTime into TT 2010-07-08 23:47:06 +02:00
steffen123
e815cc38db change version to 0.21 2010-07-08 23:43:43 +02:00
steffen123
ce0d3f59f6 correct for timezone in PS summaries, too 2010-07-08 23:31:39 +02:00
steffen123
d90fa27274 fix starttime to startTime in my new method 2010-07-08 22:47:37 +02:00
steffen123
3bff176970 Merge branch 'carl' 
Conflicts:
	packaging/debian/changelog
	pyfpdb/PokerStarsToFpdb.py
	pyfpdb/TourneySummary.py
 2010-07-08 22:33:09 +02:00
steffen123
f2fcceba17 remove more prints 2010-07-08 21:46:40 +02:00
steffen123
201b3a5b6c PS Summary now parses start/endTime. fixes MySQL support 
also removed some but not all the new prints
 2010-07-08 21:41:27 +02:00
steffen123
7070c1431a put timezone removal into separate method for use by PSS 2010-07-08 21:28:21 +02:00
steffen123
178b528d3b change calls to python2 back to python 2010-07-08 20:01:03 +02:00
steffen123
10cfaf2c75 missed file for last commit 2010-07-08 20:00:43 +02:00
steffen123
c6b6f8a788 many not really separable changes for IMAP import and associated cleaning 
- deactivated use of TourneySummary (short: TS) from HHC and subclasses
- menu entry for IMAP import
- converted ImapSummaries (short: IS) to use the config file
- IS now optionally supports non-SSL and can run on folders other than INBOX
- removed gametypes and getGameTypeAsString from TS method as identical one is in Hand
- some other stuff
 2010-07-08 19:46:25 +02:00
Worros
e7776de8f1 Fix startTime change in remaining files 2010-07-08 23:30:02 +08:00
Worros
7c8339485d Fix startTime variable change from another patch 2010-07-08 23:14:55 +08:00
Worros
52ae2e6b1f Merge branch 'master' of git://git.assembla.com/fpdb 
Conflicts:
	pyfpdb/DatabaseManager.py
	pyfpdb/TourneySummary.py
	setup.py
 2010-07-08 15:48:21 +08:00
Worros
4d4d6f297f Merge branch 'master' of git://git.assembla.com/fpdb-gimick 2010-07-08 11:44:10 +08:00
gimick
084c7a5c58 Update help/about set version 0.20 2010-07-07 21:55:01 +01:00
steffen123
aeaac92fb9 commit before changing intendation. 2010-07-07 22:21:46 +02:00
steffen123
1bf3827921 copied bit of error handling from Carl 2010-07-07 08:17:18 +02:00
steffen123
0ecd19fbdf change PSS to give None for *Count 2010-07-07 08:12:10 +02:00
steffen123
160ca30abe much improved PS summary parsing thanks to carls help 2010-07-07 08:05:42 +02:00
steffen123
2046fc1122 the two new files for PS summary mail parsing 2010-07-07 07:06:11 +02:00
steffen123
ca5ba3ee68 comment on reverted method-deletion 2010-07-07 07:00:57 +02:00
steffen123
c855706640 Revert "removed seemingly misplaced method" 
This reverts commit 7042f11954.
 2010-07-07 06:59:08 +02:00
steffen123
92a4b105cc parsing PS summary emails now. just need to write insert/update code now 2010-07-07 06:58:42 +02:00
Worros
1d47fbb3c5 Add simple IMAP email fetcher 2010-07-07 10:47:02 +08:00
steffen123
e3ce1b8c2d remove old empty function 2010-07-07 04:24:46 +02:00
steffen123
d27d6a310c removed DatabaseManager.py as it's unused 2010-07-07 04:16:44 +02:00
steffen123
7042f11954 removed seemingly misplaced method 2010-07-07 04:11:28 +02:00
steffen123
eb3233ac98 more tourney work 
- moved HH-based tourney handling completely into Hand
- renamed Tourney.py to TourneySummaries
- changed many DB fields to allow NULL and removed defaults
 2010-07-07 04:01:40 +02:00
steffen123
18faa5288c first steps to get PS tourney results from IMAP 2010-07-07 02:53:27 +02:00
steffen123
04ed65e88c minor DB changes. recording TourneysPlayers now for FTP and PS 2010-07-07 00:52:44 +02:00
steffen123
e4916bc456 replace catchall except with an if 2010-07-06 23:52:59 +02:00
steffen123
e2087d60a1 rename tourney methods in DB 2010-07-06 23:43:49 +02:00
steffen123
f5c1fd4ed7 check for tourney rather than tourNo not to be none 2010-07-06 23:39:25 +02:00
steffen123
e5cba5172d DB version increase for rush field 2010-07-06 18:14:35 +02:00
steffen123
1ab4db685f add rush poker field 2010-07-06 18:07:43 +02:00
steffen123
2717c71b4e fixes FTP tourneys to work as good/bad as PS tourneys 2010-07-06 18:07:26 +02:00
Worros
f44947c8a0 Add a new sample file for parsing website results. 
Decided to knock up a quick proof of concept for fetching and parsing tournament results from a website.

Specifically uses:
- Pythons Beautiful Soup library
- P5s results pages - replace playername with the desired p5s username (eg. taypaur)

Of note; no tournament ids are displayed on any of the sites, so for this to work we may need to add a field like 'p5sid'
 2010-07-06 16:13:25 +08:00
Worros
958e67beac Merge branch 'master' of git://git.assembla.com/fpdb-gimick 2010-07-06 12:18:16 +08:00
gimick
659f3e8835 walkthrough updated to fix numpy dotblas error : add fdl1.2 licence to walkthroughs 2010-07-05 22:15:45 +01:00
steffen123
d01435d068 store Tourneys and TourneyTypes for PS tourneys. see ML for more details 2010-07-05 11:48:26 +02:00
steffen123
be68f56c1b Revert "copyright correction" - sqlcoder commited with Carl as "owner" 
This reverts commit dea3e72343.
 2010-07-05 06:18:16 +02:00
Worros
4577cfbfa2 some cleanups: 
- updated copyright notices
- added copyright notices that were missing
- changed python to python2
- added gpl-2/3 license texts
- removed THANKS.txt file as the wiki version is more up to date
- removed empty fpdb_db.py
- added GPL2 to debian license file

Conflicts:

	pyfpdb/Database.py
	pyfpdb/DerivedStats.py
	pyfpdb/SQL.py
	pyfpdb/SummaryEverleaf.py
	pyfpdb/TournamentTracker.py
	pyfpdb/Tourney.py
	run_fpdb.py
 2010-07-05 12:17:08 +08:00
steffen123
dea3e72343 copyright correction 2010-07-05 06:14:07 +02:00
steffen123
6b95c46b27 change email address for bug reports from my personal one to mailing list 2010-07-05 11:42:12 +08:00
steffen123
39859970d7 another repair as a result of removing payinAmounts 2010-07-05 01:29:05 +02:00
steffen123
fd7556af89 fix call to tourney.addPlayer after removal of payinAmount 2010-07-04 23:42:57 +02:00
steffen123
ea1e136ae2 Merge branch 'master' of git://git.assembla.com/fpdb-gimick 2010-07-04 23:20:24 +02:00
steffen123
8c0395ef78 quit fpdb automatically after re-create. ppl tend to ignore msgboxes ;) 2010-07-04 23:19:57 +02:00
steffen123
3b24fd18b2 some cleanups: 
- updated copyright notices
- added copyright notices that were missing
- changed python to python2
- added gpl-2/3 license texts
- removed THANKS.txt file as the wiki version is more up to date
- removed empty fpdb_db.py
- added GPL2 to debian license file
 2010-07-04 03:05:16 +02:00
gimick
fcde707644 version -pre4; graph export fix; add mysql-python123.exe walkthrough 2010-07-02 23:13:36 +01:00
steffen123
e8864bf241 change email address for bug reports from my personal one to mailing list 2010-07-02 23:48:01 +02:00
steffen123
d291b8621f removed TourneysPlayers.payinAmounts 2010-07-02 22:40:40 +02:00
steffen123
6b417ebdd4 added HandsPlayers.sitout as discussed on ML 2010-07-02 22:17:15 +02:00
steffen123
6e296cf38f Merge branch 'master' of git://git.assembla.com/fpdboz 2010-07-02 19:46:09 +02:00
steffen123
122eedcbb2 Merge branch 'master' of git://git.assembla.com/fpdb-gimick 2010-07-02 19:45:51 +02:00
steffen123
5e45a086bd DB-version increase for headsup-removal 2010-07-02 19:45:30 +02:00
steffen123
6bc3e741c6 removed TourneyTypes.headsUp 2010-07-02 19:39:02 +02:00
Worros
68e3f5b181 CarbonPokerToFpdb: Fix for Black Chip poker 
This site records a timestamp for every action
 2010-07-01 21:53:24 +08:00
steve
cd3ed9a937 fix graph export to png. More focus fixes 2010-06-27 23:21:40 +01:00
Gerko de Roo
d90156a02a Merge branch 'master' of git://git.assembla.com/fpdb.git 2010-06-27 20:55:27 +02:00
sqlcoder
e34092b175 Merge branch 'master' of git://git.assembla.com/fpdb-gimick 2010-06-26 18:08:27 +01:00
gimick
40745ace13 improve walkthrough and include postgresql - tweak script for python 2.6 2010-06-26 13:46:33 +01:00
steffen123
d652eb5d3c repaired sqlite db creation 2010-06-26 12:24:30 +02:00
gimick
222b70fbb4 add mysql to build instructions, py2.6 mods to py2exe, set ver 0.20pre3 2010-06-26 00:48:55 +01:00
gimick
cde793a4a1 fix tray->quit lockup if child windows open 2010-06-25 18:06:51 +01:00
steffen123
eab41b1519 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-06-25 11:03:46 +02:00
steffen123
0477c73801 changed TourneyTypes as discussed, some currency-related fixes 
I haven't expanded all queries etc. to include the new fields
    as that code is not currently used by anything and can be
    expanded as needed
 2010-06-25 11:02:01 +02:00
Worros
e0b51bee07 Really add the 0.20/0.40 limit level 
Limit occurs in Stars 8 game
 2010-06-25 16:58:14 +08:00
Worros
06e5e5ec26 Merge branch 'master' of git://git.assembla.com/fpdb-gimick 2010-06-25 16:22:38 +08:00
steffen123
eaa184614a Added warning to keep history files to start screen. 2010-06-25 15:24:38 +08:00
steffen123
90ff0559b3 Added warning to keep history files to start screen. 2010-06-25 08:16:56 +02:00
gimick
b4463b2e92 fix new bug - prefs cancel button not working 2010-06-24 23:33:43 +01:00
gimick
0de6d20340 fix focus of warning when editing prefs if any notebook tabs open 2010-06-24 22:47:42 +01:00
gimick
bd440f3008 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-06-24 21:41:16 +01:00
gimick
5b1bb5f5f9 fix focus issues if task switching to fpdb when popups are open 2010-06-24 21:34:50 +01:00
steffen123
8a2f881b61 split TourneyTypes.rebuyOrAddon to rebuy and addOn 2010-06-22 22:27:10 +02:00
steffen123
e0a42bab8e more modifications for TourneysPlayers changes 2010-06-22 21:45:22 +02:00
steffen123
58da99c86c removed 2 ancient unusued methods and updated TourneysPlayers 
tested bulk import for PS and FTP, player stats and positional stats
also fixed a little bug that sqlite created HandsPlayers.actionString
	with type REAL instead of VARCHAR
 2010-06-22 21:05:33 +02:00
gimick
6324ad0c93 Set version to 0.20-pre1 - to indicate snapshot for the initial python26 .exe build 2010-06-22 12:03:00 +08:00
gimick
304ea7419d fpdb.exe + python 2.6 crash at runtime, needs gio 2010-06-22 12:00:41 +08:00
steffen123
64597cf0a5 fix silly mistake i made when changing start screen text 2010-06-22 12:00:37 +08:00
steffen123
085a269fbe changed start page text 2010-06-22 11:15:22 +08:00
steffen123
7bda305143 removed outdated documentation and moved license files 2010-06-22 11:14:29 +08:00
steffen123
1ed18ec265 minor spelling correction 2010-06-22 11:12:06 +08:00
gimick
14146f58d7 Set version to 0.20-pre1 - to indicate snapshot for the initial python26 .exe build 2010-06-22 00:46:09 +01:00
gimick
180f93ba4d fpdb.exe + python 2.6 crash at runtime, needs gio 2010-06-22 00:17:38 +01:00
steffen123
e46b0b7a0f renamed tourneyplayers to tourneysplayers in a few places 2010-06-21 17:12:20 +02:00
steffen123
e6fd3afbba renamed totalRebuys/AddOns to totalRebuyCount/AddOnCount 2010-06-21 16:45:15 +02:00
steffen123
d83c68d578 fix silly mistake i made when changing start screen text 2010-06-21 15:54:32 +02:00
steffen123
cfcec2182e removed fields from Tourneys 
buyinChips, rebuyChips, addonChips, rebuyAmount, addonAmount and koBounty
 2010-06-21 15:48:22 +02:00
steffen123
e244a5d502 minor spelling correction 2010-06-21 15:41:45 +02:00
steffen123
d207261c82 Merge branch 'master' of git://git.assembla.com/fpdboz 
removed pyfpdb/fpdb.py
 2010-06-21 14:02:08 +02:00
steffen123
9f9fdb7abf removed outdated documentation and moved license files 2010-06-21 13:13:19 +02:00
steffen123
ad95038edb changed start page text 2010-06-21 13:00:09 +02:00
Worros
5720012b3b Actually remove fpdb.py 2010-06-21 18:44:38 +08:00
Worros
77211cd4be Revert change to HUD_main window 2010-06-21 18:44:04 +08:00
Worros
cf4e80cfa3 Add new test file, delete fpdb.py 2010-06-21 18:42:15 +08:00
Worros
d6f2cd4e83 Add utf8 encoding line to fpdb.pyw 2010-06-21 18:41:31 +08:00
Worros
cf2b913592 make CLI parameters to run_fpdb.py and fpdb.py work again 
Conflicts:

	pyfpdb/fpdb.py
	run_fpdb.py
 2010-06-21 14:49:56 +08:00
Worros
79a6aa8f48 Merge branch 'master' of git://github.com/kangaderoo/fpdb-kangaderoo 2010-06-21 14:45:03 +08:00
steffen123
35e7db570c moved test_Python* to root folder so they don't collide with py.test and because it fits better there anyways 2010-06-21 13:43:43 +08:00
steffen123
3d8a38e59a renamed test scripts to make their purpose clearer 2010-06-21 13:43:24 +08:00
steffen123
6f8fe4a68c expanded explanation of vpip 2010-06-21 13:42:53 +08:00
Worros
6902bf8150 FTP Stud steal examples. 
Stud steal examples provided by Cardvark on 2+2
 2010-06-21 13:12:52 +08:00
steffen123
51a51dc892 readd warning dialogue to restart after recreate 
after loosing it in merge
 2010-06-21 12:44:29 +08:00
Worros
d647a3a5ec Adjust author names on request 2010-06-21 12:44:13 +08:00
sqlcoder
6a999f4232 change shortcut key for import button so that it still works when button label is 'I M P O R T I N G' 2010-06-20 17:47:23 +01:00
steffen123
8e65370027 make CLI parameters to run_fpdb.py and fpdb.py work again 2010-06-20 18:09:17 +02:00
steffen123
5f240aabb7 readd warning dialogue to restart after recreate 
after loosing it in merge
 2010-06-20 18:07:44 +02:00
steffen123
de2d810ac5 moved currency field from Sites to Gametypes&TourneyTypes, addded Sites.code 2010-06-20 17:34:58 +02:00
steffen123
4d42953135 make rename and executes work in linux 2010-06-20 13:52:44 +02:00
steffen123
9543413b43 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:
	pyfpdb/fpdb.py
 2010-06-20 13:32:39 +02:00
Gerko de Roo
f94fa0c685 Added aggression information in guiplayerstats 2010-06-20 10:02:01 +02:00
Gerko de Roo
d706dea126 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-06-20 09:25:06 +02:00
Worros
057a864794 Stars: Add 0.20/0.40 limit 2010-06-19 08:42:49 +08:00
Worros
0ee7724d00 Merge branch 'master' of git://git.assembla.com/fpdb-gimick 2010-06-18 18:58:16 +08:00
gimick
6189a67b1e stop HUD_main window being closed. Temp fix to prevent lockup in .exe builds 2010-06-17 23:35:38 +01:00
Worros
00dd86ee19 Fix sessionStats query to exclude tourney hands. 2010-06-17 12:57:31 +08:00
Gerko de Roo
16dc98b1b7 Aggression freq, aggression factor and Overall CBET added 
in default pop-up overlay
 2010-06-16 17:21:49 +02:00
Gerko de Roo
1279c8d67e When div by 0, still display usefull info 2010-06-16 17:17:14 +02:00
Gerko de Roo
1c238e4119 Code change must be reviewed! 
The Handplayers and Hands both have a street(x)Raises index added to the
query result. I'm not sure this solution works.
 2010-06-16 17:17:08 +02:00
Gerko de Roo
d9f6967c1c Street(x)Bet and street(x)Call and Street(x)Raises 
Now updates in hud chache also
 2010-06-16 17:17:03 +02:00
Gerko de Roo
db6f7989a9 Street(x)Bet street(x)Calls were stored in (db.)handplayers. 
They were not yet available in (db.)hudchache.
Using the Bets and Call, together with stree(x)Agression the
aggression frequency and aggression factor can be calculated.
 2010-06-16 17:16:58 +02:00
Gerko de Roo
4d4dafee8f Added aggression factor, aggression freq and Overall Cont. bet. 
At the moment the agrression based equations are not correct yet due to
missing stat info...
Missing stat code is mentioned in comment.
using saw_x as an indication....
 2010-06-16 17:16:53 +02:00
Gerko de Roo
b855b53918 Merge branch 'master' of git://git.assembla.com/fpdb-sql.git 2010-06-16 17:15:10 +02:00
Gerko de Roo
5fd4c2c443 import regression files 2010-06-16 17:13:05 +02:00
Worros
61e3f79a7f Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-06-15 11:07:24 +08:00
sqlcoder
d6f3bed1d4 fix comment error in example hud config and call sys.exit() if the error is still there instead of exit() 2010-06-14 22:52:23 +01:00
steffen123
7896ae7380 expanded explanation of vpip 2010-06-13 07:40:59 +02:00
Worros
498eb486b5 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-06-13 13:33:02 +08:00
sqlcoder
9b59957a9b comment out new .close() calls to fix autoimport button 2010-06-12 11:15:55 +01:00
sqlcoder
92aab5e80b fix new call to get_site_parameters() 2010-06-12 11:15:02 +01:00
sqlcoder
7205ac78d3 change legend position in graph, 'best' seems to use top right for me sometimes when upper left seems the obvious place to put it 2010-06-11 21:09:04 +01:00
sqlcoder
bf5f24fb6b add xshift/yshift config to move menu window on hud 2010-06-11 21:03:53 +01:00
sqlcoder
fbefe1e611 try to wrap long lines in config file, attributes are still sorted into alpha order :-( 2010-06-09 22:46:17 +01:00
sqlcoder
5803933ba0 update py2exe instructions 2010-06-09 20:58:05 +01:00
Worros
5660d6cb5e Merge branch 'master' of git://git.assembla.com/fpdb-gimick 2010-06-08 13:30:30 +08:00
Worros
5f1308688b Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-06-08 13:17:20 +08:00
Worros
523a70ebd8 Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2010-06-08 11:47:14 +08:00
steffen123
aed767ef4b add warning dialogue to restart after recreate as i encountered bugs under some circumstances if I didn't but it 
doesn't seem worth investigating
 2010-06-08 04:33:27 +02:00
steffen123
816be22833 moved test_Python* to root folder so they don't collide with py.test and because it fits better there anyways 2010-06-08 04:30:10 +02:00
steffen123
5aadfde2df renamed test scripts to make their purpose clearer 2010-06-08 02:52:41 +02:00
gimick
a926f7b19f Histories updated with random hand numbers, to avoid duplicates. PLO example added with sidepots 2010-06-08 01:40:09 +01:00
sqlcoder
d26b0f3a9f another python -> pythonw change 2010-06-07 21:59:01 +01:00
sqlcoder
fb811ca388 minor heading change in Preferences dialog 2010-06-07 21:58:04 +01:00
sqlcoder
8e0fb78570 further refinements to .py -> .pyw and python -> pythonw change 2010-06-07 19:29:59 +01:00
steffen123
d84ff44875 Merge branch 'master' of git://git.assembla.com/fpdb-gimick 2010-06-07 03:31:00 +02:00
steffen123
e72b7364b8 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:
	pyfpdb/DerivedStats.py
 2010-06-07 03:08:07 +02:00
steffen123
e349dad1b2 Revert "dirty but working patch to make it load utf8 files (specifically, FTP)" 
This reverts commit 12e89306b5.
 2010-06-07 03:03:52 +02:00
gimick
1f9b7788ad add 8 example Stars hand histories to pyfpdb/regression-test-files 2010-06-07 00:44:08 +01:00
gimick
38ad49bf38 Write Anonymise output to .anon file, rather than the terminal 2010-06-06 21:06:04 +01:00
sqlcoder
1c897e54d5 rename HUD_main from .py to .pyw as well 2010-06-06 21:03:03 +01:00
sqlcoder
1aafe79b4a fix name of list indexes query 2010-06-06 13:21:21 +01:00
sqlcoder
b7a7af37d5 minor whitespace change 2010-06-06 13:20:39 +01:00
sqlcoder
da203fbe6c debug and refine fpdb.pyw changes for .exe version 2010-06-06 10:57:51 +01:00
sqlcoder
544a682891 rename fpdb.py to fpdb.pyw makes it run smoother from .exe (no dos window) 2010-06-06 09:01:26 +01:00
sqlcoder
30d5cf56ca Merge branch 'master' of git://git.assembla.com/fpdboz 2010-06-05 16:54:18 +01:00
sqlcoder
397ae8bbcd show site name in error message if match failed 2010-06-05 16:53:48 +01:00
Worros
3d7668bde5 Add required import 2010-06-05 18:00:41 +08:00
Worros
18a3af2e88 Fix HHC init and python 2.5 incompatibility 2010-06-05 17:58:00 +08:00
Mika Bostrom
d56d3009b6 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-06-05 10:13:04 +03:00
Worros
3b823574ab Bump version to 0.20 2010-06-05 00:44:40 +08:00
Worros
0c3cdb12f8 General cleanup - Exception messages and improved logging. 
Stars HHC, HHC itself and Hand.

Should not get the first 100 characters of an failing hand in the log, which contains the handid for later reference.

Played around with the number of characters a while ago - 100 chars is about the sweet spot.
 2010-06-04 15:59:47 +08:00
Worros
12ad272f91 SQL.py - Add functions for listing indexes. 
Not used anywhere - may be a good reference at some point
 2010-06-04 15:26:50 +08:00
Worros
212438a0c6 Database.py - Additional logging and comments 2010-06-04 15:25:56 +08:00
Worros
6b00311756 Make sqlite index deletion and creation work. 
Also updated the coding style and logging in that area.
 2010-06-04 14:37:46 +08:00
Mika Bostrom
18036fb2cc Merge branch 'master' of git://git.assembla.com/fpdboz 2010-06-04 06:43:58 +03:00
Gerko de Roo
3716f11f06 1970-01-01 in mktime generates overflow... 2010-06-04 05:55:46 +08:00
Gerko de Roo
1edf860760 Add support for post of dead small blind (PartyPoker) 2010-06-04 05:46:19 +08:00
Gerko de Roo
e41c63f6ee When small blind raises here the addRaiseBy was generating money. 
One player on small blind with total $2.25, commited $2.27 to the pot.
 2010-06-04 05:46:06 +08:00
Gerko de Roo
bdbcf19b06 Player stat fix for PartyPoker 
When placing a uncalled bet (like all-in) the uncalled part is put in a sitepot
Therefore the player exist 2* in collected.
The uncalled part of the bet was subtracted twice for collected and collectees.
 2010-06-04 05:45:55 +08:00
Worros
def398e0c2 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-06-04 05:42:28 +08:00
Worros
e17058953c Add preliminary functions and variables for hex encoding patch 
Kangaderoo has a patch which potentially fixes storage and display issues for users who do not have their database text storage as utf8.

Functions and variables added to Charset to disect the patch
 2010-06-04 05:36:59 +08:00
Worros
23ae26259b Steffen reported a FTP file in UTF-8 format. 
Added it as the 3rd codec tested
 2010-06-04 04:17:30 +08:00
Gerko de Roo
27e5bf8698 Moved Codec conversion to Charset 
The TIP is using a codec conversion that doesn't handle error exeptions.
This could lock up the HUD....
 2010-06-04 03:58:49 +08:00
Gerko de Roo
5a13e96b3b Auto close HUD support for closing tourney windows added. 
Not neat but functional.
 2010-06-04 03:48:43 +08:00
steffen123
f6fbf08250 moved fold stats so that the file no longer indicates that they're not done 2010-06-04 03:35:40 +08:00
Worros
994f0fdccc Modify recent patch from Steffen adding fold stats 
- Remove added whitespace
- Reformatted debug strings in preferred printf style (and starting with DEBUG:)
- Swapped len(aggrers)>0 and i>0 for short circuit evaluation, and reformatted spacing for consistent coding style
-- (NOTE: for NLHE this will definitely be faster as less hands go to flop - may be slower for limit games)

Also added a couple of comments near enumerate() calls about 2.5 to 2.6 syntax
 2010-06-04 03:02:07 +08:00
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