Commit Graph

252 Commits

Author SHA1 Message Date
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
grindi
054abfc178 Merge branch 'party'
Conflicts:
	pyfpdb/Database.py
	pyfpdb/Hand.py
	pyfpdb/PartyPokerToFpdb.py
2009-08-06 18:44:03 +04:00
Worros
d043368c88 Prep for PartyPoker plugin add 2009-08-06 20:54:39 +08:00
eblade
34c469ab3a Add AbsoluteToFpdb.py
Database: Add Absolute to sites
GuiPlayerStats: set avgseats to False
Hand: Add Absolute to SITEIDS list
fpdb_import: check for presence of settings['dropHudCache'] before testing it, to keep command line import from erroring
2009-08-05 21:07:16 -04:00
grindi
cefd1e38e4 First "compiling" version 2009-08-05 20:15:11 +04:00
Worros
ff2cca361c New insert player function for HHC import
Added getSqlPlayerIDs to Database.py - returns a hash {playername:sqlid}

Function uses a caching hash in Database.py to reduce the number of round trips to the database needed just to fetch the player ids for later inserts.

Need to do a performance comparison on a larger import.
2009-08-02 12:19:33 +08:00
eblade
f5ba0b5b7f Database: insert missing HandToWrite.payin_amounts var
EverleafToFpdb: remove DEBUG XXXXXXX line
FulltiltToFpdb: pass on converting tournament hands
Hand: add Hand.fee var that Database is looking for
fpdb_import: clean up file update scan code, queue files that have changed in the last 60 seconds for the next importer pass, instead of locking it up reading them now (not that this does anything since FT no longer updates the mtime until it closes the table, but maybe it works with Stars or others)
2009-07-30 21:50:08 -04:00
eblade
c400fd9ba7 FTtoFpdb: default buyin to $0.00+$0.00 and level to 0, they don't seem to be in the FT hh 2009-07-30 20:56:39 -04:00
eblade
b27b697ec6 GuiBulkImport: fix indentation error
Hand: fix Pot __str__ to support infinite side pots
2009-07-27 14:25:24 -04:00
Ray
94a030922a Clean up handling of mixed games on FTP. 2009-07-22 19:21:00 -04:00
Ray
0291fcf489 Fix a problem when there is a comma in the BI for FTP stud games. 2009-07-22 14:43:13 -04:00
Ray
9d803957cb Detect mixed games in FTP HH. Fix typos. 2009-07-22 10:24:29 -04:00
Ray
37a5f2d83b Fix problem when someone times out and folds before posting. 2009-07-22 08:53:03 -04:00
Ray
0002043087 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-07-21 11:08:15 -04:00
sqlcoder
58957e78e6 fix typo that blew up when 2 side pots present 2009-07-20 22:31:24 +01:00
Ray
10f454ae77 Guess maxseats when not supplied by SiteToFpdb. 2009-07-20 10:01:51 -04:00
sqlcoder
ceaedebcd9 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-07-19 14:31:36 +01:00
Ray
3c64e67750 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-07-19 00:27:29 -04:00
Ray
c5cffc2326 Allow add* to take amounts with commas. 2009-07-18 21:31:39 -04:00
Worros
8386dd594e Add empty function prepInsert 2009-07-18 19:02:55 +08:00
Ray
26a1996353 Change Pot object to support variable currency symbol. 2009-07-16 12:13:24 -04:00
Worros
152f16c7a0 Make euros print as $ in writeHand.
fpdb_simple avoidance at the moment.
2009-07-16 13:54:41 +08:00
Ray
2fa3781349 Make euros print as $ in writeHand. 2009-07-16 00:54:09 -04:00
Ray
52fcbd7966 Remove completed TODOs(plenty left!). Remove obsolete comments. 2009-07-15 23:40:07 -04:00
Ray
b5b0b6a7b7 Get rid of hard wired $ in writeHand.
Replace with appropriate symbol based on ring, tournament, play,
etc.
2009-07-15 23:04:16 -04:00
Ray
889aea48b6 Make the board in the summary of flop games print in the right order. 2009-07-15 22:30:41 -04:00
Ray
e0dc556a67 Clean up some methods previously commented out. 2009-07-15 22:15:20 -04:00
Ray
3253d5a234 Get stud shown cards right in writeHand(). 2009-07-15 22:11:23 -04:00
Ray
12db3c0d55 Add a space to make stud holecard printing perfect. 2009-07-15 21:46:45 -04:00
Ray
427999b69c Correctly write stud holecards in writeHand(). 2009-07-15 21:22:07 -04:00
Ray
32a1c322d4 Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:
	pyfpdb/PokerStarsToFpdb.py
