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

2489 Commits

Author SHA1 Message Date
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
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
Worros
7683334e36 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-07-14 05:00:48 +08:00
Ray
31dd10b5e6 Make writehand() to work for tournament/mixed/play$ games. 
Also refactored the writing of the first 2 lines in writehand().
 2009-07-13 16:22:23 -04:00
Ray
d79ea0e6e5 Fixes for Mixed and Play Money games. 2009-07-13 16:21:20 -04:00
Ray
dd1b442122 Rationalized holecards for stud and draw games. 
Cards are now lists of cards rather than sets. Removed some
game-specific methods and replaced with general methods.
Let the superclass handle some stuff.
 2009-07-13 00:37:51 -04:00
Ray
3234f89aad Rationalized hole card format for flop games. 
Also updated writehand() so flop hands are written OK.
This breaks stud and draw--fixing them now.
 2009-07-12 16:01:02 -04:00
Ray
e294314e25 Fix: hand.maxseats has to be and int. 2009-07-12 13:14:50 -04:00
Ray
d8820ae1f7 Allow parsing of tournaments, draw and play money. 
Sorry about the massive commit. There are still numerous bugs
parsing non-holdem hands and writehand() is broken for all
but holdem cash games.
 2009-07-11 13:44:32 -04:00
Ray
4e952de825 Remove intermediate print. 2009-07-07 14:15:36 -04:00
Ray
56bd7b37ba Parse Stars tournaments for flop and stud games. 
Tournaments are not correctly written in writehand(). Nor are
stud games.
 2009-07-07 13:48:43 -04:00
Worros
c3d463b689 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-07-07 21:28:54 +08:00
Ray
21d2276679 Get rid of intermediate hand obj print. 2009-07-06 12:01:39 -04:00
Ray
4ae8b123ce Fix game type for non-Mixed games. 2009-07-06 12:00:16 -04:00
Mika Bostrom
b7ca7a77a7 Work around error with no database 
Instead of blindly trusting that SELECT ... works, use try-catch to get
around errors when the database doesn't have the tables yet.
 2009-07-06 09:01:49 +03:00
Ray
799aa41c1e Correct handling of open/closed stud hole cards. 2009-07-05 23:44:53 -04:00
Mika Bostrom
dd4aeffa4f Remove obnoxious error window 
Do we really need that annoying error note about table viewer not
working any longer? It's useless with postgres backend anyhow, so might
as well kill it off entirely.
 2009-07-06 00:18:46 +03:00
Mika Bostrom
14dc35ef81 Fix initial run with postgres 
Simplify error check, so that regardless of how the table name is
mangled, we now catch just the meaningful part.

When trying to obtain the lock, make sure that there is no transaction
block open (which tends to happen on error-paths); flush the database
connection before requesting exclusive lock.
 2009-07-06 00:15:37 +03:00
Mika Bostrom
d3373add8b Fix most annoying typo in Postgres case 
The error message from postgres contains the said table as written in
original command. 'Players' != 'players', indeed. Now software can at
least start with postgres and an empty database.
 2009-07-06 00:00:32 +03:00
Mika Bostrom
105e868864 Catch local connection config 
If database backend is Postgres and the connection is over domain
socket, the only values in <database> node are:
    * db_name
    * db_server
    * db_type

Now, for some reason the config reader unconditionally creates "tidy"
string representations for all possible keys. This means that
host, user and password are all empty strings (''), and not even
NoneType entities.

To catch the case for postgres, simply treat empty host the same as
undefined host.
 2009-07-05 23:33:09 +03:00
Ray
8f2350f861 Set dealt flag when reading holdem hero cards. 2009-07-05 11:47:18 -04:00
Ray
c4cc6bd1aa Make WriteHand for holdem report mucked cards. 2009-07-04 15:28:20 -04:00
Ray
a35b1a8b3c Make WriteHand for stud report mucked hand. 2009-07-04 15:19:46 -04:00
Ray
f323447313 Get shown and mucked cards for stud games. 2009-07-04 14:35:20 -04:00
Worros
89b410a766 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-07-04 14:51:55 +08:00
Ray
23a4ca34c8 Fix bug preventing some shown cards from being read. 2009-07-03 20:41:08 -04:00
Ray
0636a290f7 Get mixed game info and put it in gameType structure. 2009-07-03 19:28:32 -04:00
Ray
9d7c370449 Get mucked cards from Stars flop games. __str__ method for Hand. 2009-07-03 18:59:50 -04:00
Ray
3c2c328f5a Fix for PokerStars NewVPP tables. 2009-07-03 13:23:30 -04:00
Ray
7d97365fbf Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-07-02 10:11:23 -04:00
Ray
97520bfee9 Fix call to StoreHands for stud games. 2009-07-01 13:55:12 -04:00
Ray
4394c7beb3 Fix to convert stud hands. 2009-07-01 13:53:30 -04:00
Ray
2cfe7f2ccc Fix bug--get correct player id in Flop_Mucked tool tip. 2009-07-01 08:29:37 -04:00
Worros
7351749b7a Merge branch 'master' of git://git.assembla.com/fpdb-sql 
Conflicts:
	pyfpdb/Hand.py
 2009-07-01 09:21:21 +08:00
