Commit Graph

3434 Commits

Author SHA1 Message Date
Worros
ad4fcef2fd DerivedStats: re-fix (break?) sawShowdown again.
Comment from code:

hand.players includes people that are sitting out on some sites for cash games
actionStreets[1] is 'DEAL', 'THIRD', 'PREFLOP', so any player dealt cards
must act on this street if dealt cards. Almost certainly broken for the 'all-in blind' case
and right now i don't care - CG
2010-08-12 21:44:40 +08:00
Worros
acd80f7666 Fix Stars commit.
Forgot a ')'
2010-08-12 15:35:29 +08:00
Erki Ferenc
31d3c37224 Determine blind amounts from RINGLIMIT and max buyin
The previous method was giving wrong results in some cases (e.g. the preflop forced allin situation from blind positions), so here's an another enhancement. At
PartyPoker there's two types of buyins for a cashgame table: 20BB min and 100BB max. The former has a 40BB max, while the latter has 35BB min too. This patch
makes fpdb to determine if a ring table is a 20BB min or 100BB max table, then calculates the correct big blind amount from that. When big blind is ready then
halves it for the small blind (except when big blind is 0.25$ when small blind is 0.10$).
2010-08-12 14:59:45 +08:00
Worros
5c76ec77d6 Merge branch 'master' of git://git.assembla.com/fpdb 2010-08-12 14:40:09 +08:00
Worros
a20bc801e8 Stars: Adjust limit blind lookup
The hash for limit values needed both 20.00 and 20.

Fixed for all values up to 1000
2010-08-12 12:23:22 +08:00
steffen123
b5e481412e fix session stats in pgsql 2010-08-11 06:11:11 +02:00
steffen123
f0b5b4063b fix session viewer in mysql 2010-08-11 05:53:02 +02:00
steffen123
19bcc60c6a missed a spot 2010-08-11 04:50:01 +02:00
steffen123
d1c1a0a0f4 correct Backings.tourneysPlayerId to tourneysPlayersId like it's used in HP 2010-08-11 04:43:17 +02:00
steffen123
f1ac0b1dfa record HC.TTid on pgsql 2010-08-11 04:39:34 +02:00
steffen123
02b5ea8d37 corrected sqlite table layout. this also fixes hudcache generation for tourneys on sqlite 2010-08-11 04:25:47 +02:00
steffen123
5cba225fb3 improve naming of replacement clauses 2010-08-11 04:23:16 +02:00
steffen123
b385f9f0da this caused it to create a new TourneyType for each Tourney
Revert "remove some default values - if we don't know, don't just assume no/normal"

This reverts commit 7f8243f19d.
2010-08-11 03:10:08 +02:00
steffen123
174aa4adfb hudcache is regenerated properly on mysql now 2010-08-11 00:10:10 +02:00
steffen123
36b212388d make rebuildHudCache act on cash hands only 2010-08-10 23:31:53 +02:00
steffen123
87d4549b67 renamed PP files to match existing scheme 2010-08-10 23:16:30 +02:00
steffen123
d7a7cca2ab Revert "GRAPH: Put legend in "best" position, not fixed in top left."
previous consensus that I wasn't aware was to have the old setting, since "best" is
only better in some cases so I'm reverting this
This reverts commit 2d8f9dcc78.
2010-08-10 20:50:19 +02:00
steffen123
f0ef6e7e8b add stub for query for positional stats on sqlite 2010-08-10 20:45:40 +02:00
steffen123
ced47999bb GuiImap: don't show email password 2010-08-10 06:14:15 +02:00
steffen123
9dff572385 GuiImap: more error handling 2010-08-10 05:19:54 +02:00
steffen123
4da521eadc GuiImap: pass on auth failed error to GUI 2010-08-10 05:10:39 +02:00
steffen123
d94254c9cd GuiImap: turn non-editable fields into labels 2010-08-10 04:50:27 +02:00
steffen123
59f8bb1a70 GuiImapFetcher can save config 2010-08-10 04:44:35 +02:00
steffen123
97f1f8b836 display existing configs in IMAP tab 2010-08-10 03:50:26 +02:00
steffen123
6e654e5075 allow multiple email configs, start of nicer GUI for it 2010-08-10 03:28:57 +02:00
Erki Ferenc
c7e86513c7 Added validation to blind detection
Included checks for any ring game hands if there's a blind could be
found and if either SB or BB detection fails then determineGameType will
return None. It's needed for handling some invalid ring hands (e.g.
table closed messages at the end of a HH file).

