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

2541 Commits

Author SHA1 Message Date
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
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
sqlcoder
16eb0b1e1f small changes for sqlite 2009-10-28 20:12:03 +00: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
sqlcoder
998c80b7d0 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-27 08:45:58 +00: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
sqlcoder
16f8fffd68 add separate hud config for user and allow some user config in HUD menu (opponents still only via editing HUD_main.py) 2009-09-28 23:59:17 +01:00
Mika Bostrom
5260f5c384 Merge branch 'master' of git://trac-git.assembla.com/fpdb-sql 
Conflicts:
	pyfpdb/Database.py

Resolve by reverting to sqlcoder's version; it uses the nice insert in
fillDefaultData for each case now and having the DB backends separate
might be good for the foreseeable future.
 2009-09-28 18:07:08 +03:00
sqlcoder
cb9a972eda add aggregation options to hud menu 2009-09-28 00:51:09 +01:00
sqlcoder
b6ea02fd43 improve tourney importing 2009-09-28 00:44:55 +01:00
sqlcoder
db861292a5 use False for boolean so it works in postgres as well as mysql 2009-09-27 23:42:00 +01:00
sqlcoder
d6414d211b allow separate hud options on each table and add aggregate options to main table menu 2009-09-27 21:23:00 +01:00
sqlcoder
7f47a753db cosmetic change to comment 2009-09-27 21:21:26 +01:00
sqlcoder
8353d0739b improve hudcache recalc when db is empty and avoid mysql long int problem 2009-09-27 13:36:45 +01:00
sqlcoder
01c33c26f8 fix tourneytypes insert for postgres again 2009-09-27 12:47:21 +01:00
sqlcoder
8d01caa30f try to work around Everleaf problem where winning hole cards not always shown - derive from winning hand where possible 2009-09-27 12:21:22 +01:00
sqlcoder
d5a1523e59 fix startCard calcs 2009-09-27 11:40:39 +01:00
sqlcoder
9a7d7267ff remove print 2009-09-27 10:42:33 +01:00
sqlcoder
6f75719ffe refine hero's player id derivation in empty db's 2009-09-27 02:06:07 +01:00
sqlcoder
c1711c4e2e refine new date option on hudcache rebuild 2009-09-27 01:42:26 +01:00
sqlcoder
b054a9c09a fix params when creating Database instance 2009-09-27 00:06:06 +01:00
sqlcoder
e75d915120 allow hudcache rebuild to only start Hero's stats from chosen date :-) 2009-09-26 23:32:44 +01:00
sqlcoder
518fd9e039 merge from Eric 2009-09-26 11:45:05 +01:00
sqlcoder
ea74862a5a start changes to allow different hud choices for hero and opponents 2009-09-26 11:30:12 +01:00
sqlcoder
3d301718ae create/alter unique indexes and change inserts into tourneytypes and tourneysplayers 2009-09-25 23:10:58 +01:00
sqlcoder
c519756a49 look for sqlite db in 'database' dir, create dir first if required 2009-09-25 20:18:13 +01:00
sqlcoder
a67830d92e 2 changes: move recognisePlayerIDs from fpdb_simple into Database, and make index on siteTourneyNo on Tourneys table unique and refine store_tourneys function to handle this 2009-09-24 02:12:04 -04:00
Mika Bostrom
6f536d29e7 Fix import on PostgreSQL 
Database.py : fillDefaultData()

Remove manual 'id' from INSERT command. In database schema,
TourneyTypes.id is a primary key and thus autoincrement. In postgres,
autoincrements are implemented as sequences - inserting a value
"manually" bypasses the sequence generation, which resulted in a
remarkably weird error.

Namely, upon the first hand to import, the insert fails due to primary
key violation. The default value from an unused sequence is 1, but a
row with such an id already exists.

The solution is to create the single row of default data values with
unspecified TourneyTypes.id, hence allowing postgres to generate the
correct id from the sequence. This way the import works again.
 2009-09-24 07:08:32 +03:00
sqlcoder
daeefd7d8a hide regular exception when closing hud 2009-09-23 23:04:38 +01:00
sqlcoder
23f56ea2ae 2 changes: move recognisePlayerIDs from fpdb_simple into Database, and make index on siteTourneyNo on Tourneys table unique and refine store_tourneys function to handle this 2009-09-23 23:03:34 +01:00
Mika Bostrom
df71dcf2c7 Fix knockout variable type 
fpdb_parse_logic.py : recogniseTourneyTypeId()

The column in table is of type 'boolean' but the default value was
integer '0'; this triggered an error
 2009-09-23 23:44:57 +03:00
Mika Bostrom
00f8b34fff Simplify database creation 
Database.py : fillDefaultData()

Sql-coder had fixed the default data insert, and in the process changed
the default type ID. Since his works in general case, I can remove my
modifications.
 2009-09-23 23:36:17 +03:00
Worros
a20bfe0921 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-09-23 13:22:45 +08:00
Worros
4e361e383c Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-09-23 13:22:35 +08:00
sqlcoder
e080ec3fd1 further fix to tourneytypes insert for postgres 2009-09-22 22:08:42 +01:00
sqlcoder
455e92e6f6 fix tourneytypes insert for postgres 2009-09-22 22:04:05 +01:00
sqlcoder
b0677545e0 remove UNSIGNED from postgres create table statement 2009-09-22 21:54:01 +01:00
sqlcoder
5c92d6ac02 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-09-22 21:46:50 +01:00
Worros
89f86dd32b Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-09-22 12:35:11 +08:00
Mika Bostrom
1351cd6dd9 Use cleaner syntax in fillDefaultData 2009-09-21 15:31:19 +03:00
sqlcoder
6357f22f11 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-09-20 22:52:05 +01:00
Worros
2cea6f01b9 Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-09-19 19:25:01 +08:00
Worros
577beed942 Prep new function - commented out for the moment 2009-09-19 19:24:07 +08:00
Mika Bostrom
e54c45b7d1 Fix database creation with Postgres 
* Database.py : fillDefaultData()

PostgreSQL has a rather annoying (mis)feature when dealing with boolean
data types: raw 1/0 input as integer is not automatically cast to
boolean values. Instead, one must use one of several other ways of
signifying true/false.
http://www.postgresql.org/docs/8.4/static/datatype-boolean.html
documents the available and understood formatting.

Fix by special-casing PostgreSQL and making all boolean values fed as
strings, '1' for true and '0' for false.
 2009-09-19 11:44:06 +03:00
