evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,225 Commits 1 Branch 0 Tags 14 MiB
ea3edb6f18
Commit Graph

2056 Commits

Author SHA1 Message Date
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
grindi
faa95ca26e Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-29 11:49:09 +03:00
Worros
a872769b2b Fix cli to Everleaf 2009-10-29 16:37:33 +08:00
Worros
626ff49eb4 Print out actual exception when import fails 2009-10-29 13:17:17 +08:00
Worros
d80360b3bb Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-10-29 12:28:48 +08:00
Ray
645be07667 Make DS.py friendlier to stud and draw. 2009-10-28 22:00:05 -04:00
unknown
02e8154710 remove error trap on read_stdin() - please fix bugs instead of relying on error trap 
some reformatting in Tables.py, as well as some new debug prints to deal with some potential issues. Add code to deal with potential problems in Win x64, that are biting me at random.  Not finished, but the problems stopped happening so can't continue.
 2009-10-28 19:53:31 -04:00
unknown
37af499bc6 Merge branch 'master' of git://git.assembla.com/fpdb-sql.git 2009-10-28 17:41:35 -04:00
unknown
83051d1f4a Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-10-28 17:41:27 -04:00
unknown
dcbc7d7203 fix format of line 2009-10-28 17:40:25 -04:00
grindi
c7410d6fc8 Fix config's default values for hud colors 
00000 -> #000000
FFFFF -> #FFFFFF
 2009-10-28 19:03:04 +03:00
grindi
5a972ad292 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-10-28 18:48:46 +03:00
grindi
65e1e33c88 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-28 18:48:35 +03:00
grindi
e18a1f2f93 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-28 18:48:20 +03:00
Worros
159c39245f Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-10-28 10:14:19 +08:00
Mika Bostrom
677ec5551c Merge branch 'master' into good 2009-10-27 19:48:00 +02:00
Mika Bostrom
9886b61840 Tray icon click toggles window visibility 
Many of the tools that place an icon in systray allow to toggle the
application visibility by left-clicking on the icon. Why not follow
suit?
 2009-10-27 19:45:52 +02:00