Signed-off-by: steffen123 <steffen@schaumburger.info>
2010-08-10 02:05:14 +02:00
gimick
a6d7f27f5b FullTilt fixup currency typo 2010-08-10 00:32:53 +01:00
gimick
792e66c2b5 Merge branch 'master' of git://git.assembla.com/fpdb 2010-08-10 00:31:14 +01:00
steffen123
c5acd04bb6 This makes HUD Cache work again but without tourneytypeid - one of these lines breaks it 2010-08-10 01:27:25 +02:00
steffen123
4fbb26b4fa remove some 100% duplicates 2010-08-10 01:00:35 +02:00
steffen123
08451c77d5 handle player not found 2010-08-10 00:49:14 +02:00
steffen123
10fac81ef9 handle tourney not found 2010-08-10 00:46:55 +02:00
steffen123
391c42cdff add error handling for invalid entry into tourneNo field 2010-08-10 00:35:02 +02:00
steffen123
3467f757d3 refactor a bit in GuiTourneyViewer to reduce code duplication 2010-08-10 00:25:43 +02:00
steffen123
8a6fe1588c PP histories by email. note how it skips the lines about hero raising 2010-08-10 00:05:13 +02:00
steffen123
f72b45e8f0 PP corner case history from ferki 2010-08-10 00:03:24 +02:00
steffen123
bb743b4567 add button to display info from TP to tourneyviewer 2010-08-09 23:41:48 +02:00
steffen123
c5bd036b6e add tourney viewer that displays info from TT and T, but not yet TP 2010-08-09 23:22:58 +02:00
gimick
2d8f9dcc78 GRAPH: Put legend in "best" position, not fixed in top left. 2010-08-08 22:48:08 +01:00
steffen123
6ac8f410f6 Merge branch 'eric' 2010-08-08 20:13:07 +02:00
Eric Blade
16cd5e7505 update Everleaf config example, add bbper100/BBper100 stats to popup default, fix my last tweak to hhc 2010-08-05 12:31:37 -04:00
Eric Blade
e49beb7724 Hand: extreme terminal spam when something bad happens in readBlinds, stop crashing import
HHC: set obs when failing to open a file (ie, you've stored a zip file in your handhistory folder), stop crashing import
2010-08-05 12:12:18 -04:00
Worros
333c0bb716 Filters: fix SQL query to only return ring game blind levels 2010-08-05 17:18:43 +08:00
Worros
0c9e3e4973 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2010-08-05 16:55:18 +08:00
Worros
246c625fef FTP: Update regexes to support EUR games.
This touches on many Full Tilt regexes, and they appear to be functional.

I dont have a pristine FTP.fr hand history to test this with yet.

Buyer beware.
2010-08-05 16:43:24 +08:00
Eric Blade
7486095069 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2010-08-05 04:11:36 -04:00
Eric Blade
381e8958d9 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-08-05 04:09:51 -04:00
Eric Blade
42d85abfa4 Merge branch 'master' of git://git.assembla.com/fpdb.git 2010-08-05 04:08:17 -04:00
Eric Blade
28576d70f8 switch "0.00%" on ffreq1 to NA, need to update all the other percents with that sometime too 2010-08-05 04:07:37 -04:00
Worros
2859948c8a Merge branch 'master' of git://git.assembla.com/fpdb 2010-08-05 12:04:14 +08:00
Worros
c8006dc468 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-08-05 12:03:54 +08:00
Worros
cb6be49c6a Merge branch 'master' of git://git.assembla.com/fpdb-eric 2010-08-05 12:03:21 +08:00
Worros
7449f11718 Fix HUD_config.xml.example 2010-08-05 12:03:04 +08:00
Worros
9c263f3c84 Bulk Import: Adjust usage text so i can actaully copy paste 2010-08-05 11:49:45 +08:00
Eratosthenes
8b1baa6593 Don't break stud and draw when counting players at street. 2010-08-04 20:52:37 -04:00
steffen123
9f52867bf6 add HP.wentAllInOnStreet field. explanation on wiki. 2010-08-04 23:41:50 +02:00
Eratosthenes
7d0b9ae505 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-08-04 17:39:35 -04:00
Eratosthenes
edce06c5cb Merge branch 'master' of git://git.assembla.com/fpdb 2010-08-04 17:39:00 -04:00
sqlcoder
15f99ddfa7 add bbper100 and BBper100 stats for HUD 2010-08-04 22:23:28 +01:00
Worros
5362cd1f73 Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2010-08-05 00:36:37 +08:00
steffen123
2f9ded5141 fix pgsql index rebuilding 2010-08-04 17:39:45 +02:00
grindi
bcccefe8cf Fix a bug with blinds' amount detection on PartyPoker ring games
Patch by Erki Ferenc <erkiferenc@gmail.com>
2010-08-04 19:31:52 +04:00
Eric Blade
618dcc0473 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-08-04 07:29:48 -04:00
Worros
8f596d11af Config: Add the hint of providing defaults for the new config element
Adds a new function to Config to provide a complete list of Gui stat cols.

Still needs test to see if the element actually exists in the config
2010-08-04 17:28:38 +08:00
Worros
c0f8f2be2a Config: Add default config for player stats columns 2010-08-04 16:18:22 +08:00
sqlcoder
e203c1321d add new section for ring stats to example hud_config 2010-08-04 08:54:16 +01:00
Worros
bc06e031fa Stars: Potention fix to Mixed PLH/PLO tourneys.
"PokerStars Game #47587046512: Tournament #294420919, $5.00+$0.50 USD Mixed PLH/PLO (Hold'em Pot Limit) - Level XVII (500/1000) - 2010/08/01 20:39:48 ET"

We already parsed up to 'Mixed' and accepted HORSE/HOSE and 8-Game previously. Added PLH/PLO to the list.
2010-08-04 13:16:34 +08:00
steffen123
bf33f0cef3 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2010-08-03 22:36:12 +02:00
steffen123
7f8243f19d remove some default values - if we don't know, don't just assume no/normal 2010-08-03 22:32:31 +02:00
steffen123
faee37e101 set isKO to false when we know it's not a KO 2010-08-03 22:25:49 +02:00
Worros
edd0d36aa7 Test file: NLHE-USD-MTT-1-KO.201008.txt
$1.40 KO SnG from Stars.

Worth noting that neither the HH nor the tournament summary contain any bounty information.

The only place it was noted was in the individual tourney mailout

"You have also received USD 1.25 in Knockout Bounties for this tournament. You won bounties for the following players: odotb, Yvbo, bumbastik7, gliberis, __DMN__54321"
2010-08-04 02:10:44 +08:00
Worros
dc2b315a9f Stars: Fix FPP tourneys (maybe...)
Also move hand.isKO to the correct place
2010-08-03 19:52:49 +08:00
Worros
53c796dddc Importer: Add excetion handler to hud call.
Had a report on the 2+2 thread that:

  File "C:\Documents and Settings\b\Desktop\fpdb\pyfpdb\GuiAutoImport.py", line 160, in do_import
    self.importer.runUpdated()
  File "C:\Documents and Settings\b\Desktop\fpdb\pyfpdb\fpdb_import.py", line 371, in runUpdated
    (stored, duplicates, partial, errors, ttime) = self.import_file_dict(self.database, file, self.filelist[file][0], self.filelist[file][1], None)
  File "C:\Documents and Settings\b\Desktop\fpdb\pyfpdb\fpdb_import.py", line 467, in import_file_dict
    print "fpdb_import: sending hand to hud", hand.dbid_hands, "pipe =", self.caller.pipe_to_hud
IOError: [Errno 9] Bad file descriptor

Was happening, which is a crash attempting to print self.caller.pipe_to_hud

This patch doesn't fix the problem, but should give some indication in the log that it happened.
2010-08-03 19:27:34 +08:00
Worros
9329475298 Stars: Take 42 on Tourney parsing
Hopefully fix parsing for bounty and cash tourneys for good.

FPP is probably still broken
2010-08-03 19:22:52 +08:00
Worros
2fd856d55b HHC: Shorten length of time hh file is open by 2 lines 2010-08-03 18:24:03 +08:00
Eric Blade
d20c82c296 add preflop actors to blindsantes for determining who was in hand for wtsd calcs 2010-08-03 00:24:14 -04:00
Eric Blade
0c318df8ea fix comment on cbet stat 2010-08-02 17:50:19 -04:00
Eric Blade
7cd9b767a7 add some missing stats to the default popup 2010-08-02 17:33:18 -04:00
Eric Blade
49d8e0055d tweak cards shown regex 2010-08-02 16:47:32 -04:00
steffen123
7d70386c7e remove two windows packaging files as they're superseded 2010-08-02 22:37:00 +02:00
steffen123
8b3131eb9e update GUI version to indicate git 2010-08-02 22:35:31 +02:00
steffen123
ed3d6ac15a fix so it works with old-style tourney header missing ISO currency code 2010-08-02 16:46:46 +02:00
steffen123
08959e3176 fix for 1FPP tourney 2010-08-02 16:36:25 +02:00
steffen123
9daadeb7f9 fix regex for FPP tourneys 2010-08-02 15:12:55 +02:00
steffen123
57d9cc5665 very dirty hack to work around bug in gameinfo regex missing last digit of second number 2010-08-02 14:56:20 +02:00
steffen123
1054bf028d Merge branch 'gimick' 2010-08-02 14:37:14 +02:00
steffen123
b10868347f Merge branch 'sqlcoder' 2010-08-02 14:34:35 +02:00
steffen123
102cfa5d88 Merge branch 'eric'
Conflicts:
	pyfpdb/DerivedStats.py - identical change was already pulled
2010-08-02 14:30:29 +02:00
steffen123
1b4b335b29 Merge branch 'carl' 2010-08-02 14:00:26 +02:00
steffen123
9ad275e11c recognise and store knockout and bounty 2010-08-02 13:53:50 +02:00
gimick
7b3bee9146 py2exe : include mit.txt licence file 2010-08-02 12:36:42 +01:00
steffen123
388097a412 fix import for non-KO tourneys 2010-08-02 13:35:20 +02:00
steffen123
0776b8ef25 Merge branch 'gimick' 2010-08-02 12:47:25 +02:00
steffen123
d3f7583174 correct license info in about dialogue 2010-08-02 12:05:49 +02:00
steffen123
ddf69015cb add MIT license and notice 2010-08-02 11:53:02 +02:00
steffen123
0c4ce1b655 remove license menu entry as that info is in the about dialogue 2010-08-02 11:18:44 +02:00
gimick
5f2acf9fe6 py2exe: get pytz working; make script more restartable; update walkthrough 2010-08-01 23:51:33 +01:00
gimick
f9b437c8d3 Merge branch 'master' of git://git.assembla.com/fpdb 2010-08-01 22:51:47 +01:00
Eric Blade
d3f99eec9b call reposition_windows after doing a window move, so that the user doesn't need to hit the menu option to do it (reposition_windows manages to successfully move the hidden windows, whereas the original move doesn't, for some reason) 2010-08-01 03:05:35 -04:00
Eric Blade
8daee8da9b Merge branch 'master' of git://git.assembla.com/fpdb.git 2010-08-01 02:42:48 -04:00
steffen123
ed239668c0 fix pgsql index and foreign key drops 2010-07-31 23:55:05 +02:00
Eric Blade
e8d39711dd fix from carl for wtsd, more tweaks to everleaf regexes 2010-07-31 17:24:06 -04:00
sqlcoder
a3e55ba3f5 smarten up names of displayed categories and settings 2010-07-31 21:38:52 +01:00
steffen123
b4ff46ec4f fix typo in pgsql raiseFirstInChance 2010-07-31 22:31:55 +02:00
steffen123
c136f7a2dc fix pgsql table creation 2010-07-31 22:27:24 +02:00
sqlcoder
09dba1001e Merge branch 'master' of git://git.assembla.com/fpdb 2010-07-31 20:55:50 +01:00
sqlcoder
66cbf49cdc store column info for cash stats in config. Can now enhance gui to let user change column choices 2010-07-31 20:55:29 +01:00
Worros
14588b3bf9 DerivedStats: Fix sawShowdown for sitting out players in cash games 2010-08-01 02:09:34 +08:00
Worros
832135054c Revert "DerivedStats: Fix sawShowdown for sitting out players in cash games"
This reverts commit 43de7a7141.
2010-08-01 02:07:12 +08:00
Worros
43de7a7141 DerivedStats: Fix sawShowdown for sitting out players in cash games 2010-08-01 01:17:33 +08:00
Eric Blade
0e4be93e50 further update regexes for accounting problems with euro games 2010-07-31 12:25:01 -04:00
Eric Blade
7289f79bba Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-07-31 11:51:24 -04:00
grindi
223f7441b6 Fixes for absolute poker
Note: previous xtables's re doesn't match java absolute client
2010-07-31 22:55:43 +08:00
grindi
37e098fce9 Fixes for absolute poker
Note: previous xtables's re doesn't match java absolute client
2010-07-31 14:38:24 +04:00
Worros
961ade9aff Stars: Make Knockout tourneys parse
Adjusted GameInfo regex to separately parse buyin, rake and knockout for tournamets
2010-07-31 16:57:25 +08:00
gimick
841cb85f0b bump version numbers 2010-07-30 22:52:03 +01:00
Eric Blade
638b0cc2c1 Merge branch 'master' of git://git.assembla.com/fpdb.git 2010-07-30 16:10:08 -04:00
steffen123
a493e22c54 Merge branch 'carl' 2010-07-30 13:33:11 +02:00
steffen123
f407b70419 Merge branch 'sqlcoder' 2010-07-30 02:50:07 +02:00
sqlcoder
1688dfc991 add ability to display different columns in summary and position breakdown. Next job is to add this info to config and build a column config dialog. Also set height of top stat pane better. 2010-07-30 01:00:31 +01:00
steffen123
4510268bc8 teach windows how to handle non-ASCII usernames 2010-07-30 00:51:47 +02:00
unknown
c059fde3a9 remove derpy comment 2010-07-29 17:57:19 -04:00
unknown
981dcc632c everleaf euro support 2010-07-29 17:52:19 -04:00
unknown
4fa5ce2411 sql.py change for storing currency 2010-07-29 17:27:36 -04:00
unknown
a11f4f61cd store game currency 2010-07-29 17:27:07 -04:00
steffen123
216c9f2714 increase DB version for sqlcoder's recent DB change 2010-07-29 17:31:40 +02:00
Worros
de39d1cabf Add all Timezones that Stars supports to TZ function
All timezones outside of Australia I dodn't define for the moment.

