Commit Graph

213 Commits

Author SHA1 Message Date
Steffen Schaumburg
28dead2905 Merge branch 'next'
Conflicts:
	pyfpdb/Configuration.py
	pyfpdb/locale/de/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/es/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/fpdb-de_DE.po
	pyfpdb/locale/fpdb-en_GB.pot
	pyfpdb/locale/fpdb-es_ES.po
	pyfpdb/locale/fpdb-fr_FR.po
	pyfpdb/locale/fpdb-hu_HU.po
	pyfpdb/locale/fpdb-it_IT.po
	pyfpdb/locale/fpdb-pl_PL.po
	pyfpdb/locale/fpdb-pt_BR.po
	pyfpdb/locale/fpdb-ru_RU.po
	pyfpdb/locale/fpdb-zh_CN.po
	pyfpdb/locale/fr/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/hu/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/it/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/pl/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/pt/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/ru/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/zh/LC_MESSAGES/fpdb.mo
2011-04-10 19:14:20 +02:00
Steffen Schaumburg
e4ab1f37cf more string cleaning, remove useless CLI option from GBI 2011-04-09 18:49:09 +02:00
Chaz Littlejohn
e03d08c0be Fixed small conflict in debug message when recreating tables 2011-04-08 21:15:35 +00:00
Steffen Schaumburg
398a2609ef more string cleaning 2011-04-08 13:39:56 +02:00
Steffen Schaumburg
65bba7d368 allow import of $1.25/$2.50 blinds on FTP 2011-04-08 07:01:37 +02:00
Steffen Schaumburg
56c26f5dcd activate support for capNL and FL/PL/NL draw tourneys on FTP - thanks Oleg for the histories 2011-04-07 12:37:40 +02:00
Steffen Schaumburg
38832a84fb Merge branch 'carl' 2011-04-07 10:39:50 +02:00
Worros
d4c58fd23f FTP: Fix crasher with returned antes
FTP forces all players at a cash game table to post antes, but if they
are in the blinds they can timeout and have the ante returned to them,
listing them as sitting out.
2011-04-07 18:26:55 +10:00
Worros
4f4a905609 FTP: Fix issue with RIT hands.
RIT hands on FTP have two summary sections. If a player is sitting out
and needs to be removed from the player list, they were removed twice.

The second remove from a python dict is a crash. Patch avoids this
situation
2011-04-07 17:54:47 +10:00
Chaz Littlejohn
ae8006935d Merge branch 'sorrow' into chazdazzle-test 2011-04-06 16:56:48 +00:00
Chaz Littlejohn
d7ed15bcfe Added the column 'showed' to handsplayers which flags whether or not a player showed his or her hand. If false and 'sawSD' is true then they mucked. If true and 'sawSD' is false, then they showed outside of a showdown (site dependent). Also fixed up readShownCards in FTP's hhc so it recorded mucked and showed correctly. 2011-04-05 02:41:53 +00:00
Steffen Schaumburg
0f8f2099cc reduce translation word count about another 50 2011-04-05 03:03:39 +02:00
Chaz Littlejohn
5f9d402701 Added new showdownStrings dictionary in the Hand module as well as the appropriate regex in re_ShownCards for capturing the text discrption of showdown hands. FTP and Stars only for now. Once evaluating hand strings is added to Stove, this will be used as a back up for games Poker-eval does not fully support such as Razz and Badugi 2011-04-04 19:57:54 +00:00
Chaz Littlejohn
d98a28ea0a Added support for board cards in FTP run it twice (RIT) hands. Hands continues to store the standard board for the hand, while run it twice board cards dealt after the all in are stored in the new Boards table. Designed to allow for more than 2 boards if a hand history allows it. Can be enabled for other sites by adding regex to detect multiple FLOP|TURN|RIVER deals in hhc.markStreets, and by updating hhc.readCommunityCards to save RIT streets and set hand.runItTimes with the number of deals. The Hands table now includes a 'runIt' BOOL indicating if a hands was run multiple times and board inserts are done in the storeHand method. 2011-04-04 04:50:01 +00:00
Chaz Littlejohn
f55cd5569d Added methods for storing the filename and import statistics in a new 'Files' table which links with the Hands table via Hands.fileId. Extended support for storing mixed game information for Full Tilt Poker coming from the filename, and updated mixed game dictionaries for PokerStars. Added a field in GameTypes to track this mixed game variable entitled 'mix' which takes on the string value of 'none' if not a mix game hand. 2011-04-02 23:56:52 +00:00
Worros
eec01083b1 FTP: Add high limit lookup
Clear the blind string of ,s and add 1k/2k and 1.5k/3k.
2011-04-02 23:22:56 +08:00
Worros
684689c9db Revert "changed all of the currency substitutions from byte stream (i.e. \xe2\x82\xac for EURO) to unicode (u'\u20AC') as it was throwing unicode errors when attempting to format the string in the various regex statements. I am aware that I may be the only one to encounter this problem."
This reverts commit d0ae2a155d.

Conflicts:

	pyfpdb/FulltiltToFpdb.py
2011-03-29 15:46:15 +08:00
Worros
59b65ca146 Merge branch 'chazdazzle' of git://github.com/ChazDazzle/fpdb-chaz
Conflicts:
	pyfpdb/FulltiltToFpdb.py
