Commit Graph

311 Commits

Author SHA1 Message Date
Chaz
0e9fb62b0d * added a call to the import_parameter 'saveActions' in Hand.py, saving it's value in the variable Hand.saveActions
* added logic to Hand.import() so that it only calls db.storeHandsActions if saveActions is true
* added logic to DetailedStats.getstats() so that it only calls assembleHandsActions() if saveActions is true
2010-09-28 17:17:15 -04:00
Chaz
a76e34598d * Modified storeHandsPlayers() so it returns a dictionary of handId & playerId to handPlayerIds
* Filled storeHandsActions() with the required information
* Updated Hand.insert so that it calls storeHandsActions() and added the variable dbid_hpid to receive the new dictionary
2010-09-28 17:09:24 -04:00
Chaz
94d4bf6ed5 * added ACTION dictionary for looking up actionId
* edited addAnte(), addBlind(), addCall(), addBet(), addBlind() (Draw), addDiscard() (Draw), 
addComplete() (Stud), and addBringIn() (Stud) to standardize element order and datatype
*  added a field to  _addRaise() which allows  addComplete() (Stud) to pass the 'compleates' action type
2010-09-28 16:50:33 -04:00
Worros
9e13930742 Hand: Whitespace changes from Forrest 2010-09-28 12:04:40 +08:00
Worros
dee17e8001 L10n: H->M updated 2010-09-23 14:10:30 +08:00
Worros
2e6bec5c18 Hand: Add fake GBP symbol 2010-09-19 00:14:14 +08:00
Worros
ebcd9f0b66 Hand: Remove error message 2010-09-14 14:15:23 +08:00
Worros
1a7b1caf48 Hand: Remove non-standard exception handler
That code should either crash or raise a FpdbParse* exception which will be caught at a higher level
2010-09-14 13:53:47 +08:00
Worros
e1bb9a602b Stars/Hand: Fix issue produced by last regression test file
7-Stud-USD-0.04-0.08-200907.Missing.Showdown.Card.txt only contains 6 showdown cards.

Put filthy hack in addShownCards to guard against this condition, and add a commented out debug print in the HHC
2010-09-09 13:19:19 +08:00
Worros
304c9e71a2 Hand: Wrap Pot.end() section in exception handler
If Hand.end() fails in that section, then something is seriously wrong with either action parsing or stack parsing.

Throw a parse error in the hopes we can continue on.
2010-09-02 14:02:19 +08:00
Worros
7aeb5e4531 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-09-01 11:08:04 +08:00
Worros
9a3d60e0b3 HandsActions: Stub in the remaining calls for HandsActions 2010-09-01 10:47:13 +08:00
sqlcoder
06b34e8648 clarify difference between site and filter to allow 2 sites from same network, prompt to add site to db if missing 2010-08-31 22:44:41 +01:00
sqlcoder
536adad477 merge from Steffen/Carl 2010-08-29 00:05:22 +01:00
sqlcoder
6e3953e774 add hand ID to warning message 2010-08-28 23:57:04 +01:00
steffen123
6505334ac6 Merge branch 'carl' 2010-08-26 18:20:38 +02:00
steffen123
28aaa5366d revert recent change of Hand.py to fix FTP 2010-08-26 18:17:22 +02:00
Worros
6a823a430c Hand: Add PKR to sites lookup 2010-08-26 10:27:40 +08:00
steffen123
b6e59b54de fix that it creates a new TT for each tourney when maxseats is unknown. 2010-08-25 06:37:22 +02:00
steffen123
b41e385979 improve error reporting in Hand.checkPlayerExists 2010-08-23 02:16:44 +02:00
Worros
109ad292c0 Hand: Add optional argument for printing test data
And pass the argument on too Database
2010-08-19 18:28:10 +08:00
steffen123
aacfb61d3b add missing gettext imports, gettextify TournamentTracker.py 2010-08-15 23:23:17 +02:00
steffen123
7dafc12206 gettextify hand 2010-08-15 05:59:05 +02:00
steffen123
b385f9f0da this caused it to create a new TourneyType for each Tourney
Revert "remove some default values - if we don't know, don't just assume no/normal"

