sqlcoder
4b7aadd325
fix starting hand order
2009-10-18 23:19:26 +01:00
sqlcoder
c1a998b7d8
add all player (and min hands) ability to stats window
2009-10-18 22:56:10 +01:00
sqlcoder
6453154ef6
prepare for all players display
2009-10-18 17:18:07 +01:00
sqlcoder
0ccc204c89
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-10-18 12:19:42 +01:00
sqlcoder
5beb033547
debug session stats
2009-10-18 12:19:22 +01:00
Worros
cfc854ab50
Fix some bugs in BetfairToFpdb.
...
As reported by tchaz on 2+2:
http://forumserver.twoplustwo.com/showpost.php?p=13870274&postcount=1960
Using the only sample file I have for Betfair, it appears there is still and accounting error
2009-10-18 07:56:34 +08:00
Worros
639036871b
HUD_config.xml.example update
...
Added Betfair to default config - copied Party.
Also went through and cleaned up whitespace in that file at the same time - tabs to spaces, cleaned trailing spaces.
2009-10-18 07:54:41 +08:00
sqlcoder
7bd388613d
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-10-15 23:02:57 +01:00
sqlcoder
ac50cf85ca
update comments on aggregation
2009-10-15 23:02:50 +01:00
Worros
ceaa78bdc8
Add usage message to GuiBulkImport cli
...
I keep forgetting the format for Full Tilt cli import
2009-10-15 15:23:47 +08:00
Worros
c3bc165a90
Add comment to DerivedStats
2009-10-15 15:13:09 +08:00
Worros
7a9237b707
GuiBulkImport - make cli version print out import stats
2009-10-15 15:12:08 +08:00
Worros
2e2531c0e4
Merge branch 'master' of git://repo.or.cz/fpbd-bostik
2009-10-15 14:55:21 +08:00
Mika Bostrom
019440a71b
Merge branch 'master' into good
...
Conflicts:
pyfpdb/Configuration.py
pyfpdb/HUD_config.xml.example
2009-10-15 09:06:31 +03:00
Worros
2d9b92af90
Make GuiBulkImport allow multi-file select
2009-10-15 11:57:42 +08:00
Mika Bostrom
54d309f797
Minor fixes to hud setup code
2009-10-14 19:33:19 +03:00
Worros
16d1f43c7e
[NEWIMPORT] HandsPlayers.streetXAggr insert.
2009-10-14 23:55:51 +08:00
Mika Bostrom
a232a94eb1
Try to make hud more configurable
...
Modified files:
* Configuration.py
* HUD_config.xml.example
* HUD_main.py
Instead of tweaking aggregation settings directly in code, make the
values configurable through HUD_config.xml; use the newly created
<hud_ui> element for this. Retain coding convention and key-value
names as they are.
2009-10-14 16:04:09 +03:00
Worros
7b2c1fa243
[NEWIMPORT] Minor update, use DerivedStats.getStats()
2009-10-14 20:28:07 +08:00
Worros
2350474d38
[NEWIMPORT] Start of HandsPlayers insert
2009-10-14 20:20:17 +08:00
Worros
f0f2bcda14
Merge branch 'master' of git://git.assembla.com/fpdb-sql
2009-10-14 12:06:01 +08:00
Worros
1fc015b09f
[NEWIMPORT] Move db insert into SQL.py (store_hand)
2009-10-14 12:05:17 +08:00
sqlcoder
4d92e3d2a0
update graph viewer to work with enhanced filter
2009-10-13 23:06:09 +01:00
sqlcoder
4b0a399ffd
stop fpdb.py accessing fpdb_db directly
2009-10-13 21:53:51 +01:00
sqlcoder
785e3d63a2
add 'is db running' printed message when pg db connect fails
2009-10-13 21:52:13 +01:00
Worros
843bd754f6
[NEWIMPORT] Prep insert functions
...
Cleaned up storeHandsPlayers and added storeHudCacheNew
Haven't decided on the data structures to be passed in as yet so the functions only insert the bare minimum and have a list of commented out variables
2009-10-13 17:42:02 +08:00
Worros
4d04a4b1db
[NEWIMPORT] Take a copy of generateHudCache for DerivedStats
...
Commented out, should give a good basis for generating the stats from Hand class
2009-10-13 17:30:49 +08:00
Worros
f4887235a0
[NEWIMPORT] Fix Hand import so it runs
...
Also comment out some debug
2009-10-13 15:58:05 +08:00
Worros
00a8593631
Fix table re-create bug in fillDefaultData
2009-10-13 14:12:25 +08:00
Worros
1d0177f6d4
[NEWIMPORT] Finish up Hand import
...
Decided to leave streetXRaisesN alone for the moment
2009-10-13 14:04:19 +08:00
Worros
e7a7229dc0
Merge branch 'master' of git://git.assembla.com/fpdb-sql
2009-10-13 13:22:08 +08:00
sqlcoder
aaba84de19
Add ring/tourney radio button to filter
2009-10-12 23:02:20 +01:00
Worros
035b71b018
Merge branch 'master' of git://git.assembla.com/fpdb-sql
2009-10-12 10:20:22 +08:00
sqlcoder
181294ddf4
tidy up Filters and PlayerStats layout a bit
2009-10-11 23:36:26 +01:00
sqlcoder
b14fd2553c
add some debug for session stats - I think there is a bug in here somewhere that makes it include too many hands sometimes ...
2009-10-11 23:34:05 +01:00
sqlcoder
b8be20f551
show nl and fl limits separately in filter
2009-10-11 22:44:52 +01:00
Eric Blade
d4cbed121d
fix indentation errors
2009-10-09 07:39:05 -04:00
Eric Blade
8eeac34fce
Merge branch 'master' of git://git.assembla.com/fpdb-sql.git
2009-10-09 07:35:12 -04:00
Eric Blade
05ccca63ad
Merge branch 'master' of git://git.assembla.com/fpdboz.git
...
Conflicts:
pyfpdb/fpdb.py
2009-10-09 07:34:13 -04:00
Eric Blade
ee864033ee
Add exception for not being able to connect to MySQL, make use of it to pop up an error box
2009-10-09 07:31:25 -04:00
Worros
6d0ec5d831
[NEWIMPORT] Add playersAtStreetX to insert
2009-10-08 18:13:13 +08:00
Worros
cf6c3c8ad0
[NEWIMPOR] Fix playersVpi from last patch
...
Oops - forgot to add the argument
2009-10-08 18:07:54 +08:00
Worros
31f48c4932
[NEWIMPORT] Calculate playersAtStreetX
...
Untested code.
Still missing playersAtShowdown, haven't looked to see if hand.actionStreets contains showdown.
2009-10-08 18:01:49 +08:00
sqlcoder
7d708a327c
try to fix aggBBmultItemAll error
2009-10-07 23:45:59 +01:00
Worros
024618235f
Clean up variables in DerivedStats
...
Doesn't look like they are going to be used like that
2009-10-07 14:15:12 +08:00
Worros
fdef5b12d9
Add playersVpi to NEWIMPORT code
...
Untested at the moment, moved the code from Hand.py into DerivedStats.
2009-10-06 18:30:52 +08:00
Worros
94af5b1ea8
Fix order bug for seats in NEWIMPORT
2009-10-06 12:08:20 +08:00
Worros
230eb32615
Merge branch 'master' of git://git.assembla.com/fpdb-sql
2009-10-06 11:11:58 +08:00
sqlcoder
8851b141a2
add dropdown to player name in filter
2009-10-05 22:12:35 +01:00
sqlcoder
7149de3aa2
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2009-10-05 20:41:10 +01:00
sqlcoder
7900ebcebe
Tell user what is happening on startup
2009-10-04 17:46:04 +01:00
sqlcoder
5e3644d8d9
make separate hud menus for player and opponents stats
2009-10-04 12:26:37 +01:00
Ray
971a282383
Merge branch 'master' of git://git.assembla.com/fpt_fpdb
2009-10-03 21:09:21 -04:00
sqlcoder
5a0c83b60a
debug session stats
2009-10-03 23:11:45 +01:00
Mika Bostrom
f6eb365b3c
Add the default box text to example config
...
Now that the text on HUD's box is configurable, move the default text
from code to default/sample config.
2009-10-03 21:18:49 +03:00
Mika Bostrom
14122770ef
Make hud's menu-area text configurable
...
By default the hud positions a little box on top-left corner of each
table. Make the text in this box user-modifiable without touching the
source.
Most likely useful for active users and those who play with smaller
tables. On shrunk table the default box may cover some of the players'
cards.
2009-10-03 21:18:39 +03:00
Mika Bostrom
c77e143436
Add the default box text to example config
...
Now that the text on HUD's box is configurable, move the default text
from code to default/sample config.
2009-10-03 21:10:09 +03:00
Mika Bostrom
18cc51ba7a
Make hud's menu-area text configurable
...
By default the hud positions a little box on top-left corner of each
table. Make the text in this box user-modifiable without touching the
source.
Most likely useful for active users and those who play with smaller
tables. On shrunk table the default box may cover some of the players'
cards.
2009-10-03 21:05:41 +03:00
Mika Bostrom
a1d5f2292f
Merge branch 'master' of git://trac-git.assembla.com/fpdb-sql
2009-10-03 00:57:25 +03:00
sqlcoder
61f384a886
improve stats menu in HUD some more
2009-10-01 23:16:20 +01:00
sqlcoder
b0037e545a
improve stats menu on hud
2009-10-01 21:40:14 +01:00
Worros
d36d8f4249
From 7d5a3e81a5d41298ab1fa4d57bef25862a167350 Mon Sep 17 00:00:00 2001
...
From: lucktard <ntogden@gmail.com>
Date: Wed, 30 Sep 2009 12:16:06 -0500
Subject: [PATCH] Detect and import capped 6 max hands on FullTilt
and
From b35d23aba38935406cf1522ae07a49cd441318b3 Mon Sep 17 00:00:00 2001
From: lucktard <ntogden@gmail.com>
Date: Wed, 30 Sep 2009 12:21:34 -0500
Subject: [PATCH] Detect deep 6 max tables for HUD on FT
2009-10-01 10:49:59 +08:00
Mika Bostrom
e4969820b8
Merge branch 'master' of git://trac-git.assembla.com/fpdb-sql
2009-09-30 20:27:17 +03:00
sqlcoder
2b7a42bf1d
fix bug for tourneys in new code, modify part of hud menu to use checkmenuitems
2009-09-29 23:34:52 +01:00
Mika Bostrom
432c24173e
Merge branch 'master' of git://trac-git.assembla.com/fpdb-sql
2009-09-29 09:11:33 +03:00
sqlcoder
16f8fffd68
add separate hud config for user and allow some user config in HUD menu (opponents still only via editing HUD_main.py)
2009-09-28 23:59:17 +01:00
Mika Bostrom
5260f5c384
Merge branch 'master' of git://trac-git.assembla.com/fpdb-sql
...
Conflicts:
pyfpdb/Database.py
Resolve by reverting to sqlcoder's version; it uses the nice insert in
fillDefaultData for each case now and having the DB backends separate
might be good for the foreseeable future.
2009-09-28 18:07:08 +03:00
sqlcoder
cb9a972eda
add aggregation options to hud menu
2009-09-28 00:51:09 +01:00
sqlcoder
b6ea02fd43
improve tourney importing
2009-09-28 00:44:55 +01:00
sqlcoder
db861292a5
use False for boolean so it works in postgres as well as mysql
2009-09-27 23:42:00 +01:00
sqlcoder
d6414d211b
allow separate hud options on each table and add aggregate options to main table menu
2009-09-27 21:23:00 +01:00
sqlcoder
7f47a753db
cosmetic change to comment
2009-09-27 21:21:26 +01:00
sqlcoder
8353d0739b
improve hudcache recalc when db is empty and avoid mysql long int problem
2009-09-27 13:36:45 +01:00
sqlcoder
01c33c26f8
fix tourneytypes insert for postgres again
2009-09-27 12:47:21 +01:00
sqlcoder
8d01caa30f
try to work around Everleaf problem where winning hole cards not always shown - derive from winning hand where possible
2009-09-27 12:21:22 +01:00
sqlcoder
d5a1523e59
fix startCard calcs
2009-09-27 11:40:39 +01:00
sqlcoder
9a7d7267ff
remove print
2009-09-27 10:42:33 +01:00
sqlcoder
6f75719ffe
refine hero's player id derivation in empty db's
2009-09-27 02:06:07 +01:00
sqlcoder
c1711c4e2e
refine new date option on hudcache rebuild
2009-09-27 01:42:26 +01:00
sqlcoder
b054a9c09a
fix params when creating Database instance
2009-09-27 00:06:06 +01:00
sqlcoder
e75d915120
allow hudcache rebuild to only start Hero's stats from chosen date :-)
2009-09-26 23:32:44 +01:00
sqlcoder
518fd9e039
merge from Eric
2009-09-26 11:45:05 +01:00
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