2011-03-29 13:52:08 +08:00
Worros
cf5e3878bd FTP: Allow '_' in tablename 2011-03-28 17:14:27 +08:00
Worros
b6ca0565ce FTP: Allow # in tablename 2011-03-25 13:14:26 +08:00
Chaz Littlejohn
a87f43f933 Updated the import process for Draw hands so that cards, along with additional draws can now be stored. HandsPlayers now includes 20 card fields to accomodate up to 4 five card hands for each player. The regex for the 'stands pat' action was also improved so that hero cards from those streets could be taken from that line of text 2011-03-24 06:00:10 +00:00
Chaz Littlejohn
5eeafc4503 Added regex & methods for picking up the 'discards' and 'stands pat' actions in FTP draw hands 2011-03-24 04:08:08 +00:00
Chaz Littlejohn
d0ae2a155d changed all of the currency substitutions from byte stream (i.e. \xe2\x82\xac for EURO) to unicode (u'\u20AC') as it was throwing unicode errors when attempting to format the string in the various regex statements. I am aware that I may be the only one to encounter this problem. 2011-03-23 19:27:55 +00:00
Chaz Littlejohn
ed1259fe30 It's not actually a big deal if there's no bring-in, like if the bring-in completes instead, so changed to debug. 2011-03-22 04:17:46 +00:00
Chaz Littlejohn
41e0042235 Added tracking for FTP 2-7 Single Draw 2011-03-22 04:16:23 +00:00
Steffen Schaumburg
bc7a5c55ff Merge branch 'carl'
Conflicts:
	pyfpdb/WinamaxToFpdb.py (just a comment and an output string
2011-03-16 09:37:44 +01:00
Steffen Schaumburg
d49d2e2220 few more string unifications (I know its too late, but I wanted them in so translators running non-source can try their translations better), update l10n files 2011-03-12 21:47:14 +01:00
Worros
eef755ac01 Merge branch 'master' of git://git.assembla.com/fpdb 2011-03-10 18:06:30 +08:00
Steffen Schaumburg
8a519699b5 update copyright year 2011-03-10 06:16:31 +01:00
Steffen Schaumburg
23818e0c6b more string unification 2011-03-10 04:36:20 +01:00
Steffen Schaumburg
4c71fd7baf unify a string 2011-03-10 04:29:16 +01:00
Steffen Schaumburg
5a0f2946a4 fix many strings that weren't being picked up by gettext's parser 2011-03-10 04:15:53 +01:00
Worros
e6df3cd809 FTP: Mod game regexes for older Hi/Lo format 2011-03-05 17:47:01 +08:00
Worros
e11e66c3e6 FTP: Minor updates.
Was sent an old file that has 'Omaha' instead of 'Omaha Hi' in the gametype line.

Was also sent a hand history that contain no player stack information at all.
2011-03-02 16:01:55 +08:00
Worros
1e482a8a37 FTP: Specify full filename in log when gametype not matched 2011-02-24 22:48:53 +08:00
Worros
2b8b6ec626 FTP: Fix markStreets to correctly identify single draw 'DEAL'
This has the knock on effect of fixing pre/post deal stats and almost certainly the same bug that affected the stars parser fixed in e387593967
2011-02-16 16:14:32 +08:00
Worros
005dc9ba4c FTP: Handle partial hhs in date function 2011-02-07 23:22:17 +08:00
Worros
7d1a54bf66 FTP: Add new blind for limit 2011-02-07 23:16:45 +08:00
Worros
7fe3ece235 FTP: Comment out debug line 2011-02-07 23:15:42 +08:00
Worros
9626812f89 FTP: Recommit accidentally reverted patch 2011-02-02 16:40:03 +08:00
Eratosthenes
543862629f recommit one of Carl's prev commits. 2011-01-31 09:59:11 -05:00
Eratosthenes
c8a9529ae4 Revert "Merge /home/reb402/workspace/free_poker_tools"
This reverts commit 64ebf9f6ae, reversing
changes made to d01951089b.
2011-01-30 17:14:57 -05:00
Worros
e26abfeb71 FTP: Make re_SummarySitout ungreedy
The line

Seat 5: evv888 (button) is sitting out

Was crashing as (button) was becoming part of the player name,

Made the name match ungreedy, and allowed (button) as optional.
2011-01-29 03:17:55 +08:00
Worros
25d0c36022 FTP: Add additional blind levels 2011-01-27 15:58:38 +08:00
Worros
db3df7b42e FTP: Make Summary split more careful
This prevents the import from crashing on Run It Twice hand histories.
2011-01-27 12:42:06 +08:00
Worros
de28aa7dc0 FTP: Add 1k/2k limit to lookup.
Also remove a noisy debug line
2011-01-27 12:12:27 +08:00
Worros
5a30d793c7 FTP: Update re_HandInfo
After last patch the regex was greedy when including space.

Fixes 7 issues noted by THP
2011-01-24 14:13:03 +08:00
Worros
e6be901cf3 FTP: Fixes for Multi entry rush and FTP archive files
- Minor fix for table name match
- Make the word 'Table|Match' optional as it isn't in the archive file
- Add optional section for 'Entry #id'
2011-01-24 14:00:25 +08:00
Worros
66247216a5 FTP: Introduce Lim_Blinds lookup table for Big Bets 2011-01-17 14:11:43 +08:00
Worros
acdd1aa507 FTP: Refine re_CollectPot
FTP Draw games do not necessarily have the ending ', mucked' or ' with blah' in the summary
2011-01-14 14:14:14 +08:00