Commit Graph

2031 Commits

Author SHA1 Message Date
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
a965e34415 Merge branch 'master' of git@git.assembla.com:fpdb-eric.git 2009-08-29 06:55:01 -05:00
Eric Blade
bd7f3de3d7 Conflicts:
pyfpdb/fpdb_import.py
2009-08-29 06:54:20 -05:00
Eric Blade
5b6a3b5b73 Merge branch 'master' of git://git.assembla.com/mctfpdb.git
Conflicts:
	pyfpdb/fpdb_import.py
2009-08-28 18:01:01 -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
c98f8aab8c Merge branch 'master' of git://git.assembla.com/fpdb-eric.git 2009-08-27 07:45:04 -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
9c391088ed Tables: add " - Table " to ignore strings, so we don't attach to Absolute chat windows 2009-08-27 02:30:15 -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
Mika Bostrom
59560b1025 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-08-24 07:36:38 +03:00
Ray
cb8bc13ceb Allow self.codepage to be a list of codecs to try. 2009-08-23 19:40:39 -04:00
Mika Bostrom
be116905c4 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-08-23 22:25:51 +03:00
Ray
2e0c743671 Detect and skip HHs flagged as partial. 2009-08-23 15:02:00 -04:00
Mika Bostrom
f4e6de744a Fix noop() prototype
Hud's noop() is called from gtk event handler, which passes
additional arguments. We don't care about them but we do want to prevent
HUD-error.txt from being flooded with TypeError messages.
2009-08-23 10:18:06 +03:00
Mika Bostrom
d43954bc5f Clean up debian/control
Drop unneeded and already covered dependencies. Change package priority
from optional to extra, which makes more sense.
2009-08-22 23:05:18 +03:00
Mika Bostrom
ae0612370d Packaging fixes
* It seems that fpdb gets installed into /usr/share/python-support/
  while many other packages end up in .../pyshared; fixed the symlink
  target
* Fixed mail address in changelog, which now is the correct one
* Added postinst script to make fpdb.py executable again. This hack
  is needed because dh_fixperms didn't allow to ignore the script's
  permissions and the file is located in .../fpdb/ along with all the
  other fpdb modules
* Told package manager to create /usr/bin/fpdb symlink pointing to
  fpdb.py so we now have an application named "fpdb" in the system
2009-08-22 22:47:27 +03:00
Mika Bostrom
777b7b726a Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-08-22 17:41:31 +03:00
Mika Bostrom
f84644990b Debian packaging, step #1
* add setup.py for python distutils use
* add packaging/debian/*

Not ready yet, but at least seems to behave sanely
2009-08-22 17:36:44 +03: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
Ray
db2124879c Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-08-20 12:21:43 -04:00
Ray
70e973944c Merge branch 'master' of git://git.assembla.com/fpdboz 2009-08-20 12:21:19 -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