Commit Graph

2461 Commits

Author SHA1 Message Date
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
92e20bcd12 Add more chars to player name in prev commit. 2010-01-27 23:16:11 -05:00
Eratosthenes
d50e70fdd4 Another fix of FTP playername reg ex. 2010-01-27 20:10:07 -05:00
sqlcoder
1df418c8e4 create fpdb dir if required, improve sqlite performance :-) 2010-01-27 23:48:39 +00:00
Worros
a9f2a261d4 Regex fix for Fulltilt player names
"Seat 7: moletrapper collected ($2.50)"
vs
"Seat 7: moletrapper ($2.50)"

The regex update should match the second and not the first.
2010-01-28 01:44:14 +08:00
Gerko de Roo
6f78749ebd Default graph created for empty data query 2010-01-27 18:37:23 +01:00
Worros
cd05c1da48 Remove unused variable 2010-01-28 01:36:42 +08:00
Gerko de Roo
92b5a43a22 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-01-27 16:46:45 +01:00
Eratosthenes
2ad7e430a2 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-01-27 09:49:14 -05:00
Eratosthenes
2adf0158a4 Merge branch 'master' of git://git.assembla.com/fpdb-sql
Conflicts:
	pyfpdb/Database.py
	pyfpdb/PartyPokerToFpdb.py
2010-01-27 09:48:31 -05:00
Eratosthenes
080b7f80c9 Compile the " collected" reg ex. 2010-01-27 09:23:12 -05:00
Worros
929e182a28 FulltiltToFpdb: Fix tourney player matching for players sitting out 2010-01-27 18:20:48 +08:00
Worros
8dea509245 FulltiltToFpdb: partially fix player ids
_mysql_exceptions.IntegrityError: (1062, "Duplicate entry 'romatrifon (small blind) showed -1' for key 'name'")

Previous regex was matching past the name.
2010-01-27 18:02:30 +08:00
sqlcoder
e82d276cf9 pull and merge from carl (nothing changed) 2010-01-27 08:56:51 +00:00
Eratosthenes
d75e5e3920 Fixed typos, pylint complaints, and obsolete TODOs. 2010-01-27 01:10:58 -05:00
Eratosthenes
30de5142db Ugly fix to ugly edge case where winner voluntarily showed cards. 2010-01-27 00:57:58 -05:00
Eratosthenes
e0d11fe9a3 Fix problem with finding HHs for utf-16 files. 2010-01-27 13:10:50 +08:00
Gerko de Roo
6c5c479ee8 Autocomplete Hero names only lists the valid names for that pokersite
SiteID list needed to be filled before the Hero field was filled.
2010-01-27 13:04:21 +08:00
Worros
fb7aae9186 clean-up code to get playerId in gui-stats and gui-graphs
Conflicts:

	pyfpdb/GuiGraphViewer.py
2010-01-27 13:04:13 +08:00
Gerko de Roo
241dc1e717 Fixed limit and freeroll support for Partypoker tourney's 2010-01-27 11:33:15 +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
5a9836862f sqlite mods, made sqlite the default in HUD_config.xml.example - works (roughly) straight out of the box 2010-01-27 00:48:02 +00:00
sqlcoder
11bc48e126 merge fpdb_db.py into Database.py 2010-01-26 23:54:04 +00:00
sqlcoder
47baee65f9 add tourneyid to hands table (REQUIRES REIMPORT) and fix sqlite db access 2010-01-26 22:46:48 +00:00
Gerko de Roo
f5c910bff0 clean-up code to get playerId in gui-stats and gui-graphs 2010-01-26 23:36:38 +01:00
Gerko de Roo
b248270135 Sorting routine caused errors when sorted on gametype,
since it used the starthand sort routine
2010-01-26 23:34:08 +01:00
sqlcoder
de2b807c9b refine hud_config handling some more (copies .exmaple to proper dir) 2010-01-26 21:54:58 +00:00
sqlcoder
5c88c6b0ad put database directory next to HUD_config.xml file 2010-01-26 21:02:37 +00:00
Mika Bostrom
ff9305924c Use proper encoding name
When system is unicode, the second item in locale.getdefaultlocale() is
"UTF8", not "utf-8".
2010-01-26 20:31:11 +01:00
Gerko de Roo
88cf6ec3a5 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-01-26 20:29:19 +01:00
Gerko de Roo
4814c30d8f Autocomplete Hero names only lists the valid names for that pokersite
SiteID list needed to be filled before the Hero field was filled.
2010-01-26 20:25:04 +01:00
Gerko de Roo
12c93ea9a6 Support for same hero name on multiple sites also implemented in GuiGraph 2010-01-26 20:20:17 +01:00
Eratosthenes
7d7ba94da1 Fix problem with finding HHs for utf-16 files. 2010-01-26 10:56:07 -05:00
Mika Bostrom
7f04ed88f4 Use proper encoding name
When system is unicode, the second item in locale.getdefaultlocale() is
"UTF8", not "utf-8".
2010-01-26 08:01:46 +02:00
Eratosthenes
7683590898 Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:
	pyfpdb/Configuration.py
