evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,104 Commits 1 Branch 0 Tags 14 MiB
0ecd19fbdf
Commit Graph

2802 Commits

Author SHA1 Message Date
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
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
sqlcoder
c9b9927315 fix new timing code so it actually works\! 2009-12-03 21:02:05 +00:00
sqlcoder
cd65aae374 allow legend box to work in python 2.5 2009-12-03 20:20:42 +00:00
sqlcoder
9dd09fe8a1 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-12-03 20:14:12 +00:00
Eric Blade
6195397c88 fix typos.. durrr 2009-12-03 12:52:57 -05:00
Eric Blade
adadb7defa slight optimizations 2009-12-03 12:51:10 -05:00
Eric Blade
3248cb60f2 added checks to see if player has folded when processing wether they've seen streets/showdown (corrects problem of player calling someone's short all in and it not counting as having seen showdown) 2009-12-03 12:35:00 -05:00
Eric Blade
f05b521d6f comment out some prints, apparently mysqlcoder and my editors do not agree well with each other on spacing. 2009-12-03 07:24:12 -05:00
Eric Blade
81adfff93b Add some basic error handling at the very beginning of startup, to deal with missing imports and such, update about box 2009-12-03 07:22:33 -05:00
Eric Blade
2120257aee whitespace.. sorry guys. 2009-12-03 07:21:24 -05:00
Eric Blade
86449333c0 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-12-03 06:30:08 -05:00
Worros
b7d9a843bd Add PLO test file for Betfair, update test to import it 2009-12-03 17:45:04 +08:00
Worros
247af28f7e Add a HH anonymiser 
Usage:
python Anonymise.py -i regression-test-files/tour/Stars/Flop/NLHE-USD-MTT-5r-200710.txt

At least works for Stars at the moment
 2009-12-03 17:26:40 +08:00
Worros
76163733ee Repair recent damage to Options 2009-12-03 16:46:10 +08:00
sqlcoder
ffb59570d2 merge from carl 2009-12-02 15:23:05 +00:00
sqlcoder
5e3c920e16 add timing info to log 2009-12-02 15:17:31 +00:00
Mika Bostrom
a0a6207810 Fix profit graph query 
At least postgresql requires to have grouping by hp.sawShowdown as well
 2009-12-02 12:29:48 +02:00
Eric Blade
deb2f87bcc Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-12-02 05:14:49 -05:00
Worros
8d95835afe Remove annotate from graph. 
Legend box is smarter and looks better imho
 2009-12-02 14:07:06 +08:00
Worros
395f19b5fb Add showdown/non-showdown winnings to Grapher 2009-12-02 14:02:06 +08:00
Eratosthenes
b5e64fd747 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-12-01 10:26:14 -05:00
Eratosthenes
f2947ce730 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-12-01 10:26:00 -05:00
Eric Blade
abf132c719 Merge branch 'master' of git://git.assembla.com/fpdb-sql.git 
Conflicts:
	pyfpdb/Database.py
 2009-12-01 08:03:25 -05:00
Eric Blade
bec343abfd argh at whitespace churn, do i have my editor settings screwey? 
trap error 2003 on mysql connect (same as 2002, but for tcp)
 2009-12-01 06:58:33 -05:00
grindi
45eccb0697 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-12-01 11:11:34 +03:00
sqlcoder
f7ed06d071 improve rebuild hudcache and indexes dialogs 2009-11-30 21:43:29 +00:00
Eratosthenes
ef6d46b458 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-11-30 10:30:36 -05:00
Eratosthenes
9ced37a859 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:
	pyfpdb/Configuration.py
 2009-11-30 10:30:11 -05:00
Eric Blade
9953e76c9e trap IOError on hud pipe write when hud closed without autoimport stopping, turn off hud 2009-11-30 09:51:47 -05:00
Eric Blade
8c8fdba7c8 ttime = float with us to ms resolution 2009-11-30 09:08:30 -05:00
Eric Blade
284b0c1f38 fix return tuple in import_file_dict, fix text from autoimport to actually show up in autoimport window 2009-11-30 08:14:03 -05:00
Worros
fc20330f2b [NEWIMPORT] Don't actually writeHand on NEWIMPORT 2009-11-30 15:11:00 +08:00
Worros
f30b3a6117 Oops - actually add NEWIMPORT const to Configuration 2009-11-30 14:41:07 +08:00
Worros
36dda2174b Move NEWIMPORT into config 
Fix test_PokerStars test to catch exception when importing with the legacy importer
 2009-11-30 14:33:32 +08:00
