Commit Graph

2438 Commits

Author SHA1 Message Date
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
Worros
4746ddb33d Fix thinko in stub 2009-12-14 19:03:01 +08:00
Worros
2ca866398f Merge branch 'master' into stats 2009-12-14 18:02:08 +08:00
Worros
56c5521e6a [NEWIMPORT] Move HandsPlayers insert statement into SQL.py 2009-12-14 18:01:24 +08:00
Worros
fb92ee2941 [NEWIMPORT] Stub remaining HandsPlayers stats 2009-12-14 17:52:08 +08:00
Carl Gherardi
7d45d40d16 Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-12-14 16:47:10 +08:00
Carl Gherardi
6b45723b09 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-12-14 16:46:57 +08:00
Carl Gherardi
cf6e818ae5 [NEWIMPORT] Enable NEWIMPORT by defaul 2009-12-14 16:45:08 +08:00
Eratosthenes
0592b1c2c0 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-12-13 12:38:17 -05:00
Mika Bostrom
20de6fe730 Clean up about window
Remove duplicates
2009-12-13 16:12:29 +02:00
sqlcoder
69168ff868 unwind change that stopped mysawshowdown being set unless all-in (which I hardly ever am, since I play limit ... so my WtSD was displaying as 0) 2009-12-13 12:57:46 +00:00
sqlcoder
05d0d02df4 reload profile after editing Prefs if no other tabs are open, otherwise suggest restart 2009-12-13 12:55:15 +00:00
Carl Gherardi
e08afeecb1 [NEWIMPORT] Move database prep into prepInsert 2009-12-13 13:48:17 +08:00
Carl Gherardi
40cbb55f7f [NEWIMPORT] Enable printInsert, disable hud pipe 2009-12-13 13:47:14 +08:00
sqlcoder
4cc1c4cfe6 add name to nodes 2009-12-12 12:09:58 +00:00
sqlcoder
c7e11a8cc3 default guiprefs window to larger size 2009-12-12 12:08:48 +00:00
sqlcoder
ab89f9f603 show message dialog if pg connect fails 2009-12-12 09:51:07 +00:00
Mika Bostrom
fcf14f9100 Merge own master 2009-12-10 06:47:13 +02:00
Mika Bostrom
835fc98f6f Cosmetic fix
About -> Credits takes a list of strings in .set_authors() as opposed to
a single string. Now the credit popup looks about right.
2009-12-10 06:41:15 +02:00
Eric Blade
e221c9c0f6 Merge branch 'master' of git://git.assembla.com/fpdb-sql.git 2009-12-09 21:36:34 -05:00
Eratosthenes
ea60cda961 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-12-09 20:25:44 -05:00
Eratosthenes
e85608ee52 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-12-09 20:25:36 -05:00
Eratosthenes
bb9f5553ce Merge branch 'master' of git://git.assembla.com/fpdboz 2009-12-09 20:25:25 -05:00
sqlcoder
fc95de82f4 logviewer: avoid memory-mapped files, make it work when opened a second time 2009-12-09 21:58:56 +00:00
Eric Blade
5e7bd33cd0 no changes here 2009-12-08 17:48:52 -05:00
sqlcoder
bbaecc1697 add package version info to About dialog 2009-12-08 22:17:55 +00:00
sqlcoder
50e63a8131 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-12-07 22:55:32 +00:00
sqlcoder
68835dd9b8 tidy up log viewer some more 2009-12-07 22:55:12 +00:00
Worros
09b0e02c37 Add Makefile and a couple of test HH's 2009-12-07 12:14:19 +08:00
Worros
5f67fc8220 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-12-07 12:10:56 +08:00
Worros
a3192e77f2 Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-12-07 12:10:43 +08:00
Worros
49576b5eb3 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-12-07 12:09:05 +08:00
Worros
cd5b5b468c Forgot to add actual test file 2009-12-07 12:07:43 +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
909c2bd0fc Add test for Stars sawShowdown.
Test currently fails in the old import code and passes on NEWIMPORT

Tests for uncalled allin bet on river, which has been erronously marked as showdown previously
2009-12-06 22:57:27 +08:00
Worros
8f787b2d44 Make test file use real database.
Please note this could be destructive
2009-12-06 22:56:29 +08:00
Worros
4d38488f26 [NEWIMPORT] Fix sawShowdown stat 2009-12-06 22:52:45 +08:00
sqlcoder
63f04908be add simple test scripts for python and gtk 2009-12-06 14:17:22 +00:00
Mika Bostrom
128fa2f356 Enclose dict key lookup in try-except block
Some recent changes moved the dictionary access outside try-except block
again. Widen the block enough again.
2009-12-06 14:08:27 +02:00
Eratosthenes
c3c36e1e53 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-12-05 19:16:42 -05:00
Eratosthenes
b483686019 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-12-05 19:16:36 -05:00
sqlcoder
66b4ed35e5 add refresh button to log viewer 2009-12-05 22:48:41 +00:00
sqlcoder
18b0a47555 move print message to log 2009-12-05 22:20:44 +00:00
sqlcoder
85242f13cb fix bug with hud stats, must use ORDER BY in the selects 2009-12-05 21:59:42 +00:00
sqlcoder
2934c32132 limit number of lines displayed in log viewer 2009-12-05 20:31:37 +00:00
sqlcoder
2d8c44110c refine log viewer 2009-12-05 20:10:00 +00:00
sqlcoder
72303bf900 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-12-05 15:55:06 +00:00
sqlcoder
6826d0157a create gui option to view the log 2009-12-05 15:54:49 +00:00
Worros
61840e73c6 Add beginings of test for sawShowdown - unfinished.
Some sort of weird commit problem going on. Conmmitiing to work on htat
2009-12-05 20:18:47 +08:00
Worros
c40d665700 Newimport - comments for a getPosition function.
Decided that I needed some test functions before I kick on
2009-12-05 20:15:28 +08:00
Eratosthenes
a1bdf68dc2 Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-12-04 12:16:38 -05:00
Eratosthenes
2863edf1df Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-12-04 12:16:26 -05:00
Eratosthenes
193944799d Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-12-04 12:16:17 -05:00
Eratosthenes
6987cf6584 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-12-04 12:16:10 -05:00
Worros
ee205c3b29 [NEWIMPORT] Partially fix number of hands parsed reporting 2009-12-04 17:56:56 +08:00