Mika Bostrom
84dc9652df Fix table creation for Postgres 
PostgreSQL does not have an UNSIGNED specifier in its language.
Mysql's "TINYINT UNSIGNED" is postgreSQL's "SMALLINT" which is a bit
inconvenient but apart from annoying, not a problem.
 2009-09-19 11:10:07 +03:00
Eric Blade
3f0ede67ee fix a small error that caused deletion of your hud_config when saving.. oopsie 2009-09-17 05:26:06 -05:00
Eric Blade
226153f15f Revert "FTtoFPDB: readBlinds: cleanup exception handler" 
This reverts commit 0938afb882.

Conflicts:

	pyfpdb/FulltiltToFpdb.py
 2009-09-16 01:40:43 -05:00
Eric Blade
05267db38a i hate git, i hate git, yes i do 2009-09-16 01:36:34 -05:00
Eric Blade
fbceb6d7af bypass the changes made in readBlinds which somehow broke the hell out of stuff 2009-09-16 01:28:28 -05:00
Eric Blade
7ed5d0972e use with..as for file reading/writing, as we don't need 2.4 compat anyway right? 2009-09-16 01:26:19 -05:00
Eric Blade
ded05cb290 put the regex search back into the try: in FT readBlinds() because it broke FL games somehow 2009-09-16 00:54:29 -05:00
Eric Blade
2095f3c899 use with..as for file reading/writing, as we don't need 2.4 compat anyway right? 2009-09-16 00:13:42 -05:00
Eric Blade
0938afb882 FTtoFPDB: readBlinds: cleanup exception handler 
also deal with finishPositions not being accurate, by printing a message to that effect, instead of crashing an import
 2009-09-15 23:32:23 -05:00
Eric Blade
ba1513847b clean up exception handling in Configuration and imports in GuiGraphViewer 2009-09-15 23:30:59 -05:00
Eric Blade
bcecf643f2 cleanup imports section and spacing in fpdb_db 2009-09-15 22:10:37 -05:00
Eric Blade
ba663c231c cleanups 2009-09-15 22:04:37 -05:00
Eric Blade
a566d52b9a cleaning cleaning cleaning.. keep them coders cleaning.. cleaning cleaning cleaning.. 2009-09-15 21:26:10 -05:00
Eric Blade
23acfbd642 deal with KeyErrors in update() in a vaguely intelligent fashion 2009-09-15 21:25:26 -05:00
Eric Blade
2790a623af import, code, exception cleanups 2009-09-15 21:07:31 -05:00
Eric Blade
e4772dcb74 init vars used in load_clicked, comment out the exception handler that was single handedly stopping virtually all errors in the import process from showing up 2009-09-15 21:06:43 -05:00
Eric Blade
a1783a37cb reflow init_hud_stat_vars exception handling 2009-09-15 21:04:00 -05:00
Eric Blade
d6c5309aa3 clean up some module import code in fpdb_import 2009-09-15 20:10:18 -05:00
Eric Blade
8b19750b1f == None to is None (PEP 8, Style Guide for Python Code) 2009-09-15 19:27:25 -05:00
Eric Blade
4374b6c810 remove Database:__init__ parameters for db_name and game, as there was a comment right next to them # db_name and game not used anymore 2009-09-15 18:49:34 -05:00
Eric Blade
b0616a7d2c as soon as a stat window is clicked on, with any button, bring it forward. this seems to almost completely solve the insane focus-wobbling in windows 2009-09-13 15:08:23 -05:00
PassThePeas
16d53f1502 Patch for HUD and FTP tourneys 
modified:   Hand.py
	- writeTableLine : adds the tourneyNo in tourney context
	modified:   Tables.py
	- discover_nt_by_name : add filter for HUD and chat windows
 2009-09-12 23:14:55 +02:00