Worros
152933ed49 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-11-30 14:23:37 +08:00
Worros
71c2fea1ca Add query object to test 2009-11-30 14:22:58 +08:00
Worros
bb38d7e1dd [NEWIMPORT] Clean up HandsPlayers.cardX fetching 2009-11-30 14:20:48 +08:00
Eric Blade
67beb4bd9f add textview to autoimport window for dropping status/info messages on, just call it's AddText func to get it there 2009-11-29 23:52:36 -05:00
Eric Blade
3439523de8 Merge branch 'master' of git://git.assembla.com/fpdb-sql.git 2009-11-29 22:02:49 -05:00
Worros
db5e321fe0 Fix obvious typo 2009-11-30 10:53:15 +08:00
Worros
aed892139d Add -i option for input file 2009-11-30 10:52:28 +08:00
Eratosthenes
76680e8511 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:
	pyfpdb/Configuration.py
	pyfpdb/HUD_main.py
 2009-11-29 19:56:32 -05:00
sqlcoder
00c85aa62d add rebuild indexes option to Database menu (can we put tooltips over these menu options?) 2009-11-29 23:02:45 +00:00
sqlcoder
8221e86757 turn off hud seats restriction as default 2009-11-29 18:14:04 +00:00
sqlcoder
78004a2e76 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-11-29 17:37:19 +00:00
sqlcoder
65b372570f add some comments 2009-11-29 17:36:37 +00:00
sqlcoder
432a39b172 better icon for tab close buttons 2009-11-29 17:36:22 +00:00
Eric Blade
bab3ad6ca9 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-11-29 12:28:14 -05:00
Eric Blade
3f140ab157 exception traceback in idle_func in create_hud 2009-11-29 12:25:02 -05:00
Worros
a667fe37be Merge branch 'master' of git://repo.or.cz/fpbd-bostik 
Conflicts:
	pyfpdb/HUD_main.py
 2009-11-29 18:08:47 +08:00
Worros
8d10cbcd5e test_PokerStars - Add test for 5 card draw 2009-11-29 17:10:14 +08:00
Worros
a6a3217bbc Fix draw parsing finally? 2009-11-29 16:54:15 +08:00
Worros
39f27bc781 test_PokerStars: Add 2-7 Lowball test 2009-11-29 15:28:32 +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
e93412f12d Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-11-29 11:44:26 +08:00
sqlcoder
c77ae39077 add close buttons to tabs 2009-11-28 23:36:54 +00:00
sqlcoder
db3371a202 use notebook widget to show proper tabs 2009-11-28 22:00:44 +00:00
sqlcoder
cce1545024 add gui stuff to test, stop crash if xml.dom.ext not present 2009-11-28 21:11:52 +00:00
sqlcoder
7f40d9dd3a change default for min_seats to 0 in case hc.activeSeats is zero 2009-11-28 11:48:06 +00:00
Mika Bostrom
2f742e371b Use wider try-except block 
The 'temp_key' table name in hud_dict can vanish between DB roundtrips.
Enclose all three lines within try-block.
 2009-11-28 10:59:44 +02:00
Mika Bostrom
6dec7f38f3 Fix a stupid syntax error 
Use python's format-string syntax.
 2009-11-27 22:21:45 +02:00
Worros
a13ae41134 Fix MySQL startup error: 2002 
2002, "Can't connect to local MySQL server through socket '/var/run/mysqld/mysqld.sock' (2)"
 2009-11-27 20:19:43 +08:00
Eric Blade
41c963baa9 look at all that whitespace churn.. sorry my git just acts weird. it's gitty. 2009-11-27 02:09:06 -05:00
sqlcoder
b60895a89f merge from carl 2009-11-26 22:35:50 +00:00
sqlcoder
6037f17fb9 added seats options to hud menu 2009-11-26 22:24:24 +00:00
sqlcoder
65fe163379 add ability to display hud stats by number of seats at table (All / Custom / Exact) 2009-11-26 21:28:05 +00:00
Mika Bostrom
df6d9a0a56 Fix missing checks before .set_active() 
Some validity tests were still missing. Also, typofix:
self.cbFl -> self.cbFL
 2009-11-26 23:07:58 +02:00
