Commit Graph

247 Commits

Author SHA1 Message Date
Eratosthenes
5021cae297 Clean up logging changes. 2009-11-09 19:30:23 -05:00
Eratosthenes
c8b7608bc1 Delete intermediate prints. Small fix to make py2exe happy. 2009-11-08 23:16:56 -05:00
Eratosthenes
0bbbc7222b First go at rationalizing config paths and logging defaults. 2009-11-08 22:53:10 -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
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
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
Worros
cc89433ba8 Merge branch 'master' of git://git.assembla.com/fpdb-eric
Conflicts:
	pyfpdb/Configuration.py
2009-11-04 14:44:25 +08: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
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
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
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
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
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
grindi
066cf12eb6 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-31 17:44:28 +03:00
grindi
c7410d6fc8 Fix config's default values for hud colors
00000 -> #000000
FFFFF -> #FFFFFF
2009-10-28 19:03:04 +03:00
Mika Bostrom
ca8182c37d Merge branch 'master' into good 2009-10-27 06:08:19 +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
Mika Bostrom
7b6581de7d Merge branch 'master' into good 2009-10-26 17:09:06 +02: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
fpdb-mme
0b0312d1ee Signed-off-by: fpdb-mme <jUrner@arcor.de>
initial commit
2009-10-25 00:13:35 +02: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
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
Mika Bostrom
54d309f797 Minor fixes to hud setup code 2009-10-14 19:33:19 +03: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
Mika Bostrom
f6e1926679 Merge branch 'master' of git://trac-git.assembla.com/fpdb-sql 2009-10-07 19:59:45 +03:00
sqlcoder
7900ebcebe Tell user what is happening on startup 2009-10-04 17:46:04 +01: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
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
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
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
ba1513847b clean up exception handling in Configuration and imports in GuiGraphViewer 2009-09-15 23:30:59 -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
Matt Turnbull
b40132e961 db can be specified in cmd line option again 2009-09-04 22:12:35 +01:00
Matt Turnbull
d2380ba738 merge from futz2 branch 2009-08-28 18:24:51 +01: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
Matt Turnbull
29a0ad85c7 full path to logging.config, small fix in Configuration.Database string repr 2009-08-15 22:36:14 +01:00
Matt Turnbull
222d713169 too much changes to go into master 2009-08-12 01:46:39 +01: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
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
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
Matt Turnbull
79ca83c95a Merge from ray, minor conflicts 2009-07-15 00:20:26 +01:00
Matt Turnbull
dc6a1c45f9 sqlite - connecting and (re)creating some tables 2009-07-14 00:04:10 +01:00
Ray
462ff87596 Add xpad and ypad to site and game elements. Cleanup some defaults. 2009-06-20 09:43:05 -04:00
Ray
b1ea38bea9 Add -c config cl option. Fpdb passes cl options to HUD. 2009-06-14 23:14:53 -04:00
Ray
4ef4260342 Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:
	pyfpdb/Database.py
	pyfpdb/SQL.py
	pyfpdb/fpdb_db.py
	pyfpdb/fpdb_save_to_db.py
2009-06-08 10:16:34 -04:00
Ray
441b300cff Add db-type to get_db_parameters(). doh! 2009-06-01 18:26:20 -04:00
Worros
20221b1121 Merge branch 'master' into siteneutral
Conflicts:

	pyfpdb/HUD_config.xml.example
	pyfpdb/fpdb_save_to_db.py
	pyfpdb/fpdb_simple.py
2009-04-10 00:38:27 +08:00
Ray
fb4e818ed2 get_sites now returns only enabled sites--enabled is the default in Config. 2009-03-29 23:40:03 -04:00
Ray
a109687ac4 Fixed some 'True' v True problems. 2009-03-29 10:08:33 -04:00
Ray
1d45137502 Change fastStoreHudCache = False as default Import parameter. 2009-03-27 13:26:01 -04:00
Worros
0b3b7f66d6 Merge branch 'master' into siteneutral
Conflicts:

	pyfpdb/fpdb_import.py
	pyfpdb/fpdb_parse_logic.py
	pyfpdb/fpdb_simple.py
