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
Ray
5660b77355
Delete uneeded intermediate prints.
2009-07-30 23:44:59 -04:00
Ray
29366d3bb6
Ugly fix to prevent importing from failing due to undef positions array.
2009-07-30 23:42:57 -04:00
eblade
f5ba0b5b7f
Database: insert missing HandToWrite.payin_amounts var
...
EverleafToFpdb: remove DEBUG XXXXXXX line
FulltiltToFpdb: pass on converting tournament hands
Hand: add Hand.fee var that Database is looking for
fpdb_import: clean up file update scan code, queue files that have changed in the last 60 seconds for the next importer pass, instead of locking it up reading them now (not that this does anything since FT no longer updates the mtime until it closes the table, but maybe it works with Stars or others)
2009-07-30 21:50:08 -04:00
eblade
c400fd9ba7
FTtoFpdb: default buyin to $0.00+$0.00 and level to 0, they don't seem to be in the FT hh
2009-07-30 20:56:39 -04:00
eblade
3ce0f91b27
useless change of a comment just to test my rss output
2009-07-30 19:53:44 -04:00
Ray
4cc3cc2272
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-07-30 18:11:14 -04:00
Ray
eafc77ff92
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-07-30 18:11:08 -04:00
Ray
1820e71054
Started on supporting expected HH change--rewrote GameType regex.
...
This version should work with the expected HH format for $ tables
only. I abstracted the ISO currency codes and currency symbols
out of the regex so they only need to be maintained in 1 place.
I didn't apply the change to everywhere "\$" appears, in case
comments are negative.
2009-07-30 18:06:13 -04:00
eblade
2c7e00f02a
fpdb_import: use stat_info.st_size instead of stat_info.st_mtime to determine hh file updates
2009-07-30 17:29:57 -04:00
eblade
98e376a956
Merge branch 'master' of git://git.assembla.com/free_poker_tools.git
2009-07-30 15:28:41 -04:00
Mika Bostrom
74d571a938
Merge branch 'master' of git://git.assembla.com/free_poker_tools
...
Conflicts:
pyfpdb/Database.py
pyfpdb/fpdb_db.py
Reverted to upstream versions
2009-07-30 10:47:38 +03:00
Worros
68ac5ff554
Q&D hack to fix FTP file reads after update
...
Contributed by grindi on 2+2 http://forumserver.twoplustwo.com/showpost.php?p=12156328&postcount=166
Removes u'\xff\xfe' from the end of file if they exist.
2009-07-30 12:13:45 +08:00
Worros
73e6666cbc
Add auto folder creation to HHC
...
Contributed by grindi on 2+2 http://forumserver.twoplustwo.com/showpost.php?p=12156328&postcount=1666
Creates the sub folders of hhArchiveBase for placing the converted files in.
2009-07-30 11:40:16 +08:00
Ray
e36b300271
Merge branch 'master' of git://git.assembla.com/fpdb-sql
2009-07-29 10:35:01 -04:00
Ray
835c4ad0cf
Added encodeCard() to Card.py.
2009-07-29 10:33:42 -04:00
sqlcoder
c2f79ddc24
refine mysql index drop/creation, but redundant as have left Erics new commands in - mysql crawls with 10k hands! get postgres :-)
2009-07-29 07:57:18 +01:00
sqlcoder
38ee98e492
pass sql list from fpdb through guibulkimport to fpdb_import
2009-07-29 06:37:06 +01:00
sqlcoder
9c62ecb80e
debug move to Database.py and move last part of mainparser into Database.py
2009-07-29 06:17:51 +01:00
sqlcoder
298de5dc15
move most stuff from fpdb_db.py to Database.py and simplify db connections in fpdb_import
2009-07-28 23:58:10 +01:00
sqlcoder
3cc5ed8024
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-07-28 21:25:07 +01:00
sqlcoder
12e1da0a5e
add lock_for_insert routine but comment out for now (hangs)
2009-07-28 21:19:31 +01:00
eblade
47f27cf31f
fpdb.py: Add "Recreate HUD Cache" to Database menu
...
fpdb_db.py: Junk the dropping of indexes/FKs for MySQL INNODB in favor of just telling MySQL to ignore them. Not sure if that works for other MySQL engines or other Database softwares.
2009-07-27 17:28:06 -04:00
sqlcoder
5d5a6ed39d
comment out a debug message and 1 char change to output message
2009-07-27 22:02:37 +01:00
Ray
2adef78269
Get rid of intermediate prints.
2009-07-27 15:41:42 -04:00
eblade
b27b697ec6
GuiBulkImport: fix indentation error
...
Hand: fix Pot __str__ to support infinite side pots
2009-07-27 14:25:24 -04:00
eblade
31f8db1788
Long-handed out the logic in twoStartCards, the shortcuts were killing it somewhere, added short-circuit into it for pairs, fixed order cards are returned in for offsuit cards in twoStartCardString.
...
*Note: I think someone should fix the "Hand Breakdown" chart to not include "Seats" in it's criteria, if "Show Number of Players" is not checked. ?
2009-07-26 18:00:12 -04:00
sqlcoder
f45038673c
more moves into Database.py, better exception handling, store hudcache stats for holdem tourneys (some maybe no use? it's a start anyway - need to add NL/FL switch on Filter)
2009-07-26 01:42:09 +01:00
eblade
308cfb1e56
Merge branch 'master' of git://git.assembla.com/free_poker_tools.git
2009-07-25 13:08:21 -04:00
eblade
656792ff5c
make command line bulk import not drop indexes.
2009-07-25 13:00:54 -04:00
sqlcoder
859d18734c
minor corrections to output messages
2009-07-25 17:39:06 +01:00
Ray
0c36ab0bda
Add simple __main__ to Card.py, so I can remember how it works.
2009-07-25 11:58:43 -04:00
Ray
c3a408766d
Merge branch 'master' of git://git.assembla.com/fpdb-sql
2009-07-25 11:36:00 -04:00
Ray
8e04ca316d
Catch up with recent changes in HHC and Hand.
2009-07-25 11:34:13 -04:00
sqlcoder
495885e49c
_x (where x is a single digit) at the end of a stat name in hud_config.xml now indicates the number of decimal places to display in the HUD. Some stats renamed slightly to remove the _ before last character of name.
2009-07-23 23:15:02 +01:00
Ray
ba42a7c453
Get rid of debuggin output.
2009-07-22 19:27:12 -04:00
Ray
9f0d54a1f7
Merge branch 'master' of git://git.assembla.com/fpdb-sql
2009-07-22 19:22:26 -04:00
Ray
94a030922a
Clean up handling of mixed games on FTP.
2009-07-22 19:21:00 -04:00
sqlcoder
9c9202b539
remove debug statement
2009-07-22 20:22:20 +01:00
sqlcoder
ab004b8284
only update psycopg2 extensions when using it
2009-07-22 20:19:41 +01:00
Ray
0291fcf489
Fix a problem when there is a comma in the BI for FTP stud games.
2009-07-22 14:43:13 -04:00
Ray
b963ac0a3d
Correct detection of hero in FTP stud games.
2009-07-22 14:06:05 -04:00
Ray
e7441021f2
Fix problem with detecting max on FullTilt.
2009-07-22 13:51:48 -04:00
Ray
9d803957cb
Detect mixed games in FTP HH. Fix typos.
2009-07-22 10:24:29 -04:00
Ray
3e0b0e0873
Allow parsing of play money tables and fix some typos.
2009-07-22 08:54:30 -04:00
Ray
37a5f2d83b
Fix problem when someone times out and folds before posting.
2009-07-22 08:53:03 -04:00
sqlcoder
f69281e2fd
finish hudcache rebuild code which speeds up bulk imports nicely - turn off permanently via allow_hudcache_rebuild in fpdb_import.py. Also some more moves into Database.py and cosmetic stuff
2009-07-21 22:26:23 +01:00
sqlcoder
ab413faab9
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2009-07-21 21:34:19 +01:00
Ray
0002043087
Merge branch 'master' of git://git.assembla.com/fpdb-sql
2009-07-21 11:08:15 -04:00
sqlcoder
58957e78e6
fix typo that blew up when 2 side pots present
2009-07-20 22:31:24 +01:00
sqlcoder
0670637abc
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-07-20 22:26:40 +01:00
Ray
af19c3f365
Fix a bug in the Action regex. Thanks Carl.
2009-07-20 14:27:03 -04:00
Ray
10f454ae77
Guess maxseats when not supplied by SiteToFpdb.
2009-07-20 10:01:51 -04:00
Ray
00aeda5667
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-07-19 16:50:22 -04:00
sqlcoder
b9d462c175
make graphviewer use Database.py
2009-07-19 21:19:58 +01:00
sqlcoder
0fecdfb2d7
make positional stats use Database.py
2009-07-19 18:28:13 +01:00
sqlcoder
ceaedebcd9
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2009-07-19 14:31:36 +01:00
sqlcoder
fb4ad79803
use someone else's interprocess locking code instead of python locks/semaphores - needs testing in Linux
2009-07-19 12:28:17 +01:00
Worros
d546557ef7
Make new db insert code "usable"
...
Next step, make the players insert. Function doesn't exist at the moment and crashes when NEWIMPROT set to true
2009-07-19 15:45:18 +08:00
Worros
e113a1e692
Merge branch 'master' of git://git.assembla.com/fpdb-sql
2009-07-19 11:29:18 +08:00
Worros
36f4da0adf
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2009-07-19 11:28:59 +08:00
Ray
cbbf820eb5
Add support for tournaments.
2009-07-18 21:33:00 -04:00
Ray
c5cffc2326
Allow add* to take amounts with commas.
2009-07-18 21:31:39 -04:00
sqlcoder
3352f608cf
take global lock while doing imports
2009-07-18 23:01:18 +01:00
sqlcoder
6a69bf512e
use python locks instead of db locks for global lock
2009-07-18 22:21:29 +01:00
sqlcoder
9d9f850753
use Database.py in GuiPlayerStats
2009-07-18 20:46:50 +01:00
sqlcoder
a1e0e0539a
add queries for player stats
2009-07-18 20:41:20 +01:00
sqlcoder
96376e7421
fine tune player stats
2009-07-18 20:39:01 +01:00
sqlcoder
cdd94d512f
improve handling of hud_style options
2009-07-18 18:29:06 +01:00
Worros
8386dd594e
Add empty function prepInsert
2009-07-18 19:02:55 +08:00
Ray
52ecc64505
Update to work with recent Hand.py changes.
2009-07-17 17:07:53 -04:00
Worros
34932c14ee
Add index parameter to Plugins
...
Change constructor to HHC to accept an index arg, so that file reads can seek
2009-07-17 17:45:22 +08:00
Worros
61b0b8f4fe
Prep work for inserting directly from HHC
2009-07-17 17:16:06 +08:00
Ray
26a1996353
Change Pot object to support variable currency symbol.
2009-07-16 12:13:24 -04:00
Worros
152f16c7a0
Make euros print as $ in writeHand.
...
fpdb_simple avoidance at the moment.
2009-07-16 13:54:41 +08:00
Ray
6cd6b2d1dd
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-07-16 01:00:44 -04:00
Worros
0d5af4c974
Make Win2day client use updated readHeroCards api
2009-07-16 12:58:39 +08:00
Ray
2fa3781349
Make euros print as $ in writeHand.
2009-07-16 00:54:09 -04:00
Ray
88d4f2ee05
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-07-16 00:32:29 -04:00
Worros
d8df3ea11a
Possible fix for 2.6 versions of Matplotlib
...
Long standing issue with multiple plots being added to a single canvas.
Calling canvas.draw() appears to be the "correct" way to do this in pythin 2.6
Need someone to test if this still works in python 2.5
2009-07-16 11:46:52 +08:00
Ray
52fcbd7966
Remove completed TODOs(plenty left!). Remove obsolete comments.
2009-07-15 23:40:07 -04:00
Ray
b5b0b6a7b7
Get rid of hard wired $ in writeHand.
...
Replace with appropriate symbol based on ring, tournament, play,
etc.
2009-07-15 23:04:16 -04:00
Ray
889aea48b6
Make the board in the summary of flop games print in the right order.
2009-07-15 22:30:41 -04:00
Ray
e0dc556a67
Clean up some methods previously commented out.
2009-07-15 22:15:20 -04:00
Ray
3253d5a234
Get stud shown cards right in writeHand().
2009-07-15 22:11:23 -04:00
Ray
12db3c0d55
Add a space to make stud holecard printing perfect.
2009-07-15 21:46:45 -04:00
Ray
427999b69c
Correctly write stud holecards in writeHand().
2009-07-15 21:22:07 -04:00
Ray
32a1c322d4
Merge branch 'master' of git://git.assembla.com/fpdboz
...
Conflicts:
pyfpdb/PokerStarsToFpdb.py
2009-07-15 13:36:00 -04:00
Worros
b92feee021
Revert Matts change for sqlite until fixed.
...
Previous syntax failed to insert the required line into TourneyTypes
2009-07-15 23:58:34 +08:00
Ray
bd2db98612
Housecleaning. Refactoring writeHand() = not finished.
2009-07-15 11:50:27 -04:00
Ray
0e76c3a676
Fix findHeroCards() for empty streets.
2009-07-15 11:48:58 -04:00
Worros
ec9ce544ca
Fix if database hasn't been created yet.
...
Still broken on my setup, but at least fpdb now starts
2009-07-15 23:32:17 +08:00
Worros
83f21e822d
Merge branch 'master' of git://git.assembla.com/mctfpdb
...
Conflicts:
pyfpdb/fpdb_db.py
2009-07-15 23:09:25 +08:00
Worros
cd2ec0c74f
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2009-07-15 22:52:09 +08:00
Mika Bostrom
9a98d7ac07
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2009-07-15 16:56:35 +03:00
Worros
521e17f856
Add some boilerplate stuff for Boss Media/Win2day plugin
2009-07-15 12:22:46 +08:00
Matt Turnbull
35a5cffb77
Working on PS HORSE file now..
2009-07-15 00:26:53 +01:00
Matt Turnbull
79ca83c95a
Merge from ray, minor conflicts
2009-07-15 00:20:26 +01:00
Ray
021b9934ea
Fix writing of mixed tournament hands. Other minor changes.
2009-07-14 19:18:38 -04:00
Matt Turnbull
70f271ef78
location of test PS horse hh
2009-07-15 00:15:04 +01:00
Matt Turnbull
806d61ae23
log line
2009-07-15 00:14:25 +01:00
Matt Turnbull
b252e350d6
fix my breakage..
2009-07-14 23:34:47 +01:00
Ray
599aee6393
Fix parsing of tournaments of mixed games.
2009-07-14 10:55:39 -04:00
Mika Bostrom
96f0c77920
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2009-07-14 14:11:39 +03:00
Matt Turnbull
dc6a1c45f9
sqlite - connecting and (re)creating some tables
2009-07-14 00:04:10 +01:00
Worros
79d0ba35b0
Initial commit of BossMedia importer.
...
Contributed by Thomas Wigele (twigele gmail com - star-fox on sourceforge)
Sample HH - http://www.pastebin.ca/1490652
2009-07-14 06:39:49 +08:00