Still requires support for actually getting said timezone, but were on our way.
2010-07-29 22:57:57 +08:00
steffen123
792a2aec4f finally fix the DST handling properly using pytz 2010-07-29 16:18:05 +02:00
steffen123
5721b5b23c Merge branch 'carl' 2010-07-29 14:39:34 +02:00
steffen123
872bf2fa28 correct version number 2010-07-29 14:24:23 +02:00
Worros
ac728fffb2 FTP and Timezone fix.
Error reported with the following hand hostory from FTP France:

Full Tilt Poker.fr Game #22632637058: Daily Euro (174599326), Table 3 - 10/20 - No Limit Hold'em - 20:15:39 CET - 2010/07/27

The existing FTP parser crashed on CET times.

1) Fixed parser to accept CET
2) Added timezone offset into HHC

Not happy with TZ1/TZ2 solution.
2010-07-29 19:59:45 +08:00
Ferenc Erki
d241ce9b48 Added new stat: fold to steal
Added new stat: fold to steal

Signed-off-by: steffen123 <steffen@schaumburger.info>
2010-07-28 16:17:58 +02:00
steffen123
f74d5b14ca Merge branch 'gimick' 2010-07-28 12:20:04 +02:00
Worros
0cd5b50b2f Merge branch 'master' of git://git.assembla.com/fpdb
Conflicts:
	pyfpdb/FulltiltToFpdb.py
