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

3786 Commits

Author SHA1 Message Date
Chaz
9c225a5b72 * Updated storeHandsPlayers() to insert via executemany() if 'saveActions' is False and via looped execute() to call get_last_insert_id() if 'saveActions' is True 2010-09-28 23:34:20 -04:00
Worros
a964b17de6 Merge branch 'chaz' of git://github.com/ChazDazzle/fpdb-chaz 2010-09-29 10:11:16 +08:00
Chaz
76b2dec2b6 * updated _addRaise() so that it does in fact accept the action variable 2010-09-28 17:33:15 -04:00
Chaz
ae6a035834 * fixed a small issue in assembleHandsActions() 2010-09-28 17:23:44 -04:00
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
030a15f041 * Filled assembleHandsActions() 2010-09-28 17:11:09 -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
1b0db117ce * updated 'createHandsActionsTable' and 'store_hands_actions' in the SQL dictionary 2010-09-28 17:01:31 -04:00
Chaz
c1b2a0040c * Added HandsActions & Actions indexes & foreign keys to Database.py 
* Added 'createActionsTable' to the SQL dictionary
* Updated create_tables so 'createActionsTable' would be called
* Updated dumpdatabase(), adding in u'Actions'
* Added action name & code info for filling the Actions table in FillDefaultData()
 2010-09-28 16:59:37 -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
b14344aea6 Merge branch 'master' of git://ferki.hopto.org/fpdb 2010-09-28 22:47:34 +08:00
Worros
4f3f7570ab Party: Couple of mods to start support for Stud H/L 2010-09-28 22:47:04 +08:00
Erki Ferenc
bb0bb3c2dd l10n: fixed a typo 2010-09-28 15:56:02 +02:00
Erki Ferenc
d2f5633384 PartyPoker: improved handling of players with zero or unknown stacks 2010-09-28 15:46:51 +02:00
Worros
9e13930742 Hand: Whitespace changes from Forrest 2010-09-28 12:04:40 +08:00
Worros
f62201c8e9 HUD_main: L10n update 2010-09-28 11:59:10 +08:00
Worros
d299a19abc Merge branch 'master' of git://git.assembla.com/fpdb 
Conflicts:
	pyfpdb/Hud.py
 2010-09-28 11:43:42 +08:00
Worros
2d90fbf3b6 Winamax: L10n change 2010-09-28 11:41:27 +08:00
Worros
42067c0873 TableWindow: Remove whitespace breakage 2010-09-28 11:41:03 +08:00
Eric Blade
61d2c48da2 Merge branch 'master' of git://git.assembla.com/fpdb.git 
Conflicts:
	pyfpdb/HUD_main.pyw
 2010-09-27 16:15:54 -04:00
steffen123
2ecee26d99 Merge branch 'eric' 
trivial conflict
 2010-09-27 22:14:37 +02:00
Eric Blade
c325daf7f6 check_table_no deals with "None" passed to it 2010-09-27 07:34:25 -04:00
Eric Blade
df1cd4a15d fix syntactical issue in get_table_no 2010-09-27 07:29:34 -04:00
Eric Blade
ca967992b5 fix a comment 2010-09-27 07:11:16 -04:00
Eric Blade
b0056be03c further fixes to get stdout working in windows again 2010-09-27 07:10:13 -04:00
Eric Blade
baf47d476e fix for call to check_table_no now needing an argument 2010-09-27 05:56:52 -04:00
Eric Blade
bfec231b5d slight formatting changes to agree with PEP8 moar closely 2010-09-27 05:08:34 -04:00
Eric Blade
4b3fe3dfa2 fix conflicts between ray's new window move code and my old window move code 
Ray: when you finish implementing yours, please adapt and/or disable Hud::update_table_position
 2010-09-27 04:04:56 -04:00
steffen123
a29de2b533 Merge branch 'eric' 
trivial conflict
 2010-09-27 09:23:53 +02:00
steffen123
3509beb828 some missing _() 2010-09-27 09:22:07 +02:00
Eric Blade
a98e71ad24 semi-fix stdout for hud_main in windows when running from source 2010-09-27 03:14:10 -04:00
Gerko de Roo
ad2983a968 Detection system for table change during tourney's 
The routine stores the actual seat.
When being reseated during tourney's the seat change is detected.
The HUD window adjust is recalculated.
 2010-09-26 17:31:05 +02:00