sqlcoder
b45fceac21 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-06-30 22:20:21 +01:00
sqlcoder
56ef131bed use 1 or 2 Database methods instead of the underlying fpdb_db methods (more to do) 2009-06-30 22:18:15 +01:00
sqlcoder
cb1a4d2d0a add wrappers for fpdb_db methods (plan is to move the fpdb_db methods into Database) 2009-06-30 22:00:55 +01:00
sqlcoder
04b9dd9126 use Players table for global lock because Database.init() tries to access Hands 2009-06-30 21:58:59 +01:00
Ray
a3f233ca07 Comment out a DEBUG print. 2009-06-30 14:21:06 -04:00
Ray
3e90f42e89 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-06-30 11:51:20 -04:00
Ray
71d673f64f Added Hello_Seats to Hello.py. Demo of Aux_Seats class. 2009-06-30 11:45:14 -04:00
Ray
a8b8ff2f4d More on Aux_Seats class. This seems to work OK. 2009-06-30 11:43:47 -04:00
Worros
3c438a9298 Make site selection behave like other options 2009-06-30 18:32:58 +08:00
Worros
5611f115cd Remove DEBUG line that wasn't supposed to make the last commit 2009-06-30 18:32:30 +08:00
sqlcoder
a3e6c2696f use Database instead of fpdb_db 2009-06-28 19:19:32 +01:00
sqlcoder
dc7a3fb88e finish removal of store_board_cards() 2009-06-28 18:56:18 +01:00
sqlcoder
cb323d2d63 remove unused queries 2009-06-28 17:20:41 +01:00
sqlcoder
a2db28ebf2 create Database instance in import to pass into parser - will eventually replace fpdb_db 2009-06-25 23:14:32 +01:00
sqlcoder
9b4e47df9a comment out debug message 2009-06-25 23:10:37 +01:00
Ray
7f7ad2a13e Further on Aux_Seats interface. Works. Not ready for prime time. 2009-06-25 10:07:40 -04:00
sqlcoder
9b50987d0c add sql param to Database constructor - aim is to have just one SQL instance passed around and to use Database for db connections and methods 2009-06-23 23:44:37 +01:00
sqlcoder
84cc951045 comment out database creation wrongly included from my dev code 2009-06-23 22:05:22 +01:00
sqlcoder
2f0c7e8167 make load_profile reload HUD_config.xml and update status bar 2009-06-23 20:45:11 +01:00
Ray
2f8918ebc9 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-06-23 10:25:12 -04:00
Ray
24b7af5703 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-06-23 10:23:05 -04:00
Ray
0bf39dbcf6 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:
	pyfpdb/fpdb_import.py
 2009-06-23 10:04:23 -04:00
Ray
8cdac24517 Subclass Aux_Seats from Aux_Windows. Flop_mucked now a Aux_Seats. 2009-06-23 09:56:29 -04:00
sqlcoder
0afd8e2e70 use do_connect() instead of connect() 2009-06-22 23:43:11 +01:00
sqlcoder
1456104382 make graph viewer use its own db connection 2009-06-22 23:30:54 +01:00
sqlcoder
456ddb3e91 use do_connect() instead of connect() and remove settings parameter (config includes them) 2009-06-22 23:19:03 +01:00
sqlcoder
45a9358cbd set defaults for unused params to allow new calls without needing to set them 2009-06-22 23:16:34 +01:00
sqlcoder
699f79722b add time print for positional stats tab 2009-06-22 22:05:28 +01:00
sqlcoder
45c78b8a5f Merge branch 'master' of git://git.assembla.com/fpdboz 2009-06-22 21:43:59 +01:00
sqlcoder
1fbb7d166c remove redundant code 2009-06-22 21:41:41 +01:00
sqlcoder
ac30e912c7 smarten up positional stats tab (still needs configurable columns) 2009-06-22 21:39:14 +01:00
Ray
287394c97d Use xpad and ypad from game element. 2009-06-20 10:01:52 -04:00
Ray
462ff87596 Add xpad and ypad to site and game elements. Cleanup some defaults. 2009-06-20 09:43:05 -04:00
Worros
22ff98d7c9 Remove passthrough section from import_file_dict 2009-06-20 14:02:03 +08:00
Worros
706ce46a9f Boardcards for Hands table in new importer 2009-06-20 07:58:53 +08:00
Worros
d00031edf7 Add get_last_insert_id() to Database API 2009-06-20 06:22:57 +08:00
Worros
864e37ddc8 Remove empty file 2009-06-20 05:38:33 +08:00
Worros
2569eeddc8 Remve legacy storeHudCache function 2009-06-20 05:37:30 +08:00
Worros
2b3e507a3c Factor out some common code 2009-06-20 05:33:33 +08:00
Ray
c9572129a6 Fix passing settings in import chain. 2009-06-19 16:48:42 -04:00
Worros
f1921bebde Move functions from fpdb_save_to_db into Database.py 
Doesn't actually do much cleanup.

Intend on moving all db functions into Database.py and fpdb_db.py and
providing and API, the functionality of fpdb_simple et all to shift into
the HHC
 2009-06-20 04:15:52 +08:00