2010-07-28 11:49:07 +08:00
sqlcoder
9c5581caf0 rename stealattempt fields to raisefirstin and derive accordingly 2010-07-27 22:27:18 +01:00
steffen123
acbe15fadd remove another near-duplicate from TourneyFilters 2010-07-27 19:14:23 +02:00
steffen123
0266a707ac move method from TourneyFilters to Filters 2010-07-27 19:07:14 +02:00
steffen123
3f4c5d45e8 for fear of repeating myself, removed another dupe from TourneyFilters 2010-07-27 18:54:40 +02:00
steffen123
31aa76abc9 and another dupe from TourneyFilters.. 2010-07-27 18:44:06 +02:00
steffen123
fd4e421ca3 remove another dupe from TourneyFilters 2010-07-27 18:41:51 +02:00
steffen123
e006db3a2d move 2 more methods from TourneyFilters to Filters 2010-07-27 18:35:38 +02:00
steffen123
c5ae1e785b remove another method from TF - this was only an almost-dupe 2010-07-27 18:33:01 +02:00
steffen123
9781cd1d87 yet more dupe removal from TourneyFilters 2010-07-27 18:31:35 +02:00
steffen123
90c81cb4ee move method from TF to F 2010-07-27 18:25:27 +02:00
steffen123
9006a7f45b remove another dupe method from TourneyFilters 2010-07-27 18:24:07 +02:00
steffen123
84df9ad567 remove more duplicate methods from TourneyFilters 2010-07-27 18:21:43 +02:00
steffen123
c996a11ed6 move method from TourneyFilters to Filters 2010-07-27 18:17:25 +02:00
steffen123
20ebd040c1 remove some methods in TourneyFilters that are identical in Filters 2010-07-27 18:16:46 +02:00
steffen123
e0b194ddf0 minor cleanup 2010-07-27 17:43:47 +02:00
steffen123
5b432bcd99 GUI: remove obselete and broken table viewer 2010-07-27 15:48:19 +02:00
steffen123
71df9b06dd HUD: make it work again after my previous overzealous removal of HP.TTid 2010-07-23 04:45:57 +02:00
steffen123
1f933563ee EVERLEAF: add comment where to get tourney info 2010-07-23 04:03:35 +02:00
steffen123
7f25cf6da8 DB: allow NULL for TT.currency/buyin/fee for when this info is not available 2010-07-23 04:00:25 +02:00
steffen123
a2243c8542 EVERLEAF: remove comment about converting to ET - we do not want to do that! 2010-07-23 03:55:45 +02:00
steffen123
de8b9e89c5 FTP: fix import 2010-07-23 02:07:49 +02:00
gimick
dfca631280 py2exe script update 2010-07-22 22:21:46 +01:00
steffen123
3759af4902 GUI: update version indicator to include "plus git" again 2010-07-22 22:59:53 +02:00
steffen123
4eefd15175 GUI: update version for snapshot 2010-07-22 21:18:55 +02:00
steffen123
61034680fe GUI: indicate that TPS is only for mysql right now 2010-07-22 21:18:20 +02:00
steffen123
ad28168d02 DB/TOUR: remove HandsPlayers.tourneyTypeId 2010-07-22 21:03:01 +02:00
steffen123
b73ee36602 Merge branch 'sqlcoder' 2010-07-22 20:28:25 +02:00
steffen123
7063bc8905 TOURNEY: stop it from creating new TT for each tourney 2010-07-22 20:23:27 +02:00
steffen123
a6c43cdca7 TOUR: a trivial fix, a trivial change, and a few debug prints 2010-07-22 19:26:11 +02:00
Eratosthenes
ba66f85f8a Merge branch 'master' of git://git.assembla.com/fpdboz 2010-07-22 13:26:03 -04:00
Eratosthenes
8de59c0400 Merge branch 'master' of git://git.assembla.com/fpdb 2010-07-22 13:25:45 -04:00
Worros
72f395bab0 Merge branch 'master' of git://git.assembla.com/fpdb
Conflicts:
	pyfpdb/FulltiltToFpdb.py
2010-07-22 10:49:22 +08:00
Worros
6da2c6de82 Merge branch 'master' of git://github.com/kangaderoo/fpdb-kangaderoo
Conflicts:
	pyfpdb/FulltiltToFpdb.py