Worros
57f05ba2fb Merge branch 'master' of git://git.assembla.com/fpdb-mme 2009-10-28 00:21:13 +08:00
Worros
6cb16df055 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-10-28 00:20:44 +08:00
Ray
e829ec56ef Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-27 11:43:55 -04:00
unknown
269bc0b7a3 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-10-27 11:05:31 -04:00
unknown
7bd7b5b053 add todo to remind me 2009-10-27 11:01:45 -04:00
Mika Bostrom
fe53e8c8a7 Merge branch 'master' into good 2009-10-27 15:28:40 +02:00
Mika Bostrom
15980877dd Typofix in status icon load 2009-10-27 15:28:11 +02:00
Mika Bostrom
e25e4cf9b3 Use custom tray icon instead of GTK stock 
Use the "Anonymous Cards" image from openclipart.org
(http://openclipart.org/media/files/Anonymous/12230)

This same image is used in other new FPDB icons, but the combinations
with looking-glass don't look good in systray. This icon is plain enough
to work properly even when scaled really small.
 2009-10-27 15:24:49 +02:00
fpdb-mme
e732b74956 too many changes to remember 
Signed-off-by: fpdb-mme <jUrner@arcor.de>
 2009-10-27 11:04:24 +01:00
fpdb-mme
30103c5cb2 second try... 
Signed-off-by: fpdb-mme <jUrner@arcor.de>
 2009-10-27 09:01:06 +01:00
Mika Bostrom
879506cee4 Merge branch 'master' into good 2009-10-27 06:26:25 +02:00
Mika Bostrom
cba416e27a Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-10-27 06:26:04 +02:00
Mika Bostrom
ca8182c37d Merge branch 'master' into good 2009-10-27 06:08:19 +02:00
Mika Bostrom
fcaa1030b6 Merge branch 'master' of git://trac-git.assembla.com/fpdb-sql 2009-10-27 05:53:47 +02:00
Worros
9144c7ae68 Revert "Merge branch 'master' of git://git.assembla.com/fpdb-mme" 
This reverts commit 1f07fa9a14.
 2009-10-27 11:28:27 +08:00
sqlcoder
d2cf8e9bc9 attempt at making system tray icon go away when quitting 2009-10-26 22:26:22 +00:00
sqlcoder
fabec1604a stop warnings when importing from fpdb.py 2009-10-26 21:59:41 +00:00
sqlcoder
6b280d7db9 stop warning message from set_cell_data_func 2009-10-26 21:38:04 +00:00
sqlcoder
da64e336d7 allow sorts on both grids 2009-10-26 21:12:57 +00:00
Ray
0ac559a2db Add a comment to a comment. 2009-10-26 16:50:17 -04:00
Ray
fd31ecc0bf Minor problem with rogue merge info in HHC.py. 2009-10-26 11:19:44 -04:00
Mika Bostrom
7b6581de7d Merge branch 'master' into good 2009-10-26 17:09:06 +02:00
Worros
6b7b46754c Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-10-26 23:00:08 +08:00
Mika Bostrom
35b24fa002 Remove a stray conflict marker 2009-10-26 16:53:18 +02:00
Ray
14115b759e Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-10-26 10:10:05 -04:00
Ray
9d42b46459 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-26 10:09:57 -04:00
Mika Bostrom
27fa27f370 GTK signal handlers need to return True/False 
Since we deal with minimize/expose/show/hide routines ourselves, we
don't want these signals passed any further.

NOTE: if no return type is specified, it is automatically None which
usually is translated to False. That might trigger some weird behaviour,
up to and including rare and hard to reproduce GTK crashes.
 2009-10-26 13:29:32 +02:00
Mika Bostrom
bb6b2ab9a2 Fix session timestamp range 
PostgreSQL does automatic argument conversion/formatting when dealing
with timestamps. This simplification allows the session stats to be
generated with PostgreSQL as db backend.
 2009-10-26 12:55:23 +02:00
Mika Bostrom
73262e808c Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-26 12:18:37 +02:00
Mika Bostrom
70426a70a0 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-10-26 12:12:56 +02:00
Worros
9360bd6894 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-26 17:27:29 +08:00
unknown
22b3d5de7f should minimize to tray in windows. windows 7's tray doesn't like it much, but it'll get over it for now 2009-10-26 05:03:25 -04:00
Worros
115c44e7b1 Move session stats query into SQL.py 2009-10-26 16:39:37 +08:00
sqlcoder
a87bcbb43a allow sort on all cols, tidy up some more details 2009-10-26 08:38:45 +00:00
Worros
e0c193b77d Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-10-26 14:41:11 +08:00
Worros
1f07fa9a14 Merge branch 'master' of git://git.assembla.com/fpdb-mme 
Conflicts:
	docs/tabledesign.html
	pyfpdb/CarbonToFpdb.py
	pyfpdb/Configuration.py
	pyfpdb/Database.py
	pyfpdb/EverleafToFpdb.py
	pyfpdb/FpdbSQLQueries.py
	pyfpdb/GuiAutoImport.py
	pyfpdb/GuiBulkImport.py
	pyfpdb/GuiGraphViewer.py
	pyfpdb/GuiPlayerStats.py
	pyfpdb/GuiTableViewer.py
	pyfpdb/HUD_config.xml.example
	pyfpdb/HUD_main.py
	pyfpdb/HandHistoryConverter.py
	pyfpdb/Hud.py
	pyfpdb/Mucked.py
	pyfpdb/SQL.py
	pyfpdb/Stats.py
	pyfpdb/Tables.py
	pyfpdb/fpdb.py
	pyfpdb/fpdb_db.py
	pyfpdb/fpdb_import.py
	pyfpdb/fpdb_parse_logic.py
	pyfpdb/fpdb_simple.py
	pyfpdb/upd_indexes.sql
 2009-10-26 14:40:11 +08:00
unknown
f15bb627c0 add trayicon, minimize to tray by default (doesn't work quite right on windows) 2009-10-26 01:36:29 -04:00
Worros
71eb683a3d Make cash cols sortable. 
After sqlcoders effort this appears to work
 2009-10-26 12:16:20 +08:00
sqlcoder
69b3c5a339 improve sorting but still not quite working right 2009-10-26 00:33:33 +00:00
Mika Bostrom
1dda03fda0 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-25 21:40:55 +02:00
Worros
0b049a128b Make green in PlayerStats darker 2009-10-25 20:51:46 +08:00
Worros
73e8544117 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-25 20:49:39 +08:00
unknown
0a084d1110 remove try..finally block in HUD_update idle_func function, move return to after the threads_leave() call, HUD now works in Win 7 2009-10-25 08:27:55 -04:00
unknown
3b54fab9e0 remove the exception handler in kill_hud() i think sqlcoder put it in - it doesn't help because the exception isn't a python exception, it's a GTK exception. (looks like a bug in GTK.. not that they'll ever acknowledge anything) 2009-10-25 07:34:07 -04:00
grindi
aff69287ff Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-25 14:23:08 +03:00
grindi
b4200f9f51 Tiny fix 2009-10-25 14:22:49 +03:00
fpdb-mme
1efdd7fc68 add DatabaseManager 2009-10-25 10:22:06 +01:00
fpdb-mme
0b0312d1ee Signed-off-by: fpdb-mme <jUrner@arcor.de> 
initial commit
 2009-10-25 00:13:35 +02:00
sqlcoder
b1d65dbadd default all values in hud_params when not passed into get_stats_from_hand 2009-10-24 20:01:24 +01:00
sqlcoder
d39a34686e tidy up main() output 2009-10-24 12:41:51 +01:00
sqlcoder
11f50765c9 fix main 2009-10-24 12:16:26 +01:00
Worros
914f930c5b GuiSessionViewer update. 
Getting closer - added player and date tests. Not convinced the data coming back is koshur though - got a $3600 day in the middle of my data
 2009-10-23 15:01:02 +08:00
Worros
a2309f704c More GuiSessionViewer updates 
Getting closer to a decent layout
 2009-10-23 13:50:06 +08:00
Worros
397f654789 GuiSession viewer update. 
Still broken, got the math right in preparation for candlestick graph
 2009-10-22 14:09:36 +08:00
Mika Bostrom
6ec309a685 Provide extra path for mucked cards image 
Modified:
* Mucked.py

When running from outside source tree, the image containing mucked
cards' faces could not be loaded. Provide an extra path to load from.
 2009-10-22 08:44:45 +03:00
Mika Bostrom
616c07a4eb Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-21 20:29:44 +03:00
Mika Bostrom
b8f19741e0 Fix packaging issues 
Affected files:
* Configuration.py
* Database.py
* HandHistoryConverter.py
* fpdb_import.py

and setup.py to a lesser extent.

Logging requires a configuration file when initialising the class. If we
are executing from outside the source tree, this file is not present.
Catch config parser's error and try to provide the logging config file
from debian package path.

Update symlink target to match python-support from latest Debian and the
oncoming Ubuntu versions.
 2009-10-21 20:24:46 +03:00
Worros
58707d2022 Update GuiSessionViewer. 
Still horribly broken, but on its way
 2009-10-21 17:22:47 +08:00
Worros
4f754fa881 Add some prep work for sorting the stats page 2009-10-20 12:06:29 +08:00
Worros
b39f766941 Color cash columns in red and green 2009-10-19 19:39:46 +08:00
sqlcoder
6a029ccfa7 comment out debug statement 2009-10-19 00:36:31 +01:00
sqlcoder
2c7a853b3f keep heading on screen when scrolling stats windows 2009-10-19 00:36:08 +01:00
sqlcoder
35cc1b1314 fix mysql code for new stats options 2009-10-19 00:15:11 +01:00
sqlcoder
4b7aadd325 fix starting hand order 2009-10-18 23:19:26 +01:00
sqlcoder
c1a998b7d8 add all player (and min hands) ability to stats window 2009-10-18 22:56:10 +01:00
sqlcoder
6453154ef6 prepare for all players display 2009-10-18 17:18:07 +01:00
sqlcoder
0ccc204c89 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-18 12:19:42 +01:00
sqlcoder
5beb033547 debug session stats 2009-10-18 12:19:22 +01:00
Worros
cfc854ab50 Fix some bugs in BetfairToFpdb. 
As reported by tchaz on 2+2:

http://forumserver.twoplustwo.com/showpost.php?p=13870274&postcount=1960

Using the only sample file I have for Betfair, it appears there is still and accounting error
 2009-10-18 07:56:34 +08:00
Worros
639036871b HUD_config.xml.example update 
Added Betfair to default config - copied Party.

Also went through and cleaned up whitespace in that file at the same time - tabs to spaces, cleaned trailing spaces.
 2009-10-18 07:54:41 +08:00
sqlcoder
7bd388613d Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-15 23:02:57 +01:00
sqlcoder
ac50cf85ca update comments on aggregation 2009-10-15 23:02:50 +01:00
Worros
ceaa78bdc8 Add usage message to GuiBulkImport cli 
I keep forgetting the format for Full Tilt cli import
 2009-10-15 15:23:47 +08:00
Worros
c3bc165a90 Add comment to DerivedStats 2009-10-15 15:13:09 +08:00
Worros
7a9237b707 GuiBulkImport - make cli version print out import stats 2009-10-15 15:12:08 +08:00
Worros
2e2531c0e4 Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-10-15 14:55:21 +08:00
Mika Bostrom
019440a71b Merge branch 'master' into good 
Conflicts:
	pyfpdb/Configuration.py
	pyfpdb/HUD_config.xml.example
 2009-10-15 09:06:31 +03:00
Worros
2d9b92af90 Make GuiBulkImport allow multi-file select 2009-10-15 11:57:42 +08:00
Mika Bostrom
54d309f797 Minor fixes to hud setup code 2009-10-14 19:33:19 +03:00
Worros
16d1f43c7e [NEWIMPORT] HandsPlayers.streetXAggr insert. 2009-10-14 23:55:51 +08:00
Mika Bostrom
a232a94eb1 Try to make hud more configurable 
Modified files:
* Configuration.py
* HUD_config.xml.example
* HUD_main.py

Instead of tweaking aggregation settings directly in code, make the
values configurable through HUD_config.xml; use the newly created
<hud_ui> element for this. Retain coding convention and key-value
names as they are.
 2009-10-14 16:04:09 +03:00
Worros
7b2c1fa243 [NEWIMPORT] Minor update, use DerivedStats.getStats() 2009-10-14 20:28:07 +08:00
Worros
2350474d38 [NEWIMPORT] Start of HandsPlayers insert 2009-10-14 20:20:17 +08:00
Worros
f0f2bcda14 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-14 12:06:01 +08:00
Worros
1fc015b09f [NEWIMPORT] Move db insert into SQL.py (store_hand) 2009-10-14 12:05:17 +08:00
sqlcoder
4d92e3d2a0 update graph viewer to work with enhanced filter 2009-10-13 23:06:09 +01:00
sqlcoder
4b0a399ffd stop fpdb.py accessing fpdb_db directly 2009-10-13 21:53:51 +01:00
sqlcoder
785e3d63a2 add 'is db running' printed message when pg db connect fails 2009-10-13 21:52:13 +01:00
Worros
843bd754f6 [NEWIMPORT] Prep insert functions 
Cleaned up storeHandsPlayers and added storeHudCacheNew

Haven't decided on the data structures to be passed in as yet so the functions only insert the bare minimum and have a list of commented out variables
 2009-10-13 17:42:02 +08:00
Worros
4d04a4b1db [NEWIMPORT] Take a copy of generateHudCache for DerivedStats 
Commented out, should give a good basis for generating the stats from Hand class
 2009-10-13 17:30:49 +08:00
Worros
f4887235a0 [NEWIMPORT] Fix Hand import so it runs 
Also comment out some debug
 2009-10-13 15:58:05 +08:00
Worros
00a8593631 Fix table re-create bug in fillDefaultData 2009-10-13 14:12:25 +08:00
Worros
1d0177f6d4 [NEWIMPORT] Finish up Hand import 
Decided to leave streetXRaisesN alone for the moment
 2009-10-13 14:04:19 +08:00
Worros
e7a7229dc0 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-13 13:22:08 +08:00
sqlcoder
aaba84de19 Add ring/tourney radio button to filter 2009-10-12 23:02:20 +01:00
Worros
035b71b018 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-12 10:20:22 +08:00
sqlcoder
181294ddf4 tidy up Filters and PlayerStats layout a bit 2009-10-11 23:36:26 +01:00
sqlcoder
b14fd2553c add some debug for session stats - I think there is a bug in here somewhere that makes it include too many hands sometimes ... 2009-10-11 23:34:05 +01:00
sqlcoder
b8be20f551 show nl and fl limits separately in filter 2009-10-11 22:44:52 +01:00
Eric Blade
d4cbed121d fix indentation errors 2009-10-09 07:39:05 -04:00
Eric Blade
8eeac34fce Merge branch 'master' of git://git.assembla.com/fpdb-sql.git 2009-10-09 07:35:12 -04:00
Eric Blade
05ccca63ad Merge branch 'master' of git://git.assembla.com/fpdboz.git 
Conflicts:
	pyfpdb/fpdb.py
 2009-10-09 07:34:13 -04:00
Eric Blade
ee864033ee Add exception for not being able to connect to MySQL, make use of it to pop up an error box 2009-10-09 07:31:25 -04:00
Worros
6d0ec5d831 [NEWIMPORT] Add playersAtStreetX to insert 2009-10-08 18:13:13 +08:00
Worros
cf6c3c8ad0 [NEWIMPOR] Fix playersVpi from last patch 
Oops - forgot to add the argument
 2009-10-08 18:07:54 +08:00
Worros
31f48c4932 [NEWIMPORT] Calculate playersAtStreetX 
Untested code.

Still missing playersAtShowdown, haven't looked to see if hand.actionStreets contains showdown.
 2009-10-08 18:01:49 +08:00
sqlcoder
7d708a327c try to fix aggBBmultItemAll error 2009-10-07 23:45:59 +01:00
Worros
024618235f Clean up variables in DerivedStats 
Doesn't look like they are going to be used like that
 2009-10-07 14:15:12 +08:00
Worros
fdef5b12d9 Add playersVpi to NEWIMPORT code 
Untested at the moment, moved the code from Hand.py into DerivedStats.
 2009-10-06 18:30:52 +08:00
Worros
94af5b1ea8 Fix order bug for seats in NEWIMPORT 2009-10-06 12:08:20 +08:00
Worros
230eb32615 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-06 11:11:58 +08:00
sqlcoder
8851b141a2 add dropdown to player name in filter 2009-10-05 22:12:35 +01:00
sqlcoder
7149de3aa2 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-10-05 20:41:10 +01:00
sqlcoder
7900ebcebe Tell user what is happening on startup 2009-10-04 17:46:04 +01:00
sqlcoder
5e3644d8d9 make separate hud menus for player and opponents stats 2009-10-04 12:26:37 +01:00
Ray
971a282383 Merge branch 'master' of git://git.assembla.com/fpt_fpdb 2009-10-03 21:09:21 -04:00
sqlcoder
5a0c83b60a debug session stats 2009-10-03 23:11:45 +01:00
Mika Bostrom
f6eb365b3c Add the default box text to example config 
Now that the text on HUD's box is configurable, move the default text
from code to default/sample config.
 2009-10-03 21:18:49 +03:00
Mika Bostrom
14122770ef Make hud's menu-area text configurable 
By default the hud positions a little box on top-left corner of each
table. Make the text in this box user-modifiable without touching the
source.

Most likely useful for active users and those who play with smaller
tables. On shrunk table the default box may cover some of the players'
cards.
 2009-10-03 21:18:39 +03:00
Mika Bostrom
c77e143436 Add the default box text to example config 
Now that the text on HUD's box is configurable, move the default text
from code to default/sample config.
 2009-10-03 21:10:09 +03:00
Mika Bostrom
18cc51ba7a Make hud's menu-area text configurable 
By default the hud positions a little box on top-left corner of each
table. Make the text in this box user-modifiable without touching the
source.

Most likely useful for active users and those who play with smaller
tables. On shrunk table the default box may cover some of the players'
cards.
 2009-10-03 21:05:41 +03:00
Mika Bostrom
a1d5f2292f Merge branch 'master' of git://trac-git.assembla.com/fpdb-sql 2009-10-03 00:57:25 +03:00
sqlcoder
61f384a886 improve stats menu in HUD some more 2009-10-01 23:16:20 +01:00
sqlcoder
b0037e545a improve stats menu on hud 2009-10-01 21:40:14 +01:00
Worros
d36d8f4249 From 7d5a3e81a5d41298ab1fa4d57bef25862a167350 Mon Sep 17 00:00:00 2001 
From: lucktard <ntogden@gmail.com>
Date: Wed, 30 Sep 2009 12:16:06 -0500
Subject: [PATCH] Detect and import capped 6 max hands on FullTilt

and

From b35d23aba38935406cf1522ae07a49cd441318b3 Mon Sep 17 00:00:00 2001
From: lucktard <ntogden@gmail.com>
Date: Wed, 30 Sep 2009 12:21:34 -0500
Subject: [PATCH] Detect deep 6 max tables for HUD on FT
 2009-10-01 10:49:59 +08:00
Mika Bostrom
e4969820b8 Merge branch 'master' of git://trac-git.assembla.com/fpdb-sql 2009-09-30 20:27:17 +03:00
sqlcoder
2b7a42bf1d fix bug for tourneys in new code, modify part of hud menu to use checkmenuitems 2009-09-29 23:34:52 +01:00
Mika Bostrom
432c24173e Merge branch 'master' of git://trac-git.assembla.com/fpdb-sql 2009-09-29 09:11:33 +03:00