Matt Turnbull
ebcfebbc2f
gameinfo changes, to fit better with db spec in docs folder
...
tests
2009-03-09 23:01:58 +00:00
Matt Turnbull
f9817a7e1a
Merge branch 'master' of mt@192.168.1.5:src/mctfpdb
2009-03-09 22:59:07 +00:00
Matt Turnbull
250505f13b
Merge commit 'carl/master'
2009-03-09 22:28:47 +00:00
Matt Turnbull
ddaf2575e0
git complaining have to commit
2009-03-09 22:28:35 +00:00
Worros
9427c97f4c
Start of card selection filter
...
Doesn't display yet
2009-03-10 01:41:36 +09:00
Ray
6314c5a7cc
Display community cards.
2009-03-09 11:41:58 -04:00
Ray
3d6bd0eb46
New query: get common cards for mucked card display.
2009-03-09 11:37:34 -04:00
Worros
b062ed6e70
Add query from Eleatic Stranger on 2+2
...
Preliminary query for analysing hole cards
2009-03-10 00:34:07 +09:00
Ray
7d7bf80024
Export button is not sensitive until graph is created.
2009-03-09 10:21:40 -04:00
eblade
b64213e6c5
bulk change range to xrange
2009-03-09 06:41:02 -04:00
eblade
5f1e5d0996
revert to ray's Configuration.py
2009-03-09 06:40:38 -04:00
eblade
60e66dcf31
Merge branch 'master' of git://git.assembla.com/free_poker_tools.git
...
Conflicts:
pyfpdb/Configuration.py
2009-03-09 06:31:13 -04:00
Worros
7f63ef7cfe
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-03-09 19:23:00 +09:00
Worros
d6b5f5d019
Merge branch 'master' of git://git.assembla.com/fpdb-eric
...
Conflicts:
pyfpdb/Configuration.py
2009-03-09 19:22:54 +09:00
eblade
30f8c8ed07
range->xrange bs
2009-03-09 06:18:12 -04:00
eblade
3c00915861
modernize syntax in classifyLines()
2009-03-09 05:56:41 -04:00
eblade
7a6684699a
remove string concat from fairly highly used convert_cards() func
2009-03-09 05:06:36 -04:00
Worros
023fe50bb0
Change default file (about to switch to another branch)
2009-03-09 17:50:09 +09:00
eblade
9dab2899f7
code optimization wrt string addition, map(), xrange()
2009-03-09 04:23:57 -04:00
eblade
66e05d08b1
make use of python's bizarre conditional assignment
2009-03-09 03:47:25 -04:00
eblade
635d59b25d
use some lambda map/filter calls where they make sense instead of for loops
...
localize some variables in the HUD update function
2009-03-08 16:28:09 -04:00
eblade
1b6337365f
eliminate some string addition, change calls from range() in HUD to xrange()
2009-03-08 15:39:55 -04:00
Worros
b679fddfd2
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2009-03-08 14:18:20 +09:00
Worros
da88e1b20c
Merge branch 'master' of git://git.assembla.com/mctfpdb
...
Conflicts:
pyfpdb/EverleafToFpdb.py
pyfpdb/FulltiltToFpdb.py
2009-03-08 14:09:16 +09:00
Ray
1a417441f6
First commit of Mucked_Flop. Works, but needs polish.
2009-03-07 20:44:10 -05:00
Ray
5f60cfde7c
Add get_aux_locations.
2009-03-07 17:02:51 -05:00
Worros
b07823b372
Merge branch 'futz' from Matt
...
Conflicts:
pyfpdb/EverleafToFpdb.py
pyfpdb/FulltiltToFpdb.py
pyfpdb/Hand.py
pyfpdb/HandHistoryConverter.py
2009-03-08 00:43:33 +09:00
Worros
dee2c63a5d
Syntax cleanups and optimisations
2009-03-07 23:35:52 +09:00
Worros
17609ce71b
Minor mods to Grapher to try and resolve issue with multiple plots being
...
added
2009-03-07 18:23:30 +09:00
Worros
c505e98bcf
Player regex interface updates from monkeyfutz
2009-03-07 18:06:52 +09:00
Ray
753754c924
Allow Aux_windows to have layouts and some cleanup.
2009-03-06 21:46:34 -05:00
Matt Turnbull
ca6f6e513b
message
2009-03-06 18:10:04 +00:00
eblade
d81a701ec2
fix kill hud not killing popups, fix some popup bugs
2009-03-05 21:27:12 -05:00
Matt Turnbull
426b5c2db5
had a go at PokerStars -> PokerStars conversion...
...
fpt : bugfix
hand : DrawHand class, moved discardCards there
is 'studhi' = '7 Card Stud' in PokerStars string? was playing with
Natalie HORSE file
2009-03-06 01:24:38 +00:00
Ray
baa8d145ae
Delay getting game type to support mixed games.
2009-03-05 20:10:56 -05:00
eblade
a34c90dee3
git still pisses me off
2009-03-05 18:43:00 -05:00
eblade
fc855995c7
Merge branch 'master' of git://git.assembla.com/free_poker_tools.git
...
Conflicts:
pyfpdb/Hud.py
git is really pissing me off
2009-03-05 18:38:10 -05:00
eblade
4f1697d390
HHC: fix missing second arg to determineGameType
2009-03-05 10:17:17 -05:00
Ray
e9861e18c8
Fix error when no aux_windows are specified.
2009-03-05 10:12:31 -05:00
Matt Turnbull
1e047b6998
Don't error gruesomely when someone exports nonexistant graph
...
sys.path[0] to get basepath of fpdb script
2009-03-05 12:31:56 +00:00
eblade
98e0a096d2
Merge branch 'master' of git://git.assembla.com/free_poker_tools.git
2009-03-05 00:04:03 -05:00
Matt Turnbull
75dcf002f9
Configuration: _getframe(0) so that GuiAutoImport can run standalone
...
(stack not deep enough to go one deeper)
fpdb_import: Everleaf plumbing back in place.
GuiAutoImport.py: run standalone.
2009-03-05 01:12:15 +00:00
Ray
6667f4cddb
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-03-04 20:08:20 -05:00
Ray
30ac181a36
New file: Hello.py. Aux_window examples.
2009-03-04 20:07:09 -05:00
Ray
a6d70e6e13
More tuning of the aux_window interface.
2009-03-04 20:04:23 -05:00
Worros
50a1ec1ccf
Add logging function from futz
2009-03-05 01:46:01 +09:00
Worros
87d9dbcf25
Merge branch 'master' of git://git.assembla.com/fpdb-eric
...
Conflicts:
pyfpdb/EverleafToFpdb.py
2009-03-05 01:07:42 +09:00
Worros
740fe92914
rename hand.string to hand.handText
...
Few other minor updates to match monkeyfutz
2009-03-05 00:10:08 +09:00
Worros
e8552023da
Whitespace and comment updates from monkeyfutz
2009-03-04 23:29:13 +09:00
eblade
4d09686309
hud_main window resizes to smallest possible size whenever a hud is removed from the list (pls test in nix guys tnx)
2009-03-04 08:17:23 -05:00
Worros
dd6a912aa7
Merge branch 'master' of git://git.assembla.com/mctfpdb into futz
2009-03-04 12:40:17 +09:00
Matt Turnbull
7049a959ec
I attempted to merge monkeyfutz into master.
...
Let me know how you get on.
I just remembered autoimport probably broken at this point, I have
changed the way HHC is called and only been testing standalone
filtering..
Just try it and then git checkout ^HEAD
Merge branch 'monkeyfutz'
Conflicts:
pyfpdb/EverleafToFpdb.py
pyfpdb/FulltiltToFpdb.py
pyfpdb/Hand.py
2009-03-03 18:45:02 +00:00
Matt Turnbull
703fa40073
Merge branch 'master' of git://git.assembla.com/fpdboz
...
Conflicts:
pyfpdb/Hand.py
2009-03-03 12:24:42 +00:00
Worros
81279a0c9e
Fix col align
2009-03-03 20:43:16 +09:00
eblade
1c79ecf82c
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2009-03-03 06:36:57 -05:00
Worros
86101c522c
GuiPositionalStats.py
...
New tab, output cols aren't labelled properly but we appear to have
something sane
2009-03-03 20:32:01 +09:00
eblade
9ebabc79dd
fix my misspelling of the maxseats var
2009-03-02 19:51:18 -05:00
Matt Turnbull
36befa43a8
More futzing
...
- made it so that Hand.__init__ calls the hhc readX methods in the right
order for that kind of Hand (Stud or Holdem/Omaha)
- hhc.readX methods then callback Hand.addX methods
Why? WHY! I hear you ask. Actually I can see there's very little gain,
sorry about that; but it sort of makes sense. Now you just make the
right kind of Hand, give it the text and the right kind of HHC filter,
and it makes itself.
- apart from that, biggest actual thing done is probably in adding
player cards for stud hands -- revamped and made it really clear (I
think) whats happening (see FullTilt.readStudPlayerCards)
When I run FullTiltToFpdf.py it goes through all the hands.
- Still have some print statements, have been changing them to
logging.debug or logging.info as I come across them.
You may find "tail -f logging.out" useful
Actually I'm not at all convinced about the use of logging except that
you can redirect it to stderr quite easily and then set the threshold
for what gets logged quite easily, so that might be a plus.
- Oh and the subclassing of Hand is getting clearer.
2009-03-02 21:48:30 +00:00
Worros
25ae39d7b5
Minor fixups: set->list and FullTilt lookup table
2009-03-03 00:10:15 +09:00
Matt Turnbull
5c26bb028d
Merge branch 'master' into monkeyfutz
...
Everleaf converts hands
Moved process hand logic into the hand subclass that knows what it
wants, it calls back to the hhc (which knows about the format) to populate itself
Conflicts:
pyfpdb/EverleafToFpdb.py
pyfpdb/Hand.py
pyfpdb/HandHistoryConverter.py
2009-03-01 23:22:47 +00:00
eblade
3018483a6f
changes to lookup list for sb/bb in flhe
2009-03-01 15:58:12 -05:00
eblade
dc458b1c19
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2009-03-01 13:33:46 -05:00
Worros
d4cc5d4182
Initial fix for Everlead limit games
...
Only one entry in the lookup table at the moment, need to collect data
and expand for all known limits
2009-03-02 01:52:52 +09:00
Worros
3cf8239cc9
Fix bug inmporting Everleaf PLO
2009-03-01 23:05:21 +09:00
Worros
ca9ed06351
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2009-03-01 22:44:03 +09:00
Ray
5ba8d3b95d
Fix missing argument in call to kill_hud.
2009-02-28 18:46:54 -05:00
Ray
5bf7d9038a
Fix bug in autoclosing HUDs on windows.
2009-02-28 15:19:01 -05:00
eblade
4ca4e11591
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2009-02-28 14:23:57 -05:00
eblade
7a7eb25529
Merge branch 'master' of git://git.assembla.com/free_poker_tools.git
2009-02-28 14:22:06 -05:00
eblade
aecb6092d0
fix missing self.
2009-02-28 14:21:59 -05:00
Ray
b3fb9e954d
Fix clobber of db object.
2009-02-28 11:31:24 -05:00
Worros
09d577214b
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2009-02-28 13:08:27 +09:00
Worros
e5c65fe036
Fix Everleaf HandInfo regex to support limit
2009-02-28 12:45:44 +09:00
Worros
c0400f6c66
Fix Everleaf GameInfo regex to detect FL
...
Added regression test mechanism while at it
2009-02-28 12:34:41 +09:00
Ray
d44c90aec7
Temp fix to HUD crashing when closed table is updated.
...
Also fixes popups not closing correctly.
General cleanup in the HUD closing code. Closing a HUD
is now managed by the HUD_Main object--this should ensure
that no objects are left dangling.
2009-02-27 19:47:52 -05:00
Ray
e85a531f6a
Fix missing "self." in previous commit.
2009-02-27 14:27:57 -05:00
Matt Turnbull
7087ede374
temp commit
2009-02-27 18:42:53 +00:00
eblade
fe4087d929
Merge branch 'master' of git://git.assembla.com/free_poker_tools.git
2009-02-27 13:38:26 -05:00
eblade
701079fe35
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2009-02-27 13:37:08 -05:00
Matt Turnbull
9254be66a1
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-02-27 18:29:43 +00:00
Matt Turnbull
a2f6578848
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2009-02-27 18:29:36 +00:00
Ray
167ea98b8b
Eliminate erronious multi huds on same table in some cases.
2009-02-27 12:42:49 -05:00
Ray
e45c42b172
Correct mistaken removal of stderr redirect.
2009-02-27 10:36:45 -05:00
eblade
4c0b709c22
fix for error if totalprofit = 0 (new player)
2009-02-26 22:01:35 -05:00
Ray
55d61fd1a5
Merge branch 'master' of git://git.assembla.com/mctfpdb
2009-02-26 12:02:14 -05:00
Ray
20514bd0cb
Merge branch 'master' of git://git.assembla.com/fpdboz
...
Conflicts:
pyfpdb/GuiBulkImport.py
pyfpdb/Hud.py
2009-02-26 12:01:18 -05:00
Ray
af906352fc
Minor changes.
2009-02-26 11:55:51 -05:00
Ray
baefbb5a07
Cleanup in GuiBulkImport, trivial change to Tables.
2009-02-26 11:53:31 -05:00
Matt Turnbull
0773818831
set -> list
2009-02-26 16:50:45 +00:00
Matt Turnbull
31b37f3746
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-02-26 16:50:27 +00:00
Worros
3fba85456c
Fix button regex
2009-02-27 01:26:50 +09:00
Matt Turnbull
ca57a5a5ff
set -> list
2009-02-26 16:04:08 +00:00
Matt Turnbull
da602b2908
temp
2009-02-26 15:36:23 +00:00
Worros
6d862cff52
addPlayerCards done - now need to print it
2009-02-27 00:35:15 +09:00
Worros
7f1fd2ca38
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-02-26 23:32:41 +09:00
eblade
9557117a16
add "totalprofit" stat
2009-02-26 09:27:59 -05:00
Ray
333cbdbf6d
Speed and reliability changes (+cleanup) to aux window interface.
2009-02-25 23:35:15 -05:00
eblade
c7541d9f14
return appropriate tuple from import_fpdb_file on file error
2009-02-25 23:17:36 -05:00
eblade
560cb1a543
fpdb_import runUpdated() will now remove files that were found to be newly missing on it's most recent pass from it's list of files to check
2009-02-25 22:44:03 -05:00
Matt Turnbull
0986e36648
work in progress!
...
- command line options
Try the following
./Everleaf --help
cat everleaf.txt | ./Everleaf -i - -o -
Try using -i -, and pasting in a hand. Be aware it needs an EOF
<ctrl>-d (unless you specify --follow, which isn't done yet)
- HHC is a thread
- hand gametypes per hand
- lots of stupid little things just to cause trouble
- added logging
Not yet done:
- tail -f mode
- integration into fpdb_import. Two options for grand plan here:
1) recently modified files get a HHC filter attached
when the HHC runs out of pipe it waits
runUpdated finds modified files and notifies the thread
2) the thread follows independently, when it runs out of input it
sleeps and then tries again at intervals
I like both, 1) involves bigger changes to fpdb_import whilst with 2) we
just point the existing fpdb_import code at the filter output (the way
we currently do filtering has to be altered though)
Comments welcome of course.
2009-02-26 00:59:36 +00:00
eblade
7ebf27c07e
add site config option "use_frames", set to "True" to get frames
2009-02-25 15:25:58 -05:00
eblade
3c9f5537ea
import should stop erroring out and crashing if a file it wanted to read has been deleted
2009-02-25 12:40:39 -05:00
Worros
440602198f
Fix(?) HeroCards regex for stud
2009-02-26 01:48:41 +09:00
Worros
59136c70d1
Merge branch 'master' of git://git.assembla.com/mctfpdb
2009-02-26 01:24:15 +09:00
Worros
354a67c0e4
Some bringin code for stud/razz
2009-02-26 01:23:46 +09:00
Worros
a71be6ddd3
Add stud/razz ante for FullTilt converter
2009-02-26 00:45:46 +09:00
Matt Turnbull
d5b7b17b21
bugfix
2009-02-25 15:16:18 +00:00
Matt Turnbull
e5489056ff
less broken, please check sanity
2009-02-25 14:59:11 +00:00
Matt Turnbull
65c34a7377
keeping Everleaf uptodate with FullSteamAhead changes
...
Also, made static regexes class-wide, so compile once on import
2009-02-25 14:35:28 +00:00
Matt Turnbull
abf489f0c6
need re.MULTILINE and not to have syntax errors
2009-02-25 14:14:42 +00:00
Matt Turnbull
bb4eece2f7
Merge branch 'master' of git://git.assembla.com/fpdboz
...
Only seemed to conflict the [ --> \[ in the HeroCards re
Conflicts:
pyfpdb/FulltiltToFpdb.py
2009-02-25 12:36:45 +00:00
Worros
d500a9f9c5
More Razz - First pass through hh that doesn't crash
2009-02-25 21:34:05 +09:00
Matt Turnbull
8cccce512d
regexs start at start of lines
2009-02-25 12:34:01 +00:00
Worros
8b9b77edb9
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-02-25 20:40:55 +09:00
Matt Turnbull
a324dc4c7e
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-02-25 11:32:14 +00:00
Matt Turnbull
a5b7b8202a
tiny changes
2009-02-25 11:32:03 +00:00
eblade
cda897608c
EverleafToFpdb: should at least recognise Stud, once the HandInfo regex is fixed. Not that it'll do anything good with it.
...
HHC: return doing nothing but printing a warning message to output, if determineGameType() returns None
2009-02-25 06:01:44 -05:00
Worros
a6df1b6461
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-02-25 19:35:54 +09:00
Worros
3d9026da2c
More razz updates
2009-02-25 19:32:12 +09:00
Matt Turnbull
baa5b2e8b5
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-02-25 10:26:25 +00:00
Worros
dd6c23ad85
Move markStreets outside of if statement in main processing loop
2009-02-25 02:12:45 +09:00
Worros
a8a870548e
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2009-02-25 02:08:06 +09:00
Worros
a4f0e9a1fd
Fulltilt nlhe working, more razz stuff
...
Everleaf still broken - need to create/move button regex to new abstract
method
2009-02-25 02:05:51 +09:00
Worros
7fd90ce760
Thinko - use right regex
2009-02-25 01:27:10 +09:00
Worros
b38c62367a
Preliminary razz support for Fulltilt
...
Breaks stuff
2009-02-25 01:17:25 +09:00
Ray
c535dc7f24
Cleaner intermediate print during autoimport.
2009-02-24 10:54:02 -05:00
Worros
bca9fb15cf
Note in code re: os.walk
2009-02-24 22:46:05 +09:00
eblade
163842e379
Merge branch 'master' of git://git.assembla.com/free_poker_tools.git
2009-02-23 22:48:28 -05:00
Ray
f1530860d2
Fixed problem with unreliable fav_seat placement.
...
Eliminated special query to get actual seat by
incorporating in to stat_dict query. Provided for
graceful skipping of hands when there is an error
in a query in the read_stdin() thread. Left
intermediate prints for use of others.
2009-02-23 21:33:23 -05:00
eblade
b2ee8fa0ce
add a couple of missing commas
2009-02-23 07:56:33 -05:00
Worros
a4911b8b9e
More syntax error
2009-02-23 21:56:29 +09:00
eblade
4a12d5e9a7
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2009-02-23 07:53:29 -05:00
Worros
5aecfb8e30
Oops. fix syntax error
2009-02-23 19:24:21 +09:00
Matt Turnbull
03f89ee439
for some reason my GuiBulkImport was missing get_vbox()
...
Added a combobox for selecting a filter
But import brokea bit
2009-02-23 01:03:18 +00:00
eblade
89fde673e2
should detect FL games (need to implement way to actually not continue processing FL since we don't support it currently)
2009-02-22 18:03:19 -05:00
eblade
482ad798aa
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2009-02-22 18:01:51 -05:00
Worros
1c1adfaf08
Preliminary support for Everleaf PLO?
2009-02-22 18:21:49 +09:00
Worros
232c0df33a
determineGameType fixed for FTP, PLO working
2009-02-22 18:07:11 +09:00
Worros
baae7af5e0
Remove a tonne of debug, neaten output
2009-02-22 14:37:38 +09:00
Worros
3febe073cc
Make FullTilt wrk with new importer
2009-02-22 12:42:16 +09:00
Ray
2ebb026543
Cleanup in HUD_main and HUD.py to simplify.
...
HUD_run_me no longer needed but not removed.
2009-02-21 18:19:49 -05:00
eblade
0dc63746f9
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2009-02-21 11:20:28 -05:00
Worros
40ccefe105
Separate collected and collectees for output
2009-02-22 01:17:06 +09:00
Worros
cf52ee4822
Fix blinds output
...
Changes self.posted to be a list of lists.
[[p1, "small blind"][p2, "big blind"][p3, "big blind"][p4, "both"]]
2009-02-22 00:22:25 +09:00
eblade
560bead1d3
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2009-02-21 09:39:33 -05:00
Worros
76688ed1c2
Fix regex for posting both blinds
...
Partially fix output:
neslein: posts small blind [$ 0.05 USD]
dokiprogym: posts big blind [$ 0.10 USD]
EricBlade: posts both blinds [$ 0.15 USD]
Tilting2: posts big blind [$ 0.10 USD]
becomes:
neslein: posts small blind $0.05
dokiprogym: posts big blind $0.10
Tilting2: posts big blind $0.10
EricBlade: posts big blind $0.10
EricBlade should post .15
2009-02-21 23:26:37 +09:00
Worros
d196b80a60
Deal with case 'no small blind and walk in bb'
2009-02-21 22:31:57 +09:00
Worros
5c6793d373
Add sanity check to HHC
...
Make sure input file and output file are different so we dont overwrite
the source.
2009-02-21 22:06:10 +09:00
eblade
9fa6d05528
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2009-02-21 07:46:20 -05:00
Worros
420c4fec69
Add 'Uncalled bet' line to output of new converter
2009-02-21 21:37:47 +09:00
eblade
45d2e5cedd
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2009-02-21 06:44:14 -05:00
Worros
e8d90bd705
Fix for table names with '-' in them
2009-02-21 20:42:16 +09:00
eblade
4baa9835f9
fix my last patch to use os.path.sep instead of hardcoded "\\"
2009-02-21 06:25:12 -05:00
Worros
36568075fe
Add output line for main import code
...
Main import should probably read summary, meh
2009-02-21 20:24:11 +09:00
Worros
22c9fd6acb
Adds command line operation to file.
...
Only supports a single file at the moment
2009-02-21 20:05:17 +09:00
eblade
6fc903b504
contingency plan in case you refer to the filename iwthout it's full pathname, ie manual conversion
2009-02-20 17:22:36 -05:00
eblade
506f0fd751
add folder with date-name to outputfilename for everleaf converter (uses whatever the prior folder name in the path was, regardless of if it's a date or not, but normally it would be a date)
2009-02-20 16:54:42 -05:00
eblade
824f6a3129
Merge branch 'master' of git://git.assembla.com/mctfpdb.git
...
Conflicts:
pyfpdb/HandHistoryConverter.py
2009-02-20 15:58:00 -05:00
Matt Turnbull
2b13d38da6
fixed keyword arg before non keyword arg bug from last commit
2009-02-20 18:02:23 +00:00
Matt Turnbull
483e177346
Explicit matching of player names
...
About the only place where we are guaranteed to get all the players'
names correctly is in the seating plan in the hand header. We extract
the names and build a regex that matches only the names. We only do this
if the current regex is out of date, to avoid recompiling them too
often.
I also did away with self.rexx because it seemed unnecessary and was
difficult to work with.
2009-02-20 16:29:52 +00:00
eblade
b8f88661f3
Add comment to Hand.py, around addCollectPot(). Please look at that, Matt.
2009-02-20 03:33:25 -05:00
eblade
c02f5dbaeb
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2009-02-20 03:26:12 -05:00
Worros
81c92f9599
Revert last change and try alternate
...
Assumes that the player names cannot have a ':' or a ' ' in them
2009-02-20 17:22:58 +09:00
eblade
fe5045b14f
hand error in checkPlayerExists will tell you why it failed
2009-02-20 02:44:06 -05:00
Worros
65821dbd2b
Remove debug line that slipped thorugh in last commit
2009-02-20 16:42:57 +09:00
Worros
77591788e4
Minor regex update for raises in Everleaf
2009-02-20 16:38:13 +09:00
eblade
f0dc69250c
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2009-02-20 02:30:41 -05:00
Worros
e5ab933659
Fix major bug in fpdb_import
...
Hat tip to Eric
2009-02-20 16:06:22 +09:00
eblade
71b47c237a
Merge branch 'master' of git://git.assembla.com/fpdboz.git
...
Conflicts:
pyfpdb/HandHistoryConverter.py
2009-02-19 16:59:28 -05:00
eblade
14cf64f81b
HHC will return without generating python errors if given an empty input, commented out echoing the input
2009-02-19 16:56:37 -05:00
Worros
08a4d568cc
Fix parseHandStartTime for FullTilt
...
Doesn't come close to fixing Full Tilt tourneys as far as i can tell.
2009-02-20 02:26:29 +09:00
Worros
d9656b25f6
Oversight in Hand.py (?)
...
Bp missing in this function, and doesn't run if called. No idea if the
function has ever been called.
2009-02-20 01:37:48 +09:00
Worros
bc8f1b56b6
Remove Unicode mode from file read.
...
Hope this fixes the issue with Erics source file getting nuked
2009-02-19 22:58:29 +09:00
Worros
98ea23cd49
Couple of additional fixes for import
2009-02-19 22:10:31 +09:00
Worros
50ca5d5457
Fix tab/spacing
2009-02-19 21:15:12 +09:00
Worros
66fe3f990b
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-02-19 20:35:33 +09:00
Worros
2a90c798a2
Make executable
2009-02-19 20:35:05 +09:00
eblade
d2159b6430
changes to make auto-import recursive, and to get the converter thingee kind of working
2009-02-19 05:38:51 -05:00
Worros
dcee1c6d28
Merge branch 'master' of git://git.assembla.com/free_poker_tools
...
Conflicts:
pyfpdb/fpdb_import.py
2009-02-11 16:40:33 +09:00
Ray
18140defd8
Update bulk import, optionally drop indexes, improve gui
2009-02-07 10:06:48 -05:00
Worros
6214131713
Small change - note we should error check
2009-02-05 18:50:50 +09:00
Worros
315d010311
Make Everleaf converter actually function.
...
Makes HandHistoryConverter actually write out a file to
$hhArchiveBase/sitename/
Adds code in importer call the functions in EverleafToFpdb
2009-02-05 18:28:18 +09:00
Ray
9395643aad
Straighten out Cards01.png thing. (see typo)
2009-01-30 17:27:31 -05:00
Ray
79fd998718
Added Cards0.png = ftp card images for use with Mucked.py
2009-01-30 17:13:00 -05:00
Ray
5f290ace56
Updated version to 0.10 via new VERSION variable.
2009-01-30 13:00:29 -05:00
Worros
9cd88c0399
Comment patch: FTP HH headers
2009-01-30 13:23:09 +09:00
Ray
8ee2b72a42
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-01-29 12:37:25 -05:00
Worros
b023a9404c
Quick commit to add the failing Full Tilt HH Header
...
Only as a comment for now. Need to pull together all the valid Full Tilt
HH lines so we can write a decent regex to match
2009-01-30 02:18:19 +09:00
Worros
d684b50415
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-01-29 11:27:28 +09:00
eblade
e17c2eb64e
fpdb_import: cleanup, and fix for FT bug that puts multiple seats on one line of summary
2009-01-28 03:46:43 -05:00
Ray
c767bb9986
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-01-27 23:52:51 -05:00
Worros
c4ce2ea95a
Make grapher export image file.
...
Currently dangerous with no error checking.
Exports a png file in the same dimensions as it appears on screen
2009-01-28 12:51:39 +09:00
Worros
e782fbd5f3
Comment out sample session detection code
2009-01-28 12:35:54 +09:00
Ray
58ccf0327c
Complete prev commit by deleting intermed output.
2009-01-27 14:13:54 -05:00
Ray
9ddce0b016
Remove some comments that didn't get removed with its code.
2009-01-27 14:11:53 -05:00
Worros
1179067033
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2009-01-27 19:35:35 +09:00
Worros
07b765482d
Added prelim Betfair parser.
...
Straight copy of the current Everleaf parser
2009-01-27 16:22:15 +09:00
Ray
64f1f17d7c
Make player stats rows not expand = prettier.
2009-01-26 20:02:01 -05:00
Ray
3261f28506
Put a frame around each eb in the stat window-avoid tooltip annoyance.
2009-01-26 18:31:04 -05:00
Ray
37a643f054
Kill aux windows when killing the HUD.
2009-01-26 14:31:08 -05:00
Ray
b6ee768f2c
Merge branch 'master' of git://git.assembla.com/mctfpdb
2009-01-24 09:22:27 -05:00
Ray
9981a62847
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-01-24 09:22:18 -05:00
Matt Turnbull
05701955ac
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-01-22 18:21:48 +00:00
eblade
24e9e56726
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2009-01-22 00:19:38 -05:00
Matt Turnbull
f048a763c0
Merge branch 'session' of git://git.assembla.com/fpdboz
2009-01-21 21:16:33 +00:00
Worros
30cd579131
Session detection code.
...
Possible use in showing sessions graphically on the plot
2009-01-22 01:40:05 +09:00
Worros
3bc8327d12
Remove euro symbol is it barfs python
2009-01-22 01:31:39 +09:00
Ray
02e03c7ed9
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-01-19 12:57:05 -05:00
eblade
4d5b86ebdf
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2009-01-19 03:31:18 -05:00
Worros
b2c135ee12
Possible fix for problem Eric is reporting in importer
2009-01-19 11:32:34 +09:00
eblade
6941521a8c
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2009-01-18 07:29:32 -05:00
Worros
8cf705240c
Change bulk import output slightly
2009-01-17 02:41:18 +09:00
Worros
ffb037b1fe
Added output totals for bulk import
2009-01-17 02:24:00 +09:00
Worros
a3ff477395
Added comment/debug to damaged FTP file
...
Doesn't fix issue, but documents what the bug is in the FTP software,
and prints the file name and line number that it occurs in so user can
fix.
Ideally the parser itself would be able to deal with this.
2009-01-17 00:24:01 +09:00
eblade
9bf8551327
update get_nt_exe() to elevate privileges before calling OpenProcess, bizarre.
2009-01-15 11:09:30 -05:00
eblade
cd1d4df96d
HUD_main:
...
Add site name to list of windows being HUDed,
fix weird call convention to the "del" operator, which is not a function.
call clean_title() on hud titles being killed, so we actually kill (deep) tables and such
HUD:
Add function "kill_hud_menu", which is now called from the Kill This HUD menu option, to avoid a potential loop in kill_hud()
Record the handle of the HUD's destroy signal, use it to un-register, before performing a kill, also avoiding potential loop there
Do not allow kill_hud() to be called twice in the same HUD object, return doing nothing if deleted is already set on it (that should totally solve the loop problem)
2009-01-14 23:05:08 -05:00
Ray
b965654962
Merge branch 'master' of git://git.assembla.com/mctfpdb
2009-01-12 19:22:18 -05:00
Ray
fcd70293fb
minor formatting changes
2009-01-12 19:21:43 -05:00
Ray
d5597f7955
HUD_runme.py needs to be executable.
2009-01-12 19:20:24 -05:00
Matt Turnbull
5db308e1b2
execute permission on HUD_run_me.py
...
removed huge chunk of duplicate code in fpdb_simple.py (strange git
problem -- first 300 lines or so were duplicated in a pull)
2009-01-10 01:46:23 +00:00
eblade
0fd6c4a9b2
fpdb_parse_logic: use 'in' instead of 'find'
2009-01-08 10:40:18 -05:00
eblade
0cd97db548
fix typo from last commit
2009-01-08 06:25:25 -05:00
eblade
37a418484f
Replace all occurences in Tables.py where RegExps and the string 'find()' method were being used for simple string checks, with "in" operator
2009-01-08 06:17:56 -05:00
eblade
326805950b
Merge branch 'master' of git://git.assembla.com/free_poker_tools.git
...
Conflicts:
pyfpdb/Hud.py
2009-01-07 12:46:19 -05:00
eblade
ff3d6c75b8
Merge branch 'master' of git://git.assembla.com/mctfpdb.git
2009-01-07 12:36:09 -05:00
Matt Turnbull
d14dddca90
Break from thread loop instead of continuing. Fixes a bug where
...
we'd be looking up a new_hand_id of ""
2009-01-06 23:13:12 +00:00
Matt Turnbull
214861fc51
Merge branch 'master' of git://github.com/sqlcoder/fpdb-sql
2009-01-06 20:37:29 +00:00
eblade
fb9d7c0af2
Add file HUD_run_me, to be run by GuiAutoImport
...
GuiAutoImport: run HUD_run_me instead of HUD_main
HUD_main: Add HUD_removed() function, called by HUD when an individual HUD is closed, eliminates polling them every update; use 'in' operator instead of has_key
HUD: clean up code that deals with lack of font descriptor in config, and notification of what font was selected
HUD: clean up unnecessary use of keys() functions, and 'in' vs has_key
HUD: restore previous definition of reposition_windows(), although i can't make it error at will anymore
Tables: cleanup with keys() and in operator
fpdb: no longer raise an error on duplicate tab, since we currently depend on that, it's not an error, right?
2009-01-06 05:18:45 -05:00
Ray
c0557c7ef9
rationalized button presses, fixed reposition windows
2009-01-05 20:26:39 -05:00
Matt Turnbull
80e1eed7ec
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-01-05 19:04:46 +00:00
Ray
d994f04e01
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-01-05 10:53:31 -05:00
Ray
644201e669
Merge branch 'master' of git://git.assembla.com/fpdboz
...
Conflicts:
pyfpdb/HUD_config.xml.example
2009-01-05 10:53:10 -05:00
Ray
84653ff99c
updating HUD_config.xml.example
2009-01-05 10:49:27 -05:00
sqlcoder
ab1e8cf670
added new faster version of storeHudCache routine, storeHudCache2
...
Set the fastStoreHudCache variable to True to test this out.
In the best case it only does one DB operation (update), if
this fails because the record does not exist it does an insert.
2009-01-03 19:55:54 +00:00
sqlcoder
cc31f86269
add profit/100 hands stat
2009-01-03 18:00:44 +00:00
sqlcoder
257dd35c93
let fpdb_db routine work out which bits of config to use for connection
2009-01-03 17:59:48 +00:00
sqlcoder
26ad0ff91b
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-01-03 17:10:58 +00:00
eblade
0f90d8a899
discover functions all return None, instead of False, fixing bool has_key() problem in hud
2008-12-31 13:14:28 -05:00
eblade
26a549d7d2
discover functions all return None, instead of False
2008-12-31 13:13:35 -05:00
eblade
9b6e18c2c0
Merge branch 'master' of git://git.assembla.com/mctfpdb.git
2008-12-31 12:08:25 -05:00
eblade
6276386aa8
Merge branch 'master' of git://git.assembla.com/free_poker_tools.git
2008-12-31 12:06:58 -05:00
eblade
9989a97c25
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2008-12-31 12:03:15 -05:00
Worros
0857739d83
Add Euro Symbol (€) and EUR to regexes
2008-12-31 01:28:28 +09:00
sqlcoder
e469202b66
Merge branch 'master' of git://git.assembla.com/fpdboz
2008-12-28 09:50:33 +00:00
eblade
6de2607505
create_hud adds to the main_hud window, a list of tables that are being monitored (it is culled in read_stdin(), so i'll need to do some thinking on that to remove lag time between removal of hud and removal from list)
...
i can see using this for table info, debug info, buy-in info maybe, but i wanted some place i could write to directly and see things in real time rather than depending on the logs
2008-12-24 07:56:32 -05:00
Matt Turnbull
a76442f67e
Poll if HUD window is already terminated before attempting to
...
communicate the \n character to tell it to terminate.
2008-12-22 20:17:29 +00:00
eblade
fc4671fc98
add NA for attempted steal %
2008-12-21 18:42:21 -05:00
eblade
d4e16b9b05
code/comment cleanup
2008-12-21 17:14:57 -05:00
eblade
24069d607b
code/comment cleanup in Hud
2008-12-21 06:49:34 -05:00
eblade
c974864e13
Merge branch 'master' of git://git.assembla.com/mctfpdb.git
2008-12-21 06:11:33 -05:00
Matt Turnbull
a6c2152be4
break less badly on a hand which I can't handle at the moment
2008-12-20 22:52:47 +00:00
Ray
93a4059488
Merge branch 'master' of git://git.assembla.com/mctfpdb
2008-12-20 16:45:40 -05:00
Ray
74dbd8ab3d
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2008-12-20 16:44:50 -05:00
Ray
0dd46d38ac
Merge branch 'master' of git://git.assembla.com/fpdboz
...
Conflicts:
pyfpdb/Hud.py
2008-12-20 16:32:30 -05:00
Matt Turnbull
da41e8e2ce
Rid of cruft
2008-12-20 16:57:12 +00:00
Matt Turnbull
319ea7080d
Pot taking on much functionality
...
committing before deleting a lot of commented out bits
2008-12-20 16:48:25 +00:00
eblade
0cb5bc046a
Merge branch 'master' of git://git.assembla.com/fpdboz.git
...
Conflicts:
pyfpdb/Hud.py
stupid single blank line. wtf.
2008-12-20 01:42:38 -05:00
Worros
5d909fb648
Reapply stars regex changed reverted during a merge
2008-12-20 12:20:18 +09:00
Worros
83f50bafd3
Merge branch 'master' of git://git.assembla.com/free_poker_tools into session
...
Conflicts:
pyfpdb/Hud.py
2008-12-20 12:19:37 +09:00
Matt Turnbull
16f9906d84
pot total line output matches pokerstars better
2008-12-20 02:22:21 +00:00
eblade
aad02554ca
(font size config) Merge branch 'master' of git://git.assembla.com/free_poker_tools.git
2008-12-19 15:13:33 -05:00
eblade
bb3dee75e0
Merge branch 'master' of git://git.assembla.com/mctfpdb.git
2008-12-19 15:06:43 -05:00
Ray
15e1461cca
Merge branch 'master' of git://git.assembla.com/fpdboz
...
Conflicts:
pyfpdb/Hud.py
2008-12-19 14:08:36 -05:00
Matt Turnbull
28e5a05037
Merge branch 'master' of git://git.assembla.com/fpdboz
2008-12-19 11:32:40 +00:00
eblade
e9f9fa4111
Merge branch 'master' of git://git.assembla.com/fpdboz.git
...
Conflicts:
pyfpdb/fpdb_simple.py
GIT is really, really pissing me off. These 'conflicts' were two identical lines, with no beginning/trailing whitespace.
2008-12-19 04:39:45 -05:00
Worros
659f0bb508
Grapher: Fix Postgres to work again
2008-12-19 17:27:18 +09:00
Worros
db6a8c5b31
Grapher: Make date ranges work - MySQL
2008-12-19 17:21:58 +09:00
Worros
2d700820f4
Add Everleaf to DB init process
...
Should these come from config on startup...?
2008-12-19 16:58:24 +09:00
Worros
49aa8921e3
Grapher: Update to support mutiple sites and players
...
Makes sites actually selectable via checkboxes.
Removed the sitename from the graph string for the moment - How that
string is generated needs a major overhaul
2008-12-19 16:52:32 +09:00
Matt Turnbull
b37ddc5ace
So close, yet so far. Need to calculate rake to output the side pots
...
line correctly.
2008-12-19 03:01:45 +00:00
eblade
653cf9847d
allow position 8 in hud cache
2008-12-18 20:38:43 -05:00
eblade
685abee8b1
re-indent function
2008-12-18 17:39:43 -05:00
eblade
42113f301f
finish conflict resolution on those patches to check/parsePositions .. git really sucks.
2008-12-18 15:45:13 -05:00
eblade
2ccd00d3fd
redo changes to checkPositions, and such
2008-12-18 15:42:46 -05:00
eblade
9263aa998e
redo changes to parsePositions
2008-12-18 15:40:28 -05:00
Matt Turnbull
7803f52307
autoimport a bit better, no?
2008-12-18 17:49:17 +00:00
Ray
bb9f85233e
font and font_size added to config and used in HUD.
2008-12-17 21:57:05 -05:00
sqlcoder
f9a805f5cd
add do_commit(config) method to fpdb_db.py to make creating
...
a db connection easier. Used this in guiplayerstats.py to
create a separate connection and added commit to stop
locks here blocking hand imports.
2008-12-17 23:03:17 +00:00
Ray
e0105c5ed1
Clean up db connection in aux window. Hole cards to stud mucked list.
2008-12-17 13:24:37 -05:00
Matt Turnbull
fe2c806822
Everleaf appears to need addCallandRaise
2008-12-17 11:57:06 +00:00
Matt Turnbull
d168166495
Added:
...
addCallandRaise - when reported amount is the actual amount transfered
addRaiseBy - when reported is the amount additional to the
previous bet
_addRaise - common helper
2008-12-17 11:54:26 +00:00
Matt Turnbull
877f0771ab
nongreedy matches in collect_pot_re to fix kicker being picked up
...
instead of hand bug
2008-12-17 11:22:02 +00:00
Worros
dd7ede8903
Adjust regex to read 'and is all-in'
2008-12-17 14:04:29 +09:00
Worros
e5e8643557
Minor update to handinfo regex for OnGame
2008-12-17 13:46:16 +09:00
Matt Turnbull
a5bd749959
quick hack to Hand to help ongame
2008-12-17 00:30:31 +00:00
Matt Turnbull
ef48b83a80
OnGame is a bit weird, here's a start
2008-12-17 00:29:54 +00:00
Matt Turnbull
58411a1ae3
use python datetime handling functions : strptime strftime
2008-12-16 23:23:33 +00:00
Matt Turnbull
070091472c
first BB is treated as a call & raise of sb, so if folded round to bb,
...
it's an uncalled bet and he collects pot
2008-12-16 22:03:13 +00:00
Matt Turnbull
6f1e335275
FullTilt output is looking good, tried it on a HandHQ history, no crashes!
...
Hand.py: report summary line only for players who acted preflop (as with
stacks)
bug in a BB calling itself fixed
2008-12-16 21:49:04 +00:00
Matt Turnbull
1f1332b849
a bit more FTP; works? on 7 hand sample. No regression test of Everleaf
...
:(
2008-12-16 21:08:10 +00:00
Matt Turnbull
f230a82add
board cards read
...
button read
2008-12-16 17:26:58 +00:00
Matt Turnbull
8bd58e849e
some generality changes for FTP support
2008-12-16 17:14:37 +00:00
Worros
186ef42663
Upper case Flop Turn and River in board dict
2008-12-16 23:48:49 +09:00
Worros
1a46230176
Add first pass Full Tilt converter
2008-12-16 23:45:58 +09:00
Worros
d42739a958
Merge branch 'master' of git://git.assembla.com/mctfpdb
2008-12-16 22:39:51 +09:00
Matt Turnbull
988a7e3eb5
Added 'and is all-in' logic.
...
Altered to read actions in correct street order. hand.streetList must be
set correctly for different types of games.
2008-12-16 04:29:11 +00:00
eblade
6e1499fb69
reposition_windows() after bringing one forward that has been hidden previously, even though they should already be relocating while hidden.. suspect gtk bug
2008-12-15 23:07:37 -05:00
eblade
eec9c94342
merge from carl
2008-12-15 22:46:31 -05:00
Worros
eb6de6c68c
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2008-12-16 12:45:05 +09:00
Worros
5a7ccad725
Merge branch 'master' of git://git.assembla.com/fpdb-sql
2008-12-16 12:42:35 +09:00
eblade
e50fbf4f21
timer runs only under windows, not only under unix, oops
2008-12-15 22:38:04 -05:00
Worros
fe59ec8ac2
Merge branch 'master' of git://git.assembla.com/mctfpdb
2008-12-16 12:32:54 +09:00
Worros
828cfc405d
Merge branch 'master' of git://git.assembla.com/fpdb-eric
...
Conflicts:
pyfpdb/fpdb_simple.py
2008-12-16 12:17:50 +09:00
Matt Turnbull
9c5d0f4598
Writes hands to stderr, miscellanous crap to stdout; usuable as cmdline
...
filter: ./Everleaf 'hhfile' 1>/dev/null 2>outfile
Holecards are sets -- should work on Omaha hi hands also.
Successfully imported Speed_Kuala_full.txt to fpdb.
Added gettext.
cards strings are handled a little better (one fewer regex)
Testfile can be supplied as first cmd line arg.
2008-12-15 23:56:19 +00:00
sqlcoder
695b3a53cf
update mysql query for position stats (postgres one still to do ...)
2008-12-15 23:15:54 +00:00
Worros
764ef1b286
Merge branch 'master' of git://git.assembla.com/mctfpdb
...
Merge execution fixes from Ray with toggle button code from Matt.
Conflicts:
pyfpdb/GuiAutoImport.py
2008-12-15 17:22:49 +09:00
eblade
691608b6ca
update_table_position will kill huds that are closed, timer will not be called when under unix, currently, as this function only works in windows.
...
checkPositions() accepts position 9 again.
2008-12-15 02:04:35 -05:00
eblade
65e43a34e6
Merge branch 'master' of git://git.assembla.com/free_poker_tools.git
...
Conflicts:
pyfpdb/fpdb_simple.py
2008-12-14 21:57:03 -05:00
Matt Turnbull
fb02d9224b
Merge branch 'exp'
...
Conflicts:
pyfpdb/Hand.py
2008-12-14 22:15:14 +00:00
Matt Turnbull
2796a95669
Merge branch 'master' of git://github.com/sqlcoder/fpdb-sql
2008-12-14 22:09:17 +00:00
Matt Turnbull
3dbb0e8376
Everleaf uncalled bets; pot total; rake
2008-12-14 22:05:51 +00:00
Ray
5afc411cad
Fix the "(deep)" error on FTP.
2008-12-14 15:10:59 -05:00
Matt Turnbull
7926ac9def
multiple 'collected pots' handles side pots, rake calculated from
...
totalbets - totalcollected.
2008-12-14 19:25:04 +00:00
sqlcoder
f1be7c2ec0
saveActions setting was supposed to be True in 'official' code
2008-12-14 11:31:47 +00:00
Ray
a0ef01a0d1
Use execution_path() for finding card images.
2008-12-13 23:08:11 -05:00
sqlcoder
2ae8c792a6
playerstats: round value for variance before displaying, correct
...
calculation of $/hand
2008-12-14 03:07:05 +00:00
sqlcoder
791068d24f
refine column headings, handle null stats and remove debug message
2008-12-14 02:50:09 +00:00
sqlcoder
26506b3421
use new routine in fpdb_simple to create indexes
2008-12-14 02:42:07 +00:00
sqlcoder
fb6b8e5a5b
add variable at top of file to control whether actions are saved
...
or not and commented out timing debug statement
2008-12-14 02:38:09 +00:00
sqlcoder
d4e03424bf
call routines to drop and recreate some indexes and foreign
...
keys before and after bulk import
2008-12-14 02:30:19 +00:00
sqlcoder
a429cbb6e1
added new routines to drop and recreate indexes and foreign keys.
...
These could be called from any combination of standalone menu options,
as part of the database re-create option or as part of the bulk
import option
2008-12-14 02:23:40 +00:00
Ray
094f176c5d
Moved execution_path() to Configuration.py.
2008-12-13 17:37:23 -05:00
Ray
3994d3bb94
Get and use path for HUD_main.py to prevent some crashes.
2008-12-13 14:57:08 -05:00
eblade
a6544f5d10
Merge branch 'master' of git://git.assembla.com/fpdboz.git
...
Conflicts:
pyfpdb/fpdb_simple.py
2008-12-13 12:54:32 -05:00
eblade
84dfb0e967
looks like a whitespace churn, don't know why
2008-12-13 12:52:25 -05:00
Ray
71309ab337
Merge branch 'master' of git://git.assembla.com/fpdboz
2008-12-13 12:33:48 -05:00
eblade
2002da9fb7
Merge branch 'master' of git://git.assembla.com/fpdboz
2008-12-13 11:51:31 -05:00
Matt Turnbull
7deb0bcc3e
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2008-12-13 16:38:44 +00:00
sqlcoder
ef060cd96a
playerstats: refine mysql query to stop divide by zero errors and
...
format figures properly
2008-12-13 14:47:03 +00:00
sqlcoder
c533822c96
playerstats: refine postgres query to stop divide by zero errors and
...
format figures properly
2008-12-13 14:33:12 +00:00
sqlcoder
6e72d602e9
playerstats changes: modify columns shown, use left join in case
...
playeractions data is missing, correct postgres syntax but now
giving divide by zero error
2008-12-13 14:15:03 +00:00
sqlcoder
e9fa9e4324
revert back to carl's version, previous simplification of playerstats
...
query doesn't allow calculation of things like variance as added
by Eleatic Stranger
2008-12-13 13:18:16 +00:00
Worros
e8bf2d8a22
Additional Player stats from Eleatic Stranger
...
Variance and $/hand
2008-12-13 14:03:53 +09:00
sqlcoder
3148d0398c
pulled from fpdboz
2008-12-13 03:35:31 +00:00
sqlcoder
f51d760a54
revise position stats query using hudcache data and create postgres version
2008-12-13 03:17:54 +00:00
sqlcoder
cb2e8a96ef
use hudcache query for all player stats and tidy up output
2008-12-13 02:18:02 +00:00
sqlcoder
167c0de3b5
include antes in hudcache totalProfit figure
2008-12-13 02:02:07 +00:00
sqlcoder
a03a6852e8
convert tabs to spaces
2008-12-13 01:32:44 +00:00
sqlcoder
a426ec9434
include antes in net profit calculation
2008-12-13 01:15:25 +00:00
Matt Turnbull
24805700da
StopAutoImport kills HUD
2008-12-13 01:06:26 +00:00
Ray
b37913f279
Fix call to aux window clobbered by merge.
2008-12-12 20:05:23 -05:00
Ray
b80dc2fb38
Merge branch 'master' of git://git.assembla.com/fpdboz
2008-12-12 20:00:29 -05:00
Matt Turnbull
cbac52ccbb
Autoimport toggle button
2008-12-13 00:52:31 +00:00
Ray
8bacf766f7
Clean up duplicate functions.
2008-12-12 18:30:18 -05:00
Ray
eba9ccef90
Turn off window dragging to avoid crash when client is closed.
2008-12-12 17:44:11 -05:00
Ray
77804f68e4
Pick up the blinds/bring in when getting action.
2008-12-12 13:04:59 -05:00
Ray
6c6e7fa793
Fixed mucked cards import for stud games--AGAIN.
2008-12-12 12:16:19 -05:00
Worros
ec7c21621d
Move hand into its own file and fix
2008-12-12 23:29:45 +09:00
Worros
0e2f6bf4ab
Fix default value when run from RegressionTest
2008-12-12 20:25:26 +09:00
Worros
6afe8f0240
Add regression test for clean_title function and revert regex change
2008-12-12 20:12:45 +09:00
Worros
ff1a2c42b8
HHC - Make getGameTypeAsString actually do a lookup
2008-12-12 19:51:57 +09:00
Worros
1db21d8d0d
Merge branch 'exp' of git://git.assembla.com/mctfpdb
2008-12-12 18:52:52 +09:00
Worros
8262705edb
Test patch for xaiviax FullTilt deep problem
2008-12-12 17:40:33 +09:00
Worros
02b2e5044c
Remove duplicate function from Tables.py
2008-12-12 17:38:55 +09:00
Matt Turnbull
b34c0e1300
setting holecards for a player is now idempotent
2008-12-11 17:35:44 +00:00
Matt Turnbull
7500bcdf92
Everleaf sometimes shows the entire winning hand without reporting holecards seperately.
2008-12-11 17:31:58 +00:00
Worros
f4ab01ca23
Merge branch 'master' of git://git.assembla.com/mctfpdb
...
Conflicts:
pyfpdb/GuiGraphViewer.py
pyfpdb/Hud.py
2008-12-12 00:50:51 +09:00
Ray
8500851b99
Merge branch 'master' of git://git.assembla.com/fpdboz
2008-12-11 10:25:40 -05:00
Ray
2f88818eb9
Minor changes to aux-window support.
2008-12-11 10:24:37 -05:00
Worros
3a1ddad58f
Fix crasher in Grapher if no hands returned.
...
Should alert user or at least draw something in right pane.
2008-12-11 23:55:03 +09:00
Worros
90803b297f
PlayerStat update - Postgres fixes (still failing)
...
Fixed parameter passing to execute - psycopg2 appears to be a bit fussy
about how parameters are passed.
Main query still doesn't work.
psycopg2.DataError: division by zero - appears to be caused by
,round(100*sum(wonAtSD)/sum(sawShowdown)) AS wmsd
Stuck there.
2008-12-11 23:42:33 +09:00
Worros
7fcd2d9c93
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2008-12-11 19:08:24 +09:00
Worros
438b6238e8
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2008-12-11 19:08:12 +09:00
Matt Turnbull
90b87c0d98
should be right?
2008-12-10 23:27:29 +00:00
sqlcoder
b62d1fb2a9
remove connection code from fpdb_import.py and use fpdb_db.py instead
2008-12-10 23:22:47 +00:00
Matt Turnbull
e90712c9a7
copied & pasted this back in, can't work out how to revert my reversion.
2008-12-10 23:16:29 +00:00
Matt Turnbull
489efc779b
Merge branch 'master' of git://git.assembla.com/free_poker_tools
...
Conflicts:
pyfpdb/Hud.py
Hope I chose the right lines here.
2008-12-10 22:52:07 +00:00
Matt Turnbull
69f6769a6b
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2008-12-10 22:48:20 +00:00
Matt Turnbull
fd2cb9dc42
Merge branch 'master' of git://git.assembla.com/fpdboz
2008-12-10 22:47:54 +00:00
Ray
95f5eab448
merge with eric's drag changes
2008-12-10 13:45:56 -05:00
eblade
efc3e591ea
fix timeout callbacks for tracking table position
2008-12-10 13:35:15 -05:00
Matt Turnbull
092b1a1b83
Merge branch 'exp'
2008-12-10 18:08:46 +00:00
Matt Turnbull
f3afba129a
Revert "Add start of graph export functionality"
...
This reverts commit 998ab6eac3
.
2008-12-10 18:01:20 +00:00
Matt Turnbull
d1a8c445e2
for perusal of dispatcher
2008-12-10 17:56:16 +00:00
Matt Turnbull
dda88b76ba
cosmetics, comments, some value checking
...
added mucked / folded / shown summary lines
2008-12-10 16:30:57 +00:00
Worros
9ca0574d78
Really basic check that username exists
2008-12-10 21:21:43 +09:00
Worros
dc33003ce4
Merge branch 'master' of git://git.assembla.com/fpdb
2008-12-10 20:14:44 +09:00
Worros
8258c19c8f
Merge branch 'master' of git://git.assembla.com/fpdb-sql
2008-12-10 19:39:37 +09:00
Worros
5a568527b8
Merge branch 'exp' of git://git.assembla.com/mctfpdb
2008-12-10 19:39:27 +09:00
Ray
fff1e53eb9
Merge branch 'master' of git://git.assembla.com/fpdboz
...
Conflicts:
pyfpdb/Hud.py
2008-12-10 00:02:50 -05:00
steffen123
c8d12cfe61
p144 - updated table design after comments on draw tables
2008-12-10 03:55:12 +00:00
Matt Turnbull
3ff2ec2106
removed read board cards from markStreets
2008-12-10 00:58:10 +00:00
Worros
390519c549
Merge branch 'exp' of git://git.assembla.com/mctfpdb
2008-12-10 09:50:42 +09:00
Matt Turnbull
91105824bd
wasn't printing bets
...
and fixed last fix
2008-12-10 00:48:45 +00:00
Matt Turnbull
215d5a74b2
If the small blind is dead and it's folded round to big blind, no one collects a pot. Warning if we do not see 'collected' line.
2008-12-10 00:05:12 +00:00
Matt Turnbull
c9cb2ea7dd
takes care of weirdness with everleaf saying:
...
player folds
but also
player: bets
takes care of double spaces and other junk where stack size is usually reported.
2008-12-09 23:58:38 +00:00
sqlcoder
1a43ccf2da
remove redundant unique keyword in create table statements
2008-12-09 23:38:40 +00:00
Matt Turnbull
e8810839f9
bit less mess
2008-12-09 23:38:16 +00:00
Matt Turnbull
6b0dcc37d4
I set it up with Speed_Kuala_full.txt and now it's time to go through them all fixing the bugs.
2008-12-09 23:30:58 +00:00
Matt Turnbull
7ac433fede
2 decimal places for rake
2008-12-09 15:35:16 +00:00
Matt Turnbull
2d6412c8a7
pseudo stars!
2008-12-09 15:32:37 +00:00
Worros
f607b3ff63
Merge branch 'master' of git://git.assembla.com/fpdb-sql
2008-12-09 23:50:35 +09:00
Worros
7b05adea80
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2008-12-09 23:49:25 +09:00
Worros
49f1f6bda0
Merge branch 'exp' of git://git.assembla.com/mctfpdb
2008-12-09 23:48:28 +09:00
eblade
5e23b55361
specify right function name to timer, duh
2008-12-09 08:35:19 -05:00
eblade
7516d17a40
add 0.5 sec auto-timer to auto-run update_table_position
2008-12-09 08:21:50 -05:00
eblade
9dd6f36df6
add Hud::update_table_position(), tracks table.x and table.y, repositions all stat_windows within. triggered each update(), and when the Reposition Stats menu option is selected.
...
fix windows code to use same gdkhandle variables as unix code
2008-12-09 07:51:41 -05:00
eblade
7d4bded3d5
make sure we close each handle opened by ProcessOpen in the win32 calls
2008-12-09 01:43:13 -05:00
sqlcoder
71a587faca
mods to use insert_id() instead of repeated selects and get postgres working
2008-12-09 00:29:39 +00:00
Ray
7d75e4af91
Add winner and pot to Mucked list list box + intfac imp.
2008-12-08 14:10:45 -05:00
Matt Turnbull
4f44eff3da
getting somewhere, very messy, using pokereval, not sure if this is right direction, comments please
2008-12-08 06:23:50 +00:00
sqlcoder
30e61901d6
use spaces not tabs and get first part of insert_id() code working again
2008-12-08 01:38:06 +00:00
sqlcoder
3ea95acb0c
add db param to allow insert_id() matching fpdb_parse_logic.py
2008-12-08 00:55:03 +00:00
Worros
a73a9d446c
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2008-12-08 09:43:42 +09:00
sqlcoder
4dc15bfd94
pulled and merged from fpdboz
2008-12-07 23:38:33 +00:00
sqlcoder
ec01f7ae40
move code closer to carl's repo
2008-12-07 17:23:38 +00:00
Worros
ba944c2d7c
Merge branch 'master' of git://git.assembla.com/free_poker_tools
...
Conflicts:
pyfpdb/fpdb_simple.py
2008-12-07 18:07:00 +09:00
Worros
edd3d3ec07
White space churn to RegressionTester
2008-12-07 17:35:37 +09:00
Worros
977e954574
Fixups to GuiPlayerStats
...
Now sets up and obeys the radio buttons more correctly.
Also reads the names from the text box, and replaces <player_test> in
the sql query.
2008-12-07 17:06:01 +09:00
Worros
425997d66a
Merge branch 'master' of git://repo.or.cz/fpbd-bostik
2008-12-07 14:17:05 +09:00
Worros
b1a9109190
Merge branch 'exp' of git://git.assembla.com/mctfpdb
2008-12-07 14:04:00 +09:00
Mika Bostrom
90e348946f
First step at fixing the bulk importer with postgres
2008-12-06 21:59:58 +02:00
Mika Bostrom
415eb4a3c6
Retab/whitespace demangly fpdb_import.py
2008-12-06 21:50:40 +02:00
Mika Bostrom
19c0328955
Change syntax for CREATE INDEX... for postgresql
2008-12-06 21:14:39 +02:00
Matt Turnbull
72addde510
whitespace
2008-12-06 14:15:41 +00:00
Matt Turnbull
95f43dfd74
pot total and rake
2008-12-06 14:13:38 +00:00
Mika Bostrom
6070066f8a
obtain_global_lock() is a method, not top-level function
2008-12-06 15:16:55 +02:00
Mika Bostrom
dfb8a06686
Allow to connect to local PostgreSQL via domain socket
2008-12-06 15:07:37 +02:00
Mika Bostrom
7ecfac5437
Retab/whitespace demangle fpdb_db.py
2008-12-06 14:40:04 +02:00
Mika Bostrom
c9700fc1a7
Some debugs
2008-12-06 14:34:44 +02:00
Mika Bostrom
0f05d0886e
Modify local HUD_config.xml, clean some places and change DB type to
...
postgresql
2008-12-06 14:10:50 +02:00
Worros
998ab6eac3
Add start of graph export functionality
...
No function yet - just adds callback
2008-12-06 20:51:36 +09:00
Worros
88075bc4f2
Colorise the stats rows, add refresh button
...
Refresh button destroys table at the moment.
2008-12-06 20:50:06 +09:00
Mika Bostrom
3eb1a1dd0b
Start to clean up psycopg2.connect() and surroundings
2008-12-06 13:41:39 +02:00
Worros
1576387d61
Add GuiPlayerStats to menu
2008-12-06 19:09:18 +09:00
Worros
803491e6fd
Add new GUI insterface for players stats
...
First pass at displaying player stats. Only works if your player id is
3, and you play nl
2008-12-06 19:08:07 +09:00
Ray
1e9263f202
Fix width of left column.
2008-12-05 12:51:19 -05:00
Worros
d17e353509
Merge branch 'exp' of git://git.assembla.com/mctfpdb
2008-12-05 22:50:22 +09:00
Worros
51ce6fc191
Index mods '+0' from sqlcoder on mailing list
...
Have been tested and provide a significant improvement on import.
"""
Along with new indexes, I think some of the sql in fpdb_simple can be
altered to make it use existing indexes more effectively. Generally
these mods affect statements where the db has a choice of 2 indexes to
use and I think it is choosing badly, e.g. it is using tourneyTypeId
which could match the whole table when it could use the new
siteTourneyNo index which will return very few rows.
To stop the db from using an index I'm just adding zero to the field, so
something like
playerId = %s
changes to
playerId+0 = %s
We humans can tell this is no real change at all, but the db sees this
as a change from <field> = <value> to <expression> = <value>, and it can
only use the index if the <field> the index is on is being tested.
(Nowadays you can index expressions in some databases but we'll ignore
that!)
"""
2008-12-05 17:18:13 +09:00
Matt Turnbull
47e2fd053a
unimplemented is more meaningful warning
2008-12-05 02:42:13 +00:00
Matt Turnbull
862502cdc0
Hand class keeping track of pot total / bet amounts
...
Began to turn hand.printHand into the writeHand method but this may not be necessary after all
2008-12-05 02:40:04 +00:00
Ray
22111e6d3f
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2008-12-04 12:57:05 -05:00
Ray
3cfea4eb30
Merge branch 'master' of git://git.assembla.com/fpdboz
...
Conflicts:
pyfpdb/fpdb_simple.py
2008-12-04 12:56:27 -05:00
Worros
afea3315fc
Merge branch 'exp' of git://git.assembla.com/mctfpdb
2008-12-04 18:47:42 +09:00
Worros
42381eaabc
Merge branch 'master' of git://git.assembla.com/mctfpdb
...
Conflicts:
pyfpdb/fpdb_simple.py
2008-12-04 18:46:55 +09:00
Worros
fefbcfca65
Whitespace churn on Graph viewer
2008-12-04 16:15:38 +09:00
Worros
a1ed9603f3
Revert debug changes made while working with Eric
2008-12-04 15:52:24 +09:00
Matt Turnbull
92656ae6a0
hole cards / community cards extracted and added to printout
2008-12-03 23:57:20 +00:00
sqlcoder
160db08689
calc totalprofit for hud
2008-12-03 23:14:03 +00:00
eblade
0186145065
remove no-longer-needed "topify_window" for Stat_Window, removed some lines that were commented out due to no longer being needed, etc. Seems to fix the windows randomly re-attaching in Win32.
2008-12-03 13:35:19 -05:00
Ray
7063e03d6e
futile attempt to fix mystery crash
2008-12-03 12:48:04 -05:00
Ray
3be6453b42
Minor bug in import parameters.
2008-12-03 12:01:37 -05:00
Worros
1f7f3f7187
Fix MySQL 'ADD INDEX' syntax, add functions to create_tables
2008-12-03 18:18:20 +09:00
Worros
165ca5bf19
Oops - fix last commit
2008-12-03 17:41:20 +09:00
Worros
f25e524c06
Add sqlcoders indexes to query file
2008-12-03 17:37:31 +09:00
eblade
cd858d6ade
add "debug stat windows" to hud menu .. doesn't do anything useful yet, as i'm trying to figure out what part to actually debug
2008-12-03 03:25:49 -05:00
eblade
703c2a1d12
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2008-12-03 03:25:02 -05:00
Worros
bac92f7b6e
playerStats query from sqlcoder - massive whitepsace churn - Apologies
2008-12-03 17:00:11 +09:00
Worros
e7650427b0
Initial placement of playerStatsByPosition
...
Doesn't do much thats useful yet - hard coded to nl and playerid=3
2008-12-03 16:36:49 +09:00
sqlcoder
567d585a54
script to update index choices
2008-12-02 23:28:06 +00:00
eblade
3f86c54b17
add "NA" to fold to steal stats for 0/0's
2008-12-02 10:14:38 -05:00
sqlcoder
a824814c0a
sqlcoder initial updates
2008-12-02 00:15:50 +00:00
Matt Turnbull
85f64b42fb
Merge branch 'master' of git://git.assembla.com/fpdboz
2008-12-01 14:34:39 +00:00
Worros
8820a691e8
Update bulk import codepath to output total import time.
2008-12-01 20:07:38 +09:00
eblade
401bcc15cd
remove debug code i accidently committed last time
...
account for dead seats between blinds
fix some improper position handling when BB in seat 2, with dead hand in seat 1, and SB on last seat
2008-11-27 11:27:23 -05:00
Worros
762ae46afb
Merge branch 'master' of git://git.assembla.com/fpdb-eric
...
Conflicts:
pyfpdb/GuiGraphViewer.py
2008-11-27 22:50:58 +09:00
eblade
1de34462e3
remove spurious window realize from popup_window as well
...
printEmailErrorMessage also writes a traceback to the stderr, so we can more easily figure out -what part- it failed in
parsePositions will ignore a small blind if it appears to be coming from the same place as the big (does this mess with dead blinds? who knows)
2008-11-27 08:35:17 -05:00
Worros
fed3374901
Start output of action lines for Super class
2008-11-27 21:29:19 +09:00
Worros
b495387d94
Move Everleaf updates - action now parsed
2008-11-27 20:54:42 +09:00
eblade
274cecdc58
stat windows no longer call realize() as that is done automatically by gtk when needed
...
importer dumps bad hands to hand-errors.txt after printing the normal email message
parse_logic should ignore lines where small blind is found to be "$0", however, it's still causing errors
2008-11-27 05:12:07 -05:00
eblade
6e116f4b02
don't bother doing show_all on each stat_window, then hide, just hide first. (probably shouldn't need to even hide them first, but they seem to sometimes start hidden sometimes not)
2008-11-27 02:31:52 -05:00
Worros
7cc8ce7757
Clean up profit graph function
2008-11-27 10:29:41 +09:00
Worros
6c4c450f07
Fix for postgres graph query - Remove column names to fix syntax error
2008-11-27 10:28:19 +09:00
eblade
49390940e3
add middle-click on stat_window to hide it (since we don't currently have a way to hide it when someone leaves)
2008-11-25 08:52:59 -05:00
eblade
2c00422f34
clean up some stat descriptions
2008-11-25 07:33:20 -05:00
eblade
53a95ccc80
stat windows are hidden by default, and only brought forward when there's a player in a seat that has recorded a hand
2008-11-25 07:03:33 -05:00
eblade
f8749fe7fb
Add "hudcolor" attribute to all <stat> definitions, drop font size to Sans 7, since i can't fit my stats in comfortably anymore
2008-11-25 06:47:58 -05:00
eblade
c815edaa9b
Merge branch 'master' of git://git.assembla.com/fpdboz
2008-11-22 18:16:55 -05:00
eblade
5642f4bafc
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2008-11-22 18:16:46 -05:00
Ray
2155c12587
Fixed error detecting FTP tables on NT
2008-11-22 17:28:12 -05:00
Worros
bffbc18ff4
:
2008-11-18 14:27:30 +09:00
eblade
50938c4912
Merge branch 'master' of git://git.assembla.com/fpdboz
2008-11-17 14:38:01 -05:00
Ray
17ad796917
More changes to support mucked/aux windows.
2008-11-16 17:53:31 -05:00
Worros
55332d4983
More Everleaf updates, may have a functional regex for action in NLHE
2008-11-16 13:44:16 +09:00
Worros
7aa0cff8d8
Make ftp kinda work
2008-11-16 13:43:24 +09:00
Worros
dfbcf8efc7
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2008-11-16 11:49:37 +09:00
eblade
284955350a
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2008-11-14 15:46:02 -05:00
eblade
1ed20a5f70
Merge branch 'master' of git://git.assembla.com/fpdboz.git
...
Conflicts:
pyfpdb/GuiGraphViewer.py
2008-11-14 15:45:56 -05:00
Ray
37cd869209
fix reading of mucked cards for stud games
2008-11-14 13:10:17 -05:00
Worros
0059d20f8e
Add callback for test entry so player name is changable. Still buggy but partially functional
2008-11-14 22:41:37 +10:00
Worros
ba52cb93d1
Actually implement sqlcoders query as intended.
...
Query running in about 30% of the time.
2008-11-14 19:27:37 +10:00
Worros
e4021b0525
Fix comment re: stars time format
2008-11-14 15:02:38 +10:00
Worros
115c5d920d
Text was annoying me. Turned into multiline string.
2008-11-14 14:58:35 +10:00
Worros
86ba757080
Major update to the layout of GuiGraphViewer.
...
Changes the structure to a left a left options pane and a right graph pane.
Starting to create the options dynamically, and use callbacks sanely.
2008-11-14 14:54:34 +10:00
eblade
05f3f5eee2
fix indentation typo
2008-11-13 19:42:35 -05:00
eblade
077cb70c79
Merge Carl's changes from sqlcoder to GuiGraph to mine from earlier
2008-11-13 19:41:20 -05:00
Worros
34e374a55e
Patch from sqlcoder to make the query for the profit graph smarter/faster
2008-11-14 08:15:28 +10:00
Ray
d90fa208de
Smooth wrinkles in mucked card display.
2008-11-13 17:07:24 -05:00
Ray
806744bf34
Mucked window enabled.
2008-11-12 23:02:51 -05:00
Ray
ca960cad96
Support for the mucked cards window. Still a bug in the card storing.
2008-11-12 22:45:09 -05:00
Ray
b35e6c5570
fix bug in saving layouts when fav_seat != 0
2008-11-12 10:28:48 -05:00
Worros
c2475db712
Bugfix - fixes new stars format import, also fixes bug in bulk import (that i introduced a few commits ago)
2008-11-12 22:40:29 +10:00
eblade
5903988e38
merge with ray/carl
...
GuiGraphViewer: configure matplotlib to use GTK properly, add in error handling for graphing across a database with hands the player you've requested wasn't involved in. please see # todo note on that.
2008-11-12 06:30:49 -05:00
Worros
6e182831ac
Everleaf update - Holecards read
2008-11-12 14:12:18 +10:00
Ray
29a04f639d
Merge branch 'master' of git://git.assembla.com/fpdboz
2008-11-11 14:28:50 -05:00
Ray
f5b39068cf
Added a query to get stats aggregated for all stakes.
2008-11-11 14:27:35 -05:00
Ray
461c870690
Fine tuning tournament support.
2008-11-11 14:25:56 -05:00
Ray
9923e6e8ca
Merge branch 'master' of git://git.assembla.com/fpdb-eric
...
Conflicts:
pyfpdb/Configuration.py
2008-11-11 09:55:41 -05:00
Ray
036729b8c2
Support tournaments
2008-11-11 09:50:20 -05:00
Ray
43f64dda3d
Merge branch 'master' of git://trac-git.assembla.com/fpdb
2008-11-11 09:49:04 -05:00
Ray
15d7ea70dc
Support tournament detection = major refactor of Tables.py
2008-11-11 09:40:31 -05:00
eblade
863c5be428
change text in hud main windows (smaller, indicates presence of menu and moveability), add opacity and move support (does not yet save it's position)
2008-11-11 04:36:44 -05:00
Worros
2bdc7f5057
Everleaf converter update - blinds posting
2008-11-11 18:54:24 +10:00
Worros
4bbd18d935
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2008-11-11 16:24:07 +10:00
eblade
32b1d7fa86
add opacity to p4e/everleaf config example
2008-11-10 22:42:51 -05:00
Worros
45b2b4b212
Fix sb/bb - no need to convert
2008-11-11 08:22:33 +10:00
Worros
d112c39c1c
More Everleaf updates - parse player stacks and seats
2008-11-11 00:19:45 +10:00
Worros
da83795e5a
Fix 'duh' error and grab button position
2008-11-10 23:29:49 +10:00
Worros
816a9e3b58
More Everleaf converter updates, now parsing some hand info
2008-11-10 23:02:56 +10:00
Worros
6de1ac1c82
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2008-11-10 22:55:24 +10:00
eblade
2074d755aa
Hud.py: fix typos in definitions of reposition_windows and kill_hud, eliminating errors when those functions are called
...
move pop-up window to button 3 when clicked on a stat window, added move/resize functionality to button 1 (hold shift to resize, or just click/drag to move)
restore opacity in windows (new window movement works with opacity set)
fix error in popup_window initilization referring to window instead of main_window, oops
2008-11-10 05:58:55 -05:00
eblade
e713a9c654
fix weird error on windows? possibly just with p4e? trapping if we read 0 lines from history file
2008-11-10 03:46:37 -05:00
eblade
3325538c66
Merge branch 'master' of git://git.assembla.com/fpdb.git
...
Conflicts:
docs/default.conf
2008-11-10 03:24:05 -05:00
eblade
f767ec2207
windows git is buggy
2008-11-10 03:22:21 -05:00
Worros
397cb9dd29
Merge branch 'master' of git://git.assembla.com/fpdb
2008-11-10 16:41:47 +10:00
Worros
0bbf801d89
Bit more Everleaf
2008-11-10 16:41:04 +10:00
Worros
7053b7f748
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2008-11-10 14:11:57 +10:00
steffen123
f38cdab8e0
p143 - update title
2008-11-10 02:21:47 +00:00
steffen123
49151a92bf
p142 - commented tourney summary parsing as it fails on me. this is alpha9
2008-11-10 02:02:12 +00:00
Worros
d4038c3f19
Lots of changes. Fixes the hud for auto-import - at least for me.
...
Does configer Importer to use the Config class.
2008-11-09 21:57:58 +10:00
Worros
d0218363c6
Fix GuiAutoImport startup after I deleted the default setting in a previous patch.
...
Setting now comes from config
2008-11-09 20:57:42 +10:00
Worros
c53d78491a
Minor update to Carbon poker - read gametype + sb/bb
2008-11-09 16:27:27 +10:00
Worros
43f8620dea
Remove FpdbRegex until functional
2008-11-09 15:33:42 +10:00
Worros
669382aa01
Remove errors import
2008-11-09 15:30:57 +10:00
Worros
d6706a5bdf
First pass at turning file from pokerstats into class
2008-11-09 14:00:39 +10:00
Worros
7bc686c859
Add Regex file pokerstars_cash.py from pokerstats package ( http://bostik.iki.fi/pokerstats/ )
...
Intend to turn into a class plugins can subclass and override the various regexes
2008-11-09 13:29:58 +10:00
Worros
f3224f87cc
Add sanity check function, creates ~/.fpdb/HandHistories/<sitename> if it doens't exist.
...
Fixes hhbase and hhdir interpretation.
2008-11-09 12:58:46 +10:00
Worros
328bba2d23
Updates
...
- change HH object init call.
- override carbon readFile function and hack so minidom can read it
2008-11-09 10:46:14 +10:00
Worros
7df572895b
Work on plugin initialisation, add Carbon poker plugin
2008-11-09 09:49:05 +10:00
Ray
28037de7a6
skip the set_opacity statement in windows until figured out
2008-11-08 16:58:24 -05:00
Worros
4f64464df3
Fix accessor method to import params in Coonfig. Make cli print using accessor
2008-11-08 23:45:14 +10:00
Worros
c215360a92
Read new parameter in config
2008-11-08 23:01:07 +10:00
Worros
a5ead615fc
Add parameter for base path to store HH's
2008-11-08 22:41:06 +10:00
Worros
bfa5137889
Merge branch 'master' of git://git.assembla.com/fpdb
2008-11-08 13:04:04 +10:00
Worros
8a2a851abc
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2008-11-08 13:03:52 +10:00
steffen123
56c928ccdc
p141 - support new PS UTC timestamps
2008-11-07 20:26:03 +00:00
steffen123
5a045f944f
Merge git://git.assembla.com/free_poker_tools
2008-11-07 19:58:11 +00:00
Ray
803b9a7a64
Merge branch 'master' of git://trac-git.assembla.com/fpdb
2008-11-07 14:28:58 -05:00
Ray
e26fdd79a4
possible fix to wrong window positioning seen by Elaetic
2008-11-07 12:22:37 -05:00
Ray
98d0305aa8
fixed psycopg2 connection parameters
2008-11-07 11:07:42 -05:00
Worros
70f9e6edca
Make Everleaf actully inherit from the super class
2008-11-07 23:19:18 +13:00
Worros
7e41c73742
Add initial versions of Hand Converter class, and initial implementation.
2008-11-07 21:47:00 +13:00
Worros
1f3a39142a
Change import_file_dict to take new args and fix all callers.
...
Rename the main parser and make room for site converters.
2008-11-07 21:18:12 +13:00
Worros
2b9eed8958
Change db access function to always get the latest committed transactions.
...
Fixes graph updating, so i made the label a bit prettier, and a bit better behaved.
2008-11-07 18:12:48 +13:00
Worros
b32745c28a
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2008-11-07 17:16:21 +13:00
steffen123
c739395189
p140 - added CLI option to fpdb.py to control redirection of stderr
2008-11-07 00:14:25 +00:00
steffen123
93b6f9ddaa
Merge git://git.assembla.com/free_poker_tools
2008-11-07 00:00:00 +00:00
steffen123
dd74c29551
p139 - fixed TV and removed old config
2008-11-06 23:58:41 +00:00
eblade
27c6c4884e
stat popups attach themselves to the stat window as children, have proper colors
2008-11-06 06:58:28 -05:00
eblade
c330bd772b
add .exe to PokerStars tablefinder in default config, change some things for the "everleaf" entry
2008-11-06 06:26:25 -05:00
Worros
68344b5ec0
Modified Auto import GUI to allow n-sites based on config file. Added filter option to display. Added option to enable or disable sites in Config
2008-11-06 18:39:49 +13:00
eblade
b2e32c2e15
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2008-11-05 23:46:40 -05:00
Ray
cf1efb8d27
transaction isolation code suggested by sql_coder on the forums
2008-11-05 22:44:29 -05:00
Worros
cf714a8ec1
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2008-11-06 12:19:00 +13:00
Worros
a29372a756
Fix copy-paste error in Stat.py for a_freq_3 function.
...
Hat tip to sqlcoder on sourceforge.
2008-11-06 12:14:46 +13:00
Ray
a41aec44dd
added set/get _sit_parameters to Config + removed keep_above in Hud
2008-11-05 16:52:47 -05:00
Ray
22831cc8c6
added get_converter to support Carl's importer change
2008-11-05 15:04:04 -05:00
Ray
f52a60c79d
Merge branch 'master' of git://git.assembla.com/fpdboz
2008-11-05 14:49:20 -05:00
Worros
8191db6487
Add new parameters to HUD_config.xml.example in prep for HH filter plugins
2008-11-06 06:57:15 +13:00
Worros
54b1d18146
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2008-11-06 06:49:54 +13:00
Worros
92381254e8
Change the filelist and dirlist type to be a hash of lists, delete postgres sql schema
...
dirlist is in the form:
{'Site': [ "/path/to/dir", "filter" ] }
Where filter will be the plugin to convert to stars/fpdb hand history file.
filelist is in the form:
{'file': [ "site", "filter" ] }
2008-11-06 00:36:24 +13:00
Ray
2bc04ea17b
Merge branch 'master' of git://git.assembla.com/fpdboz
...
Conflicts:
pyfpdb/fpdb_import.py
2008-11-05 05:59:08 -05:00
Ray
9c49913b9c
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2008-11-05 05:50:41 -05:00
Ray
b0be7c5b71
cleanup and new get/set for db parameters
2008-11-05 05:49:05 -05:00
Worros
093302e76d
Fix(?) problem with HUD only starting after 2 hands have been entered.
...
Import code will now import_file_dict() on every file it initially finds that was modified in the last minute.
Not perfect, as a lot of hands can take longer than that.
2008-11-05 10:39:27 +13:00
eblade
2ecfbf6c2d
fpdb_import: auto-import bases it's decisions to check files on file-size changes rather than mtime - could you guys check it out in nix and other poker sites, and tell me if that breaks anything?
...
HUD: if update() errors due to not enough stat windows being available (ie, your broken site converter tells us we have a 6 max table, but there are people in seats 7-10), it will re-assess the table as a 10-max
add StatWindow.relocate(x,y)
2008-11-04 05:02:41 -05:00
Worros
79ddee8971
Add converter attribute to support additional sites
2008-11-04 22:40:03 +13:00
Ray
0f10f87373
changes to make consolidated config files happier
2008-11-02 22:58:55 -05:00
eblade
b5ec60f5fa
forgot to commit configuration.py last time
2008-11-02 05:20:25 -05:00
eblade
e154bdd8f4
Add "hudprefix" and "hudsuffix" properties to each of the "STAT" nodes in the config, will display them before/after stats on the HUD, as appropriate.
...
(note that due to the use of a table in the hud display, it can get a little.. ugly.. looking)
Add "playername" to list of available stats
MIGHT close huds when poker table is closed in Nix. It doesn't in Windows, but it should.
2008-10-31 14:34:41 -04:00
eblade
6eca3fdce7
merge in latest ray changes, replace excessive exception handling with a couple of if blocks in get_default_colors - there were definite errors in there not getting cauhgt due to the exception handling
2008-10-30 05:30:29 -04:00
eblade
3f7347d8f6
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2008-10-30 00:05:15 -04:00
eblade
cf2c7e4267
add lines with "($0 in chips)" to list of things to ignore, as a player with no chips cannot possibly be in the hand, and the lines often contain blank usernames on p4e, which are breaking the parser.
2008-10-30 00:03:28 -04:00
Ray
8165e0fb33
Merge branch 'master' of git://git.assembla.com/fpdboz
2008-10-29 22:37:55 -04:00
Ray
f26baac94c
added some configuration accessors for Hud.py and some cleanup
2008-10-29 22:37:05 -04:00
Worros
3f6e4fc3bf
Merge branch 'master' of git://git.assembla.com/free_poker_tools
...
Conflicts:
pyfpdb/Hud.py
2008-10-29 23:46:04 +09:00
Worros
87c82df4b2
Merge branch 'master' of git://git.assembla.com/free_poker_tools
...
Conflicts:
pyfpdb/Hud.py
2008-10-29 23:35:47 +09:00
Ray
81e787221a
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2008-10-28 09:37:54 -04:00
Ray
174b7ecfa0
permission changes only
...
Please enter the commit message for your changes.
2008-10-28 09:37:11 -04:00
eblade
6f65f3eadb
Merge branch 'master' of git://git.assembla.com/free_poker_tools.git
...
Conflicts:
pyfpdb/Hud.py
Carl was right, the differences were trivial (comment markers mostly)
2008-10-28 07:30:22 -04:00
Ray
9f84cc93a7
edits to get the stacked window mods working with X
2008-10-27 12:56:09 -04:00
Worros
5809f28daf
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2008-10-27 20:14:38 +09:00
Worros
56d80d785c
HUD chmod
2008-10-27 20:14:08 +09:00
eblade
64dbe3237d
add "hudopacity" to site config, valid settings are potentially from 0.00 to 1.00
2008-10-27 07:12:04 -04:00
eblade
5f15a4f928
Configuration.py: add "bgcolor" and "fgcolor" to <site> node
...
HUD: table hud and stat windows respect "bgcolor" and "fgcolor" on a per site basis
Tables: force tw.number to be an int in Unix
2008-10-27 06:29:39 -04:00
eblade
2bde12a6cf
remove set keep above on stat windows
2008-10-27 03:13:04 -04:00
eblade
70bdc0bcb4
fix for re-parenting to work in nix, remove decorations from table hud main window
2008-10-27 03:12:12 -04:00
eblade
051f04b69f
trying to get parenting of stats windows to work in nix.
2008-10-26 15:51:12 -04:00
Worros
a1499db849
Fix return type of tables_by_name discovery for posix
2008-10-26 20:13:30 +09:00
eblade
628f71cf3d
fix return value for same function i just thought i fixed but didn't all the way
2008-10-26 06:49:47 -04:00
eblade
a1c6fa1dc6
Fix posix discover by name typo/i'm a dummy error
2008-10-26 06:09:29 -04:00
eblade
d07fe6c5c6
move re-parenting code back into windows-only topify_window() function, as it is not 100% system independent (more like 99%)
2008-10-26 05:39:43 -04:00
eblade
7b604e3bec
Table HUD window now child of poker table window
2008-10-26 05:34:36 -04:00
eblade
0cd57facda
Merge branch 'master' of git://git.assembla.com/fpdboz.git
...
Fix accessing the decoder from the wrong object, causing the hud to not work, it should work again. yay.
2008-10-25 05:36:18 -04:00
Worros
389d9361b9
Update Graph Viewer to use config file, fill Entry with player_name field from the config.
2008-10-25 14:57:29 +08:00
Worros
c48b2f3057
Remove load_default_profile function.
...
All references to load default profile were removed when Ray merged the config files.
Deletes function and all references to it.
2008-10-25 14:45:39 +08:00
Worros
81a6d5f972
Revert label from Ray - Alpha6+ back to Alpha8+
2008-10-25 14:24:10 +08:00
Worros
0c8acc5ad4
Fix typo so Full Tilt default HH_path is read
2008-10-25 14:05:01 +08:00
unknown
654b2e0ba9
trying to fix my repository
2008-10-24 16:30:08 -04:00
unknown
2bd4932a77
Tables discovered via process name, then window name, only going through two nested loops, instead of two nested loops followed by another loop.
...
(can someone test to make sure this actually doesn't break stuff on *nix?)
Windows HUD Stats Windows no longer appear in Windows taskbar (now gtk transients for table hud window)
2008-10-24 15:44:53 -04:00
Worros
1c5024d35c
Fix typo for mac
...
HT - Eric Blade (blade.eric at gmail.com)
2008-10-24 21:49:20 +08:00
Ray
3f082346f7
updated for config integration
2008-10-22 10:51:43 -04:00
Ray
bc834a9d79
more cleanup of config file consolidation
2008-10-22 10:14:25 -04:00
Ray
6d449b9a2e
more cleanup of config file consolidation
2008-10-21 21:49:17 -04:00
Ray
2f78304185
cleanup of config file consolidation
2008-10-21 21:46:30 -04:00
Ray
a719efc6dc
consolidate config files--default.conf no longer needed
2008-10-21 10:22:01 -04:00
Ray
8b86d22d68
Merge branch 'master' of git://git.assembla.com/fpdboz
2008-10-18 16:31:57 -04:00
Ray
a449e1948b
one last tipo in HUD_main.py thread stuff
2008-10-18 15:41:26 -04:00
Ray
5c8cf5760d
minor cleanups to HUD_main.py thread stuff
2008-10-18 14:05:38 -04:00
Ray
3c4d05148b
error in HUD_main threads
2008-10-18 12:00:29 -04:00
Ray
93a167b64d
cleanup of threads in HUD_main.py
2008-10-18 11:48:24 -04:00
Worros
941631c1e5
Fix table detection for Full Tilt so it detects 6 max tables (others aren't verified)
2008-10-18 14:16:24 +08:00
Ray
edf22d8cf3
Merge branch 'master' of git://git.assembla.com/fpdboz
2008-10-17 21:35:14 -04:00
Ray
9194e4bba8
Merge branch 'master' of git://trac-git.assembla.com/fpdb
...
Conflicts:
pyfpdb/HUD_main.py
2008-10-17 21:34:34 -04:00
Ray
fe2554ce35
handle new hands in a thread, minimize stat windows on demand
2008-10-17 21:28:33 -04:00
Worros
9bb8e229e4
Fix TODO item - detect if directory passed in is a valid directory
2008-10-18 02:09:34 +08:00
Worros
87af99847b
Merge branch 'master' into two-sites
2008-10-18 00:47:31 +08:00
Worros
eb67d071a5
Changed TextBuffer widget over to Entry as it looks nicer, and we dont need multiline text.
2008-10-18 00:35:59 +08:00
Worros
d338a7c2f5
First draft of multi-site AutoImport.
...
GUI looks ugly, but appears to be working
Changed TextView widget to Entry because it look neater on my system
2008-10-18 00:28:33 +08:00
Worros
7fd517d76e
Replace multiline TBuffer with an Entry widget and rename
2008-10-17 20:31:36 +08:00
Worros
ee2017bb05
Fix comment - no mtime set at that point
2008-10-17 20:23:28 +08:00
steffen123
7833c0c5cd
p136 - title update - alpha7
2008-10-17 05:59:50 +01:00
Worros
eeef0a079b
Fix from Ray - fix typo in producer function
2008-10-17 10:59:56 +08:00
Ray
1fde7655ea
Merge branch 'master' of git://git.assembla.com/fpdboz
...
Conflicts:
pyfpdb/fpdb_import.py
2008-10-16 15:21:03 -04:00
Ray
b35e0e4880
various changes with threaded HUD_main.py
2008-10-16 15:15:28 -04:00
Worros
5a085a6d23
Draft fix to mtime detection for files
2008-10-17 01:36:02 +08:00
Worros
10b0cc7bca
Merge branch 'master' of git://git.assembla.com/fpdb
2008-10-16 21:21:55 +08:00
Worros
112f041a98
Start of changes to parse tournament hostory files
2008-10-16 21:21:11 +08:00
steffen123
5c73bd7f3b
p136 - title update - alpha7
2008-10-15 18:26:24 +01:00
steffen123
6c6427af75
Merge git://git.assembla.com/fpdboz
2008-10-15 18:20:44 +01:00
steffen123
bc15025be5
p135 - updated tv
2008-10-15 18:20:33 +01:00
Ray
81f5450a17
Merge branch 'master' of git://git.assembla.com/fpdboz
2008-10-14 13:00:18 -04:00
Worros
725f0589f8
Fix importing single files again - missing arguement
2008-10-15 00:15:01 +08:00
Worros
c7ba32c755
Fix graph message to include site and player name
2008-10-14 22:35:05 +08:00
Ray
43cd552466
threaded the hudcache query, update to install in windows web page
2008-10-14 10:33:32 -04:00
steffen123
155b2e93b0
p134 - updated CliFpdb for new importer
2008-10-13 23:09:27 +01:00
Worros
3e9ef61fc8
Fix bug: incorrect use of set function to remove duplicates
...
Now detects new tables without issues
2008-10-13 23:34:18 +08:00
Worros
9a60cf84c8
Real fix this time, modify GuiAutoImport to actually tell importer to monitor the directory
2008-10-13 02:06:28 +08:00
Worros
8ca5a5c965
Should fix detection of new hh files.
2008-10-13 01:26:04 +08:00
Worros
c2c37dc5ee
Fix mtime time detection
2008-10-12 18:21:42 +08:00
Worros
6c4e2f3eb9
Changes import_file_dict interface to Importer internal.
...
Users of Importer should now addImportFile and addImportDirectory, set paramaters, then run either runImport - all files or runUpdated - modified files.
Comments out postgres regression test until fixed
Adds initial code for importing regression test files.
2008-10-12 15:49:09 +08:00
Worros
638a6d6dab
Move more "options" from calling class into settings has of fpdb_import and fix all callers
2008-10-12 02:14:06 +08:00
Worros
1e8333ec5d
Move minPrint variable from callling class to setting in Importer class
2008-10-12 01:42:08 +08:00
Worros
ae9b70ea5d
Change variable name to indicate what it actually is.
2008-10-12 01:19:57 +08:00
Worros
27ca82ca48
Change api so object and settings are passed in at creation time.
2008-10-12 01:12:30 +08:00
Worros
ac551f6535
Merge branch 'master' of git://git.assembla.com/fpdb
2008-10-11 13:36:25 +08:00
Worros
cd78d375fe
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2008-10-11 03:15:56 +08:00
Ray
52c651555d
updated to include default popup definition that got deleted sometime
2008-10-10 15:13:47 -04:00
Worros
60b97582e5
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2008-10-11 01:46:34 +08:00
Ray
576f80da25
use fh.tell() and fh.seek() to skip hh already seen in file
2008-10-10 13:42:09 -04:00
Worros
8b22981ac6
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2008-10-10 19:37:37 +08:00
steffen123
c871ce067c
p133 - cleaned CliFpdb.py
2008-10-10 04:29:12 +01:00
steffen123
4cc0eb539e
p132 - fixed tv to new importer. added CliFpdb as initial CLI importer interface. fixed fpdb.printEmailError
2008-10-10 04:14:26 +01:00
Ray
73c073ede6
Merge branch 'master' of git://git.assembla.com/fpdboz
2008-10-09 23:10:34 -04:00
Ray
7990094835
added support for favorite seat on Stars
2008-10-09 20:50:12 -04:00
steffen123
acb4160969
Merge git://git.assembla.com/fpdboz
2008-10-09 21:22:28 +01:00
steffen123
35625f6d29
p131 - insignificant changes to fpdb.py
2008-10-09 21:21:40 +01:00
Worros
54f0eee984
Syntax - Fix last commit
2008-10-10 02:53:57 +08:00
Worros
0743114c75
Factor out multiple instances of "email steffen" error message into a function
2008-10-10 02:36:12 +08:00
Worros
5e1362abf9
Read file in one hit then close. Make lines of for a class member
...
Add timing code
2008-10-10 02:18:54 +08:00
Worros
ed7122ca31
Move callHud to class attribute and remove from function parameters
...
Fix all callers
2008-10-10 01:21:01 +08:00
Worros
037178ead3
Shift db connection code to its own function
...
Add class vars for db and cursor
2008-10-10 00:13:56 +08:00
Ray
2e04eb2b99
Merge branch 'master' of git://trac-git.assembla.com/fpdb
2008-10-09 10:03:17 -04:00
Ray
6832234cfb
get rid of some useless intermediate output
2008-10-09 10:03:04 -04:00
Worros
5389244f71
Merge git://git.assembla.com/fpdb
2008-10-09 21:13:53 +08:00
steffen123
96664d009c
p130 - stud/razz tourneys run again, but completely unverified (like holdem/omaha tourneys
...
changed fpdb_import slightly to not die if a file had 0 stored hands
2008-10-09 07:17:18 +01:00
steffen123
14eb29f702
p129 - fixed stud river in HudCache generation
...
PrintPlayerHud... now uses bigbet rather than bigblind to determine gametype.
2008-10-09 06:15:50 +01:00
steffen123
5dfa5061cf
p128 - corrected 2 bugs in PrintHand.py. finished stud blackbox testdata.
2008-10-09 05:30:09 +01:00
steffen123
bc76d4baf0
p127 - fixed stud importer bugs missing hole cards and added one blackbox hand verification for studhilo.
2008-10-09 05:04:31 +01:00
Worros
14ab9f6814
Kill command line interface to fpdb_import until restructured
2008-10-09 01:48:16 +08:00
Worros
98b556f42c
Turn fpdb_import functions into class Importer
...
Fix all callers of fpdb_import
2008-10-09 01:36:08 +08:00
Worros
79651706f6
Make GuiGraphViewer use the query file.
...
Make minor adjustment to Graph
2008-10-08 19:53:25 +08:00
steffen123
e23ae25d00
p124 - renamed categories for 27 single/tripple draw. updated abbreviations.
2008-10-08 06:28:09 +01:00
steffen123
4ea04bc994
Merge git://git.assembla.com/free_poker_tools
2008-10-08 05:48:21 +01:00
steffen123
9e819f3ad2
p122 - started on table design for draw games
2008-10-08 05:47:47 +01:00
Ray
1e7b584dba
changes to allow dropping of tables on postgres
2008-10-07 19:56:01 -04:00
Ray
066c2c26f2
Merge branch 'master' of git://git.assembla.com/fpdboz
2008-10-07 17:58:35 -04:00
Worros
6aca36b564
Moved SHOW TABLES query to query dict as list_tables
...
Added failing tests for Postgres until table deletion and table listing is fixed.
2008-10-08 03:12:38 +08:00
Ray
e930f78264
Merge branch 'master' of git://git.assembla.com/fpdboz
2008-10-07 14:31:15 -04:00
Worros
5dd9dbc86f
Fix residual bugs in table droping and creation
...
Add Regression test for recreating_tables in mysql
2008-10-08 02:28:18 +08:00
Worros
dc81ca854a
Indentation fixes
2008-10-08 01:50:43 +08:00
Worros
3d43e8167c
Make drop_tables generic for mysql so we dont end up with a function that has 20 if(dbversion ==) statements within
2008-10-08 01:41:06 +08:00
Worros
3018cc660b
Move create tables code into its own function.
...
Remove Postgres specific code
2008-10-08 01:16:26 +08:00
Carl Gherardi
791ac7418d
Converts fpdb_db to use the query dictionary for table creation
2008-10-07 17:33:37 +08:00
Carl Gherardi
66033036cc
Adds table create SQL to file. Included empty stubs for SQLite.
2008-10-07 17:25:24 +08:00
Carl Gherardi
d07d1c5bcc
Add unit testing file.
...
Currently tests connection to fpdbtest and verifies that the database has the correct number of tables
2008-10-07 16:15:44 +08:00
Carl Gherardi
e6fa946835
Add drop_table query.
...
Syntax verified against MySQL, PostgreSQL and SQLite docs
2008-10-07 14:47:24 +08:00
Carl Gherardi
83fa3901fe
New file for DB queries used in fpdb.
...
Currently just a framework and simple CLI
2008-10-07 14:11:48 +08:00
Ray
99d35f6acc
Merge git://trac-git.assembla.com/fpdb
2008-10-06 23:23:58 -04:00
steffen123
ea022a6497
p121 - fixed typo in stats.py causing wrong display of fold to SB %. note that this did not affect the DB data, just display
2008-10-07 05:18:26 +01:00
Ray
90a0e4103f
Merge git://trac-git.assembla.com/fpdb
...
Conflicts:
pyfpdb/Database.py --fixed conflict = we both fixed same problem differnt ways
2008-10-06 23:06:40 -04:00
steffen123
31ab863b47
p120 - minor tv fix, renamed fpdb error, added notice about it to output. fixed tourney and stud to run again.
2008-10-07 02:21:43 +01:00
steffen123
f1c94dac3e
p119 - fixed bug that sawFlop/Turn/River/CBChance/etc gets miscalculated if someone is allin using the new all-in parsing
...
moved most of known bugs to wiki roadmap (not actually online yet since sf seems to malfunctioning..)
2008-10-06 05:19:55 +01:00
steffen123
2a90030982
p118 - added all in field to HandsActions and parsing to importer. still need to update hudCache generation to use this tho
...
expanded some todo prints and the graph missing lib error to clarify for users
2008-10-06 04:26:59 +01:00
steffen123
ce5f6f1d71
p117 - fixed bug in HudCache generation that it stored L rather than E for position
...
new blackbox regression testing data
2008-10-05 06:22:31 +01:00
steffen123
2ab942128b
p116 - fixed bug in fpdb_import.py that prevented it from running directly
2008-10-05 05:33:22 +01:00
steffen123
1cd9eb898f
p115 - fixed bugs in tourney handling of playername with $ in it in these methods: parseActionAmount, parseAnteLines
2008-10-05 05:04:42 +01:00
steffen123
d29b4f19ea
p114 - fixed bug in parseAnteLine causing tourney hands where paying ante meant all in to fail
2008-10-05 04:55:22 +01:00
steffen123
463432afbc
p113 - fixed bug in parseWinLine that it would cut off the first digit for tourneys.
2008-10-05 04:45:53 +01:00
steffen123
f9f58f88e6
p112 - fix from ray that Hud sometimes didn't save positions
2008-10-05 02:30:16 +01:00
Ray
643f76ebb7
created accessor for database parameters
2008-10-04 19:22:53 -05:00
Ray
3b618723d2
fix bug in saving layouts
2008-10-04 15:43:50 -05:00
steffen123
f1947bb6cb
p111 - Database.py now works without unnecessary db libs. Configuration.py made executable. stderr now unbuffered.
2008-10-04 19:03:02 +01:00
Ray
31d40a6274
debugging output in read_stdin function, remove later!!
2008-09-29 20:14:55 -05:00
Ray
053b3a9b10
default db name should be fpdb
2008-09-29 19:42:27 -05:00
Ray
968e9e3c5a
Close when stdin get eof
2008-09-29 19:40:42 -05:00
Ray
4500f48aa7
Handle xml parsing exceptions
2008-09-29 09:12:04 -05:00
Eratosthenes
2ccf3c6370
support HUD_config in default location, in cwd, or passed by caller
2008-09-26 18:21:38 -05:00
steffen123
3e61bb1729
p109 - change of window title. this is alpha5
2008-09-26 20:06:27 +01:00
steffen123
622a00be96
p108 - These damn small blinds... all previously supported tourneys should be working again now
2008-09-26 14:39:24 +01:00
steffen123
b549aa2605
p107 - HUD updates from ray, FTP now supported
2008-09-26 14:18:47 +01:00
steffen123
ce3187667c
p106 - fixed small blind reading
2008-09-26 13:01:57 +01:00
steffen123
6926306147
p105 - commented import in Grapher as its not used yet, reverted bug i introduced in p90
2008-09-26 02:54:08 +01:00
steffen123
96e9a0112f
p104 - grapher improvements by carl
2008-09-26 01:05:00 +01:00
steffen123
005627b9d7
p103 - reading small blinds now rather than assuming them
2008-09-24 05:47:17 +01:00
steffen123
c19c933942
p102 - moved initial data INSERTs for mysql to separate method for future unification with pgsql table creation code
2008-09-24 05:22:17 +01:00
steffen123
7bd16311b1
p101 - patch by ryan hayward to handle dead hand before BB
2008-09-24 04:37:55 +01:00
steffen123
fef324b854
p99 - graphing now removes old graph on refresh
2008-09-24 04:01:38 +01:00
steffen123
6304790f38
p98b - redirect stderr
2008-09-24 03:58:14 +01:00
steffen123
541164e378
p98 - redirect stderr
2008-09-24 03:56:44 +01:00
steffen123
7db2a471b8
p95 - graph viewer didnt work, fixed it
2008-09-23 00:39:37 +01:00
steffen123
915c948eee
p94 - it now skips rather than dies on tourney summaries
2008-09-22 22:48:12 +01:00
steffen123
4e8a09ff84
p93 - unbet now stores a negative amount since that's what it is
2008-09-22 22:12:03 +01:00
steffen123
7ed7a2b88c
p91 - patch to HUD table detection from carl
2008-09-22 03:31:33 +01:00
steffen123
8c6cecb8f7
p90 - release script renames HUD_config.xml.example so user doesnt have to
...
fixed a couple of stupid errors where i used the wrong siteID somehow
graph now lets you pick beteen PS and FTP
2008-09-21 23:38:22 +01:00
steffen123
7ed7db3791
p89 - graph now sorts by siteHandNo rather than handId and takes into account expenditure.
2008-09-21 22:21:09 +01:00
steffen123
8117193b4f
p88 - graph viewer now takes player name from GUI rather than hardcoded player id
2008-09-21 14:24:43 +01:00
steffen123
009161d55b
p87 - added profit graph kindly sent by Carl Gherardi, it's got fixed player id and is using the wrong table fields right now, will fix that tomorrow or so. note that this adds a new dependency, matplotlib, but I put it into a try except loop to avoid load failure
...
added subfolder gentoo to packaging folder and added it to release script
2008-09-20 05:56:16 +01:00
steffen123
672d2d70af
p86 - ftp: read maxSeats rather than making an assumption. included new ebuild this time but obviously untried (can only try it after making the file release..). removed old ebuilds.
2008-09-18 01:23:38 +01:00
steffen123
1a008b1ac2
p85 - improved PS timestamp parsing using regex from Carl Gherardi
2008-09-17 02:33:46 +01:00
steffen123
656356d299
p84 - included updated HUD_config.xml.example (was in the last commit actually)
2008-09-17 01:44:40 +01:00
steffen123
54a229b26f
p83 - corrected silly mistake i made in p82
2008-09-17 01:43:04 +01:00
steffen123
7dcf2d9bbc
p83 - corrected silly mistake i made in p82
2008-09-17 01:21:55 +01:00
steffen123
cd212af029
p82 - made import of SQL interface libraries into try-except loop to facilitate choosing between mysql and pgsql
2008-09-16 22:19:50 +01:00
steffen123
092f68e259
p81 - fixed create release script, updated ebuild
2008-09-16 03:14:59 +01:00
steffen123
7b13331331
p80 - a great many updates from Ray
2008-09-15 21:31:55 +01:00
steffen123
2c251d94f2
p78 - implemented stud HudCache generation and storing
2008-09-02 01:00:43 +01:00
steffen123
4976dc742c
p77 - make windows use correct language version of Appdata folder, e.g. Anwendungdaten in german
2008-09-01 17:54:48 +01:00
steffen123
54ff7b71f1
p76 - specify NOT NULL on almost all table columns to increase DB resilience against importer errors
...
little bugfix to make omaha work again
2008-09-01 17:32:18 +01:00
steffen123
c963599b76
p75 - show database version error in GUI
2008-09-01 16:18:01 +01:00
steffen123
817c227dcb
p74 - mostly recovered razz/stud support
...
removed obselete gentoo install instructions, added ubuntu instructions
2008-09-01 05:41:58 +01:00
steffen123
37e111067b
p72 - redid foldToCB, this might be correct now but havent verified
2008-08-31 23:37:40 +01:00
steffen123
a289f7b151
p71 - fixed guibulkimport. thought I'd already done that, but there you go..
...
added 4B detection to HudCache filling
added primitive filling code for foldToStreetXCB, this'll not be correct for all cases yet
2008-08-31 21:22:36 +01:00
steffen123
0b96d49b23
p70 - it displays GUI error message for missing config file
2008-08-31 03:06:24 +01:00
steffen123
60bdfb64f3
p68 - updated PrintPlayerHudData. this is alpha2
2008-08-23 01:16:35 +01:00
steffen123
1b4696b268
p67 - finished updating print_hand and renamed it to PrintHand. also updated the related .expected files and thereby checked that the importer (except cache) still works correctly.
2008-08-22 22:39:43 +01:00
steffen123
07f8220808
p66 - mostly HUD improvements from ray
...
HUD now doesnt display a taskbar window for each stat window
HUD w$wsf works
more HUD improvements
made windows not call fpdb hud
moved conf file out of profiles folder
2008-08-22 21:10:32 +01:00
steffen123
76448ce06f
p65 - fixed minor bugs in the various calls to fpdb_import
...
bulk import works on single files again
table viewer works again
fixed CLI import
2008-08-22 20:32:20 +01:00
steffen123
6879815320
p64 - fixed bug that HUD displayed wrong raw data for aggr river/6th even though it used the right numbers for calculating the % value
...
attempted to fix W$wsF in HUD but didnt work
made default interval for auto import a more sensible 10s
2008-08-20 22:47:43 +01:00
steffen123
6689054cc7
p64 - made default interval for auto import a more sensible 10s
2008-08-20 22:14:38 +01:00
steffen123
7c50ddd542
p63 - fixed slight error causing wrong info in fold flop/turn/river in HUD
2008-08-20 22:10:29 +01:00
steffen123
66d938accc
p62 - major patch from ray with new stats in HUD
...
added db todo file with the things that are left for the db
2008-08-20 20:29:08 +01:00
steffen123
d73a4614f3
p60 - patches from ray - autoimport now doesnt block GUI and calls HUD.
2008-08-19 23:38:01 +01:00
steffen123
eff5c9cc6e
p59 - hud update from ray
2008-08-19 00:18:17 +01:00
steffen123
c716dfd35e
p58 - added HUD from ray
...
fpdb_parse now returns hand id rather than site hand no
2008-08-18 23:53:25 +01:00
steffen123
999eac4019
p58 -
2008-08-18 19:42:30 +01:00
steffen123
928e7262f4
p57 - added optional call to hud into importer
...
changed config file to windows line endings
started updating print_hand to new tables
2008-08-18 15:41:34 +01:00
steffen123
660530a166
p56 - various fixes to get FTP working again
...
fixed in prev commit: sometimes truncuates position on store in tourneys
2008-08-18 09:05:22 +01:00
steffen123
b546868e10
p55 - three bugfixes
...
fixed bug that it filtered sitouts in tourneys
fixed bug that it didnt handle if some joined (tourney) out of hand
fixed bug that it didnt handle : in player name
2008-08-18 07:43:05 +01:00
steffen123
f6d596d2ed
p54 - fixed bug that caused everything but FL to fail
2008-08-18 06:51:18 +01:00
steffen123
de845d4e90
p53 - more progress on tourneys
2008-08-18 06:27:37 +01:00
steffen123
8fb57d3729
p52 - much progress on tourneys and some minor stuff and a change of tables
...
migrated install-in-windows to website
renamed table tourneysgametypes to tourneytypes
2008-08-18 05:58:41 +01:00
steffen123
6eb42cd05e
p51 - added to git instructions
...
updated tv to use new HudCache
2008-08-18 03:56:59 +01:00
steffen123
6a5d1d6332
p50 - added Hands.maxSeats
2008-08-18 02:45:06 +01:00
steffen123
5612ee6637
p48 - removed some redundant bracketed values from tv
...
renamed cache fields and added more to be flexible for stud style games. note that tv is not updated yet
added forums and bugtracker to website sidebar
2008-08-17 13:13:42 +01:00
steffen123
5a462037c3
p46 - auto-importer kinda works - it does what its supposed to, but freezes the interface. you can however just start the interface a second time. anyone know how to fix this?
2008-08-17 05:28:26 +01:00
steffen123
579b44450c
p45 - implemented HandsPlayers.seatNo
2008-08-17 04:44:53 +01:00
steffen123
18ff57027f
p44 - implement hands.tableName/importTime
2008-08-17 03:18:42 +01:00
steffen123
9531c8d85b
p43 - implemented gametypes.base/.hiLo and more updates to table design
2008-08-17 02:46:23 +01:00
steffen123
e9d8b685ec
p42 - started implementing autoimport.
...
renamed some files to match the future more precise splitting of processing and frontend code
changing from gitX to pX to match Gentoo portage's convention.
changed table design on feedback from ray but not yet the actual code - more coming shortly
2008-08-17 01:48:03 +01:00
steffen123
0f032bcc5e
git41 - added a bunch of new cache fields containing placeholder data. okay totalProfit should actually be filled correctly already :)
2008-08-16 22:03:27 +01:00
steffen123
16be2b39f9
git40 - fixed little bug in table creation and added tourneyGametypeId to the cache to make tourney caching more sensible.
2008-08-16 07:16:50 +01:00
steffen123
701a824ac6
git39 - started to reactivate tourney support - split tourneys table in design and recreate code, but still need to update the code
2008-08-15 04:28:51 +01:00
steffen123
423753de17
git38 - make HudData tables positional (sf request 2052124)
2008-08-15 03:32:27 +01:00
steffen123
732edf9e69
git37 - make table drops depending on previous db version
2008-08-15 02:53:37 +01:00
steffen123
ff2e75cb6b
git36 - implement tv-combinedStealFold and tv-combined2B3B
2008-08-15 02:45:19 +01:00
steffen123
341b24a2e0
git35 - changed table and field names to match my naming convention to stabilise downstream-facing api.
2008-08-15 01:45:40 +01:00
steffen123
e56a65b4c9
git34 - reading CB/2B/3B now. Some doc updates
2008-08-13 08:11:20 +01:00
steffen123
61d0857a4c
git33 - added fields for CB/2B/3B to table design, table creation and tv. importer fills it with placeholder data
...
renamed ebuild from v0.01 alpha to v1.0 alpha as I won't be using normal version numbers before 1.0
2008-08-13 06:50:30 +01:00
steffen123
aecfa6d61b
git31 - last git added generating the reaction to steal data. this git adds em to tv.
...
On the tested hand this works correctly :)
2008-08-13 04:22:22 +01:00
steffen123
2a0f73646c
git30 -
2008-08-13 04:13:56 +01:00
steffen123
6d61e1e6c6
git29 - it displays ST correctly (well, for the one steal I checked that is)
2008-08-13 03:29:24 +01:00
steffen123
6d7bdc347c
git28 - added test hands for steal and cb
...
uncommented db version checking - it works
started implementing storing steals
filling steal attempts and attempt chances fields now, but not verified correctness nor am i displaying it
2008-08-13 03:07:44 +01:00
steffen123
436bfc26f2
git27 - changed version identifier to alpha1. yay :)
2008-08-11 23:03:30 +01:00
steffen123
09f233d6e4
git26 - add to install the sql commands to create DB etc.
...
fixed little bug in load_profile introduced by recent improvements there
updated regression testing to take into account everything new, made sure it passes all tests
more table design cleaning
various doc updates
added create-release.sh to automate release creation
2008-08-11 17:39:13 +01:00
steffen123
47bf90d71c
git25 - default path of importer and table viewer are now plattform dependent defaults that'll work on default setups but can also be changed using the profile file
2008-08-11 01:29:08 +01:00
steffen123
9b737612d0
git24 - changed config file format to match new way of passing around settings inside the code - will use this to facilitate various code cleanups and a generalised method of dealing with settings
...
got deep links for windows DL for everything
tv option of combined postflop is now exported to profile
2008-08-11 00:44:46 +01:00
steffen123
488af76f8e
git23 - added references to readme-user and agpl to main screen
2008-08-10 03:34:45 +01:00
steffen123
e56e071b7c
git22 - now shows single postflop agg/fold rate - can be changed by editing fpdb. may flip this arbitrarily, will export it to profile soon
2008-08-10 03:26:51 +01:00
steffen123
b0dd505627
git21 - added fpdb version into db to detect outdated db format. added fields for steals to DB and placeholder inserts to importer. lots of doc updates
...
split pygtk requirements, cleaned table design HTML more
noticed its really slow now - might be because I'm running it over LAN. will figure this out shortly
2008-08-10 02:52:05 +01:00
steffen123
3d82fd4f6a
git20 - made differently arranged array for actiontypes, used that to calculate 3B/4B percentage
2008-08-09 18:53:07 +01:00
steffen123
0e84dceb1f
git19 (REIMPORT needed) - updated everything to use new action counting method -> it half works, but fails to store (or print) a substantial proportion of the action_nos
...
removed bunch of commented prints from fpdb_parse
2008-08-08 22:03:43 +01:00
steffen123
bf691fe9e7
git18 - tv now has background colours to make it far more legible
2008-08-08 00:07:00 +01:00
steffen123
33e085cf88
git17 - added fields to db+imp+tv: Won $ when seen flop and Won $ at Showdown. Seem to work fine, will verify properly later. REIMPORT is necessary after this update.
...
cleaned table design a bit more
removed actionCount from print_hand - this is useless. need to update regression-test/*.expected.txt accordingly
2008-08-07 16:08:23 +01:00
steffen123
0a9c2cb292
git16 - fixed tv browse button size
2008-08-07 12:14:53 +01:00
steffen123
490af1acaf
git15 - fixed bug that it read sawShowdown wrong. fixed postflop fold importing. fairly certain importer is running correctly now :)
...
also added SD/F, the percentage of the time the user saw the showdown when they saw the flop. I believe this is normally called WtSD, but this is clearer.
widened main GUI a bit more
the todolist is still growing hehe
2008-08-07 11:08:50 +01:00
steffen123
39f5b9095c
git14 - finished one .expected for the HUD data table. seems to reveal a total of 5 errors - ouch
...
changed range of tv-activeSeats on user feedback - will do this occasionally until i make it configurable
"fix": "imp/tv bug: handcount is only about 1/2 of what it should be" -> this was NOT a bug. I was just a bit silly and didn't connect the dots from activating a filter by number of active players and the sudden drop of hands.
2008-08-07 00:17:51 +01:00
steffen123
9ca400b4ab
git13 - tv now displays the data over a range of activeSeats. see table_viewer.py lines 75-84 for ranges.
...
added version string to GUI
made GUI a bit wider to accomodate wider t
2008-08-06 21:57:02 +01:00
steffen123
5ee5594741
git12 - added percent sign to tv display
...
removed debug prints that im not going to touch for a while.
2008-08-06 21:09:29 +01:00
steffen123
fb7a8ba9a2
git11 - documentation improved. tv shows 3B4B number of hands in brackets.
...
set correct permissions on docs
2008-08-05 19:55:50 +01:00
steffen123
84b3851cb5
git10 - added field to table design that i had neglected to document. apologies. renamed it as well to be more useful, its now PF3B4BChance. more table design cleaning.
...
finished PrintPlayerFlags and renamed to the more appropriate PrintPlayerHudData
fixed: imp/tv bug: PFR is blatantly crazy
moved the scripts that do regression testing into the testdata directory and renamed that into regression-test
2008-08-05 00:14:17 +01:00
steffen123
7af8bb922a
git8 - updated the 3 ps testdatas and regression test
2008-08-04 21:51:32 +01:00
steffen123
d95bc6dff6
git7 - calculates&displays flop stuff. I wouldnt go as far as claiming that "it works", but it runs without compiler/VM-caught error and it produces numbers - good enough till i get around to updating that damned print_hands
2008-08-04 19:57:33 +01:00
steffen123
b377fd08c6
git6 - it displays (in brackets behind the percentage) how many hands AF/FF/AT/FT/AR/FR is based on
...
commented out some prints
split off a "before alpha release" section off the known-bugs list
2008-08-04 15:54:13 +01:00
steffen123
02d928fb1e
git5 - tv now displays all postflop rounds for holdem/omaha again (but with placeholder info as not calculating base data for that in importer yet)
...
added extra field to table to facilitate 3B calculations.
2008-08-04 12:54:54 +01:00
steffen123
b829b3b266
git4 - tv displays up to flop.
2008-08-04 08:31:15 +01:00
steffen123
6659dc6b9d
git3 - it stores and updates hud data lines for holdem/omaha ring games :)
2008-08-04 08:01:26 +01:00
steffen123
67c2b3fe04
git2 - import now stores the first few fields into a new line.
...
little fix on load_profile - still doesnt work tho
2008-08-04 07:29:53 +01:00
steffen123
f17e8b54b4
git1 - initial git commit. note that right now nothing works due to reworking things
2008-08-04 04:44:28 +01:00