Gerko de Roo
b9c63bd718 Merge branch 'master' of git://git.assembla.com/fpdb.git 2010-09-26 17:19:17 +02:00
Gerko de Roo
ec8f8aff76 Merge 2010-09-26 17:19:05 +02:00
Eric Blade
e3113ae3a0 Merge branch 'master' of git://git.assembla.com/fpdb.git 2010-09-26 02:21:04 -04:00
Worros
1ae01f1502 Database: Mark 27 Single draw as a lowball game 2010-09-24 13:47:24 +08:00
Worros
121e12023f Ring Player Stats: Support Razz start card list 2010-09-24 13:46:21 +08:00
Worros
6cfd884413 RSHG: Fix a coupl eof bugs 2010-09-24 13:30:16 +08:00
Worros
f470ae863d New: RazzStartHandGenerator 2010-09-24 13:11:44 +08:00
steffen123
1adf15e8af l10n: update pot/mo file 2010-09-23 21:59:11 +02:00
Worros
ca4da923d4 Regression: Winamax PLO file 2010-09-24 00:56:25 +08:00
Worros
b6182b419c Winamax plugin: Contributed by Forrest 2010-09-24 00:31:17 +08:00
Worros
b8e66ee954 Winamax setup 2010-09-23 23:02:00 +08:00
Erki Ferenc
89e402f3b0 l10n: updated Hungarian translation 2010-09-23 11:38:01 +02:00
Worros
8a2b051916 Card: make decodeRazzStartCard return a string 2010-09-23 17:30:59 +08:00
Worros
47ca83db84 Card: Lookup table for Razz start hand combos 
Take Razz hand list table provided by gammoner of 2+2 and start the lookup table.

'(32)A':1 ... (KK)K:1193

'(00)A':-13 ... '(00)K':-1  Where 0 is unknown.
 2010-09-23 16:42:54 +08:00
Worros
235a8baa5f L10n: Remaining files 2010-09-23 14:31:16 +08:00
Worros
dee17e8001 L10n: H->M updated 2010-09-23 14:10:30 +08:00
Worros
016172f78d L10n update: Gui* 2010-09-23 13:11:06 +08:00
Worros
eefad4a486 Card: Add complete Razz start card list. 
Figure out how to use it later.

Maybe use tuple as a key to a dict?

card = { ('A', '2', '3') : 1 } ? - Might work
 2010-09-23 11:36:13 +08:00
Worros
353a7d96eb Config: Fix import ordering 
L10n change caused:
  File "/home/carlos/Projects/fpdb/fpdboz/pyfpdb/Charset.py", line 25, in <module>
    import Configuration
  File "/home/carlos/Projects/fpdb/fpdboz/pyfpdb/Configuration.py", line 30
    from __future__ import with_statement
SyntaxError: from __future__ imports must occur at the beginning of the file

Who knew?
 2010-09-23 11:27:06 +08:00
Eratosthenes
8b68bb2137 Merge branch 'master' of git://git.assembla.com/fpdb 2010-09-22 21:57:47 -04:00
Eratosthenes
1dedbe2a45 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-09-22 21:57:22 -04:00
steffen123
1e4c835d96 l10n: update pot/po/mo 2010-09-22 20:12:26 +02:00
Worros
591543d468 L10n updates: C->F 2010-09-23 00:10:32 +08:00
Worros
1b15e665e0 L10n update - Absolute->Config 2010-09-22 23:51:56 +08:00
Worros
83900736f0 fpdb.py: Use L10n 2010-09-22 23:46:03 +08:00
Worros
692cd4e6e4 L10n.py: Make safer 2010-09-22 23:41:09 +08:00
Worros
02aa42a987 Merge branch 'master' of git://git.assembla.com/fpdb 
Conflicts:
	pyfpdb/GuiBulkImport.py
 2010-09-22 23:41:05 +08:00
