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