2009-03-28 00:54:13 +09:00
Ray
503262d398 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-03-27 11:34:47 -04:00
Ray
d6fe2cac81 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-03-27 11:34:11 -04:00
Worros
2e687acf9a Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-03-27 23:55:08 +09:00
Worros
7f0185d417 More fixes to allow dbnames other than fpdb 2009-03-27 23:49:22 +09:00
Worros
1be81ced66 Allow dbname to be something other than fpdb
Patch from Rune Nesheim to allow the dbname to be specified on the
command line
2009-03-27 22:53:01 +09:00
eblade
c91244cdad just edit an old comment 2009-03-26 18:38:13 -04:00
eblade
b80a068795 per python docs http://docs.python.org/library/stdtypes.html, use != for not equal, rather than not x == y 2009-03-26 14:57:40 -04:00
Worros
497354d4f4 Make BulkImport work only with HHCs
Added new section to config for converters for ease of creating the gui.

Removed the section in the site line for filter and supported games
2009-03-24 22:58:45 +09:00
Ray
39db65b65d Fix bug in defaults of import params + bug in printing same. 2009-03-21 11:38:17 -04:00
Ray
8009281e5a More fixing of import options. 2009-03-18 12:32:34 -04:00
Ray
e67f715f27 Another silly screw up. 2009-03-18 11:37:36 -04:00
Ray
e485a9c035 Fix silly cut/paste problem. 2009-03-18 11:34:43 -04:00
Ray
466f6c09c2 Make a whole bunch of config defaults work as desired. 2009-03-16 23:34:00 -04:00
Ray
067373b128 Fixed defaults for saveActions and fastStoreHudCache. 2009-03-16 21:07:11 -04:00
Ray
6f927e6b7b saveActions and fastStoreHudCache added to import element. 2009-03-15 15:54:22 -04:00
Ray
9fca5a75b2 Allow saving of aux_window layouts. 2009-03-15 15:27:47 -04:00
Ray
e0a406e66d Make Configiuration.py executable. 2009-03-14 12:54:52 -04:00
Ray
6bf7be6ae5 Merge branch 'master' of git://git.assembla.com/fpdb-eric
Conflicts:

	pyfpdb/Configuration.py
	pyfpdb/Database.py
2009-03-11 22:46:28 -04:00
Ray
1fb6e5bfeb Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:

	pyfpdb/Database.py
	pyfpdb/Mucked.py
2009-03-11 22:36:10 -04:00
Ray
8887ea7099 A start on saving aux_win layouts. More to come. 2009-03-11 14:12:56 -04:00
eblade
5f1e5d0996 revert to ray's Configuration.py 2009-03-09 06:40:38 -04:00
eblade
60e66dcf31 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git
Conflicts:
	pyfpdb/Configuration.py
2009-03-09 06:31:13 -04:00
Worros
d6b5f5d019 Merge branch 'master' of git://git.assembla.com/fpdb-eric
Conflicts:

	pyfpdb/Configuration.py
2009-03-09 19:22:54 +09:00
eblade
9dab2899f7 code optimization wrt string addition, map(), xrange() 2009-03-09 04:23:57 -04:00
eblade
66e05d08b1 make use of python's bizarre conditional assignment 2009-03-09 03:47:25 -04:00
Worros
b679fddfd2 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-03-08 14:18:20 +09:00
Ray
5f60cfde7c Add get_aux_locations. 2009-03-07 17:02:51 -05:00
Ray
753754c924 Allow Aux_windows to have layouts and some cleanup. 2009-03-06 21:46:34 -05:00
Matt Turnbull
75dcf002f9 Configuration: _getframe(0) so that GuiAutoImport can run standalone
(stack not deep enough to go one deeper)
fpdb_import: Everleaf plumbing back in place.
GuiAutoImport.py: run standalone.
2009-03-05 01:12:15 +00:00
Ray
a6d70e6e13 More tuning of the aux_window interface. 2009-03-04 20:04:23 -05:00
eblade
7ebf27c07e add site config option "use_frames", set to "True" to get frames 2009-02-25 15:25:58 -05:00
Worros
50ca5d5457 Fix tab/spacing 2009-02-19 21:15:12 +09:00
Ray
bb9f85233e font and font_size added to config and used in HUD. 2008-12-17 21:57:05 -05:00
Ray
094f176c5d Moved execution_path() to Configuration.py. 2008-12-13 17:37:23 -05:00
steffen123
c8d12cfe61 p144 - updated table design after comments on draw tables 2008-12-10 03:55:12 +00:00
sqlcoder
4dc15bfd94 pulled and merged from fpdboz 2008-12-07 23:38:33 +00:00
Ray
3be6453b42 Minor bug in import parameters. 2008-12-03 12:01:37 -05:00
sqlcoder
a824814c0a sqlcoder initial updates 2008-12-02 00:15:50 +00:00
eblade
f8749fe7fb Add "hudcolor" attribute to all <stat> definitions, drop font size to Sans 7, since i can't fit my stats in comfortably anymore 2008-11-25 06:47:58 -05:00
Ray
17ad796917 More changes to support mucked/aux windows. 2008-11-16 17:53:31 -05:00
Ray
29a04f639d Merge branch 'master' of git://git.assembla.com/fpdboz 2008-11-11 14:28:50 -05:00
Ray
9923e6e8ca Merge branch 'master' of git://git.assembla.com/fpdb-eric
Conflicts:

	pyfpdb/Configuration.py