2010-07-22 10:48:22 +08:00
Eratosthenes
902a4ad722 Merge branch 'master' of git://git.assembla.com/fpdb
Conflicts:
	pyfpdb/FulltiltToFpdb.py
2010-07-21 22:45:14 -04:00
steffen123
d169733adf GUI: update version display for -git 2010-07-22 02:23:07 +02:00
steffen123
fe345c7cf3 Merge branch 'master' of git://github.com/kangaderoo/fpdb-kangaderoo
Conflicts:
	pyfpdb/FulltiltToFpdb.py

conflict had obvious resolution
2010-07-22 01:11:52 +02:00
Eratosthenes
21981a921b Merge branch 'master' of git://github.com/kangaderoo/fpdb-kangaderoo
Conflicts:
	pyfpdb/FulltiltToFpdb.py
2010-07-21 18:52:43 -04:00
Eratosthenes
64d76855f1 Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:
	pyfpdb/py2exe_setup.py
2010-07-21 18:46:34 -04:00
Eratosthenes
4ef31a02e1 Another tiny change to get in sync. 2010-07-21 18:43:45 -04:00
Eratosthenes
0e6aa16e41 catch up a minor changecatch up a minor change.. 2010-07-21 18:40:33 -04:00
Gerko de Roo
50422ee8e3 Patch for the new date display for Full Tilt for tourney(s).
(Havent checked on ring games... Broke on Full Tilt...)
Current the old an the new is supported:
old: bla bla, Table 800 - 15/30 - No Limit Hold'em - 4:44:59 ET - 2010/07/18
new: bla bla, Table 19 - 15/30 - Pot Limit Omaha Hi - 13:43 ET - Wed, July 21, 2010
2010-07-21 23:04:24 +02:00
sqlcoder
61fb3df695 some work on guidatabase and turn it on 2010-07-19 21:36:45 +01:00
sqlcoder
2a0fbcca4c clear auto import player cache when re-creating db 2010-07-18 16:21:27 +01:00
sqlcoder
73b7729530 quit no longer needed now importer cache is being cleared (may need to clear auto import player cache as well?) 2010-07-18 16:17:40 +01:00
steffen123
7c3c0a26f4 Merge branch 'gimick' 2010-07-18 02:06:07 +02:00
steffen123
dfacdbea7a Merge branch 'sqlcoder' 2010-07-18 02:03:40 +02:00
gimick
46e4e92246 reapply 585fd2feb2 - Update graph and session queries to identify ring games
accidentally reverted at 45210f0668, sorry, didn't spot it before push
2010-07-17 18:56:23 +01:00
gimick
9939aa4a0e Log viewer - fixes for column sorting 2010-07-17 18:19:16 +01:00
gimick
45210f0668 Revert "Update graph and session queries to identify ring games"
This reverts commit 585fd2feb2.
2010-07-17 16:52:10 +01:00
steffen123
f0d9ae0cc6 DUMP: add expected file for empty DB 2010-07-17 05:14:05 +02:00
steffen123
7f2364cf1d DUMP: change format slightly 2010-07-17 05:13:38 +02:00
steffen123
139dfbafb5 CLEANUP: move dump db file saving stuff into fpdb.pyw 2010-07-17 05:11:09 +02:00
steffen123
71108cdc9b TOURNEY: since we can detect added amount, set it to 0 if we dont 2010-07-17 04:37:15 +02:00
steffen123
a463d82f5b IMAP: add two more fields to config 2010-07-17 03:48:21 +02:00
steffen123
337fc353c8 rename RingFilters back to Filters 2010-07-17 03:39:31 +02:00
steffen123
7f2f630186 GUI: add some warnings and further info to HUD configurator 2010-07-17 03:09:55 +02:00
steffen123
59294a7b94 TIMES: record Hands.importTime as UTC instead of localtime 2010-07-17 03:01:09 +02:00
steffen123
794f0a0374 GUI: change hotkey to start/stop autoimport to alt+a 2010-07-17 02:45:52 +02:00
steffen123
656986826f TOURNEY: record added/addedCurrency 2010-07-17 02:35:02 +02:00
steffen123
90ceafda6d DB: Added TT.added, addedCurrency 2010-07-17 02:19:12 +02:00
steffen123
c23a1388fc GUI: HUD configurator fully working, dont even need to restart fpdb 2010-07-17 00:23:48 +02:00
steffen123
5bf7937f9e CLEANUP: remove trivial commented out method 2010-07-16 21:57:32 +02:00
steffen123
ef91cb5ad1 GUI: HudConfigurator displays all stats now and reads selections 2010-07-16 21:56:44 +02:00
steffen123
66ac9b27d6 comment out some broken code, add TODO for it 2010-07-16 21:33:36 +02:00
steffen123
d95fcfe5d0 GUI: HudConfigurator shows combo boxes for stats 2010-07-16 21:00:29 +02:00
steffen123
f6232004ad PSS: PS summary import now supports non-ascii playernames in sqlite 2010-07-16 20:37:53 +02:00
steffen123
71f8fb5ef1 GUI: have default selections and fix locking in HudConfigurator 2010-07-16 20:32:01 +02:00
steffen123
a1f422cbe4 GUI: second HudConfigurator dia with grid for comboboxes 2010-07-16 20:27:43 +02:00
steffen123
f56a003242 GUI: start of HUD stat configurator: select parameters 2010-07-15 03:32:10 +02:00
steffen123
a8edb976f8 FTP: fix to make it store Hand.startTime as UTC rather than ET 2010-07-15 02:19:58 +02:00
steffen123
d65b6e55c8 TOURNEY: fix recording of Hands.tourneyId, allow it to be NULL 2010-07-15 02:08:59 +02:00
steffen123
18dc3f29ff TOURNEY: fix category recording for PS summary import 2010-07-15 01:58:54 +02:00
steffen123
10a94fa441 IMAP: fix a silly mistake I made earlier 2010-07-15 01:53:46 +02:00
steffen123
3d37006bbc rename ImapSummaries to ImapFetcher to better reflect its scope 2010-07-15 01:53:22 +02:00
steffen123
32ae817a2a remove IMAPEmailFetcher as ImapSummaries has a superset of features 2010-07-15 01:49:04 +02:00
steffen123
9e004e8962 DB: remove default row for TT, allow HP.ttId to be NULL and remove default 2010-07-15 01:18:36 +02:00
steffen123
ebf16c6aa9 TOURNEY: store HandsPlayers.tourneysPlayersId 2010-07-15 00:27:57 +02:00
steffen123
6a8f3ff68b TOURNEY: createOrUpdateTourneysPlayers now updates fields as needed 2010-07-14 23:05:37 +02:00
steffen123
ced3e8ac72 TOURNEY: rename a query 2010-07-14 22:44:10 +02:00
steffen123
85cc5a5471 TOURNEY: DB.createOrUpdateTourney fills in missing fields now 2010-07-14 22:36:07 +02:00
sqlcoder
3657327566 clear player cache when recreating database 2010-07-14 21:07:20 +01:00
steffen123
40088d6cf3 rename DB.createOrUpdateTourneyType to createTourneyType since TTs are static 2010-07-14 21:07:19 +02:00
steffen123
2734dcb85a GUI: mention mailing lists on start page 2010-07-14 20:58:37 +02:00
steffen123
2bd11661e3 for now revert "comment out close of fpdb after db recreate, I don't see how it helps"
I could reproduce the bug so until its fixed I want to keep the quit-on-recreate
This reverts commit 45fa170758.
2010-07-14 18:54:31 +02:00
steffen123
79043988c2 Merge branch 'sqlcoder' 2010-07-14 18:52:33 +02:00
steffen123
5cd78b608b DB: add TourneyTypes.rebuyFee and addOnFee 2010-07-14 01:49:55 +02:00
steffen123
35bb8a4490 POLISH: add notice about time to dump DB 2010-07-14 01:48:08 +02:00
steffen123
1329101794 POLISH: add notice about long time to recreate dialogue 2010-07-14 01:46:32 +02:00
sqlcoder
397e87b800 autoimport passes filenames to fpdb_import as unicode, so make bulk import do this as well so that add_import_file() always gets same type 2010-07-13 23:12:50 +01:00
sqlcoder
b07505d367 tidy up closedown 2010-07-13 21:23:32 +01:00
sqlcoder
6661610429 comment out debug msg 2010-07-13 21:22:40 +01:00
sqlcoder
d78d69e9f4 miss out fl/pl/nl checkbox if no relevant hands 2010-07-13 21:19:18 +01:00
sqlcoder
02e1a71592 fix broken graphing 2010-07-13 20:21:34 +01:00
sqlcoder
c36e87a24d big merge from steffen 2010-07-13 20:20:46 +01:00
steffen123
256d027eca PSS: calculates timezone out of start and end time now 2010-07-13 21:17:40 +02:00
steffen123
522a745ead REFACTOR: move timezone changing method to HHC so it can used by other parsers 2010-07-13 20:37:06 +02:00
steffen123
b8968591c5 TPS: display limitType and category 2010-07-13 20:21:05 +02:00
steffen123
8ebea1a5ce PSS: now records game category and limit type
Not for mixed games - again, I need examples
2010-07-13 20:17:15 +02:00
steffen123
8db0445d71 IMAP: close server connection when done 2010-07-13 18:04:53 +02:00
steffen123
d4e54e6aae POLISH: it can now quit when it wasn't able to connect to DB 2010-07-13 18:04:26 +02:00
steffen123
1d571cabee windows: by sqlcoder, fixes importing files with greek characters 2010-07-12 18:04:30 +02:00
steffen123
c3077d5d66 Merge carls latest fixes 2010-07-12 16:53:14 +02:00
steffen123
d208d627a4 stop sqlite&postgres from doing except _mysql....
sqlite gives another error on quit unfortunately
2010-07-12 16:48:12 +02:00
steffen123
04ec51d7c1 DB: Fix capitalisation of Gametypes table in SQLite 2010-07-12 11:00:50 +02:00
Worros
585fd2feb2 Update graph and session queries to identify ring games 2010-07-12 18:41:28 +10:00
steffen123
32e1cb7b7f another fix for the introduction of TT.limitType 2010-07-12 10:20:53 +02:00
Worros
627c044b6f Fix grapher so that only cash limits show up 2010-07-12 18:19:01 +10:00
steffen123
8d5e339973 make Filters work inspite of new tt.limitType 2010-07-12 08:17:36 +02:00
steffen123
78d7d1b941 comment out duplicate query 2010-07-12 08:13:09 +02:00
sqlcoder
b52110d45f change tabs to spaces 2010-07-11 19:00:27 +01:00
sqlcoder
45fa170758 comment out close of fpdb after db recreate, I don't see how it helps 2010-07-11 18:53:26 +01:00
sqlcoder
1d263c8139 fix call to db.connected() 2010-07-11 18:36:45 +01:00
sqlcoder
26642557a1 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-07-11 15:20:41 +01:00
steffen123
519c49904a CLEANUP: remove FpdbSQLQueries as its been migrated elsewhere 2010-07-11 14:49:19 +02:00
steffen123
79282270fb DUMP: fix dumpDB Gametypes, add Backings 2010-07-11 14:33:27 +02:00
steffen123
d53b3e1b4a DB: add backings table, fix a couple of log entries 2010-07-11 12:47:28 +02:00
steffen123
9283d7b579 some fixes for handStart rename, fixes for TT.category/limitType,
dumpDatabase method and menu entry
2010-07-11 09:47:05 +02:00
steffen123
5fee5136a9 DB: renamed Hands.handStart to Hands.startTime for consistency 2010-07-11 08:05:54 +02:00
steffen123
d739773908 GUI: display config file location in about dialogue 2010-07-11 07:39:19 +02:00
steffen123
822c592db8 DB: add category and limitType to TourneyTypes 2010-07-11 06:42:37 +02:00
steffen123
cfb0a3f3d5 remove default value and allow null for Hands.rush 2010-07-11 06:37:25 +02:00
steffen123
17b3b77022 TPS: correct spent display for PSFP games 2010-07-11 06:08:57 +02:00
steffen123
5ae650e8b7 reduce imports in RingFilters 2010-07-11 06:01:44 +02:00
steffen123
be671859e7 create superclasses for Gui*PlayerStats and *Filters 2010-07-11 05:58:00 +02:00
steffen123
e526501384 rename GuiPlayerStats to GuiRingPlayerStats and Filters to RingFilters 2010-07-11 05:49:58 +02:00
steffen123
6038342de7 TPS displays profit/tourney 2010-07-11 05:35:41 +02:00
steffen123
7bf7463705 TPS displays currency and fee now 2010-07-11 05:28:43 +02:00
steffen123
ed096b6872 TPS displays ROI% 2010-07-11 05:22:36 +02:00
steffen123
33760fae9c TPS displays ITM% 2010-07-11 05:11:43 +02:00
steffen123
913fa7d7d8 fix formatting and add tourneycount to TPS 2010-07-11 04:59:31 +02:00
steffen123
9815ac976b display buyin and sitename rather than TT.id 2010-07-11 04:47:15 +02:00
steffen123
7ddb032205 display unknownRank in tourney player stats 2010-07-11 04:37:48 +02:00
steffen123
8232085be9 display 1st/2nd/3rd in tourney player stats 2010-07-11 03:42:48 +02:00
steffen123
8e9d588322 first version of Tourney Player Stats works 2010-07-11 03:13:58 +02:00
steffen123
d3c57ee9fc repair playerstats 2010-07-11 03:13:30 +02:00
steffen123
c58ade20b3 fix PS summary player/winnings/rank recording 2010-07-11 02:27:48 +02:00
steffen123
7925747213 now records winnings for finishers in unfinished tourneys 2010-07-11 02:07:03 +02:00
steffen123
87fbd56091 imports still playing tourney's TP, but not winnings of finishers 2010-07-11 01:55:15 +02:00
steffen123
ae2c32f902 imports still running tournaments, except for TourneysPlayers 2010-07-11 01:39:52 +02:00
steffen123
6a3587e92e failed attempt at making SQLite accept non-ASCII player names for this 2010-07-11 00:37:32 +02:00
steffen123
604e242349 handle FPP and added money tourneys, general currency improvements 2010-07-11 00:37:25 +02:00
steffen123
86a1f86b51 tourney query returns key information - now just need to display it 2010-07-10 23:21:36 +02:00
steffen123
043c3b5bca fix import of PS FPP tourneys 2010-07-10 23:08:05 +02:00
steffen123
eb976203c4 intermediate commit for tourney stats 2010-07-10 22:24:32 +02:00
steffen123
4efd9dc2fb fix import of normal tourneys and ring hands 2010-07-10 21:29:07 +02:00
steffen123
b9762b0486 change remainder of fpdb.pyw to indicate source of lock 2010-07-10 21:11:59 +02:00
steffen123
bf96e5103b ignore "Match Round" part of first line of HH 2010-07-10 20:39:43 +02:00
steffen123
e9346f6b82 make it record source of lock holding, print if required
this is mostly intended for devs
2010-07-10 20:10:04 +02:00
steffen123
ca61189706 added TourneyTypeCount to DB Stats window 2010-07-10 19:39:05 +02:00
steffen123
ec0db8b7cc change version indicator to sth more appropriate 2010-07-10 16:40:10 +02:00
steffen123
4c1b0e3f96 add extra enter to start screen 2010-07-10 16:24:32 +02:00
steffen123
97fbc7606c another intermediate commit for tourney stats 2010-07-10 06:23:47 +02:00
steffen123
b1e41a54ec intermediate commit on the way to tourney stats 2010-07-10 05:19:50 +02:00
steffen123
dc67197e23 change starttime to startTime 2010-07-10 02:30:42 +02:00
steffen123
25893c9610 GuiTourneyPlayerStats (mostly copied from GuiPlayerStats) works without data 2010-07-10 02:09:58 +02:00
steffen123
4c00ef19cc implement simple DB stats - Hand and tourney count 2010-07-10 02:07:47 +02:00
steffen123
00e156beba removed some unused stub methods 2010-07-09 22:09:33 +02:00
steffen123
bc85c7fe8d removed unimplemented menu entry abbreviations 2010-07-09 20:47:58 +02:00
steffen123
4d17bd65e1 remove unimplemented menu entry create/del DB user 2010-07-09 20:46:45 +02:00
steffen123
29d1120bf1 removed unimplemented menu entry session replayer 2010-07-09 20:43:01 +02:00
steffen123
ef98564d72 remove unimplemented hand replayer and player details menu entries 2010-07-09 20:32:49 +02:00
steffen123
36b90ba654 remove unimplemented auto rate menu entry 2010-07-09 20:30:57 +02:00
steffen123
a724102dbc remove unimplemented edit profile menu entry 2010-07-09 20:29:44 +02:00
steffen123
d138c3b4e1 create subclasses for guiplayerstats and filters 2010-07-09 04:47:33 +02:00
steffen123
a97342ec2e expand config example with the new email section 2010-07-09 01:20:31 +02:00
steffen123
9cb47b4195 stop it from dying on fpdb summary files (by commenting out the whole section) 2010-07-09 01:10:06 +02:00
steffen123
310c7a2947 PS Summary now stores rank, winnings, etc. into TourneysPl. 2010-07-09 01:07:22 +02:00
steffen123
5b64ad771a it now stores entries, prizepool and endTime into TT 2010-07-08 23:47:06 +02:00
steffen123
e815cc38db change version to 0.21 2010-07-08 23:43:43 +02:00
steffen123
ce0d3f59f6 correct for timezone in PS summaries, too 2010-07-08 23:31:39 +02:00
steffen123
d90fa27274 fix starttime to startTime in my new method 2010-07-08 22:47:37 +02:00
steffen123
3bff176970 Merge branch 'carl'
Conflicts:
	packaging/debian/changelog
	pyfpdb/PokerStarsToFpdb.py
	pyfpdb/TourneySummary.py