This reverts commit 7f8243f19d.
2010-08-11 03:10:08 +02:00
Eric Blade
e49beb7724 Hand: extreme terminal spam when something bad happens in readBlinds, stop crashing import
HHC: set obs when failing to open a file (ie, you've stored a zip file in your handhistory folder), stop crashing import
2010-08-05 12:12:18 -04:00
steffen123
7f8243f19d remove some default values - if we don't know, don't just assume no/normal 2010-08-03 22:32:31 +02:00
steffen123
9ad275e11c recognise and store knockout and bounty 2010-08-02 13:53:50 +02:00
steffen123
90ceafda6d DB: Added TT.added, addedCurrency 2010-07-17 02:19:12 +02:00
steffen123
40088d6cf3 rename DB.createOrUpdateTourneyType to createTourneyType since TTs are static 2010-07-14 21:07:19 +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
5b64ad771a it now stores entries, prizepool and endTime into TT 2010-07-08 23:47:06 +02:00
steffen123
178b528d3b change calls to python2 back to python 2010-07-08 20:01:03 +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
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
04ed65e88c minor DB changes. recording TourneysPlayers now for FTP and PS 2010-07-07 00:52:44 +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
d01435d068 store Tourneys and TourneyTypes for PS tourneys. see ML for more details 2010-07-05 11:48:26 +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
steffen123
6bc3e741c6 removed TourneyTypes.headsUp 2010-07-02 19:39:02 +02:00
steffen123
e244a5d502 minor spelling correction 2010-06-21 15:41:45 +02: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
2fb151fdc8 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2010-02-27 15:45:42 +08:00
Eratosthenes
b15a51d42e Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-25 10:16:22 -05:00
sqlcoder
141b88ecfd stop hudcache updating again when importing duplicate hands 2010-02-20 17:49:03 +00: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
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
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
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
Worros
44d994303c Add comment regarding accounting error 2010-02-16 00:42:13 +08:00
sqlcoder
d4248706e4 remove surplus get_logger calls, tidy up log messages some more 2010-02-01 22:31:00 +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
Eric Blade
8673cc3437 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-01-28 16:25:04 -05: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
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
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
11bc48e126 merge fpdb_db.py into Database.py 2010-01-26 23:54:04 +00:00
Eratosthenes
7683590898 Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:
	pyfpdb/Configuration.py
2010-01-25 12:06:11 -05:00
Gerko de Roo
81b9b51707 HUD fix for tournaments. Table name storage. 2010-01-23 23:18:39 +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
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
Worros
a0475aa4db [NEWIMPORT] Add function to update hudcache for Hand 2009-12-23 23:14:34 +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
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
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
Carl Gherardi
e08afeecb1 [NEWIMPORT] Move database prep into prepInsert 2009-12-13 13:48:17 +08:00
Worros
0061bd0644 [NEWIMPORT] Add call to HUD for auto import
Make sure the matching db_handid is recorded in the Hand object for later use
2009-12-06 23:02:07 +08:00
Worros
bb38d7e1dd [NEWIMPORT] Clean up HandsPlayers.cardX fetching 2009-11-30 14:20:48 +08:00
Worros
a6a3217bbc Fix draw parsing finally? 2009-11-29 16:54:15 +08:00
Worros
9071640182 Fix Draw parsing 2009-11-29 15:22:46 +08:00
Worros
f5d8f153b5 Start of fixes to draw parsing 2009-11-29 14:40:32 +08:00
Worros
aee9a7339c [NEWIMPORT] Stop duplicate hands from crashing import 2009-11-25 16:29:30 +08:00
unknown
a6b7292943 mostly None checkings fixed (== to is != to is not) 2009-11-03 14:30:52 -05:00
Worros
7b2c1fa243 [NEWIMPORT] Minor update, use DerivedStats.getStats() 2009-10-14 20:28:07 +08:00
Worros
2350474d38 [NEWIMPORT] Start of HandsPlayers insert 2009-10-14 20:20:17 +08:00
Worros
fdef5b12d9 Add playersVpi to NEWIMPORT code
Untested at the moment, moved the code from Hand.py into DerivedStats.
2009-10-06 18:30:52 +08:00
Ray
971a282383 Merge branch 'master' of git://git.assembla.com/fpt_fpdb 2009-10-03 21:09:21 -04:00
sqlcoder
8d01caa30f try to work around Everleaf problem where winning hole cards not always shown - derive from winning hand where possible 2009-09-27 12:21:22 +01:00
PassThePeas
16d53f1502 Patch for HUD and FTP tourneys
modified:   Hand.py
	- writeTableLine : adds the tourneyNo in tourney context
	modified:   Tables.py
	- discover_nt_by_name : add filter for HUD and chat windows
2009-09-12 23:14:55 +02:00
Worros
4f98b29b26 Merge branch 'master' of git://git.assembla.com/fpt_fpdb
Conflicts:
	pyfpdb/Database.py
2009-09-04 12:45:49 +08:00
Eric Blade
59a1cef821 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-09-03 02:44:11 -05:00
Worros
c80bb3ac3f sys.exit() in Hand.addShownCards() has to be wrong 2009-09-01 18:35:40 +08:00
Eric Blade
6568281589 Hand: will give you a proper message to the console if it can't figure out what your datetime passed to it is 2009-08-31 03:19:23 -05:00
Matt Turnbull
d2380ba738 merge from futz2 branch 2009-08-28 18:24:51 +01:00
Matt Turnbull
09350e8f52 Database.py - need os. Hand.py - encoding, and writeHTML doesn't need fh 2009-08-28 01:22:08 +01:00
PassThePeas
b85f8ec155 Some fixes in FTP summary parsing and preparations for summary import in DB. No behaviour change expected
modified:   FulltiltToFpdb.py
	* Tourney Summary File parsing : add support for Madness tourneys
	* HH file parsing : enhance Tourney topline parsing to retrieve some info (HU, Rebuy, KO, Turbo, ...) and store it into Hand object
	modified:   Hand.py
	* Some attributes added to store tourney specific info
	modified:   SQL.py
	* Add a new request (getTourneyTypeIdByTourneyNo) to help finding a tourney already in db (preparation for Tourney Summary import)
	modified:   Tourney.py
	* Attribute tourneyComment added
	modified:   fpdb_parse_logic.py
	* Change parameters in call of fpdb_simple.recogniseTourneyTypeId
	modified:   fpdb_simple.py
	* recogniseTourneyTypeId : signature changed to allow for the search of a tourney id already in db prior to searching for tourneyTypeId
2009-08-26 01:13:34 +02:00
grindi
2cfbb07cd1 Merge branch 'experimental'
Conflicts:
	pyfpdb/Hand.py
2009-08-12 22:04:41 +04:00
Worros
5a4bcf3997 Add streetXPot and showdownPot to hhc insert
totalPot not actually calcuated yet, and valued need to be converted from Decimal() to cents
2009-08-12 22:21:54 +08:00
grindi
56a6d77e9c Hand: added ante support 2009-08-12 03:48:48 +04:00
grindi
9d193f236e Hand: removed trailing spaces 2009-08-12 01:13:07 +04:00
Worros
24e5c2252d Fix inserting into Gametypes 2009-08-11 20:52:07 +08:00
Matt Turnbull
9f2834488c merged with carl, fixed conflict in hhc 2009-08-09 20:10:14 +01:00
Matt Turnbull
a32d4e053a FulltiltToFpdb handles canceled hands
Better exception handling during parsing
FpdbParseEcxeption takes an optional HID
Stripped pointless __init__s from *ToFpdb subclasses
Logging now has logging.conf config - default is to log only INFO to
file but easily changed to DEBUG for devel work
2009-08-09 15:19:43 +01:00
Worros
d6529ab42f Import Hand.insert() work
storeHand updated, almost works, just violating some NOT NULL contraints
2009-08-09 01:59:44 +08:00
Worros
a70bd9742d Add Gametype insert
Almost done, need to convert 0.25 to 25 for the database - Lookup?
2009-08-08 16:43:52 +08:00
Worros
5550166f37 Start of storeHand from HHC code
Currently cant actually insert as we need the fk gametypeid
2009-08-08 16:15:36 +08:00