Ray
a998a6dc6e Merge branch 'master' of git://git.assembla.com/fpdboz 2009-06-19 16:10:44 -04:00
Ray
a307081574 More for Flop_Mucked with 0-52 encoding. 2009-06-19 15:51:56 -04:00
Ray
e00887b865 Make Flop_Mucked work with the 0-52 card encoding. 2009-06-19 15:47:26 -04:00
sqlcoder
fdf4b65136 pass all settings through so that a new one can be used to skip updating hudcache (not used yet) 2009-06-20 03:21:24 +08:00
Worros
966fba2165 Fix parameter being passed to Sql __init__ db_server not db_backend 2009-06-20 01:17:06 +08:00
Worros
a47ff7fb9b Fix case sensitivity in test for Hands table before dropping 2009-06-20 00:58:41 +08:00
Worros
ccd2112c8a Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-06-20 00:41:24 +08:00
Worros
e66c73ca14 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-06-20 00:41:13 +08:00
Ray
053bfb9cee Remove intermediate print from previous commit. 2009-06-19 09:43:49 -04:00
Ray
afddc130a5 Fix minor error in writing seen hole cards. 2009-06-19 09:39:17 -04:00
Ray
0f5d5a16f8 Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-06-19 09:11:21 -04:00
Matt Turnbull
620576ba21 more html output 2009-06-19 07:21:35 +01:00
Matt Turnbull
44aed2c95f populate hands.boardcards 2009-06-19 07:04:57 +01:00
sqlcoder
2b240efd0a unimportant fix to storehudcache2 2009-06-18 20:29:02 +01:00
Ray
a6a98a750f Clean up changes to use 0-52 card encoding. 2009-06-18 14:11:53 -04:00
sqlcoder
8bbd21fa6a hide error when a window has non UTF-8 char in title 2009-06-17 23:05:20 +01:00
sqlcoder
7664373648 use fpdb_db for db connection 2009-06-17 23:03:43 +01:00
sqlcoder
dcaf6fed27 apologies - looks like I missed this out of my last release :-( 2009-06-17 21:43:30 +01:00
Ray
42f2b73c1a Get rid of some intermediate print. 2009-06-17 14:26:16 -04:00
Ray
63efc13cc9 Make Stud_Mucked work with the new card encoding scheme. 2009-06-17 14:24:16 -04:00
Ray
4a6c257b0f get_cards query now works directly with the 0-52 card encoding scheme. 2009-06-16 23:00:46 -04:00
Worros
d247b32b1b Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-06-17 10:18:31 +08:00
Worros
4d2aecc17b Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-06-17 10:18:13 +08:00
Ray
bb633fd435 Correctly pass cl options to HUD_main in Windows. 2009-06-16 20:04:06 -04:00
Ray
c4659ce5ef Untangle settings and backend changes. 2009-06-16 09:55:23 -04:00
Matt Turnbull
2a7a275e3a some stan to write an HTML hand 2009-06-16 00:29:44 +01:00
Matt Turnbull
574a286e0c round amounts to 2 dp 2009-06-15 22:30:58 +01:00
Matt Turnbull
2e08c6f9b3 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-06-15 22:21:40 +01:00
Matt Turnbull
14fbae1b54 get cards out 2009-06-15 22:21:27 +01:00
Ray
b1ea38bea9 Add -c config cl option. Fpdb passes cl options to HUD. 2009-06-14 23:14:53 -04:00
Ray
a5ac2dcf75 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-06-13 09:25:04 -04:00
Worros
a9df7d09c1 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-06-13 13:49:49 +08:00
eblade
d3d95b643d Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-06-12 13:09:15 -04:00
Ray
49a04af0c5 Add stud8 to PokerStars HH conversion. 2009-06-12 12:29:17 -04:00
eblade
93172a1a03 remove the loop from the other topify function (doesn't look like we've needed that in there in months.. oops) 2009-06-12 02:30:14 -04:00
eblade
c63e0ab461 Q&D change for old Hud code to remove the loop from one topify_window(), as we found out how to get it when working on the new Hud stuff 2009-06-10 14:11:20 -04:00
eblade
eb37de3594 fix get_geometry to use the correct parameters to IsWindow and GetWindowRect (too much error trapping will create pitfalls), use main_window.window instead of window_foreign_new() to get gdkhandle for gtkwindow, remove process enumeration in topify() for windows 2009-06-10 13:47:07 -04:00
eblade
6e63e2a5e9 fix some junk related to determining window height/width, b_width and tb_height, comment out the window_foreign_new() that's screwing up the window right now 2009-06-10 12:58:14 -04:00
Worros
ed9f02b113 Revert "pass all settings through so that a new one can be used to skip updating hudcache (not used yet)" 
This reverts commit b935a5ad67.
 2009-06-10 20:48:33 +08:00
Worros
e212bbd751 Remove unused file 2009-06-10 18:19:49 +08:00
eblade
bde0c7bb08 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-06-10 03:17:02 -04:00
Ray
9b5f8c53bc Changes to allow importing of razz hands. Tables not fully populated. 2009-06-09 19:06:20 -04:00
sqlcoder
b935a5ad67 pass all settings through so that a new one can be used to skip updating hudcache (not used yet) 2009-06-09 22:55:18 +01:00
sqlcoder
680e5c2f89 use new more flexible function to decide whether to drop indexes 2009-06-09 22:22:10 +01:00
sqlcoder
9d87e35082 fix quit option and postgres/windows connecting after last merges 2009-06-09 21:38:30 +01:00
Ray
eea4656f47 Should now run on windows--but not work correctly. 2009-06-09 16:38:26 -04:00
eblade
09ab42f31c Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-06-09 14:22:31 -04:00
Ray
dd80468f5f Fix a whitespace problem. 2009-06-09 14:18:56 -04:00
eblade
1dd1e1eca5 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-06-09 14:06:13 -04:00
Ray
f3103cc82a Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:
	pyfpdb/Database.py
	pyfpdb/fpdb_db.py
	pyfpdb/fpdb_save_to_db.py
 2009-06-09 14:01:15 -04:00
eblade
52c2411360 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-06-09 11:22:08 -04:00
Worros
8a55b2ebd9 Remove merge line 2009-06-09 23:10:11 +08:00
Worros
ed1d9cd229 Fix tests 2009-06-09 23:08:18 +08:00
eblade
82af869974 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-06-09 11:04:09 -04:00
Worros
1d6aed3250 Fix datetime.strptime v time.strptime issue 2009-06-09 22:53:09 +08:00
Worros
c3d2c5a2be Merge branch 'master' of git://git.assembla.com/free_poker_tools 
Conflicts:

	pyfpdb/Database.py
	pyfpdb/SQL.py
	pyfpdb/fpdb_db.py
	pyfpdb/fpdb_save_to_db.py

Also fix datetime issue with Everleaf
 2009-06-09 22:48:48 +08:00
eblade
868c573643 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-06-09 10:14:00 -04:00
Ray
06a62927fc Merge branch 'master' of git://git.assembla.com/fpdboz 2009-06-08 10:17:11 -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
Worros
8e1404032b Fix last patch 2009-06-08 22:13:42 +08:00
Worros
d8dffb193f Merge branch 'master' of git://git.assembla.com/mctfpdb 
Conflicts:

	pyfpdb/fpdb.py
 2009-06-08 19:20:01 +08:00
Worros
f1b887502c Merge branch 'master' of git://git.assembla.com/fpdb-sql 
Conflicts:

	pyfpdb/fpdb_db.py
 2009-06-08 19:18:58 +08:00
Worros
4f555e2d8f Hand.insert() update - low hanging fruit 2009-06-08 18:19:55 +08:00
sqlcoder
fce9941b0c add position capability to playerstats tab 2009-06-08 00:17:48 +01:00
Matt Turnbull
9b8bc1a593 re-enable insertion of boardcards 2009-06-07 22:45:46 +01:00
Matt Turnbull
0489d6fa48 Get boardcards and add them if they aren't 0x 2009-06-07 22:44:50 +01:00
Matt Turnbull
d8cf0619ac use datetime instead of time 2009-06-07 22:39:19 +01:00
sqlcoder
0a7c340656 Added timing info for index drop/create. Some small mods to output during import (obviously just change any you don't like) 2009-06-07 22:21:58 +01:00
Matt Turnbull
95a7ab8e48 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-06-07 21:58:00 +01:00
Matt Turnbull
c1e4c083fe premerge 2009-06-07 21:57:56 +01:00
Matt Turnbull
1a2d124b77 premerge 2009-06-07 21:57:13 +01:00
sqlcoder
e662279acd remove parameter to analyzeDB() (error in previous release) 2009-06-07 20:49:35 +01:00
sqlcoder
7e8b80948c move index etc functions from fpdb_simple.py into fpdb_db.py 2009-06-07 20:45:09 +01:00
sqlcoder
45a303eb25 make global lock work (do nothing) if hands table doesn't exist 2009-06-07 20:07:18 +01:00
Ray
35c5438c3c Fast hudcache fix not previously comitted. 2009-06-06 11:20:11 -04:00
Ray
109727e764 Postgres changes for unicode. 2009-06-06 11:17:49 -04:00
Ray
0008a9ede3 Mode change to Stats.py. 2009-06-06 11:06:49 -04:00
Ray
795d26ddf1 Fix prev commit of this file. 2009-06-06 10:50:28 -04:00
Worros
56f2112403 Add a few temporary comments 2009-06-06 19:26:33 +08:00
Worros
a9055049fe Fix HUD query under linux. 
Case sensitive
 2009-06-05 23:13:41 +08:00
Worros
9091efa230 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-06-05 09:11:25 +08:00
Ray
7f7a298bcb merging, I think 2009-06-04 16:52:07 -04:00
sqlcoder
b016c496f2 fix handling of global lock when re-creating tables 2009-06-04 20:27:15 +01:00
Ray
5013a07fc0 Minor change for postgres connection--not tested w/remote db. 2009-06-02 10:59:54 -04:00
Ray
9826138744 Correctly hand remote and local postgres dbs. Use get_db_parmeters(). 2009-06-01 18:27:56 -04:00
Ray
441b300cff Add db-type to get_db_parameters(). doh! 2009-06-01 18:26:20 -04:00
Worros
44cb8efb2c Add reminder for id caching 2009-06-01 22:21:40 +08:00
Worros
3e49e87842 Begin moving query functions into fpdb_db function 
No idea whether the code actually works
 2009-06-01 20:53:42 +08:00
Worros
a261517175 Add additional siteids to db, move player select function 2009-06-01 17:14:31 +08:00
Ray
069aa025e4 Fixes for importing and HUD with the postgres db. 2009-05-31 21:25:36 -04:00
Worros
21e7e010bd Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-06-01 07:51:04 +08:00
sqlcoder
5b96769de3 implement global lock by locking hands table 2009-05-31 21:59:01 +01:00
sqlcoder
be61b2d253 change quit option to standard 'Quit' 2009-05-31 21:53:10 +01:00
sqlcoder
de98ff67dd try to improve reliability of index/fk dropping in postgres and add warnings (not errors) when problems occur 2009-05-31 21:06:33 +01:00
sqlcoder
c741d720a0 add date filter to player stats 2009-05-30 22:38:54 +01:00
sqlcoder
2eb86784fe change BB heading to bb (numbers are in big blinds not Big Bets) 2009-05-30 22:33:08 +01:00
Worros
0c0832b9d3 Bump db version number 2009-05-31 02:56:08 +08:00
eblade
2e4c792bbe Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-05-30 12:04:43 -04:00
eblade
f1230c459c Apparently I made a comment and a change that I didn't realise before 0.11, and forgot to commit. oopsie. 2009-05-30 12:02:31 -04:00
Matt Turnbull
94370a653c fix conflicts 2009-05-30 16:40:27 +01:00
Worros
3b72a334a1 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-05-29 10:35:02 +08:00
sqlcoder
d44b093144 put debug message back in, this point should not be reached 2009-05-28 22:40:58 +01:00
sqlcoder
91bb9fc65f Tidy up alignment and expanding of cells in Player Stats window 2009-05-28 20:45:25 +01:00
sqlcoder
e0e4eb4c3c add date filter to positional stats 2009-05-28 19:54:32 +01:00
Worros
a9dac26381 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-05-28 22:32:34 +08:00
sqlcoder
060c102843 changes to store date in hudcache.stylekey and display all-time / session / n days stats in hud 2009-05-27 23:34:10 +01:00
sqlcoder
afee4ddb8c minor cosmetic change to autoimport button 2009-05-27 22:25:29 +01:00
sqlcoder
d41a8beacd add self. to variable reference and comment out debug message 2009-05-27 22:21:22 +01:00
Worros
3892b3789d Session breakdown Proof of Concept 
Only prints some of the session breakdown to stdout at the moment,
otherwise is a copy of PlayerStats with a bunch of stuff commented out.

Looks like:

DEBUG: len(times) 337
DEBUG: len(diffs) 336
DEBUG: len(index[0]) 2
DEBUG: index [54 88]
DEBUG: index[0][0] 54
Hands in session    0:   54  Start: 22/03/2009 07:04 End: 22/03/2009
07:49 Total: 2669
Hands in session    1:   33  Start: 24/03/2009 17:10 End: 24/03/2009
17:35 Total: 1482

I think the Total number has an index incorrect at the moment.
 2009-05-26 16:10:27 +08:00
sqlcoder
013bd0a4e3 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-05-25 22:46:25 +01:00
sqlcoder
90b886e77f another parameter fix to the fpdb.py gui update 2009-05-25 21:30:37 +01:00
Worros
962ce03fea Fix storeHudCache callers 2009-05-25 09:31:36 +08:00
Worros
ab98965b77 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-05-24 19:15:52 +08:00
sqlcoder
e7532ea497 fix typos in control keys in last release 2009-05-23 22:06:41 +01:00
sqlcoder
061ff083a6 get rid of warning message when starting fpdb 2009-05-23 21:42:26 +01:00
sqlcoder
f0b4d82fa5 always release locks when db work finished 2009-05-23 23:33:40 +08:00
sqlcoder
d811c6b656 add rollback to release locks when db reads are finished 2009-05-23 23:31:56 +08:00
sqlcoder
0b29286c9d fix 3bet stat bug in storeHudCache2 2009-05-23 23:26:03 +08:00
sqlcoder
75221f0b6a oops, missed out the key change in previous commit 2009-05-23 23:24:29 +08:00
sqlcoder
06b1ce002f fix sql to work in postgres 2009-05-23 09:47:50 +01:00
Worros
539fdcb070 Merge branch 'master' of git://git.assembla.com/fpdb-sql 
Conflicts:

	pyfpdb/Card.py
 2009-05-22 09:23:10 +08:00
sqlcoder
203dcb44ae copy storehudcache2 into storehudcache, keeping the extra copy for more changes ... 2009-05-21 23:29:34 +01:00
sqlcoder
ee9d69ae5e more minor cosmetic changes 2009-05-21 23:09:11 +01:00
sqlcoder
a9963a6a47 try to improve look of autoimport tab 2009-05-21 23:00:46 +01:00
sqlcoder
07247de030 changes to allow hud to use stylekey and aggregate stats query 2009-05-21 21:27:44 +01:00
sqlcoder
d986966332 prevent error when trying to close HUD that has already gone 2009-05-21 20:30:18 +01:00
sqlcoder
985d2c28d4 add styleKey to hudcache 2009-05-21 18:43:32 +01:00
sqlcoder
0651e89e2e add try-except blocks and correct spelling 2009-05-21 18:02:42 +01:00
sqlcoder
fcc6cf5d4f updated comment 2009-05-21 18:02:11 +01:00
Ray
f55460341d New table handling stuff and demo. 
Not working for windows and not currently used by HUD_main.
 2009-05-21 11:13:39 -04:00
Worros
dc8affb8c3 Quick comment add before checking out 0.11 2009-05-21 23:02:50 +08:00
Worros
4819fc28e5 Fix omaha hudCache update 2009-05-21 22:14:49 +08:00
sqlcoder
eda23de609 stop storehudcache from breaking with hudcache changes (storehudcache2 is better) 2009-05-21 12:19:52 +01:00
sqlcoder
828b23510f add rollback to release locks (we should create a set transaction read_only method in fpdb_db) 2009-05-21 11:23:50 +01:00
sqlcoder
399bfd98c6 fix unimportant typo in print 2009-05-21 11:14:47 +01:00
sqlcoder
cf8b6c7e92 several db changes and a fancy playerstats window, now to tidy the code up a bit .... 2009-05-21 04:26:00 +01:00
sqlcoder
93f643a958 fix error when choosing unimplemented menu option 2009-05-20 23:21:50 +01:00
sqlcoder
cee4cade3e Add hotkeys for stats windows and pass main window into guiplayerstats 2009-05-20 09:58:38 +01:00
sqlcoder
b3b99778c9 make player stats use new single detailed query and format the output in python ready for more detailed stats 2009-05-17 22:59:09 +01:00
sqlcoder
e2137a596a screwed up previous release using branches, this should work now (added hc fields as well as hp, made new fields NULLable, use 3b not 3b4b fields), next job calculate some of these fields ... 2009-05-17 17:26:05 +01:00
Worros
a5884ff7ae Fix createHandsActionTable 2009-05-17 12:41:47 +08:00
sqlcoder
339f48582c add more stat fields to db 2009-05-17 00:06:53 +01:00
sqlcoder
6495346874 Add new seatsep display flag 2009-05-10 23:11:30 +01:00
sqlcoder
aba5b94847 add new SeatSep display flag for filter, re-order some code with possible aim of using one function instead of 2 similar blocks of code for breakdown and totals 2009-05-10 23:06:35 +01:00
sqlcoder
fe806ccea1 update playerstats for new avgseats column and seats filter (is this window redundant now?) 2009-05-10 22:59:35 +01:00
sqlcoder
3e805f03b1 correct avg seats calculation, select limits in reverse order, i.e. highest first 2009-05-10 22:37:02 +01:00
sqlcoder
a4302b61a9 make gui hide new seats part of filter, refine empty query test 2009-05-10 22:30:26 +01:00
sqlcoder
199a91ea99 add rollback to release locks taken in postgres 2009-05-09 23:18:58 +01:00
sqlcoder
b7ee425558 add seats to filters and stats queries 2009-05-08 22:41:09 +01:00
sqlcoder
527232595b change import time calc 2009-05-07 21:24:53 +01:00
sqlcoder
4ffc028bbc oops, missed out the key change in previous commit 2009-05-07 21:24:06 +01:00
sqlcoder
9fe2fc902d make psycopg2 return unicode strings and go back to new recognisePlayerIDs() very similar to @885f0a023 2009-05-07 21:17:14 +01:00
sqlcoder
47dad738dd work around unicode problem with windows and postgres - use old version of recognisePlayerIDs 2009-05-05 23:57:20 +01:00
sqlcoder
0ad2b06e97 Add all/none checkboxes for limits, tidy up stats tables some more 2009-05-04 23:14:33 +01:00
sqlcoder
de98d5dd15 remove surplus db variable and debug mysql problem in previous commit 2009-05-04 20:36:11 +01:00
sqlcoder
f9a769ebd3 add summaries to position stats and allow choice of levels 2009-05-04 20:12:41 +01:00
sqlcoder
119a20a2ab Merge branch 'master' of git://git.assembla.com/fpdboz 2009-05-04 02:14:35 +01:00
sqlcoder
87f2dde961 add 3bet to stats pages and make column and heading choices configurable by editing lists in the init code 2009-05-04 02:10:05 +01:00
Worros
885f0a0232 Fix indentation error from sqlcoder 2009-05-03 19:21:21 +08:00
sqlcoder
f0a7775591 add totals lines, enable refresh button to view other players 2009-05-03 10:49:00 +01:00
sqlcoder
e60c254204 add rollback() to make sure db locks are released 2009-05-03 01:46:18 +01:00
sqlcoder
fddb29b3b8 add steal stat to positional stats and fix for postgres 2009-05-03 01:31:15 +01:00
sqlcoder
1b82ad7f65 re-fix a couple of errors from previous merges 2009-05-03 01:24:10 +01:00
sqlcoder
5111eb1a8f remove redundant db variable 2009-05-02 21:39:48 +01:00
sqlcoder
79b3dba2dd add steal stat to playerstats 2009-05-02 21:32:47 +01:00
sqlcoder
882f19a34d removed redundant db variable 2009-05-02 21:07:52 +01:00
sqlcoder
7d28f70a98 pull and merge from fpdboz 2009-05-02 21:02:26 +01:00
sqlcoder
2c991ad2d0 sql and cursor execute bugfixes to make it work with postgres 2009-05-02 00:28:53 +01:00
sqlcoder
a466201285 fix tab error on inserted line - change to spaces 2009-04-29 23:27:53 +01:00
sqlcoder
d6ebd9352d pull from Ray (I think this was release 0.11) 2009-04-29 23:05:29 +01:00
sqlcoder
fd804f4431 added a few more stats with no decimal places 2009-04-30 00:17:25 +08:00
Worros
6504cd38a6 use lower case for keys into stat_dict as postgres returns column names in lower case 
Conflicts:

	pyfpdb/Database.py
 2009-04-30 00:16:39 +08:00
sqlcoder
d28bdf7c60 added a few more stats with no decimal places 2009-04-28 22:47:05 +01:00
Worros
f6311276a7 Remove some merge noise 2009-04-28 14:50:50 +08:00
sqlcoder
2efc6f1c8e use lower case for keys into stat_dict as postgres returns column names in lower case 2009-04-27 21:29:02 +01:00
sqlcoder
d2c978d7f5 steal stat fixes to match pokertracker 2009-04-27 10:52:06 +08:00
sqlcoder
326f29b5b6 always release locks when db work finished 2009-04-27 10:47:22 +08:00
sqlcoder
d9d8043888 add rollback to release locks when db reads are finished 2009-04-27 10:45:49 +08:00
sqlcoder
064a7a6de6 fix 3bet stat bug in storeHudCache2 2009-04-27 10:40:59 +08:00
sqlcoder
3c815ed0e8 steal stat fixes to match pokertracker 2009-04-26 22:20:24 +01:00
sqlcoder
6cee8b7a97 always release locks when db work finished 2009-04-26 21:47:28 +01:00
sqlcoder
b266b48c33 add rollback to release locks when db reads are finished 2009-04-26 21:38:04 +01:00
sqlcoder
85b03ef720 fix 3bet stat bug in storeHudCache2 2009-04-26 21:31:05 +01:00
Worros
ee1186bd57 Add ability for Filters to hide() panes 
Also add ability to register a callback and name 2 buttons on hte left
panel
 2009-04-17 12:44:43 +08:00
Worros
1939979e3c Make Grapher work with limits 2009-04-14 21:31:29 +08:00
Worros
dd563aab39 Merge branch 'siteneutral' 
Conflicts:

	pyfpdb/GuiGraphViewer.py
 2009-04-11 20:16:37 +08:00
Worros
15e31eccb2 Make player and positional stats use Filters 2009-04-11 20:07:50 +08:00
Worros
d16bb0ac8b Make Grapher use new Filters object 2009-04-11 19:14:32 +08:00
Worros
2550a0b0e0 Add preliminary filters file 2009-04-11 17:11:13 +08:00
Worros
ead50c5ff8 Add a couple of queries for GUI building 2009-04-11 17:10:57 +08:00
Worros
15d7e1fab5 Add a couple of queries for GUI building 2009-04-11 17:10:00 +08:00
Worros
cf637a4ce6 Make Grapher use get_supported_sites() properly 2009-04-11 14:41:48 +08:00
Worros
76d7b63b81 Make Grapher use get_supported_sites() properly 2009-04-11 14:38:46 +08:00
Worros
702cb5851a Oops - revert converter removal 2009-04-11 11:14:01 +08:00
Worros
b1aade624f Change default window size because it bugged me 2009-04-11 04:28:54 +08:00
Worros
2bc564e292 Remove draw from supported list. 
Olld import code doesn't support draw yet, this patch prevents the bulk
importer from crashing if you have a draw hh file in the list
accidentally.
 2009-04-11 04:18:10 +08:00
Worros
5a842c52fa Add <hhcs> section to example config and remove converter from <site> 
Change to make building GUI easier from config.
 2009-04-11 04:16:36 +08:00
Worros
86fb5a0906 Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-04-11 03:52:34 +08:00
Worros
584c658590 Forgot the converter line in merge 2009-04-11 03:51:45 +08:00
Worros
e44ee1e439 Merge branch 'master' of git://git.assembla.com/mctfpdb into siteneutral 2009-04-10 02:57:16 +08: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
Worros
5a737624c9 Merge branch 'master' of git://git.assembla.com/free_poker_tools 
Conflicts:

	pyfpdb/fpdb_simple.py
 2009-04-10 00:19:32 +08:00
Ray
6866f409ce Fix regression importing some Stars tournaments. 2009-04-09 09:21:52 -04:00
Ray
fdabe29ea2 Fix stats aggregation and simplify HUD_main.py. 2009-04-08 16:43:40 -04:00
Ray
460102c3f5 Version 0.11 2009-04-07 10:44:06 -04:00
Ray
a2862c9712 Minor change to allow proper detection of FTP tables. 2009-04-06 23:45:56 -04:00
Ray
a1b2874878 Fix regression in naming HUDs that caused inconsistent killing. 2009-04-06 23:42:36 -04:00
Ray
87efd2cc8d Minor edits in HUD_config.xml.example. 2009-04-06 23:40:06 -04:00
Ray
cd2b2aaf42 Comment out some intermediate print. 2009-04-06 11:03:51 -04:00
Ray
683190a261 Updated example config to work with recent code changes. 2009-04-06 10:34:14 -04:00
eblade
63a6fd2abd Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-04-06 04:19:23 -04:00
eblade
fbc2054610 Merge branch 'master' of git://git.assembla.com/mctfpdb.git 2009-04-06 04:18:14 -04:00
Worros
3109dd5f50 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-04-06 08:12:56 +08:00
Ray
9b9d2f0570 Changed "Full Tilt" to Full Tilt Poker" 2009-04-05 14:40:22 -04:00
Ray
1b1185da17 Integrate 4bet fix from Steffen. Doesn't break-not tested on 4bets. 2009-04-05 13:46:41 -04:00
Matt Turnbull
a4ed3a2e68 (No function) Note about matching "FullTiltPoker" 2009-04-04 15:12:45 +01:00
Ray
ac93a2cb77 Change to allow import of HHs exported from PT Stud. 2009-04-03 12:51:58 -04:00
eblade
0eab0ad813 Merge branch 'master' of git://git.assembla.com/mctfpdb.git 2009-04-02 16:48:30 -04:00
Matt Turnbull
b2ac60de82 tailhands also had the wrong regex. Corrected. 2009-04-02 21:20:41 +01:00
Matt Turnbull
d81627da3f Really fix handcount bug? 2009-04-02 21:16:36 +01:00
eblade
e880fb8954 add a giant tooltip temporarily to the popup stats window 2009-04-02 05:02:24 -04:00
Matt Turnbull
ed3b09967d test_PokerStars typo, test_fpdb_simple uncommented some stuff and made 
it work in pytest
 2009-04-01 23:28:48 +01:00
eblade
c4c8529057 Merge branch 'master' of git://git.assembla.com/mctfpdb.git 2009-03-31 14:18:45 -04:00
eblade
775fc67bf0 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-03-31 14:17:51 -04:00
Matt Turnbull
5cd5ad8fa6 Fix bug I introduced that caused empty hands corresponding to splits 
between hands (blank lines) to be 'processed' by HHC in Everleaf, PS and
FTP converters.
 2009-03-31 07:44:19 +01:00
Worros
d470507a51 Fix +x on bulk importer, quick fix for Stars HU file error 2009-03-31 11:38:10 +08:00
Ray
84b6aa230b intermediate print 2009-03-30 15:53:10 -04:00
eblade
9dbbd23688 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-30 14:27:31 -04:00
Ray
f5d7764571 Remove another comprehension not working as expected in kill() 2009-03-30 11:59:07 -04:00
Ray
5505ebdec2 Remove comprehension and replace with loop in reposition_windows(). 2009-03-30 11:49:20 -04:00
eblade
fdd8eddcbf Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-30 03:15:21 -04:00
Ray
fb4e818ed2 get_sites now returns only enabled sites--enabled is the default in Config. 2009-03-29 23:40:03 -04:00
Worros
2129faa46b Add UltimateBetToFpdb 
Copy from current PokerStarsToFpdb with minor regex updates. Still
untested
 2009-03-30 06:39:21 +08:00
Worros
93d2b50867 Merge branch 'master' of git://git.assembla.com/free_poker_tools 
Conflicts:

	pyfpdb/fpdb_save_to_db.py
 2009-03-29 23:18:00 +08:00
Ray
a109687ac4 Fixed some 'True' v True problems. 2009-03-29 10:08:33 -04:00
Worros
04f293384c Really make fastStoreHudCache false by default 2009-03-29 21:47:09 +08:00
Worros
961c1795fa Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-03-29 21:37:40 +08:00
Matt Turnbull
f3ee865721 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:

	pyfpdb/PokerStarsToFpdb.py
 - this fails py.test
 2009-03-29 12:27:00 +01:00
Matt Turnbull
4bccc0fd28 some datetime tests for stars 2009-03-29 12:20:04 +01:00
eblade
e99badf69d add one to seat adjustment index in update_table_position 2009-03-28 14:31:44 -04:00
eblade
2b97b4e635 i'm apparently retarded today 2009-03-28 12:47:46 -04:00
eblade
1de35b2f01 merge error indentation fix 2009-03-28 12:30:57 -04:00
eblade
f54da25d2b Merge branch 'master' of git://git.assembla.com/fpdboz.git 
Conflicts:
	pyfpdb/GuiBulkImport.py
	pyfpdb/fpdb_simple.py
 2009-03-28 12:27:45 -04:00
Matt Turnbull
d079fea634 Stars has two spaces in header - "...#handid: gametype..." 2009-03-28 15:18:10 +00:00
Worros
0528aa74db Properly escape player names 2009-03-29 00:07:00 +09:00
Worros
ae2835cd6b GuiBulkImport cli breakage fix 2009-03-28 22:24:40 +09:00
Worros
5139b88538 utf8 fix to db connection 
Change mysql connection type to use_unicode.
 2009-03-28 20:51:54 +09:00
Worros
bdd615ede9 utf8 fix to db connection 
Change mysql connection type to use_unicode.
 2009-03-28 20:32:30 +09:00
Worros
95add13731 No passthough converter in siteneutral 2009-03-28 19:39:13 +09:00
Worros
f6ca8c1bc1 GuiBulkImport cli breakage fix 2009-03-28 19:38:37 +09:00
eblade
eb514902ee fix some weird things from the patch from runenes, 
re-replace recognisePlayerIDs(), new one converts all names to UTF-8 prior to processing, as apparently there are problems with dicts using unicode keys, and deals iwth database escaping issues.
 2009-03-27 16:52:27 -04:00
Ray
1d45137502 Change fastStoreHudCache = False as default Import parameter. 2009-03-27 13:26:01 -04:00
Ray
c8d80eef19 Revert Eric's change that failed on special chars in player name. 
Should be able to get the new player id from connction.insert_id().
 2009-03-27 13:21:33 -04:00
Worros
710893b186 Fix merge breakage 2009-03-28 00:54:30 +09: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
b92022fecd Fix call to get_db_parameters 2009-03-27 23:53:44 +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
2681b517a7 super hyper-speed version of recognisePlayerIDs() only makes 1-3 database queries per hand instead of between 2 and 30, worst case. 2009-03-27 01:19:04 -04:00
eblade
3c14055244 more very minor cleanup 2009-03-26 19:17:00 -04:00
eblade
465f27af4d mostly spacing cleanup 2009-03-26 18:55:16 -04:00
eblade
c91244cdad just edit an old comment 2009-03-26 18:38:13 -04:00
eblade
de60d51dcf some use of not instead of comparing to blank lists 2009-03-26 18:32:25 -04:00
eblade
c3517bd53b make use of the fact that an empty list is False, and use extend() to copy an array instead of doing it by hand 2009-03-26 18:28:03 -04:00
eblade
a210453cd2 cleanup ParseNames fix dumb error in parsepositions cleanup 2009-03-26 17:27:52 -04:00
eblade
cb542d9b3e stripEOLspaces = rstrip, cleanup filterCrap some more, cleanup ParseActionType, should no longer count lines with player names containing "bets" or "raises" as an action, parseHandStartTime no longer uses an infinite loop, parsePositions cleaned up, parseWinLine cleaned up, recognisePlayerIDs cleaned up 2009-03-26 17:20:08 -04:00
eblade
3e6fccd34d managed to knock checkPositions down to a single line :) 2009-03-26 15:11:24 -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
eblade
6d4c812b51 do that iteration in relocate_windows the proper way 2009-03-26 12:11:07 -04:00
eblade
94a10bbfcf Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-03-26 11:15:01 -04:00
eblade
4341222994 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2009-03-26 09:48:05 -04:00