2010-07-08 22:33:09 +02:00
steffen123
f2fcceba17 remove more prints 2010-07-08 21:46:40 +02:00
steffen123
201b3a5b6c PS Summary now parses start/endTime. fixes MySQL support
also removed some but not all the new prints
2010-07-08 21:41:27 +02:00
steffen123
7070c1431a put timezone removal into separate method for use by PSS 2010-07-08 21:28:21 +02:00
steffen123
178b528d3b change calls to python2 back to python 2010-07-08 20:01:03 +02:00
steffen123
10cfaf2c75 missed file for last commit 2010-07-08 20:00:43 +02:00
steffen123
c6b6f8a788 many not really separable changes for IMAP import and associated cleaning
- deactivated use of TourneySummary (short: TS) from HHC and subclasses
- menu entry for IMAP import
- converted ImapSummaries (short: IS) to use the config file
- IS now optionally supports non-SSL and can run on folders other than INBOX
- removed gametypes and getGameTypeAsString from TS method as identical one is in Hand
- some other stuff
2010-07-08 19:46:25 +02:00
Worros
e7776de8f1 Fix startTime change in remaining files 2010-07-08 23:30:02 +08:00
Worros
7c8339485d Fix startTime variable change from another patch 2010-07-08 23:14:55 +08:00
Worros
52ae2e6b1f Merge branch 'master' of git://git.assembla.com/fpdb
Conflicts:
	pyfpdb/DatabaseManager.py
	pyfpdb/TourneySummary.py
	setup.py