2008-11-11 09:55:41 -05:00
Ray
15d7ea70dc Support tournament detection = major refactor of Tables.py 2008-11-11 09:40:31 -05:00
Worros
d4038c3f19 Lots of changes. Fixes the hud for auto-import - at least for me.
Does configer Importer to use the Config class.
2008-11-09 21:57:58 +10:00
Worros
4f64464df3 Fix accessor method to import params in Coonfig. Make cli print using accessor 2008-11-08 23:45:14 +10:00
Worros
c215360a92 Read new parameter in config 2008-11-08 23:01:07 +10:00
Worros
68344b5ec0 Modified Auto import GUI to allow n-sites based on config file. Added filter option to display. Added option to enable or disable sites in Config 2008-11-06 18:39:49 +13:00
Ray
a41aec44dd added set/get _sit_parameters to Config + removed keep_above in Hud 2008-11-05 16:52:47 -05:00
Ray
22831cc8c6 added get_converter to support Carl's importer change 2008-11-05 15:04:04 -05:00
Ray
2bc04ea17b Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:

	pyfpdb/fpdb_import.py
2008-11-05 05:59:08 -05:00
Ray
b0be7c5b71 cleanup and new get/set for db parameters 2008-11-05 05:49:05 -05:00
Worros
79ddee8971 Add converter attribute to support additional sites 2008-11-04 22:40:03 +13:00
Ray
0f10f87373 changes to make consolidated config files happier 2008-11-02 22:58:55 -05:00
eblade
b5ec60f5fa forgot to commit configuration.py last time 2008-11-02 05:20:25 -05:00
eblade
6eca3fdce7 merge in latest ray changes, replace excessive exception handling with a couple of if blocks in get_default_colors - there were definite errors in there not getting cauhgt due to the exception handling 2008-10-30 05:30:29 -04:00
Ray
f26baac94c added some configuration accessors for Hud.py and some cleanup 2008-10-29 22:37:05 -04:00
eblade
64dbe3237d add "hudopacity" to site config, valid settings are potentially from 0.00 to 1.00 2008-10-27 07:12:04 -04:00
eblade
5f15a4f928 Configuration.py: add "bgcolor" and "fgcolor" to <site> node
HUD: table hud and stat windows respect "bgcolor" and "fgcolor" on a per site basis
Tables: force tw.number to be an int in Unix
2008-10-27 06:29:39 -04:00
Ray
a719efc6dc consolidate config files--default.conf no longer needed 2008-10-21 10:22:01 -04:00
Ray
90a0e4103f Merge git://trac-git.assembla.com/fpdb
Conflicts:

	pyfpdb/Database.py  --fixed conflict = we both fixed same problem differnt ways
2008-10-06 23:06:40 -04:00
Ray
643f76ebb7 created accessor for database parameters 2008-10-04 19:22:53 -05:00
Ray
3b618723d2 fix bug in saving layouts 2008-10-04 15:43:50 -05:00
steffen123
f1947bb6cb p111 - Database.py now works without unnecessary db libs. Configuration.py made executable. stderr now unbuffered. 2008-10-04 19:03:02 +01:00
Ray
4500f48aa7 Handle xml parsing exceptions 2008-09-29 09:12:04 -05:00
Eratosthenes
2ccf3c6370 support HUD_config in default location, in cwd, or passed by caller 2008-09-26 18:21:38 -05:00
steffen123
b549aa2605 p107 - HUD updates from ray, FTP now supported 2008-09-26 14:18:47 +01:00
steffen123
7b13331331 p80 - a great many updates from Ray 2008-09-15 21:31:55 +01:00
steffen123
66d938accc p62 - major patch from ray with new stats in HUD
added db todo file with the things that are left for the db
2008-08-20 20:29:08 +01:00
steffen123
c716dfd35e p58 - added HUD from ray
fpdb_parse now returns hand id rather than site hand no
2008-08-18 23:53:25 +01:00