Worros
0368992289 Add test config used by py.test 2009-11-27 00:19:31 +08:00
Worros
8371ed244a test_PokerStars - add test Stud files and import 
Also add commented out tests for Draw games
 2009-11-27 00:12:57 +08:00
Worros
411d4ac792 test_PokerStars - Add NLHE-USD-MTT-5r-200710.txt 
Commented out for the moment, it has never parsed in old or new code.
 2009-11-26 22:52:27 +08:00
Worros
5b5216bbe2 Fix test_PokerStars.py 2009-11-26 22:41:42 +08:00
Worros
b794d20f6d Make sqlite :memory: work again 2009-11-26 22:02:48 +08:00
Worros
9e7e22ffa1 Start of in tree HH archive 2009-11-26 17:00:22 +08:00
Worros
ac96d88a8c Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-11-26 10:01:53 +08:00
Worros
c9901c3106 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-11-26 10:01:39 +08:00
sqlcoder
9d754e5e4b make sure db locks are released 2009-11-25 20:55:58 +00:00
Mika Bostrom
cb9e2cb6e7 Try to fix two HUD main hangs 
The main HUD process can hang due to unhandled exceptions, which
occurred in two separate situations:

1. Table window is closed and HUD instance killed before auto-importer
knows about it
2. Sometimes the threading can jam

These changes attempt to counter the effect of race-conditions. The
dictionary key (table name) is properly tested at the beginning of
update/create block, *but* there are two short round-trips to database
before the key is used. While these occur, the HUD instance can vanish
and thus get its key removed from the dictionary.

Also, when Tables.Table() is created, it will be populated on-demand,
and have child attributes only when such are found from the system. The
new table code pulls in data from actual windows. Again, there is a
query involved and while it runs, the table may have vanished. This
ended up as an error in this call:

foo = gtk.gdk.window_foreign_new(table.number)

The object 'table' is valid (not None) but it has been populated only
after actual table window was killed. Therefore it may not have .number
attribute, which raised an AttributeError. Now the presence of
table.number attribute is tested before the object can be sent to
create_HUD().
 2009-11-25 20:31:02 +02:00
Eric Blade
0b4f5acec1 some weird whitespace churning, and again comment out "sending hand to hud" message 2009-11-25 08:22:14 -05:00
Mika Bostrom
5435c164f9 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-11-25 14:40:50 +02:00
Worros
aee9a7339c [NEWIMPORT] Stop duplicate hands from crashing import 2009-11-25 16:29:30 +08:00
Worros
83f06c35cc [NEWIMPORT] HandsPlayers.CBet stats 2009-11-25 14:59:29 +08:00
Mika Bostrom
8d64a720c4 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-11-25 08:50:08 +02:00
Worros
30332d2132 Remove forced assert 2009-11-25 10:27:54 +08:00
Worros
1b2a45b77e Prefs: Fix display when a comment node exists in config 2009-11-25 09:06:01 +08:00
sqlcoder
339a0133a9 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-11-24 19:51:21 +00:00
sqlcoder
02fd6d6bd0 add Preferences option on File menu 2009-11-24 19:50:48 +00:00
sqlcoder
c856824145 fix bug in save() and simplify it. Add get_doc() method 2009-11-24 19:46:57 +00:00
Mika Bostrom
48930e1679 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-11-24 19:42:39 +02:00
Worros
a87a145c28 [NEWIMPORT] HandsPlayers.streetXCalls and streetXBets 
Pretty sure the bets stat is wrong
 2009-11-25 00:57:14 +08:00
Worros
3bb1656603 [NEWIMPORT] Add HandsPlayers.wonAtSD 2009-11-24 23:23:21 +08:00
Worros
9203e0b0d8 [NEWIMPORT] HandsPlayers.sawShowdown added 2009-11-24 23:14:43 +08:00
Worros
dc1b0d2e38 [NEWIMPORT] Calculate wonWhenSeenStreet1 
Won is defined as 'collected money from the pot'

Seen street 1 does not require vpip on street 0
 2009-11-24 21:58:27 +08:00
