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
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