2010-01-25 12:06:11 -05:00
Eratosthenes
90ea33c74b Needs to be executable. 2010-01-25 12:04:21 -05:00
Mika Bostrom
12367d6f37 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-01-25 19:03:21 +02:00
Worros
896de37d0d Fix hudCache update semantics 2010-01-26 01:00:22 +08:00
Mika Bostrom
b58edb53ae Write charmap-related errors directly to stderr
This change is needed to skip a nasty behaviour: if the string triggered
a decoding error, it will trigger one *AGAIN* if the string is printed
to console. By writing directly to sys.stderr we skip the
locale/conversion issues and get the troublesome string directly in a
file where it is stored as a raw sequence of octets.
2010-01-24 21:28:08 +01:00
Mika Bostrom
2c7287c351 Add new encoder
This encoder is used to handle input from HH conversion, which needs to
end up as UTF-8 in the database. Switch the open-coded routine from
Database.py to this common routine so all encodings now take place in
the same file.
2010-01-24 21:27:40 +01:00
Mika Bostrom
860b5737b7 Use common encoding routine everywhere
The string/locale manipulation in Database.py was open-coded and did not
use Charset.to_utf8() like the rest of the code.
2010-01-24 21:27:35 +01:00
Mika Bostrom
85c9070ec8 Write charmap-related errors directly to stderr
This change is needed to skip a nasty behaviour: if the string triggered
a decoding error, it will trigger one *AGAIN* if the string is printed
to console. By writing directly to sys.stderr we skip the
locale/conversion issues and get the troublesome string directly in a
file where it is stored as a raw sequence of octets.
2010-01-24 22:17:03 +02:00
Mika Bostrom
33277ce68b Add new encoder
This encoder is used to handle input from HH conversion, which needs to
end up as UTF-8 in the database. Switch the open-coded routine from
Database.py to this common routine so all encodings now take place in
the same file.
2010-01-24 21:11:46 +02:00
Mika Bostrom
6dcec48005 Use common encoding routine everywhere
The string/locale manipulation in Database.py was open-coded and did not
use Charset.to_utf8() like the rest of the code.
2010-01-24 19:59:49 +02:00
Gerko de Roo
73ae88e47a Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-01-24 13:37:27 +01:00
Worros
dbaad2d430 Remove NEWIMPORT variable.
No going back now :)
2010-01-24 13:36:21 +01:00
Mika Bostrom
c36c60155c Use a different "unicoder" for db strings
It seems that running encoder.encode() on a latin1/latin9 string results
in, yes a bloody UnicodeDecodeError. Decode error on .encode()...
Really. This way the modification from non-unicode string to real
unicode appears to work better.
2010-01-24 13:35:10 +01:00
Worros
fde2f1f710 Fix Charset import got Grapher 2010-01-24 13:30:02 +01:00
Mika Bostrom
cc3811b8aa Add missing import
GuiPlayerStats.py didn't import the new Charset module but tried to use
the functions.
2010-01-24 13:24:26 +01:00
Gerko de Roo
7737720aa8 Conflicts:
pyfpdb/Charset.py
2010-01-23 16:35:57 +01:00
Mika Bostrom
3a03bc51a2 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-23 16:34:24 +01:00
Gerko de Roo
53153bd00a Fixed limit and freeroll support for Partypoker tourney's 2010-01-23 16:32:32 +01:00
Gerko de Roo
81b9b51707 HUD fix for tournaments. Table name storage. 2010-01-23 23:18:39 +08:00
Gerko de Roo
b888f82a53 All game selection boxes default enabled 2010-01-23 23:05:40 +08:00
Gerko de Roo
6cb956c5fd HUD fix for tournaments. Table name storage. 2010-01-23 11:17:14 +01:00
Gerko de Roo
9100ba814c All game selection boxes default enabled 2010-01-23 10:01:36 +01:00
Worros
9d6707f18f Fix Charset import got Grapher 2010-01-23 15:30:48 +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
Worros
6b38976edc Add left-2click option to hide stat windows.
Gerko, so I assume others don't have a middle mouse button.
2010-01-23 14:38:53 +08:00
Gerko de Roo
d3f17f3fb7 game selector for graphs added.
exception caught for games selector for player stats
2010-01-23 14:34:34 +08:00
Worros
29e705f337 Remove NEWIMPORT variable.
No going back now :)
2010-01-23 13:37:41 +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
Gerko de Roo
3cd51ca990 Added freeroll support for Pokerstars 2010-01-22 23:42:44 +01:00
Worros
98e4b598ed Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2010-01-23 02:18:42 +08:00
Worros
c88ccd1140 Remove unused convert_cards() 2010-01-23 02:18:20 +08:00
Gerko de Roo
261daf6003 game selector for graphs added.
exception caught for games selector for player stats
2010-01-22 18:36:21 +01:00
Gerko de Roo
fdc5a0a635 Added close on double click for a stat window
Just in case you don't have a mouse with middle button
2010-01-22 15:38:33 +01:00
Mika Bostrom
9aa52ce6a8 Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:
	pyfpdb/Card.py

Resolve by removing stray empty lines
2010-01-22 09:24:19 +02:00
Gerko de Roo
4ada389f86 Changed the card positions and mucked card
positions to relative positions.
2010-01-21 21:14:49 +01:00
Mika Bostrom
91cd2d2599 Remove erroneous encoding
This string should not be encoded, it seems.
2010-01-21 22:05:24 +02:00
Mika Bostrom
29d5204bee Add missing import
GuiPlayerStats.py didn't import the new Charset module but tried to use
the functions.
2010-01-21 21:52:22 +02:00
Mika Bostrom
04c345ae1f Use a different "unicoder" for db strings
It seems that running encoder.encode() on a latin1/latin9 string results
in, yes a bloody UnicodeDecodeError. Decode error on .encode()...
Really. This way the modification from non-unicode string to real
unicode appears to work better.
2010-01-21 21:46:14 +02:00
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