Eric Blade
9bf5017ff1 re-enable exception handling in idle_func() now that i know what we could expect to trap reasonably. Deal in update() with what might happen if update_table_position() fails 2009-11-24 06:08:43 -05:00
Worros
e9a858e4cd Make DEBUG = False in DerivedStats 2009-11-24 17:55:00 +08:00
Worros
48c395565e [NEWIMPORT] Add HandsPlayers.totalProfit 
Grapher now works after import yay
 2009-11-24 17:29:54 +08:00
Worros
d65ee55b64 [NEWIMPORT] Calculate rake, make card calculation holdem only 
Stud card fetching still terminally broken
 2009-11-24 16:44:46 +08:00
Worros
d617f1c4e0 [NEWIMPORT] Update Database.storeHandsPlayers 2009-11-24 16:39:59 +08:00
Worros
ef9abd2948 Force all output from HHCs to by utf8 2009-11-24 11:21:55 +08:00
Eratosthenes
c1f599d555 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:
	pyfpdb/Configuration.py
	pyfpdb/HUD_main.py
 2009-11-23 19:41:47 -05:00
Eratosthenes
ad91c0a526 Changes for logging. 2009-11-23 19:34:40 -05:00
Eratosthenes
bdc3248597 Changes for new logging scheme. 2009-11-23 19:32:19 -05:00
Eratosthenes
2da6e44a75 Changes for improved logging. 2009-11-23 19:29:56 -05:00
Eric Blade
a735ab67b2 stuck an error print in wintables if self.window doesn't exist 2009-11-23 10:24:38 -05:00
Eric Blade
32e7a28d2c Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-11-22 16:44:22 -05:00
Eric Blade
3e7a0ef53c remove all occurences of assigning sys.argv 2009-11-22 16:40:56 -05:00
Worros
34e7fb0459 [NEWIMPORT] Fix HandsPlayers.cardX init 2009-11-23 00:20:51 +08:00
Worros
943e188a4d [NEWIMPORT] Hole card data for flop games 
Take some code from Grindi to calculate playersAtStreetX and streetXRaises
 2009-11-23 00:05:23 +08:00
Worros
1650b76ea5 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-11-22 13:07:49 +08:00
Eric Blade
64d9a3582b No longer mess with sys.argv (messing with system variables is a bad thing, right), use argv to determine pathname of executeable as sys.path[0] is just the first component of the path. also all database errors except MySQL reporting "Access Denied" should now crash FPDB, so someone can fill those into Exceptions, and into the fpdb_db and the fpdb files. 
Process: get crash info, add exception info to Exceptions.py, catch generic database exception in fpdb_db.py (around the connect line), throw correct Fpdb exception, then catch it in fpdb.py and do the appropriate thing on the GUI end.
 2009-11-22 00:00:23 -05:00
Worros
d08e9a1ea3 Add support for UTF-8 HH type. 
Able to parse and import an EUR hh file
 2009-11-22 12:34:11 +08:00
Mika Bostrom
d2c25b6d28 Fix simple error in filter code 
Other parts test that the object is valid before calling
.set_active(); follow convention to eliminate needless errors
 2009-11-21 23:51:18 +02:00
Worros
14ccde73a2 Fix Playerstats for Pot Limit 
Still broken for cap games. Need a more flexible mechanism for this
 2009-11-21 11:16:08 +08:00
Worros
8d2b315fc8 Fix PL in Graph viewer 
Grapher still doesn't support the cap games, that code could use some cleanout.
 2009-11-21 11:11:31 +08:00
Worros
348420f30d Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-11-20 21:28:05 +08:00
Worros
4d4387bd94 Removing second layer of try: 
Killing until we figure out what it was supposed to catch
 2009-11-20 15:11:58 +08:00
Mika Bostrom
615d1ea8a6 Add default style keys 
It seems there is some weird way for stylekeys to remain unset. Catch
the special case and have a way to see why this happens.
 2009-11-20 08:48:49 +02:00
Worros
eedffdf472 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-11-20 09:11:46 +08:00
sqlcoder
6eba4a5544 fix a merge problem and replace to_char() for sqlite, player stats now working in sqlite :-) 2009-11-19 22:19:41 +00:00
Worros
5ba4dbb0e7 Clean DerivedStats.py 2009-11-19 17:54:00 +08:00
Worros
ea323d0d22 Fix mod() test for sqlite 2009-11-19 17:33:12 +08:00
Worros
33592fbc4e Add math function for sqlite - may still be broken 2009-11-19 17:24:22 +08:00
Worros
eadd7c045c Adding broken mod() test 2009-11-19 17:22:53 +08:00
Worros
571cbe07a0 Add test functions for SQLite 
Added test for VARIANCE()