Ray
e69cbc30ea Merge branch 'master' of git://git.assembla.com/fpt_fpdb 2009-09-11 10:05:22 -04:00
Ray
bd3f73bd58 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-09-11 10:05:08 -04:00
Ray
2b0c59eee9 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-09-11 10:04:57 -04:00
Eric Blade
7283d09b4d replace "trying *codepage*" message to console with an error message only if none of our specified codepages is successful 2009-09-11 00:38:20 -05:00
Eric Blade
715b14f81a moved timeout_add that calls do_import outside of the for loop, so it's only created once per autoimport start, not once per site. fix addImportFile to ignore files that don't exist (not sure how they'd get there, but just in case), fixed exception looking for fpdb_simple.DuplicateError to look in it's actual location at Exceptions.DuplicateError 2009-09-11 00:12:46 -05:00
Eric Blade
1f9dd8f8e9 HHC/fpdb_import: throw in some calls to gtk.main_iteration(False) 
GuiBulkImport: replace "Importing" label with actual progressbar (does not use percentages, simply an activity bar)
 2009-09-09 22:10:55 -05:00
Eric Blade
993199c010 add sqlcoder to about 2009-09-09 21:04:38 -05:00
Eric Blade
705210a96d use the "proper" gtk.AboutDialog() for About ... meh 2009-09-09 20:57:16 -05:00
Eric Blade
345e328795 Add Set HH Archive Directory option to Import menu on main, call it if user selects "no" on "create hh directory" prompt 2009-09-09 20:26:44 -05:00
Eric Blade
ae04f5562a Configuration::Import keeps track of it's node, added function to Configuration::Config to set the Import's hhArchiveBase 2009-09-09 20:21:27 -05:00
Eric Blade
2bf3aaa1bc most of the unimplemented stuff goes to warning_box() instead of to log/stdout. Implemented About (via warning_box, w/e) 2009-09-09 18:36:55 -05:00
Eric Blade
2397a59483 add warning_box func to fpdb, add validate_config func, checks existence of hhArchiveBase, pops up warnings if not present 
hhc traps errors creating folders, need to learn how to make it fail properly afterwards.
 2009-09-09 18:20:50 -05:00
Eric Blade
6238e2f896 spacing 2009-09-09 17:41:32 -05:00
Eric Blade
28450b1b8a remove tons of useless comments from fpdb.py - documentation should say something that isn't blazingly obvious by looking at the code 2009-09-09 05:01:03 -05:00
Eric Blade
e681fe4958 little cleanup 2009-09-06 23:07:40 -05:00
Eric Blade
fec805c9d3 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-09-06 23:07:13 -05:00
PassThePeas
49ce7de254 Patch for HandsPlayers.TourneyTypeId not being null (even in ring context) for hudcache / Extend tourneyName size in TourneysTable 2009-09-07 00:18:10 +02:00
Worros
9e30336acc Remove BOM from AbsoluteToPoker.py 2009-09-06 22:40:27 +08:00
Eric Blade
1b5c70007c Merge branch 'master' of git://git.assembla.com/mctfpdb.git 2009-09-05 03:55:56 -05:00
Ray
88d33dd4f4 Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-09-04 18:08:06 -04:00
Matt Turnbull
b40132e961 db can be specified in cmd line option again 2009-09-04 22:12:35 +01:00
Ray
d80318d950 Fix small case sensitive bug. 2009-09-04 16:43:55 -04:00
Eric Blade
e7d43ceaca fix taskbar listing of fpdb hud 2009-09-04 14:14:38 -05:00
Ray
f8a899bcfb Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-09-04 10:31:41 -04:00
Eric Blade
97a62933e4 remove logging.out from the git tree 2009-09-04 06:51:05 -05:00
Eric Blade
9fa57b6014 Database: re-write and fix drop_tables 
Exceptions: add FpdbDatabaseError
SQL: default all tourneytypeids to 1
fpdb_import: import error tuples set to right size
 2009-09-04 06:49:46 -05:00
Eric Blade
9a44a2efef Merge branch 'master' of git://git.assembla.com/fpdboz.git 
Conflicts:
	pyfpdb/HandHistoryConverter.py
 2009-09-04 05:11:01 -05:00
Eric Blade
a7dd023616 some error cleanup 2009-09-04 05:09:03 -05:00
Worros
4f98b29b26 Merge branch 'master' of git://git.assembla.com/fpt_fpdb 
Conflicts:
	pyfpdb/Database.py
 2009-09-04 12:45:49 +08:00
PassThePeas
91ebbe79e1 Last part of core tourney import 
Database.py : tStoreTourneyPlayers and tUpdateTourneysHandsPlayers implemented
HandHistoryConverter.py : fix for 0-byte summary files
SQL.py : new queries
Tourney.py : cleanup stdout
 2009-09-04 02:01:41 +02:00
Matt Turnbull
cad5149c0e Only errors to stderr and console. 2009-09-03 22:40:06 +01:00
Eric Blade
844a01318a cleanup to hud window creation, menu creation, deal properly with calls to the timeout function when we're not ready for it yet, simplify the "topify" methods, hopefully fix some focus problems 2009-09-03 09:35:59 -05:00
Worros
b52ceb3f90 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-09-03 21:37:57 +08:00
Eric Blade
b7495395e8 crlf churn i think 2009-09-03 02:46:22 -05:00
Eric Blade
18e03311e6 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-09-03 02:45:49 -05:00
Worros
c350d62089 Fix typos 2009-09-03 15:44:28 +08:00
Eric Blade
59a1cef821 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-09-03 02:44:11 -05:00
PassThePeas
4853b888a6 Correct oddity : self.status = status = self.getPlayersPosit... and status unused 2009-09-03 07:51:05 +02:00
Worros
b4ccc7f45c Add guards around numpy in GuiSessionViewer for windows users 2009-09-03 11:29:30 +08:00
PassThePeas
025c81b1e1 Tourney parsing : payinAmounts, countRebuys, countAddons and countKO are now defined by player (instead of being attached to the Tourney for Hero) 2009-09-03 02:11:38 +02:00
PassThePeas
d28f56db18 Tourney import : tRecognizeTourney implemented (search, update or insert a Tourney 2009-09-02 22:55:47 +02:00
PassThePeas
4a0b2274f8 Tourney parsing : Use of "Decimal" insted of float2int / Handle amounts in cents four Tourney Object 2009-09-01 23:46:46 +02:00
Worros
c80bb3ac3f sys.exit() in Hand.addShownCards() has to be wrong 2009-09-01 18:35:40 +08:00
PassThePeas
b00a58249f Tourney import : tRecogniseTourneyType implemented 
modified:   Database.py
	* tRecogniseTourneyType : implemented
	modified:   FulltiltToFpdb.py
	* buyin, fee, rebuyAmount, addOnAmount : converted using fpdb_simple.float2int
	modified:   SQL.py
	* Added queries for Database.tRecogniseTourneyType (getTourneyTypeIdByTourneyNo modified to return all data, getTourneyTypeId and insertTourneyTypes added)
 2009-09-01 02:35:52 +02:00
Eric Blade
6568281589 Hand: will give you a proper message to the console if it can't figure out what your datetime passed to it is 2009-08-31 03:19:23 -05:00
Eric Blade
891ed0295f Absolute: Add support for HORSE Holdem, attempts to determine table name from filename if it can't find it in the hand 2009-08-31 03:18:00 -05:00
Ray
3e2974c716 First try of py2exe setup file. fpdb.exe and HUD_main.exe work. 
Some todos in the source.
 2009-08-30 19:40:18 -04:00
PassThePeas
3323d25ce7 Patch for handsplayers.tourneyTypeId and preparation for Tourney import 
modified:   Database.py
		* correct the HandsPlayers.tourneyTypeId entry (null for omaha/he ring games, correct value instead of 1 or null for omaha/he & stud tourneys)
		* add prototypes and description of new methods to store Tourneys info
	modified:   Tourney.py
		* add calls to new methods in Tourney.insert
 2009-08-31 01:30:28 +02:00
Eric Blade
63741468d0 removing "sending hand to hud" debug message 2009-08-30 12:45:02 -05:00
Eric Blade
d39fe74284 Merge branch 'master' of git://git.assembla.com/mctfpdb.git 2009-08-30 12:44:36 -05:00
Matt Turnbull
fe72b6edad do not require sqlalchemy, except for sqlite 2009-08-29 20:16:27 +01:00
Eric Blade
bd7f3de3d7 Conflicts: 
pyfpdb/fpdb_import.py
 2009-08-29 06:54:20 -05:00
Matt Turnbull
d2380ba738 merge from futz2 branch 2009-08-28 18:24:51 +01:00
Matt Turnbull
a9fb82d3b9 even more like eric's 2009-08-28 07:49:21 +01:00
Matt Turnbull
13dcaae591 Exceptions, Eric style (lost in merge) 2009-08-28 07:43:12 +01:00
Matt Turnbull
09350e8f52 Database.py - need os. Hand.py - encoding, and writeHTML doesn't need fh 2009-08-28 01:22:08 +01:00
Eric Blade
637bdcbdfc fix #17, Absolute Poker antes and even-amount stakes now parse 2009-08-27 10:27:19 -05:00
Eric Blade
2ae6790421 fix popup window (if your configuration is correct anyway) 2009-08-27 07:41:43 -05:00
Eric Blade
079ce989cc Tables: add " - Table " to ignore strings, so we don't attach to Absolute chat windows 2009-08-27 04:28:59 -05:00
Eric Blade
f91e6d1d69 AbsoluteToFpdb: fix for HU and FL tables (need to verify data coming in for PL and NL tables now, as that required code changes to blind handling as well), also likely fixes bug #14 where HU NL hands would not convert properly (also still need to test) 2009-08-27 02:29:44 -05:00
PassThePeas
0217e2320c DB Model changes to prepare for Tourney Summary import 
modified:   Database.py
		* fillDefaultData : queries that inserts the default line into TourneyTypes rewritten (simplified to take into account the columns that have "new" DEFAULT attribute)
	modified:   SQL.py
		* createTourneyTypesTable query modified : some existing columns are now created with a default values, new columns added
		* createTourneysTable query modified : new columns added
		* createTourneysPlayersTable query modified : new columns added
 2009-08-27 01:41:04 +02:00
PassThePeas
b85f8ec155 Some fixes in FTP summary parsing and preparations for summary import in DB. No behaviour change expected 
modified:   FulltiltToFpdb.py
	* Tourney Summary File parsing : add support for Madness tourneys
	* HH file parsing : enhance Tourney topline parsing to retrieve some info (HU, Rebuy, KO, Turbo, ...) and store it into Hand object
	modified:   Hand.py
	* Some attributes added to store tourney specific info
	modified:   SQL.py
	* Add a new request (getTourneyTypeIdByTourneyNo) to help finding a tourney already in db (preparation for Tourney Summary import)
	modified:   Tourney.py
	* Attribute tourneyComment added
	modified:   fpdb_parse_logic.py
	* Change parameters in call of fpdb_simple.recogniseTourneyTypeId
	modified:   fpdb_simple.py
	* recogniseTourneyTypeId : signature changed to allow for the search of a tourney id already in db prior to searching for tourneyTypeId
 2009-08-26 01:13:34 +02:00
Ray
cb8bc13ceb Allow self.codepage to be a list of codecs to try. 2009-08-23 19:40:39 -04:00
Ray
2e0c743671 Detect and skip HHs flagged as partial. 2009-08-23 15:02:00 -04:00
Ray
4065eebabe Merge branch 'master' of git://git.assembla.com/fpt_fpdb 2009-08-21 19:31:58 -04:00
Ray
0c4c0d34e7 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-08-21 19:31:32 -04:00
PassThePeas
4a1dd26db3 First attempt to parsing summary files from FTP 
modified:   FulltiltToFpdb.py
		* Modified re_HandInfo regex to take into account Matrix Tournament Hands Histories
		* Add Regex for Tourney Summaries files parsing
		* New methods : readSummaryInfo, determineTourneyType, getPlayersPositionsAndWinnings

	modified:   HandHistoryConverter.py
		* Add a Tourney object in the attributes to allow storing the summary info retrieved and the ability to hand it over after parsing
		* Add a new attribut parsedObjectType (string : "HH" or "Summary")
		* In follow = False mode : read the first line to swicth between HH & Summary parsing
		* TO DO : Deal with parsing summary files in follow = True mode
		* New methods added : isSummary, getParsedObjectType (to be called in fpdb_import), readSummaryInfo : abstract (to be implemented in each specific HHC), getTourney (returns the new attribute)

	new file:   Tourney.py
		* New object
		* Lots of attributes regarding the tourney info (buy-in, fee, entries, speed, Rebuy/add-on info, starting chips, KnockOut info, isHeadsUp, isShootout, isMatrix, ...
		* List of players with finishing positions (when available) and winnings (when available)
		* Methods :
		  ** addPlayer(self, rank, name, winnings)
		  ** incrementPlayerWinnings(self, name, additionnalWinnings): used for KO tourneys when KO occured (for Hero only)
		  ** calculatePayinAmount : unused yet, should be necessary for DB storage
		  ** some Hand methods copied that are still to be done including : assemble and insert
		  ** TO DO : write the insert method for the object to be stored in DB. This will have to deal with the fact that the DB write can occur both before (Bulk Import) or after the HH file info has been stored (tourney might or might not already exist)

	modified:   fpdb_import.py
		* import_file_dict modified :
		  ** after the construction of the hhc, it now calls the new getParsedObjectType method of HHC in order to know what has been parsed by the HHC
		  ** If it's a hand history file (actual expected behaviour) : do as before
		  ** If it's a summary file, gets the tourney object that has been built from the hhc and calls the insert method on it (similar to NEWIMPORT=True for HH)
 2009-08-22 00:09:34 +02:00
Eric Blade
8420e22038 add in Ante RegEx for Absolute .. hopefully it works, but I don't have the roll there to play holdem with Antes to find out 2009-08-21 05:57:04 -05:00
Eric Blade
d5d0c9aee3 add "rebuy" button to TT 2009-08-21 00:48:26 -05:00
Eric Blade
832b7fe4db add first revision of my TournamentTracker idea, actually based on the HUD_main program :) 
fix SummaryEverleaf to be a little more friendly to being imported and accessed from other modules
TournamentTracker pops open an Edit Window when you add a tournament, but I don't know how to actually populate it with Edit boxes yet
 2009-08-21 00:42:19 -05:00
Eric Blade
629159c785 rename Summary-Everleaf to SummaryEverleaf, as I've discovered you can't import a module with a "-" in it's filename 2009-08-21 00:23:07 -05:00
Ray
4a794f7f7a Merge branch 'master' of git://git.assembla.com/fpt_fpdb 2009-08-20 12:21:59 -04:00
Eric Blade
1ecafb7f42 push test Summary-Everleaf program to obtain information about Everleaf tournaments from HTTP 2009-08-19 23:42:10 -05:00
Eric Blade
677b0a5e35 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-08-19 05:59:50 -05:00
Eric Blade
fafbda8053 add proper returns for our mouse-button callbacks in HUD, also trap events for focus change, which doesn't entirely solve the focus issues, but does lessen them for me 2009-08-19 05:59:44 -05:00
PassThePeas
e403c18780 Patch the readPlayerStacks : different behaviours between tourney and ring hands 
modified:   FulltiltToFpdb.py
In tourneys, players sitting out are considered as in the hand. That's not the case in ring games.
 2009-08-18 21:17:00 +02:00
Worros
0877e428ef Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-08-18 18:46:15 +08:00
Worros
4cc08763fc Add query getPlayerIdBySite 2009-08-18 18:44:47 +08:00
grindi
b8af93efb5 Merge branch 'master' of git://git.assembla.com/fpt_fpdb 
Conflicts:
	pyfpdb/FulltiltToFpdb.py
 2009-08-18 13:47:11 +04:00
sqlcoder
1640ab3cfc attempt to stop a KeyError problem (problem patching up the symptoms rather than fixing the cause) 2009-08-17 21:51:13 +01:00
Eric Blade
9f89340881 timeout in startbutton reset resets to Stop or Start as appropriate 2009-08-16 14:30:52 -05:00
PassThePeas
c5aedf321f Modification to FulltiltToFpdb.py mostly for tourneys contexts 
modified:   FulltiltToFpdb.py
- Sitting out players are no longer considered out of a hand (in a tourney context, they can act even if out at the beggining of the hand)
- re_CollectPot modified to take into account Tournament context (no $ in the pot)
- Try to read buy-in/fee from topline in Tournament context
- Deal with commas in pot size (readCollectPot)
 2009-08-16 20:01:36 +02:00
grindi
15c854d368 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-08-16 20:07:19 +04:00
Eric Blade
8bba1fd932 structured Exceptions a bit more like most python apps seem to do it (and as suggested in the manual) 2009-08-16 07:32:56 -05:00
Eric Blade
d495606f2a GuiAutoImport: 
do_import: change label of Stop button when running an import, to provide a visual indicator
 startClicked: refactor so only the Pipe Open is inside the exception handler, since that should be the only thing in there that we need to ignore an exception from.
 2009-08-16 05:30:11 -05:00
Eric Blade
aa0610dcfa fpdb: remove error trap on "Recreate Tables" menu option - trapping should be much more localized. 2009-08-16 04:46:41 -05:00
grindi
e7dc9ed586 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-08-16 13:40:28 +04:00
Eric Blade
a90415bc84 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-08-16 04:23:49 -05:00
Eric Blade
b26f4a09ce Absolute: support Pot Limit and Fixed Limit ("Normal" as they call it) 
Configuration: Only trap the thrown error when checking for existence of site default paths, if not found set path to a reasonable ERROR message instead of "default"
 2009-08-16 04:22:22 -05:00
grindi
6133d0f9bb Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-08-16 02:07:54 +04:00
Matt Turnbull
29a0ad85c7 full path to logging.config, small fix in Configuration.Database string repr 2009-08-15 22:36:14 +01:00
grindi
40b8ce799b Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-08-15 21:53:34 +04:00
Ray
46085cba5d Repair missing line in regex, comment out skipping tournaments. 2009-08-15 13:30:31 -04:00
Worros
6648036399 Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-08-15 23:38:54 +08:00
Mika Bostrom
b79f0ddccf Actually call position update on reposition 
Forgot to commit the call that does hud and aux window repositioning
 2009-08-15 14:36:08 +03:00
Worros
dede86521a Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-08-15 19:06:39 +08:00
Worros
ecad66f7d8 Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-08-15 19:06:18 +08:00
Mika Bostrom
53eaee4d7c Fix mucked cards' position update 
When menu->reposition is called, only the HUD windows were moved to
their new positions. The auxiliary windows used for mucked cards
remained where they were at the time the HUD instance was created. This
caused mucked cards to appear in wrong places after the poker table was
moved.

Split positioning code in Mucked.py to its own method. Now the same
routine that moves HUD windows to their new places also invokes code
to reposition auxiliary windows.

Now the mucked cards are displayed at correct screen coordinates too.
 2009-08-15 10:44:04 +03:00
grindi
2cfbb07cd1 Merge branch 'experimental' 
Conflicts:
	pyfpdb/Hand.py
 2009-08-12 22:04:41 +04:00
grindi
bdfc6ef83f Unified locale handling. 
Added support for importing filenames containig non-latin symbols
 2009-08-12 21:55:19 +04:00
grindi
25923b02d1 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-08-12 19:58:29 +04:00
Worros
116141b833 Merge branch 'master' of git://git.assembla.com/fpdb-eric 
Conflicts:
	pyfpdb/HandHistoryConverter.py
 2009-08-12 22:53:49 +08:00
Worros
0baabb0368 Merge branch 'master' of git://github.com/grindi/fpdb-grindi 
Conflicts:
	pyfpdb/HandHistoryConverter.py
 2009-08-12 22:51:49 +08:00
Worros
cfd7b40ab6 Merge branch 'master' of git://repo.or.cz/fpbd-bostik 
Conflicts:
	pyfpdb/HandHistoryConverter.py
 2009-08-12 22:49:18 +08:00
Worros
5a4bcf3997 Add streetXPot and showdownPot to hhc insert 
totalPot not actually calcuated yet, and valued need to be converted from Decimal() to cents
 2009-08-12 22:21:54 +08:00
Worros
483334b899 Fix Absolute plugin from recent change 2009-08-12 18:34:17 +08:00
grindi
442d96b862 Removed hack in FTP parser 2009-08-12 14:30:54 +04:00
Eric Blade
7dc635670d Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 
Conflicts:
	pyfpdb/HandHistoryConverter.py
	pyfpdb/SQL.py
 2009-08-12 04:26:42 -05:00
Eric Blade
f31f2e442e Merge branch 'master' of git://git.assembla.com/fpdboz.git 
Conflicts:
	pyfpdb/HandHistoryConverter.py
 2009-08-12 04:24:04 -05:00
Eric Blade
bfec6916f6 trying to get my new install of git to freaking work 2009-08-12 04:09:04 -05:00
grindi
dd17155aa9 Fixed bug 7 ( http://trac-git.assembla.com/free_poker_tools/ticket/7 ) 2009-08-12 12:47:18 +04:00
grindi
0aed2c2461 Party hhc: fixes 2009-08-12 11:18:42 +04:00
Mika Bostrom
185f9660c5 Use same locale conversion everywhere 
It is not enough to use actual system locale in just one spot if all
the other encodings are hard-coded to latin1. Now that we have the real
locale available, do all string conversions [.encode($locale)] with
that.
 2009-08-12 10:00:23 +03:00
Mika Bostrom
89dccac169 Merge branch 'master' of git://git.assembla.com/free_poker_tools 
Conflicts:
	pyfpdb/GuiTableViewer.py
 2009-08-12 08:30:31 +03:00
Mika Bostrom
35cd58545a More generic locale use, I hope 
Instead of assuming conversion is from latin1, use locale information
 2009-08-12 08:26:06 +03:00
Matt Turnbull
222d713169 too much changes to go into master 2009-08-12 01:46:39 +01:00
grindi
56a6d77e9c Hand: added ante support 2009-08-12 03:48:48 +04:00
grindi
433d0948ec Merge branch 'master' of git://git.assembla.com/fpdboz 2009-08-12 02:43:10 +04:00
grindi
70e8a49b10 Merge branch 'master' of git://git.assembla.com/free_poker_tools 
Conflicts:
	pyfpdb/HandHistoryConverter.py
 2009-08-12 02:39:33 +04:00
grindi
1107d9c6be Party hhc: removed trailing spaces, fixes 2009-08-12 02:35:34 +04:00
Ray
d69ab83ee5 Fix encoding problem in the written Stars HHs. 2009-08-11 17:43:28 -04:00
grindi
9d193f236e Hand: removed trailing spaces 2009-08-12 01:13:07 +04:00
Worros
6b4d065f9e Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-08-12 00:05:21 +08:00
grindi
2e60586e65 Party hhc: fixes and one fat hack 2009-08-11 19:46:21 +04:00
Worros
836cba6594 Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-08-11 20:56:43 +08:00
Worros
24e5c2252d Fix inserting into Gametypes 2009-08-11 20:52:07 +08:00
grindi
a67368cc5a Added hh path normalization 
Slashes '/' in hh path can lead to import errors on non-posix systems
Path normalization eliminates this problem
 2009-08-10 20:10:39 +04:00
grindi
dc3c721884 Party hhc: fixes and refactoring 2009-08-10 18:17:13 +04:00
grindi
3d227a42cd Party hhc: fixed after Matt's refactoring ^_^ 2009-08-10 01:45:55 +04:00
grindi
dfac9dfeb1 Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-08-10 00:39:52 +04:00
grindi
4c449059ed HUD: added max seats submenu 2009-08-10 00:26:24 +04:00
Matt Turnbull
bd12fc6410 fixes.. 2009-08-09 20:22:23 +01:00
Matt Turnbull
9f2834488c merged with carl, fixed conflict in hhc 2009-08-09 20:10:14 +01:00
Matt Turnbull
2510cc66c9 default fairly taciturn logging.conf 2009-08-09 20:03:43 +01:00
grindi
f00a6ebfd2 Party hhc: removed "max seats" recognition 2009-08-09 22:03:15 +04:00
grindi
8ef03b0697 Party hhc: added nl, pl and omaha hi support 2009-08-09 19:54:35 +04:00
Matt Turnbull
a32d4e053a FulltiltToFpdb handles canceled hands 
Better exception handling during parsing
FpdbParseEcxeption takes an optional HID
Stripped pointless __init__s from *ToFpdb subclasses
Logging now has logging.conf config - default is to log only INFO to
file but easily changed to DEBUG for devel work
 2009-08-09 15:19:43 +01:00
Ray
7882e735aa Removed support for the ptrackS database type. File is big enough. 
ptrackS is the PokerTracker Stud database. An early version of the
HUD supported that db.
 2009-08-09 09:29:44 -04:00
grindi
730c82bc95 Party hhc: added max seats recognition 2009-08-09 16:38:55 +04:00
grindi
ebbb2afcd3 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-08-09 16:31:33 +04:00
grindi
c042bea181 Improved table-by-name recognition for non-latin window titles 
What i mean:
  u'1464739' in 'Speed #1464739 -  \xc1\xcb \xd5\xee\xeb\xe4\xe5\xec' -> Exception
  u'1464739' in 'Speed #1464739 -  \xc1\xcb \xd5\xee\xeb\xe4\xe5\xec'.decode('cp1251') -> True
 2009-08-09 16:24:31 +04:00
Mika Bostrom
b1281385ec Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-08-09 14:27:05 +03:00
eblade
f431a63070 badHangs -> badHands 2009-08-08 15:58:30 -04:00
Worros
d6529ab42f Import Hand.insert() work 
storeHand updated, almost works, just violating some NOT NULL contraints
 2009-08-09 01:59:44 +08:00
Ray
0a1e6e57b5 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-08-08 09:29:41 -04:00
Worros
a24fe93612 Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-08-08 21:25:57 +08:00
Ray
b3e6b1e510 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-08-08 09:21:17 -04:00
grindi
5c468d0a38 Added party hh path into HUD_config.xml.example 2009-08-08 15:47:58 +04:00
Worros
a70bd9742d Add Gametype insert 
Almost done, need to convert 0.25 to 25 for the database - Lookup?
 2009-08-08 16:43:52 +08:00
Worros
5550166f37 Start of storeHand from HHC code 
Currently cant actually insert as we need the fk gametypeid
 2009-08-08 16:15:36 +08:00
grindi
e748f4e2a1 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-08-08 12:09:45 +04:00
grindi
88d67dc429 Fixed folder couldn't be displayed error in BulkImport 2009-08-08 12:07:30 +04:00
Worros
679393e78d Minor change to insertPlayer() 2009-08-08 14:59:23 +08:00
Worros
cbc010155d Add commented out sqlite db option to example config 2009-08-08 13:58:56 +08:00
Worros
4ef4d22c94 Add back in sqlcoders changes for sqlite - fix Grapher 2009-08-08 13:56:53 +08:00
Worros
1dcecf4ae3 Merge branch 'master' of git://git.assembla.com/fpdb-eric 
Conflicts:
	pyfpdb/fpdb_simple.py
 2009-08-08 13:10:25 +08:00
Worros
470d34c65c Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-08-08 13:06:41 +08:00
Worros
150d8f7160 Revert "Make sure the db connection is encoded using utf8" 
This reverts commit 2c9982cfff.
 2009-08-08 13:02:29 +08:00
Worros
08a70b75f2 Fix insertPlayer so that it works again 2009-08-08 12:33:25 +08:00
eblade
4445881bfe somehow a call to get_cursor() got turned into just a db pass .. and removed the debug code in recogniseplayerids 2009-08-07 17:18:51 -04:00
sqlcoder
d905b6e780 revert a line of code to avoid unicode name mangling problems until there's time to fix it properly ... 2009-08-07 21:18:44 +01:00
eblade
43b41e88f4 Merge branch 'master' of git://git.assembla.com/fpdb-sql.git 
Conflicts:
	pyfpdb/fpdb_simple.py
 2009-08-07 04:55:08 -04:00
Ray
26016bffb7 Correctly parse fpp tournaments. 2009-08-06 19:27:52 -04:00
sqlcoder
d292cd18d4 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-08-07 00:12:22 +01:00
sqlcoder
59cfcea95d Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-08-07 00:07:32 +01:00
sqlcoder
16319ea039 stop error when switching back from threads to 0 threads 2009-08-07 00:06:11 +01:00
sqlcoder
126dfd7331 get hudcache update to work for sqlite - hud now working! 2009-08-07 00:04:44 +01:00
sqlcoder
c0ddaad2e5 remove test for msql drivers 2009-08-06 21:12:50 +01:00
sqlcoder
0850721ecc fix problem when using more recent gtk libraries (each refresh was adding an extra chart to the existing one) 2009-08-06 20:36:11 +01:00
sqlcoder
6de41be9c9 mainly sqlite fixes, also removed not null on many hudcache columns 2009-08-06 20:31:46 +01:00
grindi
25be578e7d Fixed imported hands accounting 2009-08-06 21:26:55 +04:00
eblade
c6747785e2 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-08-06 12:27:38 -04:00
grindi
30ae9da2df Fixed hung up on incorrect hand history 2009-08-06 19:15:55 +04:00
grindi
054abfc178 Merge branch 'party' 
Conflicts:
	pyfpdb/Database.py
	pyfpdb/Hand.py
	pyfpdb/PartyPokerToFpdb.py
 2009-08-06 18:44:03 +04:00
grindi
21d10673d5 Party hhc: cleaned 2009-08-06 18:11:17 +04:00
Worros
56ea7c6eab Add incomplete version of PartyPoker plugin 2009-08-06 21:14:52 +08:00
Worros
d043368c88 Prep for PartyPoker plugin add 2009-08-06 20:54:39 +08:00
grindi
a1cdd76778 Party hhc: fixed cash 2009-08-06 16:39:14 +04:00
grindi
ce43ab4d52 Party hhc: now it has to work with tournaments 2009-08-06 16:09:33 +04:00
eblade
f65e4e005a aptofpdb: remove debugging print 
guiautoimport: import traceback
fpdb_simple/GuiPlayerStats: deal with multiple sites with players with matching names
HUD_main: error file is again HUD-error not fpdb-error-log.
 2009-08-06 07:23:57 -04:00
eblade
a7f857a90c Revert "Make sure the db connection is encoded using utf8" 
This reverts commit 2c9982cfff.
 2009-08-06 02:11:26 -04:00
eblade
afc4c026f9 Tables: change how the case insensitivity is done, so we don't crap out on Everleaf 2009-08-06 02:10:49 -04:00
eblade
42109ec4e4 Tables: windows table title searching now case insensitive 2009-08-06 00:12:49 -04:00
eblade
2e698bb1d4 Merge branch 'master' of git://git.assembla.com/fpdboz.git 
Conflicts:
	pyfpdb/AbsoluteToFpdb.py
 2009-08-06 00:00:29 -04:00
eblade
2685608294 bump atofpdb siteid 
configuration should not error if 'site' is empty (ie when running from command line)
guiplayerstats won't auto-load default report
hud should work from command line
 2009-08-05 23:57:26 -04:00
Worros
b75583c784 Add Absolute to HUD config example 2009-08-06 11:41:51 +08:00
Worros
a37adde67e Catch up to Eric - fix markStreets regex 2009-08-06 11:30:21 +08:00
Ray
71aaf62c40 Fix my last fix of previous commit. 2009-08-05 23:25:43 -04:00
Ray
ee01deb852 Fix problem with previous commit. 2009-08-05 23:20:28 -04:00
Worros
c35132463c Add absolute hhc to example file 2009-08-06 10:59:44 +08:00
Worros
5f5825e30b Add additional siteids to default data insert 2009-08-06 10:18:48 +08:00
eblade
f85e7cb230 AbsoluteToFpdb: convert cards 10s to Ts, etc 
fpdb_import: clear updatedsize, updatedtime, pos_in_file lists, so we can attempt multiple imports on same file, rather than just getting error when trying.
 2009-08-05 21:35:01 -04:00
Worros
2a3a5f0601 Merge branch 'master' of git://git.assembla.com/free_poker_tools 
Conflicts:
	pyfpdb/Database.py
 2009-08-06 09:20:10 +08:00
eblade
34c469ab3a Add AbsoluteToFpdb.py 
Database: Add Absolute to sites
GuiPlayerStats: set avgseats to False
Hand: Add Absolute to SITEIDS list
fpdb_import: check for presence of settings['dropHudCache'] before testing it, to keep command line import from erroring
 2009-08-05 21:07:16 -04:00
Ray
76938de104 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-08-05 19:28:30 -04:00
Ray
095d1ee3dc Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-08-05 19:28:16 -04:00
Ray
74d64eca9b Uncomment the new lines to calculate some stats. 2009-08-05 19:11:46 -04:00
Ray
3d1f02a627 Prototyping some stats calculations. 2009-08-05 19:08:53 -04:00
sqlcoder
736e94609f display importing message, and make it blue 2009-08-05 22:57:13 +01:00
grindi
aa62dc47c9 Impoved cards parsing 2009-08-06 00:09:52 +04:00
grindi
ebe652d49e Added PartyPoker into Database.py 2009-08-05 20:58:25 +04:00
grindi
cefd1e38e4 First "compiling" version 2009-08-05 20:15:11 +04:00
eblade
91e6783869 GuiBulkImport: bump max thread counter to 32 .. 2009-08-04 21:36:30 -04:00
eblade
9656db0b80 Merge branch 'master' of git://git.assembla.com/fpdb-sql.git 2009-08-04 20:22:25 -04:00
eblade
eae278f40c Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-08-04 19:57:06 -04:00
sqlcoder
cc9992509c some more refinements on drop option handling, still can't get 'importing' message to display 2009-08-04 23:18:37 +01:00
sqlcoder
b7a718d786 some more sqlite work 2009-08-04 23:17:31 +01:00
sqlcoder
fe62e78c5b mods for sqlite 2009-08-04 22:06:03 +01:00
sqlcoder
fb695098ea remove unused getLastInsertId function 2009-08-04 21:50:53 +01:00
sqlcoder
dde35fa65b implement getlastrowid for sqlite 2009-08-04 21:48:03 +01:00
sqlcoder
61d2a83779 add hudcache option to Bulk Import tab 2009-08-04 21:41:04 +01:00
eblade
cf3c7276a7 add bat/py for making an exe. exe errors with "can't find module cairo". no idea how to fix. 2009-08-04 16:20:14 -04:00
sqlcoder
4e72f476f3 one line change to enable the number of threads choice 2009-08-04 20:00:59 +01:00
Worros
2c9982cfff Make sure the db connection is encoded using utf8 
This has an issue with my current code, but may cause other issues.

Keeping to a 1 line change incase we need to revert at some point in future.
 2009-08-04 18:30:39 +08:00
Worros
5e66e48b75 Some comments and cleanup to the recent Player insert code 2009-08-04 18:22:29 +08:00
Worros
7050df10c2 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-08-04 08:34:21 +08:00
eblade
541c61c152 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-08-03 18:18:48 -04:00
Ray
8165453728 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-08-03 14:29:09 -04:00
sqlcoder
5a94f16d16 fix typo in column name 2009-08-03 19:15:36 +01:00
Ray
a6d1a41752 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-08-03 13:13:18 -04:00
Ray
bbf02c7ee3 Added correct cp1252 symbols for Euros and GBP. 2009-08-02 23:50:44 -04:00
Worros
47595ecfef Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-08-03 09:35:37 +08:00
Worros
6781d97539 Remove debug message 2009-08-03 09:35:22 +08:00
sqlcoder
745baf139f Sorry guys. Added some error checking and discovered a bug in the mysql index creation - I've fixed it and imports don't degrade anything like they used to now. I've just imported 15K hands at 20+/second when it used to be down at 5/sec after 10K hands or so. 2009-08-03 01:30:51 +01:00
sqlcoder
1a63c62cf1 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-08-02 22:50:31 +01:00
sqlcoder
8e0519708e fix bugs and move hud stat config to HUD_main.py so that GUI can set it 2009-08-02 13:00:55 +01:00
eblade
1bd8419510 merge from carl 2009-08-02 07:14:31 -04:00
Worros
ff2cca361c New insert player function for HHC import 
Added getSqlPlayerIDs to Database.py - returns a hash {playername:sqlid}

Function uses a caching hash in Database.py to reduce the number of round trips to the database needed just to fetch the player ids for later inserts.

Need to do a performance comparison on a larger import.
 2009-08-02 12:19:33 +08:00
Worros
40a0fe428b Variable name change - hhc is better imho 2009-08-02 11:03:35 +08:00
Worros
129d09796e Fix HUD_config.xml.example to have correct stat names 2009-08-02 10:19:45 +08:00
sqlcoder
d04f0efe94 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-08-01 23:29:49 +01:00
sqlcoder
cffe57dfa3 pass sql list through to importer from fpdb.py 2009-08-01 23:29:00 +01:00
sqlcoder
e2dde5c3e3 fix aggregate query and stop hud queries being executed whenever anything created a db connection 2009-08-01 23:15:04 +01:00
Ray
83fbbc6332 Finished prep for Stars HH format change. 
All currency symbols are maintained in dicts that are class
variables. The currency symbols are compiled in to the regexs.
I.e., "\$?" no longer appears in any of the regexs. Will have
to be updated with actual Euro symbol and tested against live
HHs when Stars makes the change.
 2009-08-01 11:51:37 -04:00
sqlcoder
1d2df984de New helper prog to create batch files in windows. Creates a separate .bat file for each GTK dir on PATH so that user can try each one out 2009-08-01 12:47:07 +01:00
sqlcoder
4dd9a8877d restart python if running an old version and 2.5 or 2.6 is available on PATH (Windows) 2009-08-01 12:45:10 +01:00
sqlcoder
fed180d945 set allow threads option to false 2009-08-01 00:37:13 +01:00
sqlcoder
921812f5e4 add config var at top of file to allow threaded option 2009-08-01 00:08:41 +01:00
sqlcoder
fbab3c7e24 make sure handsid is always returned and show size of queue when threaded 2009-08-01 00:07:31 +01:00
sqlcoder
e9873d38a5 fix sleep() call 2009-08-01 00:06:07 +01:00
sqlcoder
0756345f3e allow nulls in handsplayer fields so that stud can import (but most fields are missing) 2009-07-31 22:49:46 +01:00
sqlcoder
3b9fa3b177 add useful (hopefully) exception handler 2009-07-31 22:34:26 +01:00
sqlcoder
f3a4a8b0d0 fix previous merge 2009-07-31 22:30:41 +01:00
sqlcoder
8d77b961d7 merge from eric @6df03cb... 2009-07-31 22:07:27 +01:00
sqlcoder
36f09ebc82 merge from ray @f5ba0b5b7... 2009-07-31 21:58:39 +01:00
sqlcoder
70b1f5320b Merge branch 'master' of git://git.assembla.com/fpdboz 2009-07-31 21:30:20 +01:00
sqlcoder
b503626c2b add db writer threading 2009-07-31 21:24:21 +01:00
sqlcoder
36de79140c round hands/sec and show some traceback info in exception handler (v useful) 2009-07-31 20:12:29 +01:00
Mika Bostrom
f60416502d Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-07-31 08:26:50 +03:00
eblade
6df03cb234 HUD_main: if new hand id int is not available, we can't print it, so that generates a second error, double fault 
fpdb_import: ok, we're keeping two lists now, one with updated st_size and one with m_time.  grrr.
 2009-07-31 01:15:28 -04:00
eblade
6e8232f623 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-07-31 00:40:46 -04:00
eblade
047b5d94d9 move constant dicts/lists from functions to global vars, so they aren't loaded every time the function is run 2009-07-31 00:40:31 -04:00
eblade
21b859f244 remove error handler on hudcache rebuild menu, if it errors we should know about it 2009-07-31 00:15:25 -04:00
eblade
85c635d1da remove error handler on Load Profile menu opt (menu opt doesn't work anyway, so it doesn't error) 2009-07-31 00:13:51 -04:00
Ray
fd2ad9b192 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-07-31 00:06:07 -04:00