2010-07-08 15:48:21 +08:00
Worros
4d4d6f297f Merge branch 'master' of git://git.assembla.com/fpdb-gimick 2010-07-08 11:44:10 +08:00
gimick
084c7a5c58 Update help/about set version 0.20 2010-07-07 21:55:01 +01:00
steffen123
aeaac92fb9 commit before changing intendation. 2010-07-07 22:21:46 +02:00
steffen123
1bf3827921 copied bit of error handling from Carl 2010-07-07 08:17:18 +02:00
steffen123
0ecd19fbdf change PSS to give None for *Count 2010-07-07 08:12:10 +02:00
steffen123
160ca30abe much improved PS summary parsing thanks to carls help 2010-07-07 08:05:42 +02:00
steffen123
2046fc1122 the two new files for PS summary mail parsing 2010-07-07 07:06:11 +02:00
steffen123
ca5ba3ee68 comment on reverted method-deletion 2010-07-07 07:00:57 +02:00
steffen123
c855706640 Revert "removed seemingly misplaced method"
This reverts commit 7042f11954.
2010-07-07 06:59:08 +02:00
steffen123
92a4b105cc parsing PS summary emails now. just need to write insert/update code now 2010-07-07 06:58:42 +02:00
Worros
1d47fbb3c5 Add simple IMAP email fetcher 2010-07-07 10:47:02 +08:00
steffen123
e3ce1b8c2d remove old empty function 2010-07-07 04:24:46 +02:00
steffen123
d27d6a310c removed DatabaseManager.py as it's unused 2010-07-07 04:16:44 +02:00
steffen123
7042f11954 removed seemingly misplaced method 2010-07-07 04:11:28 +02:00
steffen123
eb3233ac98 more tourney work
- moved HH-based tourney handling completely into Hand
- renamed Tourney.py to TourneySummaries
- changed many DB fields to allow NULL and removed defaults
2010-07-07 04:01:40 +02:00
steffen123
18faa5288c first steps to get PS tourney results from IMAP 2010-07-07 02:53:27 +02:00
steffen123
04ed65e88c minor DB changes. recording TourneysPlayers now for FTP and PS 2010-07-07 00:52:44 +02:00
steffen123
e4916bc456 replace catchall except with an if 2010-07-06 23:52:59 +02:00
steffen123
e2087d60a1 rename tourney methods in DB 2010-07-06 23:43:49 +02:00
steffen123
f5c1fd4ed7 check for tourney rather than tourNo not to be none 2010-07-06 23:39:25 +02:00
steffen123
e5cba5172d DB version increase for rush field 2010-07-06 18:14:35 +02:00
steffen123
1ab4db685f add rush poker field 2010-07-06 18:07:43 +02:00
steffen123
2717c71b4e fixes FTP tourneys to work as good/bad as PS tourneys 2010-07-06 18:07:26 +02:00
Worros
f44947c8a0 Add a new sample file for parsing website results.
Decided to knock up a quick proof of concept for fetching and parsing tournament results from a website.