Added test for floor()
 2009-11-19 15:28:48 +08:00
Worros
29d135da1b Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-11-18 13:52:41 +08:00
sqlcoder
04c09af7b2 tidy up aggregation code, NOTE: renamed some aggregation config to try and make meaning clearer, updated aggregation description in .example 2009-11-17 21:47:43 +00:00
sqlcoder
289922e43a Merge branch 'master' of git://git.assembla.com/fpdboz 2009-11-17 20:48:06 +00:00
Worros
36fe5d2617 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-11-18 00:14:21 +08:00
Eratosthenes
e10db69a9c Merge branch 'master' of git://git.assembla.com/fpdboz 2009-11-16 19:49:12 -05:00
Eratosthenes
812998704d Yet another try to fix missing X windows. Using xwininfo. 2009-11-16 15:35:58 -05:00
Eratosthenes
55f1ebedd9 Another possible fix to missing windows. 2009-11-16 13:04:25 -05:00
Eratosthenes
4abfc0093f test print 2009-11-16 11:48:31 -05:00
Eratosthenes
d592e85375 Possible fix of not finding windows in X. 2009-11-16 11:20:44 -05:00
Eratosthenes
3ef23852a6 Update Tables_Demo to work with new XTables/TableWindow format. 2009-11-16 10:00:26 -05:00
Worros
5b02153b43 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-11-16 15:34:23 +08:00
Worros
c9b9c848be Add aggregate function VARIANCE() for sqlite 2009-11-16 15:19:24 +08:00
Eratosthenes
4e78dd8d93 Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-11-13 22:02:16 -05:00
Eratosthenes
85f488e9cb Fix pretty print test. 2009-11-11 16:25:31 -05:00
Eratosthenes
a5b0de5ed2 Fix problem with .example overiding HUD_config. 2009-11-11 16:20:43 -05:00
Eratosthenes
65393492cf Get logging.conf and matplotlib datafiles. 2009-11-09 22:02:50 -05:00
Eratosthenes
1b980e7cad Fix merge gone wrong. 2009-11-09 19:31:32 -05:00
Eratosthenes
5021cae297 Clean up logging changes. 2009-11-09 19:30:23 -05:00
Eratosthenes
b637247871 Fix for logging changes. 2009-11-09 19:24:46 -05:00
sqlcoder
9bbca552ea Merge branch 'master' of git://git.assembla.com/fpdboz 2009-11-09 20:44:05 +00:00
Eratosthenes
c8b7608bc1 Delete intermediate prints. Small fix to make py2exe happy. 2009-11-08 23:16:56 -05:00
Eratosthenes
e6b71d86bb Should be HUD_config.xml.example, not HUD_config.xml 2009-11-08 23:00:15 -05:00
Eratosthenes
0bbbc7222b First go at rationalizing config paths and logging defaults. 2009-11-08 22:53:10 -05:00
Eratosthenes
b33fd03754 Added Configuration.py exe and HowTo use. 2009-11-08 22:51:15 -05:00
Eratosthenes
efb0768b97 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:
	pyfpdb/SQL.py
 2009-11-08 22:50:47 -05:00
grindi
d888b7d463 Party hhc: cleand, added getTableTitleRe 2009-11-08 23:09:14 +03:00
grindi
dbaf4dbdbc Make msgs about parse errors more verbose 
+ fix small bug in FpdbParseError
 2009-11-07 22:01:30 +03:00
grindi
9dd600702a Moved window title re to HHC classes 
Just redefine function getTableTitleRe in coresponding hhc for custom re
 2009-11-07 20:30:47 +03:00
grindi
f99c4baa8b Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-11-07 15:35:21 +03:00
Worros
15ea852d76 Extend the tablename field in sql to 22 characters 2009-11-07 10:17:28 +08:00
Eratosthenes
99e4211e5d Integrate new table handling code. 2009-11-06 17:34:42 -05:00
grindi
fd085ecb4d Fixed another aux bug 2009-11-07 00:46:50 +03:00
grindi
c4d3789657 Fixed: aux save layout doesn't work 
Bug maker, look at
http://docs.python.org/tutorial/classes.html#generator-expressions
(...for...) returns generator rather than tuple
 2009-11-06 23:47:31 +03:00