steffen123
be39031f4f l10n: rename some things 2010-09-22 17:32:27 +02:00
steffen123
51f54f5444 refactor translation method into new file 2010-09-22 17:26:25 +02:00
Worros
0ce0c13dd0 Bug fixes: Make fpdb run after my previous patches damage 2010-09-22 23:18:36 +08:00
Worros
ee5e80894c Locale: Fix bug with last patch 2010-09-22 16:40:31 +08:00
Worros
2c8f219c50 Locale: Deal with locale initialisation more safely 2010-09-22 16:37:56 +08:00
Worros
0049cfbd3c Card.py: Adding random function and comment 2010-09-22 16:35:26 +08:00
Worros
c9f607f18b Merge branch 'chaz' of git://github.com/ChazDazzle/fpdb-chaz 2010-09-22 15:33:21 +08:00
Chaz
5cf0cf58a1 Updated saveActions default to False 2010-09-22 02:57:51 -04:00
Eratosthenes
9ca3a02006 Add support for draw games to example config. 2010-09-21 23:30:57 -04:00
Worros
2b278b781e Stars: Apparently there is a PL 5 Card draw 2010-09-21 13:47:06 +08:00
Worros
255f29cfae Win2day: Make Omaha hands not crash 
Looks like it is importing the hands - no idea of accuracy at the moment
 2010-09-20 14:18:52 +08:00
Worros
57405e7483 Win2day: Update to parse NLHE 
Hasn't been modified since contribution - used the 'old' set() interface for cards. This interface was dropped after we realised we needed ordering for stud cards
 2010-09-20 14:08:41 +08:00
Worros
178afa4773 Win2day: Add locale header 2010-09-19 00:14:50 +08:00
Worros
2e6bec5c18 Hand: Add fake GBP symbol 2010-09-19 00:14:14 +08:00
steffen123
f540214e17 l10n: missed gettextify in various *ToFpdb files 2010-09-17 19:32:50 +02:00
steffen123
a6b679c7fb fix minor string typo in imapfetcher 2010-09-17 19:18:16 +02:00
Worros
a81910d7f1 iPoker: Large update for actions and antes 
I think I have most of the action correct at the moment.
 2010-09-17 17:39:04 +08:00
Worros
14ac685e30 FTP: Adjust SplitHands regex for 2 blank lines or more 
Also add FpdbParseError() throe if GameInfo regex fails to match
 2010-09-17 11:47:23 +08:00
Worros
14bd767603 Carbon/Merge: Fix blind reading 
The new Merge network format has a timestamp in the blind line

Also made some of the error reporting more consistent with other parsers
 2010-09-17 11:44:58 +08:00
Worros
fbfaf0176c Import: First step to making FTP archive files parse 
Change regex to be explicit about the number of '*'s

Pass the ftpArchive flag to HHC init
 2010-09-17 10:58:47 +08:00
Eratosthenes
7916f9e3ef Merge branch 'master' of git://git.assembla.com/fpdboz 2010-09-16 20:52:57 -04:00
Eratosthenes
2fc2cc9743 Integrate new table handling. 2010-09-16 20:29:58 -04:00
Worros
aae1ad082e OnGame: add dead blind detection 2010-09-15 13:25:44 +08:00
Worros
a7d450d384 Importer: Add command line option for FTP archive format. 
To import

./GuiBulkImport -F -c "Full Tilt Poker" -f filename

Completely untested at the moment.
 2010-09-15 13:23:32 +08:00
Worros
90e991dec8 Regression: Omaha limit OnGame hh 2010-09-14 18:58:05 +08:00
Worros
95dee0a8d3 Regression: OnGame 7 Card Stud Hi sample hand 2010-09-14 15:21:28 +08:00
Worros
960ce096a5 Regression: 5-Card Draw for OnGame 2010-09-14 15:04:54 +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
ea5afdb14c Regression: OnGame dead small blind 2010-09-14 12:52:49 +08:00
Worros
5f8f5ffcda Merge branch 'master' of git://ferki.hopto.org/fpdb 2010-09-13 12:37:20 +08:00
Worros
662455d488 Carbon: Remove comment 2010-09-12 13:01:58 +08:00
Worros
de57731788 Merge branch 'master' of git://git.assembla.com/fpdb 2010-09-12 12:27:10 +08:00
Erki Ferenc
5c0bfa3bd0 PartyPoker fixes 
- fix the "newly joined unseated active players are taking actions" problem
- fix the "newly joined seated active players with zero initial stacks" problem
 2010-09-11 16:46:37 +02:00