Specifically uses:
- Pythons Beautiful Soup library
- P5s results pages - replace playername with the desired p5s username (eg. taypaur)

Of note; no tournament ids are displayed on any of the sites, so for this to work we may need to add a field like 'p5sid'
2010-07-06 16:13:25 +08:00
Worros
958e67beac Merge branch 'master' of git://git.assembla.com/fpdb-gimick 2010-07-06 12:18:16 +08:00
gimick
659f3e8835 walkthrough updated to fix numpy dotblas error : add fdl1.2 licence to walkthroughs 2010-07-05 22:15:45 +01:00
steffen123
d01435d068 store Tourneys and TourneyTypes for PS tourneys. see ML for more details 2010-07-05 11:48:26 +02:00
steffen123
be68f56c1b Revert "copyright correction" - sqlcoder commited with Carl as "owner"
This reverts commit dea3e72343.
2010-07-05 06:18:16 +02:00
Worros
4577cfbfa2 some cleanups:
- updated copyright notices
- added copyright notices that were missing
- changed python to python2
- added gpl-2/3 license texts
- removed THANKS.txt file as the wiki version is more up to date
- removed empty fpdb_db.py
- added GPL2 to debian license file

Conflicts:

	pyfpdb/Database.py
	pyfpdb/DerivedStats.py
	pyfpdb/SQL.py
	pyfpdb/SummaryEverleaf.py
	pyfpdb/TournamentTracker.py
	pyfpdb/Tourney.py
	run_fpdb.py
2010-07-05 12:17:08 +08:00
steffen123
dea3e72343 copyright correction 2010-07-05 06:14:07 +02:00
steffen123
6b95c46b27 change email address for bug reports from my personal one to mailing list 2010-07-05 11:42:12 +08:00
steffen123
39859970d7 another repair as a result of removing payinAmounts 2010-07-05 01:29:05 +02:00
steffen123
fd7556af89 fix call to tourney.addPlayer after removal of payinAmount 2010-07-04 23:42:57 +02:00
steffen123
ea1e136ae2 Merge branch 'master' of git://git.assembla.com/fpdb-gimick 2010-07-04 23:20:24 +02:00
steffen123
8c0395ef78 quit fpdb automatically after re-create. ppl tend to ignore msgboxes ;) 2010-07-04 23:19:57 +02:00