Worros
5c7cce090e [NEWIMPORT] Added street0VPI to HandsPlayers 
Also fixed last patch for streetXSeen
 2009-11-06 19:30:50 +08:00
Worros
006d7164ea [NEWIMPORT] Insert streetXSeen col into HandsPlayers 2009-11-06 19:13:52 +08:00
Worros
5aef7b6054 [NEWIMPORT] Insert winnings column into HandsPlayers 2009-11-06 18:39:59 +08:00
Eratosthenes
2d890be3c8 Get the tableName right for tournaments. 2009-11-05 11:27:33 -05:00
Worros
bea6bf2d6b Merge branch 'master' of git://git.assembla.com/fpdb-mme 
Conflicts:
	pyfpdb/Configuration.py
 2009-11-05 12:22:05 +08:00
Worros
5d6138e2a8 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-11-05 12:16:32 +08:00
fpdb-mme
4a6213e32e now sample code it works as expected 
grrr, soewhere down the line the exception got swallowed. this is evil!!!

-x must die
 2009-11-05 01:26:32 +01:00
fpdb-mme
2199d165f1 removed unconditional exception handling + kwarg max should be int 2009-11-05 01:21:32 +01:00
fpdb-mme
14200c5a50 simplified code a bit 2009-11-05 00:39:42 +01:00
fpdb-mme
7a602846ff combed over Config.get_tv_parameters() 
there was a bit much of unconditional exception handling

note: some parts of the application call Config.get_tv_parameters()
but afaics the actual parameters are never used anywhere. so maybe
its leftover code. someone drop a note if or not to remove tv related
stuff
 2009-11-05 00:34:02 +01:00
fpdb-mme
5a8f794057 simplified Config.get_supported_sites() 2009-11-05 00:11:43 +01:00
fpdb-mme
7e8ed08a28 simplified Config.get_aux_windows() 2009-11-04 23:58:48 +01:00
fpdb-mme
5c656625fd combed a bit over Config.get_default_font() 2009-11-04 23:41:09 +01:00
fpdb-mme
efefae4941 fix: db_type is actually db_server 2009-11-04 19:01:12 +01:00
fpdb-mme
c60dfda64c put in former logging setup again, removed excepthook 2009-11-04 18:58:01 +01:00
fpdb-mme
6d54da1c49 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:
	pyfpdb/Configuration.py
	pyfpdb/SQL.py

note:hopefully got the merge right
 2009-11-04 18:34:28 +01:00
unknown
ab1c37ead2 IndexError -> KeyError .. doh. 2009-11-04 10:46:36 -05:00
unknown
98981059cd Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-11-04 02:58:13 -05:00
Worros
cc89433ba8 Merge branch 'master' of git://git.assembla.com/fpdb-eric 
Conflicts:
	pyfpdb/Configuration.py
 2009-11-04 14:44:25 +08:00