2009-07-15 13:36:00 -04:00
Ray
bd2db98612 Housecleaning. Refactoring writeHand() = not finished. 2009-07-15 11:50:27 -04:00
Ray
021b9934ea Fix writing of mixed tournament hands. Other minor changes. 2009-07-14 19:18:38 -04:00
Worros
7683334e36 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-07-14 05:00:48 +08:00
Ray
31dd10b5e6 Make writehand() to work for tournament/mixed/play$ games.
Also refactored the writing of the first 2 lines in writehand().
2009-07-13 16:22:23 -04:00
Ray
dd1b442122 Rationalized holecards for stud and draw games.
Cards are now lists of cards rather than sets. Removed some
game-specific methods and replaced with general methods.
Let the superclass handle some stuff.
2009-07-13 00:37:51 -04:00
Ray
3234f89aad Rationalized hole card format for flop games.
Also updated writehand() so flop hands are written OK.
This breaks stud and draw--fixing them now.
2009-07-12 16:01:02 -04:00
Ray
d8820ae1f7 Allow parsing of tournaments, draw and play money.
Sorry about the massive commit. There are still numerous bugs
parsing non-holdem hands and writehand() is broken for all
but holdem cash games.
2009-07-11 13:44:32 -04:00
Ray
56bd7b37ba Parse Stars tournaments for flop and stud games.
Tournaments are not correctly written in writehand(). Nor are
stud games.
2009-07-07 13:48:43 -04:00
Worros
c3d463b689 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-07-07 21:28:54 +08:00
Ray
799aa41c1e Correct handling of open/closed stud hole cards. 2009-07-05 23:44:53 -04:00
Ray
c4cc6bd1aa Make WriteHand for holdem report mucked cards. 2009-07-04 15:28:20 -04:00
Ray
a35b1a8b3c Make WriteHand for stud report mucked hand. 2009-07-04 15:19:46 -04:00
Ray
f323447313 Get shown and mucked cards for stud games. 2009-07-04 14:35:20 -04:00
Worros
89b410a766 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-07-04 14:51:55 +08:00
Ray
9d7c370449 Get mucked cards from Stars flop games. __str__ method for Hand. 2009-07-03 18:59:50 -04:00
Ray
4394c7beb3 Fix to convert stud hands. 2009-07-01 13:53:30 -04:00
Ray
a3f233ca07 Comment out a DEBUG print. 2009-06-30 14:21:06 -04:00
Worros
5611f115cd Remove DEBUG line that wasn't supposed to make the last commit 2009-06-30 18:32:30 +08:00
Worros
706ce46a9f Boardcards for Hands table in new importer 2009-06-20 07:58:53 +08:00
Ray
053bfb9cee Remove intermediate print from previous commit. 2009-06-19 09:43:49 -04:00
Ray
afddc130a5 Fix minor error in writing seen hole cards. 2009-06-19 09:39:17 -04:00
Ray
0f5d5a16f8 Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-06-19 09:11:21 -04:00
Matt Turnbull
620576ba21 more html output 2009-06-19 07:21:35 +01:00
Matt Turnbull
2a7a275e3a some stan to write an HTML hand 2009-06-16 00:29:44 +01:00
Matt Turnbull
574a286e0c round amounts to 2 dp 2009-06-15 22:30:58 +01:00
Matt Turnbull
2e08c6f9b3 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-06-15 22:21:40 +01:00
Matt Turnbull
14fbae1b54 get cards out 2009-06-15 22:21:27 +01:00
Ray
49a04af0c5 Add stud8 to PokerStars HH conversion. 2009-06-12 12:29:17 -04:00
Ray
9b5f8c53bc Changes to allow importing of razz hands. Tables not fully populated. 2009-06-09 19:06:20 -04:00