Erki Ferenc
b1217b417f Added new regression test file 
A newly joined  player has zero stack but having actions
 2010-09-11 16:06:46 +02:00
Worros
1dce9d70b9 iPoker: Fix split hands 2010-09-11 17:07:23 +08:00
Worros
8911790408 iPoker: Update from initial Carbon template 
determineGameType: partially functional
readHandInfo: partially functional
readPlayerStacks: Done
compilePlayerRegexes: Skipped
markStreets: done for Stud
readAntes: Needs doing
readBlinds: Needs doing
readBringIn: Needs doing
...
readAction: Partially complete
 2010-09-11 16:11:16 +08:00
Worros
5a7c628dba OnGame: set maxseats to None, and let guessMaxSeats operate 2010-09-11 14:11:40 +08:00
Worros
55a0908675 Regression: OnGame LHE.hp file 2010-09-11 14:00:52 +08:00
Worros
07dc1fa9ec Regression: Everleaf FLO8 2010-09-11 13:25:03 +08:00
Worros
0729ee2d3f Regression: PLO8 for Everleaf 2010-09-11 13:13:31 +08:00
Worros
9dbe26fce6 OnGame: Fix BB regex 2010-09-11 11:56:00 +08:00
Eratosthenes
d176da93d4 Merge branch 'Xlib' 
Conflicts:
	pyfpdb/TableWindow.py
	pyfpdb/Tables_Demo.py
	pyfpdb/WinTables.py
	pyfpdb/XTables.py
 2010-09-10 23:01:21 -04:00
Eratosthenes
7314da8b38 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-09-10 21:24:01 -04:00
Eratosthenes
6a129695f4 Correct line removed by mistake. 2010-09-10 17:07:59 -04:00
Worros
8daa9cea9c ImapFetcher: Fix previous commit for actual IMAP 2010-09-10 18:09:01 +08:00
Worros
2514b424c8 Imap/PSSummary: Update and refactor 
Primarily to make FTP summaries read from file.
 2010-09-10 17:18:16 +08:00
Worros
d66ae965a1 FTSummary: First pass at a FTP summary importer 
Definetly doesn't match 'Still playing' but seems to get almost everything else right
 2010-09-10 17:16:09 +08:00
Worros
58de54560d ImapFetcher: refactor the import part from the IMAP connection 2010-09-10 14:07:09 +08:00
Worros
7f61fba314 PSS: Switch over to regex based parsing 2010-09-10 13:22:52 +08:00
Worros
7c8965486f THP: Allow sites to be manually switched off and on 2010-09-10 12:24:11 +08:00
steffen123
b6e865ff84 Merge branch 'ferki' 2010-09-09 12:56:32 +02:00
steffen123
69872b9638 PS summaries import skipped digits of tourney no 2010-09-09 12:35:05 +02:00
steffen123
c103203880 conflict in pyfpdb/PokerStarsSummary.py 2010-09-09 12:13:38 +02:00
Worros
d0df1b6e44 SQL: Iport tourneyResults query 2010-09-09 18:08:03 +08:00
steffen123
acd512d9c3 make imapfetcher work on imap again 2010-09-09 12:00:28 +02:00
Worros
3158c85d4f PSSummary: make space in Player regex optional again 2010-09-09 17:48:19 +08:00
Erki Ferenc
a927517229 Merge branch 'master' of git://git.assembla.com/fpdb 2010-09-09 11:21:28 +02:00
steffen123
c48242c219 Merge branch 'eric' 2010-09-09 10:48:36 +02:00
steffen123
3c60c8d68d Merge branch 'master' of git://git.assembla.com/fpdboz into carl 2010-09-09 10:44:27 +02:00
Worros
f9e4eef2d3 Add copyright notice 2010-09-09 16:37:18 +08:00
Worros
6f0c94a119 Revert "FTP: Fix re_PlayerInfo to find ', is sitting out' for cash games" 
This reverts commit bc4a53d754.
 2010-09-09 16:36:37 +08:00