Eratosthenes
3265766c77 Cleanup of HUD_main prior to integrating newTables code. 2009-11-03 21:52:40 -05:00
Eratosthenes
0a563cad53 Added get_table_info method. 2009-11-03 21:51:10 -05:00
unknown
51da6fb687 cleaner 2009-11-03 15:29:05 -05:00
unknown
a5de7c9b6b cleanup 2009-11-03 15:14:20 -05:00
unknown
d008eceaef mostly formatting cleanups 2009-11-03 15:06:48 -05:00
unknown
0759ded78f fix typo 2009-11-03 14:43:12 -05:00
unknown
a6b7292943 mostly None checkings fixed (== to is != to is not) 2009-11-03 14:30:52 -05:00
unknown
7667a39ded cleanup 2009-11-03 14:04:22 -05:00
unknown
6bf1824ee7 clarify where some logged or printed messages were coming from exactly 2009-11-03 13:56:26 -05:00
unknown
0e6254ce0d basic cleanup 2009-11-03 13:49:16 -05:00
fpdb-mme
9063d9749c removed all occurences of db_type/db-type 2009-11-03 19:18:51 +01:00
unknown
9ec1eb48e1 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-11-03 11:08:57 -05:00
fpdb-mme
92f98e9f51 added an application wide exception handler 2009-11-03 16:09:58 +01:00
fpdb-mme
944d48d7ef refactored logging setup 
removed fallback to '/usr/share/python-fpdb/logging.conf' if
'logging.conf' could not be found in the current directory.
1. this looked redundant, 2. usually only root has write access
to /usr/share/*

ok or not?
 2009-11-03 15:35:20 +01:00
fpdb-mme
50bafadcb1 we throw an exception now if the user supplies an unsupported database backend 
note: checked all refences. i think we can raise savely without breaking stuff. it is only
used in Database.py on get_backend_name(), raising an exception anyways if the backend
is unknown
 2009-11-03 15:17:48 +01:00
fpdb-mme
62c915928d - added a global const to config to point to "database" directory 
- adjusted fpdb_db.py to make use use of this const
 2009-11-03 10:50:13 +01:00
Worros
f276ad4dfa Merge branch 'master' of git://git.assembla.com/fpdb-mme 
Conflicts:
	pyfpdb/Configuration.py
 2009-11-03 17:25:54 +08:00
sqlcoder
c02e6365e7 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-11-02 20:52:55 +00:00
fpdb-mme
a18091161a added a note and some thoughts for review 2009-11-02 10:29:10 +01:00
unknown
2589d2ecd3 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-11-02 04:28:24 -05:00
Worros
28ca49d592 Fix GuiSessionStats.py for sqlite 
Fix based on solution from Eleatic Stranger on 2+2
 2009-11-02 17:23:50 +08:00
fpdb-mme
9e94f44fa7 started defining some application wide consts. these consts (more to come 
if my approach is accepted) are used all over the fpdb and should always be
taken from one place
 2009-11-02 10:06:54 +01:00
fpdb-mme
34bbc45cb8 whitespace 2009-11-02 09:55:08 +01:00
fpdb-mme
fb76540df6 added a TODO: 
if the user may passes '' (empty string) as database name via command line, his choice is ignored
when we parse the xml we allow for ''. there has to be a decission if to allow '' or not
 2009-11-02 09:54:16 +01:00
fpdb-mme
d3eeeef2e8 fpdb can not handle the case where no database is defined in xml, so throw a ValueError for now 2009-11-02 09:45:53 +01:00
fpdb-mme
612d6607a1 fix: FpdbError is not defined, use ValueError instead 2009-11-02 09:40:16 +01:00
fpdb-mme
3a7d159d52 sorry, whitespace was messed up, have to find a better way to convert 2009-11-02 09:38:27 +01:00
fpdb-mme
8f2a2c20cc tried my best to write a clearer comment + simplified finding out of what the selected database is 2009-11-02 09:29:58 +01:00
fpdb-mme
cb16dde365 typo 2009-11-02 09:16:18 +01:00
fpdb-mme
10343c0ef4 fixed Database.db_selected attribute. it was always be boolean True if the attribute was not set in the <database> tag 
+ it is more readable using keyword arguments explicitely
 2009-11-02 09:14:57 +01:00
fpdb-mme
75b8c4943a rewrote fix_tf() helper function to string_to_bool(). this represents better is what it actually does. 
comments stated that the function was some kind of fix for xml.dom, but XML is unaware
of python types by intention ;-)
 2009-11-02 09:09:23 +01:00
fpdb-mme
d59f1eb720 added a comment what Config.supported_databases holds for readability 2009-11-02 08:52:46 +01:00
fpdb-mme
d9a120a2c6 removed superfluous try ..except clause. Database.__init__() was not doing any sanity checks, 
so the try ..except clause was only covering exceptions we are actually interested in
 2009-11-02 08:48:07 +01:00
fpdb-mme
01b56919ca we take all <database> tags from xml instead of taking all <database> tags contained in <supported_databases> 
added a note on this
 2009-11-02 08:40:34 +01:00
fpdb-mme
62ee67c071 under certain circumstances attribute Config.db_selected could end up being undefined. 
this could cause later code relying on it failing in strange ways.
 2009-11-02 08:30:24 +01:00
Worros
f4aa5f1fe1 First fix for sqlite in PlayerStats 
Fix courtesy of Eleatic Stranger on 2+2 - Page still does not work, need to find an sqlite equivalent to to_char() and variance()
 2009-11-02 13:38:36 +08:00
fpdb-mme
0225987826 added basic support to add databases present in *.xml to our manager 
notes:
- i dont do too much error checking on input, guess this should be done in Configuration.py
 2009-11-01 20:07:41 +01:00
fpdb-mme
f5d2f5a2dc fix: according to doctests os_independend_kill() is supposed to return None 2009-11-01 09:58:14 +01:00
fpdb-mme
6fcf81e566 bugfix: InterProcessLock.locked() was broken cause InterProcessLock.aquire() no longer raises SingleInstanceError 
- fixed InterProcessLock.locked()
- fixed doctests

notes:

- doctests run ok on linux with InterProcessLockFcntl and InterprocessLockSocket
- doctests fail on linux/wine with InterprocessLockWin32 when trying to aquire the lock held by the process created on the fly.
   just a guess ..maybe the mutex is not released automatically when terminating the process. does native win32 guarantee
   this?
 2009-11-01 09:51:00 +01:00
fpdb-mme
bcbafc160d millions of changes, highlights: 
- started validating user input on create/add database
- implemented fuctionality to create sqlite databases
- never worked with sqlite,, you can not create multiple dbs in one file, so removed db attr again
- a nice todo list

Signed-off-by: fpdb-mme <jUrner@arcor.de>
 2009-11-01 07:36:18 +01:00
unknown
cb0c7430e6 add comment at point in Configuration where we would need to add support for saving new table layouts. 2009-11-01 01:54:59 -04:00
unknown
cdc310dcb6 if HUD is told to create for a layout that doesn't exist in the config file, it will pick a 9 or 10 max layout and use it's positions, which you can then move the windows around, and save, and it should be saved in the right spot. 2009-11-01 01:23:07 -04:00
unknown
64ee502239 here's the HHC patch i forgot to add on last commit 2009-10-31 21:25:27 -04:00
unknown
868a0b5bf0 getting stud tourney to not crash import: 
fix call to storeHudCache in Database to use handStartTime rather than the undefined hand_start_time; stub out store_hands_players_stud_tourney as it looks like it was never updated to use current database setup. result: hud works, no longer crashes import, presumably does not store any hand info though.
HHC base guessMaxSeats returns existing value of maxseats if some prior code has set it somewhere already
 2009-10-31 21:25:13 -04:00
unknown
2bb35fc802 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-10-31 20:19:19 -04:00
unknown
a944ba7cd3 comments edit 2009-10-31 20:06:16 -04:00
grindi
97d2052cbe Party hhc tiny fixes 2009-10-31 17:53:31 +03:00
grindi
5e6899a29e Print out actual exception when import fails. Python 2.5 compatible 2009-10-31 17:48:48 +03:00
grindi
19b46e8444 Revert "Revert "Print out actual exception when import fails"" 
This reverts commit ce0e2c139b.
 2009-10-31 17:46:11 +03:00
grindi
066cf12eb6 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-31 17:44:28 +03:00
fpdb-mme
2ae58f8947 databases can now be activated by user 
++ refactoring

Signed-off-by: fpdb-mme <jUrner@arcor.de>
 2009-10-31 12:12:17 +01:00
Worros
d5604e0e73 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-10-31 08:57:04 +08:00
Worros
ae7e721ede Merge branch 'master' of git://git.assembla.com/fpdb-mme 2009-10-31 08:56:36 +08:00
Worros
ce0e2c139b Revert "Print out actual exception when import fails" 
This reverts commit 626ff49eb4.

Turns out this commit is python 2.6 syntax
 2009-10-31 08:55:54 +08:00
fpdb-mme
604395b868 bit of refactoring + sqlite needs database too 
Signed-off-by: fpdb-mme <jUrner@arcor.de>
 2009-10-30 16:48:51 +01:00
fpdb-mme
a3a72712ac again, many many changes + still ugly code 
Signed-off-by: fpdb-mme <jUrner@arcor.de>
 2009-10-30 14:23:27 +01:00
Worros
c56f9c28fd Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-10-30 14:37:05 +08:00
Worros
3f09bf3d65 Merge branch 'master' of git://git.assembla.com/fpdb-mme 2009-10-30 14:36:42 +08:00
Worros
636727ebb6 Start of Partouche support, shift NEWIMPORT functions 2009-10-30 14:35:45 +08:00
fpdb-mme
2a878d0a83 many changes 
Signed-off-by: fpdb-mme <jUrner@arcor.de>
 2009-10-29 19:32:41 +01:00
grindi
d05f0480a4 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-10-29 11:49:52 +03:00