steffen123
5cfd693668 Merge branch 'master' of git://git.assembla.com/fpdboz into carl 2010-09-09 10:30:12 +02:00
Worros
ef99f7026f Regression: Add new FTP test file 2010-09-09 16:28:18 +08:00
Worros
ccfc55eec3 iPoker: Another minot update to determineGameType 2010-09-09 16:27:31 +08:00
steffen123
f0616a708d l10n: couple of missing gettextifies in imapfetcher 2010-09-09 10:27:21 +02:00
Worros
cb90147303 iPoker: Minor update to determineGameType 2010-09-09 16:26:37 +08:00
Worros
bc4a53d754 FTP: Fix re_PlayerInfo to find ', is sitting out' for cash games 
Turns out that a player sitting out at the start of a cash game hand can (in what i hope is a small set of hands) be dealt cards and act in a hand
 2010-09-09 15:14:54 +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
34f0c93351 Regression: Add Stars Stud crasher. 
This hand contains only 6 of the 7 cards for 'shown' and 'mucked'
 2010-09-09 13:14:19 +08:00
Worros
bdb0bda3a0 OnGame: remove non-digits from hand id 
Fixing email reported error with MySQL:

fpdb starting ...Traceback (most recent call last):
  File "GuiBulkImport.pyc", line 107, in load_clicked
  File "fpdb_import.pyc", line 251, in runImport
  File "fpdb_import.pyc", line 314, in importFiles
  File "fpdb_import.pyc", line 482, in import_file_dict
  File "Hand.pyc", line 273, in insert
  File "Database.pyc", line 1651, in storeHand
  File "MySQLdb\cursors.pyc", line 174, in execute
  File "MySQLdb\connections.pyc", line 36, in defaulterrorhandler
_mysql_exceptions.OperationalError: (1366, "Incorrect integer value: 'R5-79731715-280' for column 'siteHandNo' at row 1")
 2010-09-09 10:31:40 +08:00
Eratosthenes
582377f519 Catch up WinTables.py to recent changes in TableWindow.py. 2010-09-08 20:35:59 -04:00
Worros
3b55bd19db OnGame: Fix date regex 
Previously assumed that the day was 2 characters, and failed on:

'Fri Sep 3 05:01:22 GMT+0100 2010'

Doh
 2010-09-08 16:05:04 +08:00
Worros
c3b2e56614 OnGame: Debugging Betfair skin date format with user 2010-09-08 16:02:18 +08:00
Worros
74a0c3d7da HHReplayer: Add file for Hud testing 
Uses pygame, was playing around with the idea of using this library to create a replayer with sprite animations.
 2010-09-08 15:43:20 +08:00
Worros
3759751fe4 HHC: Raise exception when game isn't supported. 2010-09-08 15:11:55 +08:00
Worros
d605f89564 OnGame: Make sure time can't fail and report erro 2010-09-08 01:08:23 +08:00
steffen123
aa22ca8df9 l10n: gettextify graph buttons 2010-09-07 19:03:15 +02:00
Eratosthenes
9772129f30 Rewrite of XTables to use Xlib. Considerable cleanup in TableWindow. 2010-09-07 09:50:29 -04:00
Worros
1acbe15b34 PKR: Make note about actions 2010-09-06 17:50:42 +08:00
Worros
e24e722141 Betfair: Fix some error handling in legacy parser 2010-09-06 17:25:17 +08:00
Worros
c7072bdd84 THP: Add iPoker testing 2010-09-06 17:24:08 +08:00
Worros
fd9c90c908 Test Config: Add iPoker 2010-09-06 17:23:38 +08:00
Worros
9a6de0476e Stars: Make readHandInfo() failure log an error not info 2010-09-06 17:22:36 +08:00
Worros
581b58e0c7 Party: Add exception for when determineGameType fails 2010-09-06 16:44:08 +08:00
Worros
c6d4661740 Regression: iPoker Stud H/L sample hand 2010-09-06 12:10:56 +08:00
Worros
89b20b1dba iPoker: initial commit - same as Carbon poker for the moment 2010-09-06 11:23:07 +08:00
Worros
2e99fc38bc Update files to prepare iPoker 2010-09-06 11:21:22 +08:00
Erki Ferenc
ab20e28dc4 Anonymised players in a sample file 2010-09-06 00:34:02 +02:00
Worros
21043d5445 Regression: PKR updates 2010-09-06 00:39:51 +08:00
Worros
631d2361aa Regression: PKR fix rake 2010-09-05 23:28:29 +08:00