diff --git a/create-release.sh b/create-release.sh new file mode 100755 index 00000000..9f28a7ac --- /dev/null +++ b/create-release.sh @@ -0,0 +1,37 @@ +#!/bin/sh + +#Copyright 2008 Steffen Jobbagy-Felso +#This program is free software: you can redistribute it and/or modify +#it under the terms of the GNU Affero General Public License as published by +#the Free Software Foundation, version 3 of the License. +# +#This program is distributed in the hope that it will be useful, +#but WITHOUT ANY WARRANTY; without even the implied warranty of +#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +#GNU General Public License for more details. +# +#You should have received a copy of the GNU Affero General Public License +#along with this program. If not, see . +#In the "official" distribution you can find the license in +#agpl-3.0.txt in the docs folder of the package. + +rm regression-test/*.found.txt +rm regression-test/*.pyc +rm pyfpdb/*.pyc + +mkdir fpdb-$1 +cp -R docs fpdb-$1/ +cp -R packaging fpdb-$1/ +cp -R pyfpdb fpdb-$1/ +rm fpdb-$1/pyfpdb/HUD_config.* +cp pyfpdb/HUD_config.xml.example fpdb-$1/pyfpdb/HUD_config.xml +cp -R regression-test fpdb-$1/ +cp -R utils fpdb-$1/ + +cd fpdb-$1 +zip -r releases/fpdb-1.0_$1.zip * +tar -cf - * | bzip2 >> releases/fpdb-1.0_$1.tar.bz2 +cd .. +rm -r fpdb-$1 + +echo "Please ensure the files are named fpdb-1.0_alpha*_p*.*" diff --git a/docs/abbreviations.txt b/docs/abbreviations.txt new file mode 100644 index 00000000..94fd5b16 --- /dev/null +++ b/docs/abbreviations.txt @@ -0,0 +1,47 @@ +HUD/table viewer +================ +A3-7=3rd-7th street Complete/Raise percentage +AF=Flop Bet/Raise percentage +AT=River Bet/Raise percentage +AR=Turn Bet/Raise percentage +F3-7=3rd-7th street Fold percentage +FB=like FSB but for big blinds only +FF=Flop Fold percentage +FR=River Fold percentage +FSB=Fold to steal - combined of small and big blind (FSB means Fold Small Big). E.g. if a player faced a steal attempt in the SB 7 times and +FS=like FSB but for small blinds only. +FT=Turn Fold percentage +HD=Hands +PF3B4B=Pre Flop 3Bet or 4Bet +PFR=Pre Flop Raise +Postf A=Postflop (ie. flop+turn+river) Aggression% +Postf F=Postflop Fold % +SD/F=Showdown/Flop=WtSD=How often player went to showdown when he saw the flop +ST=Steal chance (nobody had entered the pot before the player in question, and the player is in cutoff, button or SB position) +W$wsF=Won $ when he saw flop +W$@SD=Won $ at showdown +VPI3=Voluntary Put In on 3rd Street (ie. call+complete+raise) +VPIP=Voluntary Put In Preflop (ie. call+raise) + +Other +===== +CLI=Command Line Interface (Shell, Terminal, "DOS-window") +FTP=Full Tilt Poker +GUI=Graphical User Interface (normal interface with buttons and menus) +HUD=Heads-Up Display (shows stats directly in the poker software) +PS=PokerStars +MTT=Multi Table Tournament +SnG=Sit and Go + +License +======= +Trademarks of third parties have been used under Fair Use or similar laws. + +Copyright 2008 Steffen Jobbagy-Felso +Permission is granted to copy, distribute and/or modify this +document under the terms of the GNU Free Documentation License, +Version 1.2 as published by the Free Software Foundation; with +no Invariant Sections, no Front-Cover Texts, and with no Back-Cover +Texts. A copy of the license can be found in fdl-1.2.txt + +The program itself is licensed under AGPLv3, see agpl-3.0.txt diff --git a/docs/benchmarks.txt b/docs/benchmarks.txt new file mode 100644 index 00000000..9f3bc680 --- /dev/null +++ b/docs/benchmarks.txt @@ -0,0 +1,75 @@ +benchmarks +========== +All measurements on my Athlon64@1.1GHz, 1 GB RAM, RAID5, Hardened Gentoo Linux 2.6.23 +From svn47 all measurements on my Athlon64 X2@1GHz, 2GB RAM +All measurements were ran several times in a row, unless otherwise noted the computer was mostly idle +svn12/15 were with PostgreSQL, svn23 onwards with MySQL +All import measurements were taken immediately after reseting the tables + +svn12, whilst compiling open office in the background +===== +reseting tables (incl filling default data): 0.5-0.6s +importing one hand from a file: 0.5-0.7s + +svn15 +===== +reseting tables (incl filling default data): 0.35-0.4s +importing one FTP hand from a file: 0.2-0.3s or 12-18k/hr +importing 51 FTP hands: 2.8-2.9s or 63-66k/hr +The large speedup will be partially due to not compiling in the background, and +partially due to less connecting/disconnecting the DB I'd imagine. +I'm VERY happy with this performance, but large gains could probably be made by +making the importer just a bit more sensible. + +svn23 +===== +reseting tables (incl filling default data): 0.3-0.35s +importing 75 PS hands: 3.2s or 84k/hr +importing 180 FTP hands: 7.7-7.9s 82k/hr +This is the rewrite in import_FTP_and_PS.py, svn12/15 are with import_file.py +Nice, it's substantially faster inspite of supporting PS and FTP (ish) rather +than just FTP and handling more special cases. + +svn24 +===== +importing 75 PS hands: 3.2-3.3s or 82k/hr +importing 507 FTP hands: 23.5-23.8s or 77k/hr +importing 947 FTP hands: 76.2-72.7s or 44k/hr +As you can see FTP has gotten about 6% slower on 500 hands - but the much expanded handling +of new cases (particularly the ante folding will be ALOT of extra string +comparisons) easily explains that. In fact I expected a much bigger impact. + (I suspect this is due to the parsing pausing whilst my shell catches up) + +svn47 +===== +It significantly slows down as the database gets larger, after a few thousand +hands it got to just one hand per second and slower. However, around 90% of the +CPU load was MySQL. Any tips are most welcome.. + +svn52 (whilst watching movie in a small window) +===== +Importing 2500 hands (mixed sites+types): 6m15s or 31k/hr (ran twice) +Of these 230 were skipped as duplicate or partial so counting 2270 hands + +svn53 (whilst watching movie in a small window) +===== +Importing the 2270 hands from svn52: 1m50 or 74k/hr (82 if counting dupes/partial) +Importing my 35661 (plus 427 dupe/part) hands: 51m51s or 41k/hr (ran once) + +The dbsize still has a significant impact, but with these sizes certainly it's +just not a problem. If anyone runs a larger database let me know how long it takes. +Thanks bwarycha for the tip with the foreign keys! + + +License +======= +Trademarks of third parties have been used under Fair Use or similar laws. + +Copyright 2008 Steffen Jobbagy-Felso +Permission is granted to copy, distribute and/or modify this +document under the terms of the GNU Free Documentation License, +Version 1.2 as published by the Free Software Foundation; with +no Invariant Sections, no Front-Cover Texts, and with no Back-Cover +Texts. A copy of the license can be found in fdl-1.2.txt + +The program itself is licensed under AGPLv3, see agpl-3.0.txt diff --git a/docs/codingstyle.txt b/docs/codingstyle.txt new file mode 100644 index 00000000..31c113f9 --- /dev/null +++ b/docs/codingstyle.txt @@ -0,0 +1,27 @@ +This is just a loose collection of things so far, but might as well make a start :) + +A word on wrapping: Please avoid making manual line breaks, the computer can and therefore should do it. Whether people use a phone or a 40" super-uber-HD screen, they should be allowed to use as much of it as they wish/can. Incidentially, if anyone knows how to activate line wrap in Eclipse I'd really appreciate if you let me know. + +Comments (or prints) with todo are things that are missing, bugs, or just messy code. + +After every def (ie. at the end of the method) there should be a comment including the name, e.g. +#def end of parseActionLine + +If you don't mind make names in java style, ie.: +Classes, files or tables like this: MyClassName +Methods and variables like this: myMethodName + +I'll eventually change all my code to that style, too. + +License +======= +Trademarks of third parties have been used under Fair Use or similar laws. + +Copyright 2008 Steffen Jobbagy-Felso +Permission is granted to copy, distribute and/or modify this +document under the terms of the GNU Free Documentation License, +Version 1.2 as published by the Free Software Foundation; with +no Invariant Sections, no Front-Cover Texts, and with no Back-Cover +Texts. A copy of the license can be found in fdl-1.2.txt + +The program itself is licensed under AGPLv3, see agpl-3.0.txt diff --git a/docs/db-todo.txt b/docs/db-todo.txt new file mode 100644 index 00000000..9d8c0042 --- /dev/null +++ b/docs/db-todo.txt @@ -0,0 +1,22 @@ +stats to add +============ +*CC,TotalColdCalls,TimesFacingRaisePreflop +**Folded to 3-Bet,FoldedToThreeBetPreflop,FacedThreeBetPreflop +Called 3-Bet,CalledThreeBetPreflop,FacedThreeBetPreflop +*Winning %,wonhand,TotalHands +**Flop Aggression Factor,timesaggressiveflop,timescalledflop +**Turn Aggression Factor,timesaggressiveturn,timescalledturn +**River Aggression Factor,timesaggressiveriver,timescalledriver +scoopedPot (useful for hi/lo split games) + +couldSqueeze, didSqueeze, facedSqueeze, calledSqueeze -> if (player raises from EP) and (someone after him calls) and (someone after that goes all in) +Donk Bet Turn,DidDonkBetTurn,CouldDonkBetTurn -> EP raises, LP reraises, EP calls. If EP bets out after the flop, it is considered a donk bet +Float Turn,DidFloatTurn,CouldFloatTurn -> + +other +===== +look at PT3 and HM tables see if i forgot anything +store all-in somewhere +add somewhere: mixed flag to denote that the game is part of a mixed game rotation + +add tables for single draw (5card draw, 2-7 single draw, badugi) and tripple draw (2-7 tripple draw) diff --git a/docs/install-in-ubuntu.txt b/docs/install-in-ubuntu.txt new file mode 100644 index 00000000..b3843eca --- /dev/null +++ b/docs/install-in-ubuntu.txt @@ -0,0 +1,46 @@ +Last checked: 1 Sep, p74 + +These instructions are for any Ubuntu Linux, but except for the name of the package management software it should be identical on other Linux distributions. + +Using the package manager (I think it's called synaptics) install the dependencies: mysql, python, mysql-python, pygtk +I don't use ubuntu but I'd imagine it will at some point prompt you for a MySQL root password enter one and when it's done installing everything open a shell/terminal and type this: +mysql --user=root --password=YourMysqlRootPassword +It should say something like this: + +Welcome to the MySQL monitor. Commands end with ; or \g. +Your MySQL connection id is 4 +Server version: 5.0.60-log Ubuntu Linux mysql-5.0.60-r1 + +Type 'help;' or '\h' for help. Type '\c' to clear the buffer. + +mysql> + +Now type this: +CREATE DATABASE fpdb; + +Next you need to create a user. Type this (replacing newPassword with the password you want the fpdb user to have - this can, but for security shouldn't, be the same as the root mysql password): +GRANT ALL PRIVILEGES ON fpdb.* TO 'fpdb'@'localhost' IDENTIFIED BY 'newPassword' WITH GRANT OPTION; + +Then download one of the alpha2 archives from the sourceforge page at https://sourceforge.net/projects/fpdb/ and unpack it into a folder of your choice. + +Next create a directory called .fpdb (the . at the beginning is important) in your home directory, e.g. /home/steffen/.fpdb +Then copy the default.conf file from the docs directory of the archive into this new folder. +Finally edit default.conf with any texteditor and enter the fpdb password you entered above (in the GRANT ALL... command). + +This should be it, try double clicking pyfpdb/fpdb.py or open it from a shell with python /path/to/fpdb/pyfpdb/fpdb.py + +Now see readme-user.txt for usage instructions. + + +License +======= +Trademarks of third parties have been used under Fair Use or similar laws. + +Copyright 2008 Steffen Jobbagy-Felso +Permission is granted to copy, distribute and/or modify this +document under the terms of the GNU Free Documentation License, +Version 1.2 as published by the Free Software Foundation; with +no Invariant Sections, no Front-Cover Texts, and with no Back-Cover +Texts. A copy of the license can be found in fdl-1.2.txt + +The program itself is licensed under AGPLv3, see agpl-3.0.txt diff --git a/docs/known-bugs-and-planned-features.txt b/docs/known-bugs-and-planned-features.txt new file mode 100644 index 00000000..a8a3f988 --- /dev/null +++ b/docs/known-bugs-and-planned-features.txt @@ -0,0 +1,58 @@ +Everything is subject to change and the order does not indicate priority. Patches for any of these or other features are very welcome, see readme-overview.txt for contacts. +Please also see db-todo.txt + +before beta +=========== +change to savannah? + + + +Any comment or print with "todo" in it in the sourcecode except what is marked todo in the menu +make a quick benchmark of mysql and postgresql: import of my whole db, some tableviewer refreshes with and without updated file +Make tab and enter work as sensible in GUIs and implement Ctrl+Q, Ctrl+X and Alt+F4 for close. +use profile file for bulk import and table viewer settings and pathes +check that we read sitout correctly in: Full Tilt Poker Game #6150325318: Table Bogside +verify at least 2 or 3 sng hands + +no rush but before 1.0RC +======================== +improve handling of dead hand before BB, see git101/7bd1631 +make DB version error offer reimport, recreation and continue. +In many places there are unnecessary database accesses or it regenerates information it already had before or just generally does things in obscenely inefficient ways. Optimise this +multi-select in bulk importer +cut down action_types array size to appropriate length +make the gui display errors +log file +move directory import code from gui to backend +convert fpdb_import to not require passing "self", generally clean the parameter passing +Doesn't handle Daylight Saving Time (I don't think at least) +ensure that refresh still takes no more than 10 seks on my P3M-800 (a quick run on git15 indicates this is ok now), or 5 with remote DB +select range of stakes and sng/mtt values and types for hud +recognise somewhere if a file is still active and if so keep it open and only read new hands rather than detecting dupes +return full ftp functionality + +can wait till 1.x +================= +in all importer: stop doing if site=="ftp", make class constants for site_id instead +It treats fold due to disconnect as voluntary fold which is not ideal +aliases +repair hands where the seat lines are missing, happens when observing at FTP +flags for storing the reason for winning (best hi, tie for best low, etc.) to DB. not sure actually if this is such a good idea remember that there can be multiple reasons for the same player in the same hand +benchmark properly on mysql innodb, postgresql, more? +rename things like this: ClassName.methodName and variableName. update codingstyle +CLI (not ncurses, normal CLI) equivalent for fpdb.py +optimise/simplify storing by creating the SQL statements depending on hand rather than calling different methods +make range of activeSeats configurable for tv/hud + +License +======= +Trademarks of third parties have been used under Fair Use or similar laws. + +Copyright 2008 Steffen Jobbagy-Felso +Permission is granted to copy, distribute and/or modify this +document under the terms of the GNU Free Documentation License, +Version 1.2 as published by the Free Software Foundation; with +no Invariant Sections, no Front-Cover Texts, and with no Back-Cover +Texts. A copy of the license can be found in fdl-1.2.txt + +The program itself is licensed under AGPLv3, see agpl-3.0.txt diff --git a/docs/readme-dev.txt b/docs/readme-dev.txt new file mode 100644 index 00000000..c8b5cd3f --- /dev/null +++ b/docs/readme-dev.txt @@ -0,0 +1,67 @@ +Hi, +This document is to serve as a little overview (later: full technical doc) for current and prospective developers with: +a) introduction into the code structure +b) organisational/legal things + +What to do? +=========== +- Anything you want. +- The most useful (because it's the most boring) would be to update print_hand.py, update the expected files (testdata/*.found.txt) and create more .found.txt to ensure import processing is running correctly. +- There's a list of various bugs, deficiencies and important missing features in known_bugs_and_planned_features.txt. +- In the main GUI there's various menu points marked with todo - all of these will have to be done eventually. + +If you want to take a look at coding-style.txt. +Ideally use git (see git-instructions.txt for some commands) and let me know where to pull from, alternatively feel free to send patches or even just changed file in whatever code layout or naming convention you like best. I will, of course, still give you full credit. + +Contact/Communication +===================== +If you start working on something please open a bug or feature request at sf to avoid someone else from doing the same +Please see readme-overview + +Dependencies +============ +Please let me know before you add any new dependencies and ensure that they are source-compatible between *nix and Windows + +Code/File/Class Structure +========================= +Basically the code runs like this + +fpdb.py -> bulk importer tab (import_threaded.py) -> fpdb_import.py -> fpdb_parse_logic.py -> fpdb_save_to_db.py +or +fpdb.py -> table viewer tab (table_viewer.py) (todo: -> libTableViewer) + +All files call the simple methods that I just collected in fpdb_simple.py, to abstract the other files off the nitty gritty details as I was learning python. +I'm currently working on (amongst other things) integrating everything into the fpdb.py GUI with a view to allow easy creation of a CLI client, too. + +Also see filelist.txt. + +How to Commit +============= +Please make sure you read and accept the copyright policy as stated in this file. Then see git-instructions.txt. Don't get me wrong, I hate all this legalese, but unfortunately it's kinda necessary. + +Copyright/Licensing +=================== +Copyright by default is handled on a per-file basis. If you send in a patch or make a commit to an existing file it is done on the understanding that you transfer all rights (as far as legally possible in your jurisdiction) to the current copyright holder of that file, unless otherwise stated. If you create a new file please ensure to include a copyright and license statement. + +The licenses used by this project are the AGPL3 for code and FDL1.2 for documentation. See readme-overview.txt for reasons and if you wish to use fpdb with different licensing. + +Preferred File Formats +====================== +Preferred: Where possible simple text-based formats, e.g. plain text (with Unix end of line char) or (X)HTML. Preferred picture format is PNG. IE-compability for HTML files is optional as IE was never meant to be a real web browser, if it were they would've implemented web standards. + +Also good: Other free and open formats, e.g. ODF. + +Not good: Any format that doesn't have full documentation freely and publicly available with a proper license for anyone to implement it. Sadly, Microsoft has chosen not fulfil these requirements for ISO MS OOXML to become a truly open standard. + +License (of this file) +======= +Trademarks of third parties have been used under Fair Use or similar laws. + +Copyright 2008 Steffen Jobbagy-Felso +Permission is granted to copy, distribute and/or modify this +document under the terms of the GNU Free Documentation License, +Version 1.2 as published by the Free Software Foundation; with +no Invariant Sections, no Front-Cover Texts, and with no Back-Cover +Texts. A copy of the license can be found in fdl-1.2.txt + +The program itself is licensed under AGPLv3, see agpl-3.0.txt diff --git a/docs/readme-overview.txt b/docs/readme-overview.txt new file mode 100644 index 00000000..825a61de --- /dev/null +++ b/docs/readme-overview.txt @@ -0,0 +1,86 @@ +Summary +======= +A database program to track your online poker games, the behaviour of the other players and your winnings/losses. Supports Holdem, Omaha, Stud and Razz for cash games as well as SnG and MTT tournaments with more possibly coming in the future. Some of this is not yet working though, please see status.txt and known-bugs-and-planned-features.txt + +Contact +======= +Please note that this project has two hostings: one at assembla.com which holds are version control "central tree" (irrelevant for users) and everything else at http://sourceforge.net/projects/fpdb/. + +The best means of contact are the sourceforge page: Use the bug, feature request or patch functions or just post in the forum. + +Alternatively feel free to contact me directly: + +mail: steffen(at)sycamoretest.info +jabber/xmpp/Google Talk: as above +ICQ: 7806355 +MSN: steffenjf@gmx.de (don't email that) + +But you could send all my hand histories to yourself! +===================================================== +At the end of the day this comes down to a question of trust, but unlike Windows and the poker client software you don't have to trust fpdb blindly. You can: +- Verify the source code yourself. +- Convince or pay someone to verify the source code for you. +- Use a personal firewall to completely block fpdb from the Internet +- (for the uber-paranoid) Get yourself the free virtualisation software VirtualBox, set up a VM (virtual machine) to run fpdb but run the poker software on your real PC. Then cut the VM off the Internet, fpdb doesn't need it. If you have a PC made in the last few years this should run fast enough as well. Note that most Windows licenses do NOT permit you to use two Windows installations at once, even if they are on the same PC. + +Installing +========== +See the install-*.txt for your operating system. If your OS is missing or if you have problems let me know (contacts are further below). In particular I'd be happy to provide packages for GNU/Linux and *BSD distributions. + +Using it +======== +See readme-user.txt +If you have a problem, request or question see the contacts section below + +Changing it +=========== +See readme-dev.txt + +Requirements +============ +Software requirements are listed in requirements.txt +As for hardware, my main test machine is a Pentium 3-M 800 with 256 RAM and Gentoo GNU/Linux +(running the poker client through what most people will call emulation). So this +program will have to work on that. If you run an even more ancient machine and +its too slow let me know and I'll see what I can do :) + +Why Free Software? +================== +This program is released under the terms of the free/libre software license AGPL3 as released by the FSF. The AGPL3 protects your rights and those of the wider community. As Richard Stallman, one of the founders of the free software movement, put it: "Free software is a matter of liberty, not price. To understand the concept, you should think of free as in free speech, not as in free beer." (well, it is both really, like the right to vote used to be free) + +For example, a "pirated" copy of proprietary software X is free of charge, but you don't actually have a legal right to use it, you don't have any possibility to fix its bugs and you certainly don't have any legal right to share it with your friends. You also won't be able to get support, often not even security fixes. Actually, even if you pay hundreds of pounds for your program they deny your right to fix their errors for them. Imagine buying a car where you're not permitted (under threat of jail) to replace broken parts.. + +With free/libre software (also known as open source software, or short FOSS or FLOSS) on the other hand you get all these freedoms: +(note: the legally binding terms are in the license text, this is merely an amateur summary so normal people don't have to read pages of legalese) + +Freedom 0: The freedom to use: To run the program, for any purpose. Free of Charge. +Freedom 1: The freedom to study and help yourself. This freedom guarantees your right to study and learn from the source code of the program, and to fix it if it is broken. If you're not a programmer yourself the developers will generally be happy to fix it for you, often even for free. Failing that you can always pay someone from the money you saved on not having to pay for it. +Freedom 2: The freedom to be a decent human being and help your neighbour: I don't threaten you with lawsuits or jail time if you share with your friends and neighbours, subject to the very modest restrictions of the AGPL3. +Freedom 3: The freedom to improve the program and release your improvements to the public (or parts thereof) so that the whole community benefits. Note that you are PERMITTED, but not REQUIRED to distribute your changes. If you do distribute your changes you must do so under the terms of the AGPL3 however. + +Note that this is the license - I retain full copyright over my code, including the right to change the license for future versions. I do not intend to do this however. In any case, any version I released under AGPL3 remains available under that license forever, or more accurately until my copyright expires at which point it goes into the public domain. + +I reject the concept of software patents as a crime and under the European Patent Agreement software patents - even if you mislabel them as "computer-implemented inventions" or whatever - are explicitly prohibited. + +Can I get/use this under a different license? +============================================= +The short answer: Maybe. +The long one: As detailed, I fully support what the FSF does and aims to achieve with the GPL. However, I realise that many free software developers don't object to closed source, some don't even object to closed source profiteering of their charity, and I don't think I have any right to go and tell them they're wrong. +So if anyone wishes to use all or part of my code in another free software/open source project with an AGPL3-incompatible license such as BSD then let me know and we'll figure out a solution that makes everyone happy. +If you wish to use all or part of this in closed source let me know how much if anything that is worth to you and I'm sure we'll be able to reach an agreement. Note that you are NOT permitted to just use fpdb code in closed source development whether in-house or by an independent software developer, you will NEED an additionally agreement with me to get fpdb under different licensing conditions. + + +License of this Document +======================== +The views expressed in this document are those of Steffen Jobbagy-Felso, other members of the fpdb team and external contributors may or may not agree. + +Trademarks of third parties have been used under Fair Use or similar laws. + +Copyright 2008 Steffen Jobbagy-Felso +Permission is granted to copy, distribute and/or modify this +document under the terms of the GNU Free Documentation License, +Version 1.2 as published by the Free Software Foundation; with +no Invariant Sections, no Front-Cover Texts, and with no Back-Cover +Texts. A copy of the license can be found in fdl-1.2.txt + +The program itself is licensed under AGPLv3, see agpl-3.0.txt diff --git a/docs/readme-user.txt b/docs/readme-user.txt new file mode 100644 index 00000000..6d3d1f76 --- /dev/null +++ b/docs/readme-user.txt @@ -0,0 +1,43 @@ +Before you do this make sure you setup the dependencies, the database, user, tables and config file. + +Running it +========== +If you have python setup properly you can execute it by double clicking pyfpdb/fpdb.py. + +Note however that all error messages are currently only printed if you call it from a shell. It'll be much easier to diagnose possible problems (which are likely in alpha stage) if you run it from a shell. In Windows XP it seems to automatically open a shell window with the fpdb window where you can see the command line output. + +In Linux/MacOS/*BSD, e.g. if its in /home/sycamore/fpdb/, do this: +cd /home/sycamore/fpdb/pyfpdb +python fpdb.py + + +That will start the main GUI. + +Have a look at the menus, the stuff that is marked todo is not yet implemented. + +The main things are the bulk importer and the table viewer. To use the importer open it from the menu (import files and directories). You can set a few options at the bottom, then select a folder or single file in the main are and click Import. Please report any errors by one of the contacts listed in readme-overview.txt. +Currently this will block the interface, but you can open another instance of this program e.g. if you wanna play whilst a big import is running. + +Please check the output at the shell for errors, if there are any please get in touch by one of the methods listed in readme-overview.txt + +Table Viewer (tv) +================= +To use the table viewer open it from the menu, select the hand history file of the table you're at, and click the Import&Read&Refresh button. The abbreviations there are explained in abbreviations.txt, but feel free to ask. Note that most poker software will only create the file once the first hand you payed to play is finished. +In each column there is either just the number (hand count for current stake, range of seats and type of game) or a percentage and the number of hands that this percentage is based on. For example, in W$@SD (won $ at shodown) the number in brackets is how many showdowns that player has seen. + +Reimporting +=========== +Currently on most updates a reimport of the whole database is required. To do this open fpdb, click the menu Database and select Create/Recreate tables. Then import all your history files again. + +License +======= +Trademarks of third parties have been used under Fair Use or similar laws. + +Copyright 2008 Steffen Jobbagy-Felso +Permission is granted to copy, distribute and/or modify this +document under the terms of the GNU Free Documentation License, +Version 1.2 as published by the Free Software Foundation; with +no Invariant Sections, no Front-Cover Texts, and with no Back-Cover +Texts. A copy of the license can be found in fdl-1.2.txt + +The program itself is licensed under AGPLv3, see agpl-3.0.txt diff --git a/docs/status.txt b/docs/status.txt new file mode 100644 index 00000000..3ab5fbf8 --- /dev/null +++ b/docs/status.txt @@ -0,0 +1,76 @@ +For all support please note that the tables WILL be changed, almost certainly without keeping backwards compatibility. Therefore you should keep your history files after import so you can re-import when necessary. Should you lose history files and need a "database updater" let me know. + +If support for another site/game would encourage you to help with this software please let me know at steffen@sycamoretest.info. + +IMPORTANT: There appears to be a bug in at least up to git34 in reading WtSD/W$wsF/W$SD + +Holdem/Omaha ring games on PokerStars +====================================== +Works, quite well tested, works in table viewer and is useful now. Functionality is quite limited so far though. This includes the holdem/omaha parts of HORSE, HOSE and any other mixed game + +Stud/Razz ring games on PokerStars +================================== +Broken - used to work, hardly tested. Needs to be updated to new infrastructure using a HudData table rather than hands_players_flags. Will fix this shortly. + +Tournaments/SnGs +================ +Broken - used to work, hardly tested. Needs to be updated to new infrastructure.. Will probably fix this shortly + +Full Tilt Poker +=============== +Might work - used to work and was very well test. It should import them (except HudData), but I believe the table viewer won't work. Would be easy to fix I think, volunteers welcome. This used to work in a pre-alpha but basically was left behind during updates to the other stuff. + +Other Sites +=========== +Patches/Volunteers welcome. Should be quite easy. + +GUI +=== +Alpha - the infrastructure stands and is fast enough, now "just" need to add more functionality. + +HUD +=== +Not started - volunteers welcome. I found a *nix utility based on xlib that does half the work for this (most of the other half is already in the table viewer), see http://www.roard.com/docs/cookbook/cbsu19.html. There's also a python implementation of xlib which should run even on Windows. + +Packaging +========= +Gentoo GNU/Linux: I'll make ebuilds, if you want one now let me know. +Other free/libre systems (e.g. other GNU/Linux-Distros, *BSD, and I'd love to help in getting this to work on any Hurd based system): Let me know what you use (Distribution, version and CPU type) and I'll make a package. +Windows/MacOSX: Manual installation of dependencies for now, integrated installer would be nice - volunteers welcome, but I'll do it eventually in any case. + +Regression Testing +================== +The query scripts are done-ish, need to verify more data so it can be used in automated regression testing. + +Database Backends +================= +- MySQL InnoDB is the default +- PostgreSQL should work but I haven't tried it. If it doesn't please let me know. +- MySQL ISAM won't be supported since it is not transactional + +Legal +===== +General: This will offer more or less the same kind of functionality as HM and PT so there shouldn't be any problem on any site that allows tracking. +PS: I have asked them and they said that due to the fast changing nature + of pre-release software they don't review that. However, looking at their + posted guidelines we're fine +FTP: I sent them an email and what I described there was ok for them. +I will write them again for "certification" on release of 1.0 + +To avoid any misunderstandings, PS and FTP obviously do not sponsor, endorse, or support fpdb. They allow using it, that's all. Any problems with fpdb should be reported to us, not the poker site. + +A note on viewing/tracking mucked hands. Many people will say this is cheating. I agree. However, I don't make the rules on these sites. The sites that store mucked hands into the history file clearly think that being able to see other people's mucked hands is ok. This software - like HM and PT - merely takes info provided by the poker site and makes it more easily accessible. +Apparently PS has now turned this off :) + +License +======= +Trademarks of third parties have been used under Fair Use or similar laws. + +Copyright 2008 Steffen Jobbagy-Felso +Permission is granted to copy, distribute and/or modify this +document under the terms of the GNU Free Documentation License, +Version 1.2 as published by the Free Software Foundation; with +no Invariant Sections, no Front-Cover Texts, and with no Back-Cover +Texts. A copy of the license can be found in fdl-1.2.txt + +The program itself is licensed under AGPLv3, see agpl-3.0.txt diff --git a/files/fpdb.desktop b/files/fpdb.desktop new file mode 100644 index 00000000..eed85047 --- /dev/null +++ b/files/fpdb.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Free Poker Database +Comment=Online Poker Tracker + HUD +Exec=/usr/bin/fpdb +Icon=fpdb-icon.png +Terminal=true +Type=Application +Categories=Utility + diff --git a/gfx/fpdb-icon.png b/gfx/fpdb-icon.png new file mode 100644 index 00000000..673b0e54 Binary files /dev/null and b/gfx/fpdb-icon.png differ diff --git a/gfx/fpdb-icon2.png b/gfx/fpdb-icon2.png new file mode 100644 index 00000000..acf50124 Binary files /dev/null and b/gfx/fpdb-icon2.png differ diff --git a/gfx/magnified_cards.png b/gfx/magnified_cards.png new file mode 100644 index 00000000..e7566821 Binary files /dev/null and b/gfx/magnified_cards.png differ diff --git a/ignore-me_perl6/LibFpdbImport.pm b/ignore-me_perl6/LibFpdbImport.pm new file mode 100644 index 00000000..ac7db336 --- /dev/null +++ b/ignore-me_perl6/LibFpdbImport.pm @@ -0,0 +1,178 @@ +#!/usr/bin/pugs + +#Copyright 2008 Steffen Jobbagy-Felso +#This program is free software: you can redistribute it and/or modify +#it under the terms of the GNU Affero General Public License as published by +#the Free Software Foundation, version 3 of the License. +# +#This program is distributed in the hope that it will be useful, +#but WITHOUT ANY WARRANTY; without even the implied warranty of +#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +#GNU General Public License for more details. +# +#You should have received a copy of the GNU Affero General Public License +#along with this program. If not, see . +#In the "official" distribution you can find the license in +#agpl-3.0.txt in the docs folder of the package. + +module LibFpdbImport; +use v6; +#use strict; +use LibFpdbShared; +#use LibFpdbImport2; + +class Player { + has Str $name; + has Int $start_cash; + has Card @.cards; + has Char $position; + + submethod BUILD (Str @strings) { + say "todo: implement Player.BUILD"; + }#end Player.BUILD + + our Player method find_players(@strings) { + #todo: i think this should be sub since its a class method not an instance method + say "todo: implement Player.find_players"; + } +}#end class Player + +class Line { + has Str $line; + has Bool $processed; + + our protected submethod BUILD() { + say "todo: implement Line.BUILD?" + }#end Line.BUILD + + our Line method recognise_and_parse(@strings) { + #todo: i think this should be sub since its a class method not an instance method + say "todo: implement Line.recognise_and_parse"; + }#end Line.recognise_and_parse +}#end class Line + +class ActionLine is Line { + has Player $player; + has Str $type; + has Int $amount; + has Bool $all_in; + has Int $action_no; +}#end class ActionLine + +class WinLine is Line { + has Player $player; + has Int $amount; +}#end class WinLine + +class RakeLine is Line { + has Int $amount; +}#end class RakeLine + +class CardLine is Line { + has Bool $board_line; + has Player $player; + has Card @cards; +}#end class CardLine + +#for useless lines +class CrapLine is Line { + has Str $type; +}#end class CrapLine + +class Hand { + has Line @.lines; + #has Str @strings; + has Site $site; + has Str $currency; + + has Str $type; + has Str $category; + has Str $limit_type;#todo: above ; missing causes error, but that doesnt list ; as a possibility + has Player @.players; + has Card @.board; + has Int $db_id; + + submethod BUILD(Str @strings) { + Util.debug("running Hand.BUILD"); + say "strings:",@strings; + #this contructor automatically parses the hand. call .store for storing + + @.players=Player.find_players(@strings); + @.lines=Line.recognise_and_parse(@strings); + + for @strings -> $line { + if class_of(line)==CardLine { + if line.board { + board=line.cards; + } else { + for player in players { + if line.player==player { + player.cards=line.cards; + } + } + } + } + } + }#end Hand.BUILD + + our Bool method is_holdem(){ + if category==("holdem"|"omahahi"|"omahahilo") { + return True; + } else { + return False; + } + }#end Hand.is_holdem + + our Bool method is_stud(){ + return not is_holdem(); + }#end Hand.is_stud + + our Bool method store($db) { + say "todo: Hand.store"; + }#end Hand.store +}#end class Hand + +class Importer { +#todo: be Thread? + submethod BUILD (Database $db, Str $filename) { + Util.debug("running Importer.BUILD"); + if (not ($db.is_connected())) { + Util.fatal("not connected to DB"); + } + + my IO $?filehandle=$filename; + #for =$filehandle -> $line {say $line} + my Str @lines =$filehandle; + + my Int $hand_start=0; + my Int $hand_end=0; + my Int $loopcount=0; + loop {#one loop of this per hand + $loopcount++; + say "loopcount", $loopcount; + my Int $current_line_index=$hand_end+1; #previous hand end is new hand start + for (my Int $i, $i<5, $i++) {#remove blank hands + if (@lines[$current_line_index].bytes) < 6 { + $current_line_index++; + } else { + $hand_start=$current_line_index; + break; + } + } + my Bool $continue=True; #todo: this is dumb, find out correct loop + while $continue {#loop through the lines to find end of hand + $current_line_index++; + if (@lines[$current_line_index].bytes) < 6 { + $hand_end=$current_line_index; + $continue=False; + } + }#end of find end of hand loop + my Str @handlines=@lines[$hand_start..$hand_end]; + my Hand $hand .= new(:lines(@handlines)); + $hand.store($db); + say "todo: record \$db_id"; + say "todo: terminate on EOF"; + } + }#end new Importer +}#end class Importer + diff --git a/ignore-me_perl6/LibFpdbShared.pm b/ignore-me_perl6/LibFpdbShared.pm new file mode 100644 index 00000000..abf2eb69 --- /dev/null +++ b/ignore-me_perl6/LibFpdbShared.pm @@ -0,0 +1,84 @@ +#!/usr/bin/pugs + +#Copyright 2008 Steffen Jobbagy-Felso +#This program is free software: you can redistribute it and/or modify +#it under the terms of the GNU Affero General Public License as published by +#the Free Software Foundation, version 3 of the License. +# +#This program is distributed in the hope that it will be useful, +#but WITHOUT ANY WARRANTY; without even the implied warranty of +#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +#GNU General Public License for more details. +# +#You should have received a copy of the GNU Affero General Public License +#along with this program. If not, see . +#In the "official" distribution you can find the license in +#agpl-3.0.txt in the docs folder of the package. + +module LibFpdbShared; +use v6; +#use strict; + +class Util { + method debug(Str $string) { + #todo: i think this should be sub since its a class method not an instance method + say "debug notice: ", $string; + }#end debug_msg + + sub warn(Str $string) { + say "todo: Util.warning"; + }#end warning + + sub fatal(Str $string, Database $db) { + say "todo: Util.fatal_error"; + }#end fatal_error +}#end class Util + +class Database { + has Str $backend; + has Str $host; + has Str $name; + has Str $user; + my Str $password; + submethod BUILD (Str $!backend, Str $!host, Str $!name, Str $!user, Str $!password) { + Util.debug("running Database.BUILD"); + self.connect(); + }#end new Database + + our method connect() { + say "todo: db.connect"; + }#end connect + + method disconnect() { + say "todo: db.disconnect"; + }#end disconnect + + method cancel_import() { + say "todo: db.cancel_import"; + }#end cancel_import + + my method drop_tables() { + #todo: make this one private + say "todo: db.drop_tables"; + }#end drop_tables + + method recreate_tables() { + say "todo: db.recreate_tables"; + }#end recreate_tables + + #returns the id of the insert + our Int method insert(Str $sql_command) { + #todo: is it a bug that i need the "our" above? + say "todo: db.insert"; + return 0; + }#end insert + + our Str method fetch(Str $sql_command) { + say "todo: db.fetch"; + }#end fetch + + our Bool method is_connected() { + say "todo: db.is_connected"; + }#end +}#end class Database + diff --git a/ignore-me_perl6/LibFpdbView.pm b/ignore-me_perl6/LibFpdbView.pm new file mode 100644 index 00000000..e4f994d1 --- /dev/null +++ b/ignore-me_perl6/LibFpdbView.pm @@ -0,0 +1,17 @@ +#!/usr/bin/pugs + +#Copyright 2008 Steffen Jobbagy-Felso +#This program is free software: you can redistribute it and/or modify +#it under the terms of the GNU Affero General Public License as published by +#the Free Software Foundation, version 3 of the License. +# +#This program is distributed in the hope that it will be useful, +#but WITHOUT ANY WARRANTY; without even the implied warranty of +#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +#GNU General Public License for more details. +# +#You should have received a copy of the GNU Affero General Public License +#along with this program. If not, see . +#In the "official" distribution you can find the license in +#agpl-3.0.txt in the docs folder of the package. + diff --git a/ignore-me_perl6/RunFpdbCLI.perl6 b/ignore-me_perl6/RunFpdbCLI.perl6 new file mode 100644 index 00000000..dbbad9a7 --- /dev/null +++ b/ignore-me_perl6/RunFpdbCLI.perl6 @@ -0,0 +1,29 @@ +#!/usr/bin/pugs + +#Copyright 2008 Steffen Jobbagy-Felso +#This program is free software: you can redistribute it and/or modify +#it under the terms of the GNU Affero General Public License as published by +#the Free Software Foundation, version 3 of the License. +# +#This program is distributed in the hope that it will be useful, +#but WITHOUT ANY WARRANTY; without even the implied warranty of +#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +#GNU General Public License for more details. +# +#You should have received a copy of the GNU Affero General Public License +#along with this program. If not, see . +#In the "official" distribution you can find the license in +#agpl-3.0.txt in the docs folder of the package. + +use v6; +#use strict; +use LibFpdbImport; +use LibFpdbShared; + + +my Database $db .= new(:backend, :host, :database, :user, :password); +#todo: below doesnt work +my Importer $imp .= new(:db($db), :filename); +#perlbug?: adding another named argument that isnt listed in the constructor gave very weird error. +say $imp; + diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 84ecbce5..ce102bf5 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,3 +1,9 @@ +free-poker-tools (0.11.3+git20091023) unstable; urgency=low + + * Snapshot release + + -- Mika Bostrom Wed, 21 Oct 2009 16:47:12 +0300 + free-poker-tools (0.10.99) unstable; urgency=low * Initial packaging release. diff --git a/packaging/debian/links b/packaging/debian/links index 01d1c490..5a4601a7 100644 --- a/packaging/debian/links +++ b/packaging/debian/links @@ -1 +1 @@ -/usr/share/python-support/python-fpdb/fpdb/fpdb.py /usr/bin/fpdb +/usr/share/pyshared/fpdb/fpdb.py /usr/bin/fpdb diff --git a/packaging/gentoo/fpdb-1.0_alpha8_p137.ebuild b/packaging/gentoo/fpdb-1.0_alpha8_p137.ebuild new file mode 100644 index 00000000..c55903f3 --- /dev/null +++ b/packaging/gentoo/fpdb-1.0_alpha8_p137.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2008 Gentoo Foundation +# Gentoo had nothing to do with the production of this ebuild, but I'm pre-emptively transferring all copyrights (as far as legally possible under my local jurisdiction) to them. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-util/fpdb/fpdb-1.0_alpha8_p137.ebuild,v 1.0 2008/10/17 steffen@sycamoretest.info Exp $ + +NEED_PYTHON=2.3 + +#inherit distutils + +MY_P="fpdb-${PV}" +DESCRIPTION="A database program to track your online poker games" +HOMEPAGE="https://sourceforge.net/projects/fpdb/" +SRC_URI="mirror://sourceforge/fpdb/${MY_P}.tar.bz2" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +#note: this should work on other architectures too, please send me your experiences +IUSE="" + +RDEPEND="virtual/mysql + dev-python/mysql-python + >=x11-libs/gtk+-2.10 + dev-python/pygtk + dev-python/numpy + dev-python/matplotlib" + +DEPEND="${RDEPEND}" + +src_install() { + DIRINST="${D}usr/share/games/fpdb/" + mkdir -p "${DIRINST}" + cp -R * "${DIRINST}" || die + + DIRBIN="${D}usr/games/bin/" + mkdir -p "${DIRBIN}" + #echo "pathes" + #echo "${DIRINST}pyfpdb/fpdb.py" + #echo "${DIRBIN}fpdb.py" + #echo + echo "cd /usr/share/games/fpdb/pyfpdb/ && python fpdb.py" > "${DIRBIN}fpdb" || die + chmod 755 "${DIRBIN}fpdb" || die +} + +#src_test() { +#} + +pkg_postinst() { + elog "Fpdb has been installed and can be called by executing /usr/games/bin/fpdb" + elog "You need to perform a couple more steps manually." + elog "Please also make sure you followed instructions from previous emerges, in particular make sure you configured mysql and set a root pw for it" + elog "Now run this command to connect to MySQL: mysql --user=root --password=yourPassword" + elog "In the mysql command line interface you need to type these two lines (make sure you get the ; at the end)" + elog "In the second line replace \"newPassword\" with a password of your choice" + elog "CREATE DATABASE fpdb;" + elog "GRANT ALL PRIVILEGES ON fpdb.* TO 'fpdb'@'localhost' IDENTIFIED BY 'newPassword' WITH GRANT OPTION;" + elog "Finally copy the default config file from ${DIRINST}docs/default.conf to ~/.fpdb/ for every user that is to use fpdb." + elog "You will need to edit the default.conf, in particular you need to replace the password with what you entered in the \"GRANT ALL...\"" + elog "Finally run the GUI and click the menu database -> recreate tables" + elog "That's it! See our webpage at http://fpdb.sourceforge.net for more documentation" + elog " " +} diff --git a/packaging/gentoo/fpdb-1.0_alpha9_p142.ebuild b/packaging/gentoo/fpdb-1.0_alpha9_p142.ebuild new file mode 100644 index 00000000..c55903f3 --- /dev/null +++ b/packaging/gentoo/fpdb-1.0_alpha9_p142.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2008 Gentoo Foundation +# Gentoo had nothing to do with the production of this ebuild, but I'm pre-emptively transferring all copyrights (as far as legally possible under my local jurisdiction) to them. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-util/fpdb/fpdb-1.0_alpha8_p137.ebuild,v 1.0 2008/10/17 steffen@sycamoretest.info Exp $ + +NEED_PYTHON=2.3 + +#inherit distutils + +MY_P="fpdb-${PV}" +DESCRIPTION="A database program to track your online poker games" +HOMEPAGE="https://sourceforge.net/projects/fpdb/" +SRC_URI="mirror://sourceforge/fpdb/${MY_P}.tar.bz2" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +#note: this should work on other architectures too, please send me your experiences +IUSE="" + +RDEPEND="virtual/mysql + dev-python/mysql-python + >=x11-libs/gtk+-2.10 + dev-python/pygtk + dev-python/numpy + dev-python/matplotlib" + +DEPEND="${RDEPEND}" + +src_install() { + DIRINST="${D}usr/share/games/fpdb/" + mkdir -p "${DIRINST}" + cp -R * "${DIRINST}" || die + + DIRBIN="${D}usr/games/bin/" + mkdir -p "${DIRBIN}" + #echo "pathes" + #echo "${DIRINST}pyfpdb/fpdb.py" + #echo "${DIRBIN}fpdb.py" + #echo + echo "cd /usr/share/games/fpdb/pyfpdb/ && python fpdb.py" > "${DIRBIN}fpdb" || die + chmod 755 "${DIRBIN}fpdb" || die +} + +#src_test() { +#} + +pkg_postinst() { + elog "Fpdb has been installed and can be called by executing /usr/games/bin/fpdb" + elog "You need to perform a couple more steps manually." + elog "Please also make sure you followed instructions from previous emerges, in particular make sure you configured mysql and set a root pw for it" + elog "Now run this command to connect to MySQL: mysql --user=root --password=yourPassword" + elog "In the mysql command line interface you need to type these two lines (make sure you get the ; at the end)" + elog "In the second line replace \"newPassword\" with a password of your choice" + elog "CREATE DATABASE fpdb;" + elog "GRANT ALL PRIVILEGES ON fpdb.* TO 'fpdb'@'localhost' IDENTIFIED BY 'newPassword' WITH GRANT OPTION;" + elog "Finally copy the default config file from ${DIRINST}docs/default.conf to ~/.fpdb/ for every user that is to use fpdb." + elog "You will need to edit the default.conf, in particular you need to replace the password with what you entered in the \"GRANT ALL...\"" + elog "Finally run the GUI and click the menu database -> recreate tables" + elog "That's it! See our webpage at http://fpdb.sourceforge.net for more documentation" + elog " " +} diff --git a/prepare-git.sh b/prepare-git.sh new file mode 100755 index 00000000..91b008e9 --- /dev/null +++ b/prepare-git.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +#Copyright 2008 Steffen Jobbagy-Felso +#This program is free software: you can redistribute it and/or modify +#it under the terms of the GNU Affero General Public License as published by +#the Free Software Foundation, version 3 of the License. +# +#This program is distributed in the hope that it will be useful, +#but WITHOUT ANY WARRANTY; without even the implied warranty of +#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +#GNU General Public License for more details. +# +#You should have received a copy of the GNU Affero General Public License +#along with this program. If not, see . +#In the "official" distribution you can find the license in +#agpl-3.0.txt in the docs folder of the package. + +rm regression-test/*.found.txt +rm regression-test/*.pyc +rm pyfpdb/*.pyc + +git-add--interactive diff --git a/pyfpdb/BetfairToFpdb.py b/pyfpdb/BetfairToFpdb.py index 59344991..f4d8bf9b 100755 --- a/pyfpdb/BetfairToFpdb.py +++ b/pyfpdb/BetfairToFpdb.py @@ -105,7 +105,7 @@ class Betfair(HandHistoryConverter): logging.debug("HID %s, Table %s" % (m.group('HID'), m.group('TABLE'))) hand.handid = m.group('HID') hand.tablename = m.group('TABLE') - hand.starttime = time.strptime(m.group('DATETIME'), "%A, %B %d, %H:%M:%S GMT %Y") + hand.starttime = datetime.datetime.strptime(m.group('DATETIME'), "%A, %B %d, %H:%M:%S GMT %Y") #hand.buttonpos = int(m.group('BUTTON')) def readPlayerStacks(self, hand): @@ -144,6 +144,7 @@ class Betfair(HandHistoryConverter): def readAntes(self, hand): logging.debug("reading antes") + m = self.re_Antes.finditer(hand.handText) for player in m: logging.debug("hand.addAnte(%s,%s)" %(player.group('PNAME'), player.group('ANTE'))) hand.addAnte(player.group('PNAME'), player.group('ANTE')) @@ -160,17 +161,15 @@ class Betfair(HandHistoryConverter): hand.buttonpos = int(self.re_Button.search(hand.handText).group('BUTTON')) def readHeroCards(self, hand): - m = self.re_HeroCards.search(hand.handText) - if(m == None): - #Not involved in hand - hand.involved = False - else: - hand.hero = m.group('PNAME') - # "2c, qh" -> set(["2c","qc"]) - # Also works with Omaha hands. - cards = m.group('CARDS') - cards = [c.strip() for c in cards.split(',')] - hand.addHoleCards(cards, m.group('PNAME')) + # streets PREFLOP, PREDRAW, and THIRD are special cases beacause + # we need to grab hero's cards + for street in ('PREFLOP', 'DEAL'): + if street in hand.streets.keys(): + m = self.re_HeroCards.finditer(hand.streets[street]) + for found in m: + hand.hero = found.group('PNAME') + newcards = [c.strip() for c in found.group('CARDS').split(',')] + hand.addHoleCards(street, hand.hero, closed=newcards, shown=False, mucked=False, dealt=True) def readStudPlayerCards(self, hand, street): # balh blah blah diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py index 38a720fc..295b1685 100755 --- a/pyfpdb/Configuration.py +++ b/pyfpdb/Configuration.py @@ -35,7 +35,13 @@ import xml.dom.minidom from xml.dom.minidom import Node import logging, logging.config -logging.config.fileConfig(os.path.join(sys.path[0],"logging.conf")) +import ConfigParser + +try: # local path + logging.config.fileConfig(os.path.join(sys.path[0],"logging.conf")) +except ConfigParser.NoSectionError: # debian package path + logging.config.fileConfig('/usr/share/python-fpdb/logging.conf') + log = logging.getLogger("config") log.debug("config logger initialised") @@ -104,7 +110,7 @@ class Site: self.xpad = node.getAttribute("xpad") self.ypad = node.getAttribute("ypad") self.layout = {} - + print self.site_name, self.HH_path for layout_node in node.getElementsByTagName('layout'): diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py index 4a0f2e17..1533c05c 100755 --- a/pyfpdb/Database.py +++ b/pyfpdb/Database.py @@ -46,7 +46,13 @@ import Tourney from Exceptions import * import logging, logging.config -logging.config.fileConfig(os.path.join(sys.path[0],"logging.conf")) +import ConfigParser + +try: # local path + logging.config.fileConfig(os.path.join(sys.path[0],"logging.conf")) +except ConfigParser.NoSectionError: # debian package path + logging.config.fileConfig('/usr/share/python-fpdb/logging.conf') + log = logging.getLogger('db') @@ -392,7 +398,7 @@ class Database: print "*** Error: " + err[2] + "(" + str(err[1]) + "): " + str(sys.exc_info()[1]) else: if row and row[0]: - self.hand_1_day_ago = row[0] + self.hand_1day_ago = int(row[0]) d = timedelta(days=hud_days) now = datetime.utcnow() - d @@ -421,7 +427,8 @@ class Database: print "***Error: "+err[2]+"("+str(err[1])+"): "+str(sys.exc_info()[1]) def get_stats_from_hand( self, hand, type # type is "ring" or "tour" - , hud_params = {'aggregate_tour':False, 'aggregate_ring':False, 'hud_style':'A', 'agg_bb_mult':100} + , hud_params = {'aggregate_tour':False, 'aggregate_ring':False, 'hud_style':'A', 'hud_days':30, 'agg_bb_mult':100 + ,'h_aggregate_tour':False, 'h_aggregate_ring':False, 'h_hud_style':'S', 'h_hud_days':30, 'h_agg_bb_mult':100} , hero_id = -1 ): aggregate = hud_params['aggregate_tour'] if type == "tour" else hud_params['aggregate_ring'] @@ -434,10 +441,6 @@ class Database: if hud_style == 'S' or h_hud_style == 'S': self.get_stats_from_hand_session(hand, stat_dict, hero_id, hud_style, h_hud_style) - try: - print "Session: hero_id =", hero_id, "hds =", stat_dict[hero_id]['n'] - except: - pass if hud_style == 'S' and h_hud_style == 'S': return stat_dict @@ -463,7 +466,7 @@ class Database: #if aggregate: always use aggregate query now: use agg_bb_mult of 1 for no aggregation: query = 'get_stats_from_hand_aggregated' subs = (hand, hero_id, stylekey, agg_bb_mult, agg_bb_mult, hero_id, h_stylekey, h_agg_bb_mult, h_agg_bb_mult) - print "agg query subs:", subs + #print "agg query subs:", subs #else: # query = 'get_stats_from_hand' # subs = (hand, stylekey) @@ -482,10 +485,6 @@ class Database: t_dict[name.lower()] = val # print t_dict stat_dict[t_dict['player_id']] = t_dict - try: - print "get_stats end: hero_id =", hero_id, "hds =", stat_dict[hero_id]['n'] - except: - pass return stat_dict @@ -1386,41 +1385,7 @@ class Database: def storeHand(self, p): #stores into table hands: - q = """INSERT INTO Hands ( - tablename, - gametypeid, - sitehandno, - handstart, - importtime, - seats, - maxseats, - texture, - playersVpi, - boardcard1, - boardcard2, - boardcard3, - boardcard4, - boardcard5, - playersAtStreet1, - playersAtStreet2, - playersAtStreet3, - playersAtStreet4, - playersAtShowdown, - street0Raises, - street1Raises, - street2Raises, - street3Raises, - street4Raises, - street1Pot, - street2Pot, - street3Pot, - street4Pot, - showdownPot - ) - VALUES - (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, - %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, - %s, %s, %s, %s, %s, %s, %s, %s, %s)""" + q = self.sql.query['store_hand'] q = q.replace('%s', self.sql.query['placeholder']) @@ -1455,19 +1420,40 @@ class Database: p['street4Pot'], p['showdownPot'] )) - #return getLastInsertId(backend, conn, cursor) + return self.get_last_insert_id(self.cursor) # def storeHand - def storeHandsPlayers(self, hid, pid, p): + def storeHandsPlayers(self, hid, pids, pdata): + #print "DEBUG: %s %s %s" %(hid, pids, pdata) + inserts = [] + for p in pdata: + inserts.append( (hid, + pids[p], + pdata[p]['startCash'], + pdata[p]['seatNo'], + pdata[p]['street0Aggr'], + pdata[p]['street1Aggr'], + pdata[p]['street2Aggr'], + pdata[p]['street3Aggr'], + pdata[p]['street4Aggr'] + ) ) + q = """INSERT INTO HandsPlayers ( handId, - playerId + playerId, + startCash, + seatNo, + street0Aggr, + street1Aggr, + street2Aggr, + street3Aggr, + street4Aggr ) VALUES ( - %s, %s + %s, %s, %s, %s, %s, + %s, %s, %s, %s )""" -# startCash, # position, # tourneyTypeId, # card1, @@ -1477,10 +1463,8 @@ class Database: # startCards, # winnings, # rake, -# seatNo, # totalProfit, # street0VPI, -# street0Aggr, # street0_3BChance, # street0_3BDone, # street1Seen, @@ -1488,10 +1472,6 @@ class Database: # street3Seen, # street4Seen, # sawShowdown, -# street1Aggr, -# street2Aggr, -# street3Aggr, -# street4Aggr, # otherRaisedStreet1, # otherRaisedStreet2, # otherRaisedStreet3, @@ -1545,85 +1525,8 @@ class Database: q = q.replace('%s', self.sql.query['placeholder']) - self.cursor.execute(q, ( - hid, - pid - )) -# startCash, -# position, -# tourneyTypeId, -# card1, -# card2, -# card3, -# card4, -# startCards, -# winnings, -# rake, -# seatNo, -# totalProfit, -# street0VPI, -# street0Aggr, -# street0_3BChance, -# street0_3BDone, -# street1Seen, -# street2Seen, -# street3Seen, -# street4Seen, -# sawShowdown, -# street1Aggr, -# street2Aggr, -# street3Aggr, -# street4Aggr, -# otherRaisedStreet1, -# otherRaisedStreet2, -# otherRaisedStreet3, -# otherRaisedStreet4, -# foldToOtherRaisedStreet1, -# foldToOtherRaisedStreet2, -# foldToOtherRaisedStreet3, -# foldToOtherRaisedStreet4, -# wonWhenSeenStreet1, -# wonAtSD, -# stealAttemptChance, -# stealAttempted, -# foldBbToStealChance, -# foldedBbToSteal, -# foldSbToStealChance, -# foldedSbToSteal, -# street1CBChance, -# street1CBDone, -# street2CBChance, -# street2CBDone, -# street3CBChance, -# street3CBDone, -# street4CBChance, -# street4CBDone, -# foldToStreet1CBChance, -# foldToStreet1CBDone, -# foldToStreet2CBChance, -# foldToStreet2CBDone, -# foldToStreet3CBChance, -# foldToStreet3CBDone, -# foldToStreet4CBChance, -# foldToStreet4CBDone, -# street1CheckCallRaiseChance, -# street1CheckCallRaiseDone, -# street2CheckCallRaiseChance, -# street2CheckCallRaiseDone, -# street3CheckCallRaiseChance, -# street3CheckCallRaiseDone, -# street4CheckCallRaiseChance, -# street4CheckCallRaiseDone, -# street0Calls, -# street1Calls, -# street2Calls, -# street3Calls, -# street4Calls, -# street0Bets, -# street1Bets, -# street2Bets, -# street3Bets, -# street4Bets + #print "DEBUG: inserts: %s" %inserts + self.cursor.executemany(q, inserts) def storeHudCacheNew(self, gid, pid, hc): q = """INSERT INTO HudCache ( diff --git a/pyfpdb/DatabaseManager.py b/pyfpdb/DatabaseManager.py new file mode 100644 index 00000000..efe0c49c --- /dev/null +++ b/pyfpdb/DatabaseManager.py @@ -0,0 +1,390 @@ + +import os +import pygtk +pygtk.require('2.0') +import gtk + +#******************************************************************************************************* +class DatabaseManager(object): + DatabaseTypes = {} + + def __init__(self, defaultDatabaseType=None): + self._defaultDatabaseType = defaultDatabaseType + def set_default_database_type(self, databaseType): + self._defaultDatabaseType = defaultDatabaseType + def get_default_database_type(self): + return self._defaultDatabaseType + +class DatabaseTypeMeta(type): + def __new__(klass, name, bases, kws): + newKlass = type.__new__(klass, name, bases, kws) + if newKlass.Type is not None: + if newKlass.Type in DatabaseManager.DatabaseTypes: + raise ValueError('data base type already registered for: %s' % newKlass.Type) + DatabaseManager.DatabaseTypes[newKlass.Type] = newKlass + return newKlass + +class DatabaseTypeBase(object): + __metaclass__ = DatabaseTypeMeta + Type = None + + DBHasHost = 0x1 + DBHasFile = 0x2 + DBHasPort = 0x4 + DBHasUser = 0x8 + DBHasPassword = 0x10 + DBHasDatabase = 0x20 + DBHasName = 0x40 + + DBFlagsFileSystem = DBHasFile|DBHasName + DBFlagsServer = DBHasHost|DBHasPort|DBHasUser|DBHasPassword|DBHasDatabase|DBHasName + + def __init__(self, host='', file='', port=0, user='', password='', database='', table='', name=''): + self.host = host + self.file = file + self.port = port + self.user = user + self.password = password + self.database = database + self.name = name + @classmethod + def display_name(klass): + raise NotImplementedError() + +class DatabaseTypePostgres(DatabaseTypeBase): + Type = 'postgres' + Flags = DatabaseTypeBase.DBFlagsServer + @classmethod + def display_name(klass): + return 'Postgres' + def __init__(self, host='localhost', file='', port=5432, user='postgres', password='', database='fpdb', name=''): + DatabaseTypeBase.__init__(self, host=host, file=file, port=port, user=user, password=password, database=database, name=name) + +class DatabaseTypeMysql(DatabaseTypeBase): + Type = 'mysql' + Flags = DatabaseTypeBase.DBFlagsServer + @classmethod + def display_name(klass): + return 'MySql' + def __init__(self, host='localhost', file='root', port=3306, user='', password='', database='fpdb', name=''): + DatabaseTypeBase.__init__(self, host=host, file=file, port=port, user=user, password=password, database=database, name=name) + +class DatabaseTypeSqLite(DatabaseTypeBase): + Type = 'sqlie' + Flags = DatabaseTypeBase.DBFlagsFileSystem + @classmethod + def display_name(klass): + return 'SqLite' + def __init__(self, host='', file='/home/me2/winetricks', port=0, user='', password='',database='', name=''): + DatabaseTypeBase.__init__(self, host=host, file=file, port=port, user=user, password=password, database=database, name=name) + +#*************************************************************************************************************************** +class MyFileChooserButton(gtk.HBox): + #NOTE: for some weird reason it is impossible to let the user choose a non exiting filename with gtk.FileChooserButton, so impl our own on the fly + def __init__(self): + gtk.HBox.__init__(self) + self.set_homogeneous(False) + + self.entry = gtk.Entry() + self.button = gtk.Button('...') + self.button.connect('clicked', self.on_button_clicked) + + # layout widgets + self.pack_start(self.entry, True, True) + self.pack_start(self.button, False, False) + + def get_filename(self): + return self.entry.get_text() + + def set_filename(self, name): + self.entry.set_text(name) + + #TODO: we got three possible actions here + # 1. user types in a new filename. easy one, create the file + # 2. user selectes a file with the intention to overwrite it + # 3. user selects a file with the intention to plug an existing database file in + #IDEA: impl open_existing as plug in, never overwrite, cos we can not guess + #PROBLEMS: how to validate an existing file is a database? + def on_button_clicked(self, button): + dlg = gtk.FileChooserDialog( + title='Choose an exiting database file or type in name of a new one', + parent=None, + action=gtk.FILE_CHOOSER_ACTION_SAVE, + buttons=( + gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, + gtk.STOCK_OK, gtk.RESPONSE_OK, + ), + backend=None + ) + dlg.connect('confirm-overwrite', self.on_dialog_confirm_overwrite) + dlg.set_default_response(gtk.RESPONSE_OK) + dlg.set_do_overwrite_confirmation(True) + if dlg.run() == gtk.RESPONSE_OK: + self.set_filename(dlg.get_filename()) + dlg.destroy() + + def on_dialog_confirm_overwrite(self, dlg): + print dlg.get_filename() + + gtk.FILE_CHOOSER_CONFIRMATION_CONFIRM + #The file chooser will present its stock dialog to confirm overwriting an existing file. + + gtk.FILE_CHOOSER_CONFIRMATION_ACCEPT_FILENAME + #The file chooser will terminate and accept the user's choice of a file name. + + gtk.FILE_CHOOSER_CONFIRMATION_SELECT_AGAIN + # + + + + + +class DialogDatabaseProperties(gtk.Dialog): + def __init__(self, databaseManager, database=None,parent=None): + gtk.Dialog.__init__(self, + title="My dialog", + parent=parent, + flags=gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, + buttons=( + gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, + gtk.STOCK_OK, gtk.RESPONSE_ACCEPT, + ) + ) + self.connect('response', self.on_dialog_response) + + # setup widget + self.widgetDatabaseProperties = WidgetDatabaseProperties(databaseManager,database=database) + self.vbox.pack_start(self.widgetDatabaseProperties, True, True) + self.widgetDatabaseProperties.show_all() + + def on_dialog_response(self, dlg, responseId): + if responseId == gtk.RESPONSE_REJECT: + pass + elif responseId == gtk.RESPONSE_ACCEPT: + pass + + +class WidgetDatabaseProperties(gtk.VBox): + def __init__(self, databaseManager, database=None): + gtk.VBox.__init__(self) + + self.fieldWidgets = ( #fieldName--> fieldHandler + { + 'label': gtk.Label('Name:'), + 'widget': gtk.Entry(), + 'getter': lambda widget, database: setattr(database, 'name', widget.get_text() ), + 'setter': lambda widget, database: widget.set_text(database.name), + 'isSensitive': lambda database: bool(database.Flags & database.DBHasName), + 'tooltip': '', + }, + { + 'label': gtk.Label('File:'), + 'widget': MyFileChooserButton(), + 'getter': lambda widget: lambda widget, database: setattr(database, 'file', widget.get_filename() ), + 'setter': lambda widget, database: widget.set_filename(database.file), + 'isSensitive': lambda database: bool(database.Flags & database.DBHasFile), + 'tooltip': '', + }, + { + 'label': gtk.Label('Host:'), + 'widget': gtk.Entry(), + 'getter': lambda widget, database: setattr(database, 'host', widget.get_text() ), + 'setter': lambda widget, database: widget.set_text(database.host), + 'isSensitive': lambda database: bool(database.Flags & database.DBHasHost), + 'tooltip': '', + }, + { + 'label': gtk.Label('Port:'), + 'widget': gtk.SpinButton(adjustment=gtk.Adjustment(value=0, lower=0, upper=999999, step_incr=1, page_incr=10) ), + 'getter': lambda widget, database: setattr(database, 'port', widget.get_value() ), + 'setter': lambda widget, database: widget.set_value(database.port), + 'isSensitive': lambda database: bool(database.Flags & database.DBHasPort), + 'tooltip': '', + }, + { + 'label': gtk.Label('User:'), + 'widget': gtk.Entry(), + 'getter': lambda widget, database: setattr(database, 'user', widget.get_text() ), + 'setter': lambda widget, database: widget.set_text(database.user), + 'isSensitive': lambda database: bool(database.Flags & database.DBHasUser), + 'tooltip': '', + }, + { + 'label': gtk.Label('Pwd:'), + 'widget': gtk.Entry(), + 'getter': lambda widget, database: setattr(database, 'password', widget.get_text() ), + 'setter': lambda widget, database: widget.set_text(database.password), + 'isSensitive': lambda database: bool(database.Flags & database.DBHasPassword), + 'tooltip': '', + }, + { + 'label': gtk.Label('DB:'), + 'widget': gtk.Entry(), + 'getter': lambda widget, database: setattr(database, 'database', widget.get_text() ), + 'setter': lambda widget, database: widget.set_text(database.database), + 'isSensitive': lambda database: bool(database.Flags & database.DBHasDatabase), + 'tooltip': 'enter name of the database to create', + }, + ) + + # setup database type combo + self.comboType = gtk.ComboBox() + listStore= gtk.ListStore(str, str) + self.comboType.set_model(listStore) + cell = gtk.CellRendererText() + self.comboType.pack_start(cell, True) + self.comboType.add_attribute(cell, 'text', 0) + # fill out combo with database type. we store (displayName, databaseType) in our model for later lookup + for dbType, dbDisplayName in sorted([(klass.Type, klass.display_name()) for klass in databaseManager.DatabaseTypes.values()]): + listStore.append( (dbDisplayName, dbType) ) + self.comboType.connect('changed', self.on_combo_type_changed) + + # init and layout field widgets + self.pack_start(self.comboType, False, False, 2) + table = gtk.Table(rows=len(self.fieldWidgets) +1, columns=2, homogeneous=False) + self.pack_start(table, False, False, 2) + for i,fieldWidget in enumerate(self.fieldWidgets): + fieldWidget['widget'].set_tooltip_text(fieldWidget['tooltip']) + + table.attach(fieldWidget['label'], 0, 1, i, i+1, xoptions=gtk.FILL) + table.attach(fieldWidget['widget'], 1, 2, i, i+1) + + # init widget + + # if a database has been passed user is not allowed to change database type + if database is None: + self.comboType.set_button_sensitivity(gtk.SENSITIVITY_ON) + else: + self.comboType.set_button_sensitivity(gtk.SENSITIVITY_OFF) + + # set current database + self.databaseManager = databaseManager + self.database= None + if database is None: + databaseType = self.databaseManager.get_default_database_type() + if databaseType is not None: + database = databaseType() + if database is not None: + self.set_database(database) + + def on_combo_type_changed(self, combo): + i = self.comboType.get_active() + if i > -1: + # change database if necessary + currentDatabaseType = self.comboType.get_model()[i][1] + if currentDatabaseType != self.database.Type: + newDatabase = self.databaseManager.DatabaseTypes[currentDatabaseType]() + self.set_database(newDatabase) + + def set_database(self, database): + self.database = database + + # adjust database type combo if necessary + i = self.comboType.get_active() + if i == -1: + currentDatabaseType = None + else: + currentDatabaseType = self.comboType.get_model()[i][1] + if currentDatabaseType != self.database.Type: + for i, row in enumerate(self.comboType.get_model()): + if row[1] == self.database.Type: + self.comboType.set_active(i) + break + else: + raise ValueError('unknown database type') + + # adjust field widgets to database + for fieldWidget in self.fieldWidgets: + isSensitive = fieldWidget['isSensitive'](self.database) + fieldWidget['widget'].set_sensitive(isSensitive) + fieldWidget['label'].set_sensitive(isSensitive) + fieldWidget['setter'](fieldWidget['widget'], self.database) + + def get_database(self): + return self.database + + + + + +#TODO: just boilerplate code +class DialogDatabase(gtk.Dialog): + def __init__(self, databaseManager, parent=None): + gtk.Dialog.__init__(self, + title="My dialog", + parent=parent, + flags=gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, + buttons=( + gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, + gtk.STOCK_OK, gtk.RESPONSE_ACCEPT, + )) + #self.set_size_request(260, 250) + + self.databaseManager = databaseManager + + label = gtk.Label('database stuff') + label.set_line_wrap(True) + label.set_selectable(True) + label.set_single_line_mode(False) + label.set_alignment(0, 0) + self.vbox.pack_start(label, False, False, 2) + self.vbox.pack_start(gtk.HSeparator(), False, False, 2) + + hbox = gtk.HBox() + self.vbox.add(hbox) + hbox.set_homogeneous(False) + + + # database management buttons + vbox = gtk.VBox() + hbox.pack_start(vbox, False, False, 2) + self.buttonDatabaseNew = gtk.Button("New...") + self.buttonDatabaseNew.connect('clicked', self.onButtonDatabaseNewClicked) + vbox.pack_start(self.buttonDatabaseNew, False, False, 2) + self.buttonDatabaseEdit = gtk.Button("Edit...") + vbox.pack_start(self.buttonDatabaseEdit, False, False, 2) + self.buttonDatabaseDelete = gtk.Button("Delete") + vbox.pack_start(self.buttonDatabaseDelete, False, False, 2) + box = gtk.VBox() + vbox.pack_start(box, True, True, 0) + + hbox.pack_start(gtk.VSeparator(), False, False, 2) + + # database tree + self.treeDatabases = gtk.TreeView() + hbox.pack_end(self.treeDatabases, True, True, 2) + + self.show_all() + + # fill database tree + store = gtk.ListStore(str, str) + self.treeDatabases.set_model(store) + columns = ('Name', 'Status', 'Type') + for column in columns: + col = gtk.TreeViewColumn(column) + self.treeDatabases.append_column(col) + + + def onButtonDatabaseNewClicked(self, button): + dlg = DialogDatabaseProperties(self.databaseManager, parent=self) + if dlg.run() == gtk.RESPONSE_REJECT: + pass + if dlg.run() == gtk.RESPONSE_ACCEPT: + pass + + dlg.destroy() + + +#************************************************************************************************** +if __name__ == '__main__': + d = DialogDatabaseProperties( + DatabaseManager(defaultDatabaseType=DatabaseTypeSqLite), + #database=DatabaseTypePostgres(), + database=None, + ) + #d = DialogDatabase(DatabaseManager(defaultDatabaseType=DatabaseTypeSqLite)) + d.connect("destroy", gtk.main_quit) + d.run() + #gtk.main() + + diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py index 315ae707..106bd038 100644 --- a/pyfpdb/DerivedStats.py +++ b/pyfpdb/DerivedStats.py @@ -29,6 +29,8 @@ class DerivedStats(): for player in hand.players: self.handsplayers[player[1]] = {} + #Init vars that may not be used, but still need to be inserted. + self.handsplayers[player[1]]['street4Aggr'] = False self.assembleHands(self.hand) self.assembleHandsPlayers(self.hand) @@ -39,6 +41,9 @@ class DerivedStats(): def getHands(self): return self.hands + def getHandsPlayers(self): + return self.handsplayers + def assembleHands(self, hand): self.hands['tableName'] = hand.tablename self.hands['siteHandNo'] = hand.handid @@ -77,10 +82,15 @@ class DerivedStats(): # commentTs DATETIME def assembleHandsPlayers(self, hand): - self.vpip(self.hand) + #hand.players = [[seat, name, chips],[seat, name, chips]] + for player in hand.players: + self.handsplayers[player[1]]['seatNo'] = player[0] + self.handsplayers[player[1]]['startCash'] = player[2] + for i, street in enumerate(hand.actionStreets[1:]): self.aggr(self.hand, i) + def assembleHudCache(self, hand): # # def generateHudCacheData(player_ids, base, category, action_types, allIns, actionTypeByNo # # ,winnings, totalWinnings, positions, actionTypes, actionAmounts, antes): @@ -777,20 +787,22 @@ class DerivedStats(): if act[1] in ('calls','bets', 'raises'): vpipers.add(act[0]) - #for player in hand.players: - # print "DEBUG: '%s' '%s' '%s'" %(player, player[1], vpipers) - # if player[1] in vpipers: - # self.handsplayers[player[1]]['vpip'] = True - # else: - # self.handsplayers[player[1]]['vpip'] = False self.hands['playersVpi'] = len(vpipers) + for player in hand.players: + if player[1] in vpipers: + self.handsplayers[player[1]]['vpip'] = True + else: + self.handsplayers[player[1]]['vpip'] = False + def playersAtStreetX(self, hand): """ playersAtStreet1 SMALLINT NOT NULL, /* num of players seeing flop/street4/draw1 */""" # self.actions[street] is a list of all actions in a tuple, contining the player name first # [ (player, action, ....), (player2, action, ...) ] # The number of unique players in the list per street gives the value for playersAtStreetXXX + # FIXME?? - This isn't couting people that are all in - at least showdown needs to reflect this + self.hands['playersAtStreet1'] = 0 self.hands['playersAtStreet2'] = 0 self.hands['playersAtStreet3'] = 0 diff --git a/pyfpdb/Filters.py b/pyfpdb/Filters.py index 6ad242bb..08581c83 100644 --- a/pyfpdb/Filters.py +++ b/pyfpdb/Filters.py @@ -55,6 +55,7 @@ class Filters(threading.Thread): ,'seatsbetween':'Between:', 'seatsand':'And:', 'seatsshow':'Show Number of _Players' ,'limitstitle':'Limits:', 'seatstitle':'Number of Players:' ,'groupstitle':'Grouping:', 'posnshow':'Show Position Stats:' + ,'groupsall':'All Players' ,'limitsFL':'FL', 'limitsNL':'NL', 'ring':'Ring', 'tour':'Tourney' } @@ -64,6 +65,10 @@ class Filters(threading.Thread): self.start_date.set_property('editable', False) self.end_date.set_property('editable', False) + # For use in groups etc + self.sbGroups = {} + self.numHands = 0 + # Outer Packing box self.mainVBox = gtk.VBox(False, 0) @@ -71,7 +76,7 @@ class Filters(threading.Thread): playerFrame.set_label_align(0.0, 0.0) vbox = gtk.VBox(False, 0) - self.fillPlayerFrame(vbox) + self.fillPlayerFrame(vbox, self.display) playerFrame.add(vbox) self.boxes['player'] = vbox @@ -122,7 +127,6 @@ class Filters(threading.Thread): groupsFrame = gtk.Frame() groupsFrame.show() vbox = gtk.VBox(False, 0) - self.sbGroups = {} self.fillGroupsFrame(vbox, self.display) groupsFrame.add(vbox) @@ -181,6 +185,9 @@ class Filters(threading.Thread): return self.mainVBox #end def get_vbox + def getNumHands(self): + return self.numHands + def getSites(self): return self.sites @@ -256,6 +263,13 @@ class Filters(threading.Thread): self.heroes[site] = w.get_text() # print "DEBUG: setting heroes[%s]: %s"%(site, self.heroes[site]) + def __set_num_hands(self, w, val): + try: + self.numHands = int(w.get_text()) + except: + self.numHands = 0 +# print "DEBUG: setting numHands:", self.numHands + def createSiteLine(self, hbox, site): cb = gtk.CheckButton(site) cb.connect('clicked', self.__set_site_select, site) @@ -393,13 +407,32 @@ class Filters(threading.Thread): self.groups[group] = w.get_active() print "self.groups[%s] set to %s" %(group, self.groups[group]) - def fillPlayerFrame(self, vbox): + def fillPlayerFrame(self, vbox, display): for site in self.conf.get_supported_sites(): - pathHBox = gtk.HBox(False, 0) - vbox.pack_start(pathHBox, False, True, 0) + hBox = gtk.HBox(False, 0) + vbox.pack_start(hBox, False, True, 0) player = self.conf.supported_sites[site].screen_name - self.createPlayerLine(pathHBox, site, player) + self.createPlayerLine(hBox, site, player) + + if "GroupsAll" in display and display["GroupsAll"] == True: + hbox = gtk.HBox(False, 0) + vbox.pack_start(hbox, False, False, 0) + cb = gtk.CheckButton(self.filterText['groupsall']) + cb.connect('clicked', self.__set_group_select, 'allplayers') + hbox.pack_start(cb, False, False, 0) + self.sbGroups['allplayers'] = cb + self.groups['allplayers'] = False + + lbl = gtk.Label('Min # Hands:') + lbl.set_alignment(xalign=1.0, yalign=0.5) + hbox.pack_start(lbl, expand=True, padding=3) + + phands = gtk.Entry() + phands.set_text('0') + phands.set_width_chars(8) + hbox.pack_start(phands, False, False, 0) + phands.connect("changed", self.__set_num_hands, site) def fillSitesFrame(self, vbox): for site in self.conf.get_supported_sites(): diff --git a/pyfpdb/FpdbRegex.py b/pyfpdb/FpdbRegex.py new file mode 100644 index 00000000..8bfb9362 --- /dev/null +++ b/pyfpdb/FpdbRegex.py @@ -0,0 +1,161 @@ +# pokerstars_cash.py +# -*- coding: iso-8859-15 +# +# PokerStats, an online poker statistics tracking software for Linux +# Copyright (C) 2007-2008 Mika Boström +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# + +# Modified for use in fpdb by Carl Gherardi + +import re + +# These are PokerStars specific; +# More importantly, they are currently valid for cash game only. +##### +# XXX: There was a weird problem with saved hand histories in PokerStars +# client 2.491; if a user was present on the table (and thus anywhere in +# the hand history), with non-standard characters in their username, the +# client would prepend a literal Ctrl-P (ASCII 16, 0x10) character to +# the hand history title line. Hence, to allow these strangely saved +# hands to be parsed and imported, there is a conditional "one extra +# character" allowed at the start of the new hand regex. + + +class FpdbRegex: + def __init__(self): + self.__GAME_INFO_REGEX='' + self.__SPLIT_HAND_REGEX='\n\n\n' + self.__NEW_HAND_REGEX='^.?PokerStars Game #\d+:\s+Hold\'em' + self.__HAND_INFO_REGEX='^.*#(\d+):\s+(\S+)\s([\s\S]+)\s\(\$?([.0-9]+)/\$?([.0-9]+)\)\s-\s(\S+)\s-?\s?(\S+)\s\(?(\w+)\)?' + self.__TABLE_INFO_REGEX='^\S+\s+\'.*\'\s+(\d+)-max\s+Seat\s#(\d+)' + self.__PLAYER_INFO_REGEX='^Seat\s(\d+):\s(.*)\s\(\$?([.\d]+)\s' + self.__POST_SB_REGEX='^(.*):\sposts small blind' + self.__POST_BB_REGEX='^(.*):\sposts big blind' + self.__POST_BOTH_REGEX='^(.*):\sposts small & big blinds' + self.__HAND_STAGE_REGEX='^\*{3}\s(.*)\s\*{3}' + self.__HOLE_CARD_REGEX='^\*{3}\sHOLE CARDS' + self.__FLOP_CARD_REGEX='^\*{3}\sFLOP\s\*{3}\s\[(\S{2})\s(\S{2})\s(\S{2})\]' + self.__TURN_CARD_REGEX='^\*{3}\sTURN\s\*{3}\s\[\S{2}\s\S{2}\s\S{2}\]\s\[(\S{2})\]' + self.__RIVER_CARD_REGEX='^\*{3}\sRIVER\s\*{3}\s\[\S{2}\s\S{2}\s\S{2}\s\S{2}\]\s\[(\S{2})\]' + self.__SHOWDOWN_REGEX='^\*{3}\sSHOW DOWN' + self.__SUMMARY_REGEX='^\*{3}\sSUMMARY' + self.__UNCALLED_BET_REGEX='^Uncalled bet \(\$([.\d]+)\) returned to (.*)' + self.__POT_AND_RAKE_REGEX='^Total\spot\s\$([.\d]+).*\|\sRake\s\$([.\d]+)' + self.__COLLECT_POT_REGEX='^(.*)\scollected\s\$([.\d]+)\sfrom\s((main|side)\s)?pot' + self.__HERO_CARDS_REGEX='^Dealt\sto\s(.*)\s\[(\S{2})\s(\S{2})\]' + self.__SHOWN_CARDS_REGEX='^(.*):\sshows\s\[(\S{2})\s(\S{2})\]' + self.__ACTION_STEP_REGEX='^(.*):\s(bets|checks|raises|calls|folds)((\s\$([.\d]+))?(\sto\s\$([.\d]+))?)?' + + self.__SHOWDOWN_ACTION_REGEX='^(.*):\s(shows|mucks)' + self.__SUMMARY_CARDS_REGEX='^Seat\s\d+:\s(.*)\s(showed|mucked)\s\[(\S{2})\s(\S{2})\]' + self.__SUMMARY_CARDS_EXTRA_REGEX='^Seat\s\d+:\s(.*)\s(\(.*\)\s)(showed|mucked)\s\[(\S{2})\s(\S{2})\]' + + def compileRegexes(self): + ### Compile the regexes + self.game_info_re = re.compile(self.__GAME_INFO_REGEX) + self.split_hand_re = re.compile(self.__SPLIT_HAND_REGEX) + self.hand_start_re = re.compile(self.__NEW_HAND_REGEX) + self.hand_info_re = re.compile(self.__HAND_INFO_REGEX) + self.table_info_re = re.compile(self.__TABLE_INFO_REGEX) + self.player_info_re = re.compile(self.__PLAYER_INFO_REGEX) + self.small_blind_re = re.compile(self.__POST_SB_REGEX) + self.big_blind_re = re.compile(self.__POST_BB_REGEX) + self.both_blinds_re = re.compile(self.__POST_BOTH_REGEX) + self.hand_stage_re = re.compile(self.__HAND_STAGE_REGEX) + self.hole_cards_re = re.compile(self.__HOLE_CARD_REGEX) + self.flop_cards_re = re.compile(self.__FLOP_CARD_REGEX) + self.turn_card_re = re.compile(self.__TURN_CARD_REGEX) + self.river_card_re = re.compile(self.__RIVER_CARD_REGEX) + self.showdown_re = re.compile(self.__SHOWDOWN_REGEX) + self.summary_re = re.compile(self.__SUMMARY_REGEX) + self.uncalled_bet_re = re.compile(self.__UNCALLED_BET_REGEX) + self.collect_pot_re = re.compile(self.__COLLECT_POT_REGEX) + self.hero_cards_re = re.compile(self.__HERO_CARDS_REGEX) + self.cards_shown_re = re.compile(self.__SHOWN_CARDS_REGEX) + self.summary_cards_re = re.compile(self.__SUMMARY_CARDS_REGEX) + self.summary_cards_extra_re = re.compile(self.__SUMMARY_CARDS_EXTRA_REGEX) + self.action_re = re.compile(self.__ACTION_STEP_REGEX) + self.rake_re = re.compile(self.__POT_AND_RAKE_REGEX) + self.showdown_action_re = re.compile(self.__SHOWDOWN_ACTION_REGEX) + + # Set methods for plugins to override + + def setGameInfoRegex(self, string): + self.__GAME_INFO_REGEX = string + + def setSplitHandRegex(self, string): + self.__SPLIT_HAND_REGEX = string + + def setNewHandRegex(self, string): + self.__NEW_HAND_REGEX = string + + def setHandInfoRegex(self, string): + self.__HAND_INFO_REGEX = string + + def setTableInfoRegex(self, string): + self.__TABLE_INFO_REGEX = string + + def setPlayerInfoRegex(self, string): + self.__PLAYER_INFO_REGEX = string + + def setPostSbRegex(self, string): + self.__POST_SB_REGEX = string + + def setPostBbRegex(self, string): + self.__POST_BB_REGEX = string + + def setPostBothRegex(self, string): + self.__POST_BOTH_REGEX = string + + def setHandStageRegex(self, string): + self.__HAND_STAGE_REGEX = string + + def setHoleCardRegex(self, string): + self.__HOLE_CARD_REGEX = string + + def setFlopCardRegex(self, string): + self.__FLOP_CARD_REGEX = string + + def setTurnCardRegex(self, string): + self.__TURN_CARD_REGEX = string + + def setRiverCardRegex(self, string): + self.__RIVER_CARD_REGEX = string + + def setShowdownRegex(self, string): + self.__SHOWDOWN_REGEX = string + + def setSummaryRegex(self, string): + self.__SUMMARY_REGEX = string + + def setUncalledBetRegex(self, string): + self.__UNCALLED_BET_REGEX = string + + def setCollectPotRegex(self, string): + self.__COLLECT_POT_REGEX = string + + def setHeroCardsRegex(self, string): + self.__HERO_CARDS_REGEX = string + + def setShownCardsRegex(self, string): + self.__SHOWN_CARDS_REGEX = string + + def setSummaryCardsRegex(self, string): + self.__SUMMARY_CARDS_REGEX = string + + def setSummaryCardsExtraRegex(self, string): + self.__SUMMARY_CARDS_EXTRA_REGEX = string + + def setActionStepRegex(self, string): + self.__ACTION_STEP_REGEX = string + + def setPotAndRakeRegex(self, string): + self.__POT_AND_RAKE_REGEX = string + + def setShowdownActionRegex(self, string): + self.__SHOWDOWN_ACTION_REGEX = string + diff --git a/pyfpdb/GuiBulkImport.py b/pyfpdb/GuiBulkImport.py index 21f9e050..9cb54d50 100755 --- a/pyfpdb/GuiBulkImport.py +++ b/pyfpdb/GuiBulkImport.py @@ -40,21 +40,6 @@ class GuiBulkImport(): # CONFIGURATION - update these as preferred: allowThreads = True # set to True to try out the threads field - # not used - def import_dir(self): - """imports a directory, non-recursive. todo: move this to fpdb_import so CLI can use it""" - - self.path = self.inputFile - self.importer.addImportDirectory(self.path) - self.importer.setCallHud(False) - starttime = time() - if not self.importer.settings['threads'] > 1: - (stored, dups, partial, errs, ttime) = self.importer.runImport() - print 'GuiBulkImport.import_dir done: Stored: %d Duplicates: %d Partial: %d Errors: %d in %s seconds - %d/sec'\ - % (stored, dups, partial, errs, ttime, stored / ttime) - else: - self.importer.RunImportThreaded() - def dopulse(self): self.progressbar.pulse() return True @@ -77,7 +62,7 @@ class GuiBulkImport(): self.timer = gobject.timeout_add(100, self.dopulse) # get the dir to import from the chooser - self.inputFile = self.chooser.get_filename() + selected = self.chooser.get_filenames() # get the import settings from the gui and save in the importer self.importer.setHandCount(int(self.spin_hands.get_text())) @@ -103,7 +88,8 @@ class GuiBulkImport(): self.importer.setDropHudCache("auto") sitename = self.cbfilter.get_model()[self.cbfilter.get_active()][0] - self.importer.addBulkImportImportFileOrDir(self.inputFile, site = sitename) + for selection in selected: + self.importer.addBulkImportImportFileOrDir(selection, site = sitename) self.importer.setCallHud(False) starttime = time() # try: @@ -151,6 +137,7 @@ class GuiBulkImport(): self.chooser = gtk.FileChooserWidget() self.chooser.set_filename(self.settings['bulkImport-defaultPath']) + self.chooser.set_select_multiple(True) self.vbox.add(self.chooser) self.chooser.show() @@ -317,8 +304,20 @@ def main(argv=None): help="If this option is passed it quits when it encounters any error") parser.add_option("-m", "--minPrint", "--status", dest="minPrint", default="0", type="int", help="How often to print a one-line status report (0 (default) means never)") + parser.add_option("-u", "--usage", action="store_true", dest="usage", default=False, + help="Print some useful one liners") (options, sys.argv) = parser.parse_args(args = argv) + if options.usage == True: + #Print usage examples and exit + print "USAGE:" + print 'PokerStars converter: ./GuiBulkImport -c PokerStars -f filename' + print 'Full Tilt converter: ./GuiBulkImport -c "Full Tilt Poker" -f filename' + print "Everleaf converter: ./GuiBulkImport -c Everleaf -f filename" + print "Absolute converter: ./GuiBulkImport -c Absolute -f filename" + print "PartyPoker converter: ./GuiBulkImport -c PartyPoker -f filename" + sys.exit(0) + config = Configuration.Config() settings = {} @@ -350,8 +349,10 @@ def main(argv=None): importer.setThreads(-1) importer.addBulkImportImportFileOrDir(os.path.expanduser(options.filename), site=options.filtername) importer.setCallHud(False) - importer.runImport() + (stored, dups, partial, errs, ttime) = importer.runImport() importer.clearFileList() + print 'GuiBulkImport done: Stored: %d \tDuplicates: %d \tPartial: %d \tErrors: %d in %s seconds - %.0f/sec'\ + % (stored, dups, partial, errs, ttime, (stored+0.0) / ttime) if __name__ == '__main__': diff --git a/pyfpdb/GuiGraphViewer.py b/pyfpdb/GuiGraphViewer.py index f91c9870..4011ba00 100644 --- a/pyfpdb/GuiGraphViewer.py +++ b/pyfpdb/GuiGraphViewer.py @@ -97,34 +97,6 @@ class GuiGraphViewer (threading.Thread): self.db.rollback() -################################# -# -# self.db.cursor.execute("""select UNIX_TIMESTAMP(handStart) as time, id from Hands ORDER BY time""") -# THRESHOLD = 1800 -# hands = self.db.cursor.fetchall() -# -# times = map(lambda x:long(x[0]), hands) -# handids = map(lambda x:int(x[1]), hands) -# print "DEBUG: len(times) %s" %(len(times)) -# diffs = diff(times) -# print "DEBUG: len(diffs) %s" %(len(diffs)) -# index = nonzero(diff(times) > THRESHOLD) -# print "DEBUG: len(index[0]) %s" %(len(index[0])) -# print "DEBUG: index %s" %(index) -# print "DEBUG: index[0][0] %s" %(index[0][0]) -# -# total = 0 -# -# last_idx = 0 -# for i in range(len(index[0])): -# print "Hands in session %4s: %4s Start: %s End: %s Total: %s" %(i, index[0][i] - last_idx, strftime("%d/%m/%Y %H:%M", localtime(times[last_idx])), strftime("%d/%m/%Y %H:%M", localtime(times[index[0][i]])), times[index[0][i]] - times[last_idx]) -# total = total + (index[0][i] - last_idx) -# last_idx = index[0][i] + 1 -# -# print "Total: ", total -################################# - - def get_vbox(self): """returns the vbox of this thread""" return self.mainHBox diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py index 4b82c861..1faa40c5 100644 --- a/pyfpdb/GuiPlayerStats.py +++ b/pyfpdb/GuiPlayerStats.py @@ -15,6 +15,7 @@ #In the "official" distribution you can find the license in #agpl-3.0.txt in the docs folder of the package. +import traceback import threading import pygtk pygtk.require('2.0') @@ -29,13 +30,19 @@ import Database import fpdb_db import Filters +colalias,colshow,colheading,colxalign,colformat,coltype = 0,1,2,3,4,5 +ranks = {'x':0, '2':2, '3':3, '4':4, '5':5, '6':6, '7':7, '8':8, '9':9, 'T':10, 'J':11, 'Q':12, 'K':13, 'A':14} + class GuiPlayerStats (threading.Thread): + def __init__(self, config, querylist, mainwin, debug=True): self.debug = debug self.conf = config self.main_window = mainwin self.sql = querylist + self.liststore = None + self.MYSQL_INNODB = 2 self.PGSQL = 3 self.SQLITE = 4 @@ -65,6 +72,7 @@ class GuiPlayerStats (threading.Thread): "SeatSep" : True, "Dates" : True, "Groups" : True, + "GroupsAll" : True, "Button1" : True, "Button2" : True } @@ -78,29 +86,30 @@ class GuiPlayerStats (threading.Thread): # ToDo: store in config # ToDo: create popup to adjust column config # columns to display, keys match column name returned by sql, values in tuple are: - # is column displayed, column heading, xalignment, formatting - self.columns = [ ["game", True, "Game", 0.0, "%s"] - , ["hand", False, "Hand", 0.0, "%s"] # true not allowed for this line - , ["plposition", False, "Posn", 1.0, "%s"] # true not allowed for this line (set in code) - , ["n", True, "Hds", 1.0, "%d"] - , ["avgseats", False, "Seats", 1.0, "%3.1f"] - , ["vpip", True, "VPIP", 1.0, "%3.1f"] - , ["pfr", True, "PFR", 1.0, "%3.1f"] - , ["pf3", True, "PF3", 1.0, "%3.1f"] - , ["steals", True, "Steals", 1.0, "%3.1f"] - , ["saw_f", True, "Saw_F", 1.0, "%3.1f"] - , ["sawsd", True, "SawSD", 1.0, "%3.1f"] - , ["wtsdwsf", True, "WtSDwsF", 1.0, "%3.1f"] - , ["wmsd", True, "W$SD", 1.0, "%3.1f"] - , ["flafq", True, "FlAFq", 1.0, "%3.1f"] - , ["tuafq", True, "TuAFq", 1.0, "%3.1f"] - , ["rvafq", True, "RvAFq", 1.0, "%3.1f"] - , ["pofafq", False, "PoFAFq", 1.0, "%3.1f"] - , ["net", True, "Net($)", 1.0, "%6.2f"] - , ["bbper100", True, "bb/100", 1.0, "%4.2f"] - , ["rake", True, "Rake($)", 1.0, "%6.2f"] - , ["bb100xr", True, "bbxr/100", 1.0, "%4.2f"] - , ["variance", True, "Variance", 1.0, "%5.2f"] + # is column displayed, column heading, xalignment, formatting, celltype + self.columns = [ ["game", True, "Game", 0.0, "%s", "str"] + , ["hand", False, "Hand", 0.0, "%s", "str"] # true not allowed for this line + , ["plposition", False, "Posn", 1.0, "%s", "str"] # true not allowed for this line (set in code) + , ["pname", False, "Name", 0.0, "%s", "str"] # true not allowed for this line (set in code) + , ["n", True, "Hds", 1.0, "%d", "str"] + , ["avgseats", False, "Seats", 1.0, "%3.1f", "str"] + , ["vpip", True, "VPIP", 1.0, "%3.1f", "str"] + , ["pfr", True, "PFR", 1.0, "%3.1f", "str"] + , ["pf3", True, "PF3", 1.0, "%3.1f", "str"] + , ["steals", True, "Steals", 1.0, "%3.1f", "str"] + , ["saw_f", True, "Saw_F", 1.0, "%3.1f", "str"] + , ["sawsd", True, "SawSD", 1.0, "%3.1f", "str"] + , ["wtsdwsf", True, "WtSDwsF", 1.0, "%3.1f", "str"] + , ["wmsd", True, "W$SD", 1.0, "%3.1f", "str"] + , ["flafq", True, "FlAFq", 1.0, "%3.1f", "str"] + , ["tuafq", True, "TuAFq", 1.0, "%3.1f", "str"] + , ["rvafq", True, "RvAFq", 1.0, "%3.1f", "str"] + , ["pofafq", False, "PoFAFq", 1.0, "%3.1f", "str"] + , ["net", True, "Net($)", 1.0, "%6.2f", "cash"] + , ["bbper100", True, "bb/100", 1.0, "%4.2f", "str"] + , ["rake", True, "Rake($)", 1.0, "%6.2f", "cash"] + , ["bb100xr", True, "bbxr/100", 1.0, "%4.2f", "str"] + , ["variance", True, "Variance", 1.0, "%5.2f", "str"] ] # Detail filters: This holds the data used in the popup window, extra values are @@ -125,8 +134,9 @@ class GuiPlayerStats (threading.Thread): self.stats_vbox = None self.detailFilters = [] # the data used to enhance the sql select - self.main_hbox = gtk.HBox(False, 0) - self.main_hbox.show() + #self.main_hbox = gtk.HBox(False, 0) + #self.main_hbox.show() + self.main_hbox = gtk.HPaned() self.stats_frame = gtk.Frame() self.stats_frame.show() @@ -136,8 +146,11 @@ class GuiPlayerStats (threading.Thread): self.stats_frame.add(self.stats_vbox) # self.fillStatsFrame(self.stats_vbox) - self.main_hbox.pack_start(self.filters.get_vbox()) - self.main_hbox.pack_start(self.stats_frame, expand=True, fill=True) + #self.main_hbox.pack_start(self.filters.get_vbox()) + #self.main_hbox.pack_start(self.stats_frame, expand=True, fill=True) + self.main_hbox.pack1(self.filters.get_vbox()) + self.main_hbox.pack2(self.stats_frame) + self.main_hbox.show() # make sure Hand column is not displayed [x for x in self.columns if x[0] == 'hand'][0][1] = False @@ -149,7 +162,8 @@ class GuiPlayerStats (threading.Thread): def refreshStats(self, widget, data): try: self.stats_vbox.destroy() except AttributeError: pass - self.stats_vbox = gtk.VBox(False, 0) + #self.stats_vbox = gtk.VBox(False, 0) + self.stats_vbox = gtk.VPaned() self.stats_vbox.show() self.stats_frame.add(self.stats_vbox) self.fillStatsFrame(self.stats_vbox) @@ -193,43 +207,111 @@ class GuiPlayerStats (threading.Thread): def createStatsTable(self, vbox, playerids, sitenos, limits, type, seats, groups, dates): starttime = time() + # Scrolled window for summary table + swin = gtk.ScrolledWindow(hadjustment=None, vadjustment=None) + swin.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) + swin.show() + vbox.pack1(swin) + # Display summary table at top of page # 3rd parameter passes extra flags, currently includes: - # holecards - whether to display card breakdown (True/False) - flags = [False] - self.addTable(vbox, 'playerDetailedStats', flags, playerids, sitenos, limits, type, seats, groups, dates) + # holecards - whether to display card breakdown (True/False) + # numhands - min number hands required when displaying all players + flags = [False, self.filters.getNumHands()] + self.addTable(swin, 'playerDetailedStats', flags, playerids, sitenos, limits, type, seats, groups, dates) # Separator - sep = gtk.HSeparator() - vbox.pack_start(sep, expand=False, padding=3) - sep.show_now() - vbox.show_now() + vbox2 = gtk.VBox(False, 0) heading = gtk.Label(self.filterText['handhead']) heading.show() - vbox.pack_start(heading, expand=False, padding=3) + vbox2.pack_start(heading, expand=False, padding=3) # Scrolled window for detailed table (display by hand) swin = gtk.ScrolledWindow(hadjustment=None, vadjustment=None) swin.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) swin.show() - vbox.pack_start(swin, expand=True, padding=3) - - vbox1 = gtk.VBox(False, 0) - vbox1.show() - swin.add_with_viewport(vbox1) + vbox2.pack_start(swin, expand=True, padding=3) + vbox.pack2(vbox2) + vbox2.show() # Detailed table - flags = [True] - self.addTable(vbox1, 'playerDetailedStats', flags, playerids, sitenos, limits, type, seats, groups, dates) + flags[0] = True + self.addTable(swin, 'playerDetailedStats', flags, playerids, sitenos, limits, type, seats, groups, dates) self.db.rollback() print "Stats page displayed in %4.2f seconds" % (time() - starttime) #end def fillStatsFrame(self, vbox): + def reset_style_render_func(self, treeviewcolumn, cell, model, iter): + cell.set_property('foreground', 'black') + + def ledger_style_render_func(self, tvcol, cell, model, iter): + str = cell.get_property('text') + if '-' in str: + str = str.replace("-", "") + str = "(%s)" %(str) + cell.set_property('text', str) + cell.set_property('foreground', 'red') + else: + cell.set_property('foreground', 'darkgreen') + + return + + def sortnums(self, model, iter1, iter2, n): + try: + ret = 0 + a = self.liststore.get_value(iter1, n) + b = self.liststore.get_value(iter2, n) + if 'f' in self.cols_to_show[n][4]: + try: a = float(a) + except: a = 0.0 + try: b = float(b) + except: b = 0.0 + if n == 0: + a1,a2,a3 = ranks[a[0]], ranks[a[1]], (a+'o')[2] + b1,b2,b3 = ranks[b[0]], ranks[b[1]], (b+'o')[2] + if a1 > b1 or ( a1 == b1 and (a2 > b2 or (a2 == b2 and a3 > b3) ) ): + ret = 1 + else: + ret = -1 + else: + if a < b: + ret = -1 + elif a == b: + ret = 0 + else: + ret = 1 + #print "n =", n, "iter1[n] =", self.liststore.get_value(iter1,n), "iter2[n] =", self.liststore.get_value(iter2,n), "ret =", ret + except: + err = traceback.extract_tb(sys.exc_info()[2]) + print "***sortnums error: " + str(sys.exc_info()[1]) + print "\n".join( [e[0]+':'+str(e[1])+" "+e[2] for e in err] ) + + return(ret) + + def sortcols(self, col, n): + try: + #This doesn't actually work yet - clicking heading in top section sorts bottom section :-( + if col.get_sort_order() == gtk.SORT_ASCENDING: + col.set_sort_order(gtk.SORT_DESCENDING) + else: + col.set_sort_order(gtk.SORT_ASCENDING) + self.liststore.set_sort_column_id(n, col.get_sort_order()) + self.liststore.set_sort_func(n, self.sortnums, n) + for i in xrange(len(self.listcols)): + self.listcols[i].set_sort_indicator(False) + self.listcols[n].set_sort_indicator(True) + # use this listcols[col].set_sort_indicator(True) + # to turn indicator off for other cols + except: + err = traceback.extract_tb(sys.exc_info()[2]) + print "***sortcols error: " + str(sys.exc_info()[1]) + print "\n".join( [e[0]+':'+str(e[1])+" "+e[2] for e in err] ) + def addTable(self, vbox, query, flags, playerids, sitenos, limits, type, seats, groups, dates): + counter = 0 row = 0 sqlrow = 0 - colalias,colshow,colheading,colxalign,colformat = 0,1,2,3,4 if not flags: holecards = False else: holecards = flags[0] @@ -240,47 +322,58 @@ class GuiPlayerStats (threading.Thread): colnames = [desc[0].lower() for desc in self.cursor.description] # pre-fetch some constant values: - cols_to_show = [x for x in self.columns if x[colshow]] + self.cols_to_show = [x for x in self.columns if x[colshow]] hgametypeid_idx = colnames.index('hgametypeid') - liststore = gtk.ListStore(*([str] * len(cols_to_show))) - view = gtk.TreeView(model=liststore) + self.liststore = gtk.ListStore(*([str] * len(self.cols_to_show))) + view = gtk.TreeView(model=self.liststore) view.set_grid_lines(gtk.TREE_VIEW_GRID_LINES_BOTH) - vbox.pack_start(view, expand=False, padding=3) + #vbox.pack_start(view, expand=False, padding=3) + vbox.add(view) textcell = gtk.CellRendererText() textcell50 = gtk.CellRendererText() textcell50.set_property('xalign', 0.5) numcell = gtk.CellRendererText() numcell.set_property('xalign', 1.0) - listcols = [] + self.listcols = [] # Create header row eg column: ("game", True, "Game", 0.0, "%s") - for col, column in enumerate(cols_to_show): + for col, column in enumerate(self.cols_to_show): if column[colalias] == 'game' and holecards: s = [x for x in self.columns if x[colalias] == 'hand'][0][colheading] else: s = column[colheading] - listcols.append(gtk.TreeViewColumn(s)) - view.append_column(listcols[col]) + self.listcols.append(gtk.TreeViewColumn(s)) + view.append_column(self.listcols[col]) if column[colformat] == '%s': if column[colxalign] == 0.0: - listcols[col].pack_start(textcell, expand=True) - listcols[col].add_attribute(textcell, 'text', col) + self.listcols[col].pack_start(textcell, expand=True) + self.listcols[col].add_attribute(textcell, 'text', col) else: - listcols[col].pack_start(textcell50, expand=True) - listcols[col].add_attribute(textcell50, 'text', col) - listcols[col].set_expand(True) + self.listcols[col].pack_start(textcell50, expand=True) + self.listcols[col].add_attribute(textcell50, 'text', col) + self.listcols[col].set_expand(True) else: - listcols[col].pack_start(numcell, expand=True) - listcols[col].add_attribute(numcell, 'text', col) - listcols[col].set_expand(True) - #listcols[col].set_alignment(column[colxalign]) # no effect? + self.listcols[col].pack_start(numcell, expand=True) + self.listcols[col].add_attribute(numcell, 'text', col) + self.listcols[col].set_expand(True) + #self.listcols[col].set_alignment(column[colxalign]) # no effect? + if holecards: + self.listcols[col].set_clickable(True) + self.listcols[col].connect("clicked", self.sortcols, col) + if col == 0: + self.listcols[col].set_sort_order(gtk.SORT_DESCENDING) + self.listcols[col].set_sort_indicator(True) + if column[coltype] == 'cash': + self.listcols[col].set_cell_data_func(numcell, self.ledger_style_render_func) + else: + self.listcols[col].set_cell_data_func(numcell, self.reset_style_render_func) rows = len(result) # +1 for title row while sqlrow < rows: treerow = [] - for col,column in enumerate(cols_to_show): + for col,column in enumerate(self.cols_to_show): if column[colalias] in colnames: value = result[sqlrow][colnames.index(column[colalias])] if column[colalias] == 'plposition': @@ -315,7 +408,7 @@ class GuiPlayerStats (threading.Thread): treerow.append(column[colformat] % value) else: treerow.append(' ') - iter = liststore.append(treerow) + iter = self.liststore.append(treerow) sqlrow += 1 row += 1 vbox.show_all() @@ -323,16 +416,42 @@ class GuiPlayerStats (threading.Thread): #end def addTable(self, query, vars, playerids, sitenos, limits, type, seats, groups, dates): def refineQuery(self, query, flags, playerids, sitenos, limits, type, seats, groups, dates): - if not flags: holecards = False - else: holecards = flags[0] - - if playerids: - nametest = str(tuple(playerids)) - nametest = nametest.replace("L", "") - nametest = nametest.replace(",)",")") - query = query.replace("", nametest) + having = '' + if not flags: + holecards = False + numhands = 0 else: - query = query.replace("", "1 = 2") + holecards = flags[0] + numhands = flags[1] + + if 'allplayers' in groups and groups['allplayers']: + nametest = "(hp.playerId)" + if holecards or groups['posn']: + pname = "'all players'" + # set flag in self.columns to not show player name column + [x for x in self.columns if x[0] == 'pname'][0][1] = False + # can't do this yet (re-write doing more maths in python instead of sql?) + if numhands: + nametest = "(-1)" + else: + pname = "p.name" + # set flag in self.columns to show player name column + [x for x in self.columns if x[0] == 'pname'][0][1] = True + if numhands: + having = ' and count(1) > %d ' % (numhands,) + else: + if playerids: + nametest = str(tuple(playerids)) + nametest = nametest.replace("L", "") + nametest = nametest.replace(",)",")") + else: + nametest = "1 = 2" + pname = "p.name" + # set flag in self.columns to not show player name column + [x for x in self.columns if x[0] == 'pname'][0][1] = False + query = query.replace("", nametest) + query = query.replace("", pname) + query = query.replace("", having) if seats: query = query.replace('', 'between ' + str(seats['from']) + ' and ' + str(seats['to'])) @@ -372,9 +491,12 @@ class GuiPlayerStats (threading.Thread): bbtest = bbtest + " and gt.type = 'tour' " query = query.replace("", bbtest) - if holecards: # pinch level variables for hole card query + if holecards: # re-use level variables for hole card query query = query.replace("", "hp.startcards") - query = query.replace("", ",hgameTypeId desc") + query = query.replace("" + , ",case when floor(hp.startcards/13) >= mod(hp.startcards,13) then hp.startcards + 0.1 " + + " else 13*mod(hp.startcards,13) + floor(hp.startcards/13) " + + " end desc ") else: query = query.replace("", "") groupLevels = "show" not in str(limits) diff --git a/pyfpdb/GuiSessionViewer.py b/pyfpdb/GuiSessionViewer.py old mode 100644 new mode 100755 index 0587e5e0..2013f8a2 --- a/pyfpdb/GuiSessionViewer.py +++ b/pyfpdb/GuiSessionViewer.py @@ -15,14 +15,26 @@ #In the "official" distribution you can find the license in #agpl-3.0.txt in the docs folder of the package. +import sys import threading import pygtk pygtk.require('2.0') import gtk import os +import traceback from time import time, strftime, localtime try: - from numpy import diff, nonzero + import matplotlib + matplotlib.use('GTK') + from matplotlib.figure import Figure + from matplotlib.backends.backend_gtk import FigureCanvasGTK as FigureCanvas + from matplotlib.backends.backend_gtkagg import NavigationToolbar2GTKAgg as NavigationToolbar + from matplotlib.finance import candlestick2 + + from numpy import diff, nonzero, sum, cumsum, max, mina +# from matplotlib.dates import DateFormatter, WeekdayLocator, HourLocator, \ +# DayLocator, MONDAY, timezone + except: print """Failed to load numpy in Session Viewer""" print """This is of no consequence as the module currently doesn't do anything.""" @@ -34,13 +46,21 @@ import Filters import FpdbSQLQueries class GuiSessionViewer (threading.Thread): - def __init__(self, config, querylist, debug=True): + def __init__(self, config, querylist, mainwin, debug=True): self.debug = debug self.conf = config self.sql = querylist + + self.liststore = None + self.MYSQL_INNODB = 2 self.PGSQL = 3 self.SQLITE = 4 + + self.fig = None + self.canvas = None + self.ax = None + self.graphBox = None # create new db connection to avoid conflicts with other threads self.db = Database.Database(self.conf, sql=self.sql) @@ -56,55 +76,63 @@ class GuiSessionViewer (threading.Thread): self.filterText = {'handhead':'Hand Breakdown for all levels listed above' } - filters_display = { "Heroes" : True, - "Sites" : True, - "Games" : False, - "Limits" : True, - "LimitSep" : True, - "Seats" : True, - "SeatSep" : True, - "Dates" : False, - "Groups" : True, - "Button1" : True, - "Button2" : True + filters_display = { "Heroes" : True, + "Sites" : True, + "Games" : False, + "Limits" : False, + "LimitSep" : False, + "LimitType" : False, + "Type" : True, + "Seats" : False, + "SeatSep" : False, + "Dates" : True, + "Groups" : False, + "GroupsAll" : False, + "Button1" : True, + "Button2" : False } self.filters = Filters.Filters(self.db, self.conf, self.sql, display = filters_display) - self.filters.registerButton2Name("_Refresh") - self.filters.registerButton2Callback(self.refreshStats) + self.filters.registerButton1Name("_Refresh") + self.filters.registerButton1Callback(self.refreshStats) # ToDo: store in config # ToDo: create popup to adjust column config # columns to display, keys match column name returned by sql, values in tuple are: # is column displayed, column heading, xalignment, formatting - self.columns = [ ("game", True, "Game", 0.0, "%s") + self.columns = [ ("sid", True, "SID", 0.0, "%s") , ("hand", False, "Hand", 0.0, "%s") # true not allowed for this line , ("n", True, "Hds", 1.0, "%d") - , ("avgseats", True, "Seats", 1.0, "%3.1f") - , ("vpip", True, "VPIP", 1.0, "%3.1f") - , ("pfr", True, "PFR", 1.0, "%3.1f") - , ("pf3", True, "PF3", 1.0, "%3.1f") - , ("steals", True, "Steals", 1.0, "%3.1f") - , ("saw_f", True, "Saw_F", 1.0, "%3.1f") - , ("sawsd", True, "SawSD", 1.0, "%3.1f") - , ("wtsdwsf", True, "WtSDwsF", 1.0, "%3.1f") - , ("wmsd", True, "W$SD", 1.0, "%3.1f") - , ("flafq", True, "FlAFq", 1.0, "%3.1f") - , ("tuafq", True, "TuAFq", 1.0, "%3.1f") - , ("rvafq", True, "RvAFq", 1.0, "%3.1f") - , ("pofafq", False, "PoFAFq", 1.0, "%3.1f") - , ("net", True, "Net($)", 1.0, "%6.2f") - , ("bbper100", True, "BB/100", 1.0, "%4.2f") - , ("rake", True, "Rake($)", 1.0, "%6.2f") - , ("variance", True, "Variance", 1.0, "%5.2f") + , ("start", True, "Start", 1.0, "%d") + , ("end", True, "End", 1.0, "%d") + , ("hph", True, "Hands/h", 1.0, "%d") + , ("profit", True, "Profit", 1.0, "%s") + #, ("avgseats", True, "Seats", 1.0, "%3.1f") + #, ("vpip", True, "VPIP", 1.0, "%3.1f") + #, ("pfr", True, "PFR", 1.0, "%3.1f") + #, ("pf3", True, "PF3", 1.0, "%3.1f") + #, ("steals", True, "Steals", 1.0, "%3.1f") + #, ("saw_f", True, "Saw_F", 1.0, "%3.1f") + #, ("sawsd", True, "SawSD", 1.0, "%3.1f") + #, ("wtsdwsf", True, "WtSDwsF", 1.0, "%3.1f") + #, ("wmsd", True, "W$SD", 1.0, "%3.1f") + #, ("flafq", True, "FlAFq", 1.0, "%3.1f") + #, ("tuafq", True, "TuAFq", 1.0, "%3.1f") + #, ("rvafq", True, "RvAFq", 1.0, "%3.1f") + #, ("pofafq", False, "PoFAFq", 1.0, "%3.1f") + #, ("net", True, "Net($)", 1.0, "%6.2f") + #, ("bbper100", True, "BB/100", 1.0, "%4.2f") + #, ("rake", True, "Rake($)", 1.0, "%6.2f") + #, ("variance", True, "Variance", 1.0, "%5.2f") ] self.stats_frame = None self.stats_vbox = None self.detailFilters = [] # the data used to enhance the sql select - - self.main_hbox = gtk.HBox(False, 0) - self.main_hbox.show() + + #self.main_hbox = gtk.HBox(False, 0) + #self.main_hbox.show() + self.main_hbox = gtk.HPaned() self.stats_frame = gtk.Frame() self.stats_frame.show() @@ -112,21 +140,23 @@ class GuiSessionViewer (threading.Thread): self.stats_vbox = gtk.VBox(False, 0) self.stats_vbox.show() self.stats_frame.add(self.stats_vbox) - self.fillStatsFrame(self.stats_vbox) - - self.main_hbox.pack_start(self.filters.get_vbox()) - self.main_hbox.pack_start(self.stats_frame, expand=True, fill=True) - -################################ + # self.fillStatsFrame(self.stats_vbox) + #self.main_hbox.pack_start(self.filters.get_vbox()) + #self.main_hbox.pack_start(self.stats_frame, expand=True, fill=True) + self.main_hbox.pack1(self.filters.get_vbox()) + self.main_hbox.pack2(self.stats_frame) + self.main_hbox.show() # make sure Hand column is not displayed - [x for x in self.columns if x[0] == 'hand'][0][1] == False + #[x for x in self.columns if x[0] == 'hand'][0][1] = False def get_vbox(self): """returns the vbox of this thread""" return self.main_hbox + + def refreshStats(self, widget, data): try: self.stats_vbox.destroy() except AttributeError: pass @@ -164,17 +194,20 @@ class GuiSessionViewer (threading.Thread): print "No limits found" return - self.createStatsTable(vbox, playerids, sitenos, limits, seats) + self.createStatsPane(vbox, playerids, sitenos, limits, seats) - def createStatsTable(self, vbox, playerids, sitenos, limits, seats): + def createStatsPane(self, vbox, playerids, sitenos, limits, seats): starttime = time() - # Display summary table at top of page - # 3rd parameter passes extra flags, currently includes: - # holecards - whether to display card breakdown (True/False) - flags = [False] - self.addTable(vbox, 'playerDetailedStats', flags, playerids, sitenos, limits, seats) + (results, opens, closes, highs, lows) = self.generateDatasets(playerids, sitenos, limits, seats) + + + self.graphBox = gtk.VBox(False, 0) + self.graphBox.show() + self.generateGraph(opens, closes, highs, lows) + + vbox.pack_start(self.graphBox) # Separator sep = gtk.HSeparator() vbox.pack_start(sep, expand=False, padding=3) @@ -194,120 +227,177 @@ class GuiSessionViewer (threading.Thread): vbox1.show() swin.add_with_viewport(vbox1) - # Detailed table - flags = [True] - self.addTable(vbox1, 'playerDetailedStats', flags, playerids, sitenos, limits, seats) + self.addTable(vbox1, results) self.db.rollback() print "Stats page displayed in %4.2f seconds" % (time() - starttime) #end def fillStatsFrame(self, vbox): - def addTable(self, vbox, query, flags, playerids, sitenos, limits, seats): - row = 0 - sqlrow = 0 - colalias,colshow,colheading,colxalign,colformat = 0,1,2,3,4 - if not flags: holecards = False - else: holecards = flags[0] + def generateDatasets(self, playerids, sitenos, limits, seats): + # Get a list of all handids and their timestampts + #FIXME: Query still need to filter on blind levels + q = self.sql.query['sessionStats'] + start_date, end_date = self.filters.getDates() + q = q.replace("", " between '" + start_date + "' and '" + end_date + "'") - self.stats_table = gtk.Table(1, 1, False) - self.stats_table.set_col_spacings(4) - self.stats_table.show() - - self.db.cursor.execute("""select UNIX_TIMESTAMP(handStart) as time, id from Hands ORDER BY time""") + nametest = str(tuple(playerids)) + nametest = nametest.replace("L", "") + nametest = nametest.replace(",)",")") + q = q.replace("", nametest) + self.db.cursor.execute(q) THRESHOLD = 1800 hands = self.db.cursor.fetchall() + # Take that list and create an array of the time between hands times = map(lambda x:long(x[0]), hands) handids = map(lambda x:int(x[1]), hands) + winnings = map(lambda x:float(x[4]), hands) print "DEBUG: len(times) %s" %(len(times)) - diffs = diff(times) - print "DEBUG: len(diffs) %s" %(len(diffs)) - index = nonzero(diff(times) > THRESHOLD) - print "DEBUG: len(index[0]) %s" %(len(index[0])) - print "DEBUG: index %s" %(index) - print "DEBUG: index[0][0] %s" %(index[0][0]) + diffs = diff(times) # This array is the difference in starttime between consecutive hands + index = nonzero(diff(times) > THRESHOLD) # This array represents the indexes into 'times' for start/end times of sessions + # ie. times[index[0][0]] is the end of the first session + #print "DEBUG: len(index[0]) %s" %(len(index[0])) + #print "DEBUG: index %s" %(index) + #print "DEBUG: index[0][0] %s" %(index[0][0]) total = 0 - last_idx = 0 + lowidx = 0 + uppidx = 0 + opens = [] + closes = [] + highs = [] + lows = [] + results = [] + cum_sum = cumsum(winnings) + cum_sum = cum_sum/100 + # Take all results and format them into a list for feeding into gui model. for i in range(len(index[0])): - print "Hands in session %4s: %4s Start: %s End: %s Total: %s" %(i, index[0][i] - last_idx, strftime("%d/%m/%Y %H:%M", localtime(times[last_idx])), strftime("%d/%m/%Y %H:%M", localtime(times[index[0][i]])), times[index[0][i]] - times[last_idx]) - total = total + (index[0][i] - last_idx) - last_idx = index[0][i] + 1 + sid = i # Session id + hds = index[0][i] - last_idx # Number of hands in session + if hds > 0: + stime = strftime("%d/%m/%Y %H:%M", localtime(times[last_idx])) # Formatted start time + etime = strftime("%d/%m/%Y %H:%M", localtime(times[index[0][i]])) # Formatted end time + hph = (times[index[0][i]] - times[last_idx])/60 # Hands per hour + won = sum(winnings[last_idx:index[0][i]])/100.0 + hwm = max(cum_sum[last_idx:index[0][i]]) + lwm = min(cum_sum[last_idx:index[0][i]]) + #print "DEBUG: range: (%s, %s) - (min, max): (%s, %s)" %(last_idx, index[0][i], hwm, lwm) + + results.append([sid, hds, stime, etime, hph, won]) + opens.append((sum(winnings[:last_idx]))/100) + closes.append((sum(winnings[:index[0][i]]))/100) + highs.append(hwm) + lows.append(lwm) + #print "Hands in session %4s: %4s Start: %s End: %s HPH: %s Profit: %s" %(sid, hds, stime, etime, hph, won) + total = total + (index[0][i] - last_idx) + last_idx = index[0][i] + 1 - print "Total: ", total + return (results, opens, closes, highs, lows) + + def clearGraphData(self): + + try: + try: + if self.canvas: + self.graphBox.remove(self.canvas) + except: + pass + + if self.fig != None: + self.fig.clear() + self.fig = Figure(figsize=(5,4), dpi=100) + if self.canvas is not None: + self.canvas.destroy() + + self.canvas = FigureCanvas(self.fig) # a gtk.DrawingArea + except: + err = traceback.extract_tb(sys.exc_info()[2])[-1] + print "***Error: "+err[2]+"("+str(err[1])+"): "+str(sys.exc_info()[1]) + raise + + + def generateGraph(self, opens, closes, highs, lows): + self.clearGraphData() + + #FIXME: Weird - first data entry is crashing this for me + opens = opens[1:] + closes = closes[1:] + highs = highs[1:] + lows = lows[1:] +# print "DEBUG:" +# print "highs = %s" % highs +# print "lows = %s" % lows +# print "opens = %s" % opens +# print "closes = %s" % closes +# print "len(highs): %s == len(lows): %s" %(len(highs), len(lows)) +# print "len(opens): %s == len(closes): %s" %(len(opens), len(closes)) # -# colnames = [desc[0].lower() for desc in self.cursor.description] -# -# # pre-fetch some constant values: -# cols_to_show = [x for x in self.columns if x[colshow]] -# hgametypeid_idx = colnames.index('hgametypeid') -# -# liststore = gtk.ListStore(*([str] * len(cols_to_show))) -# view = gtk.TreeView(model=liststore) -# view.set_grid_lines(gtk.TREE_VIEW_GRID_LINES_BOTH) -# vbox.pack_start(view, expand=False, padding=3) -# textcell = gtk.CellRendererText() -# numcell = gtk.CellRendererText() -# numcell.set_property('xalign', 1.0) -# listcols = [] -# -# # Create header row eg column: ("game", True, "Game", 0.0, "%s") -# for col, column in enumerate(cols_to_show): -# if column[colalias] == 'game' and holecards: -# s = [x for x in self.columns if x[colalias] == 'hand'][0][colheading] -# else: -# s = column[colheading] -# listcols.append(gtk.TreeViewColumn(s)) -# view.append_column(listcols[col]) -# if column[colformat] == '%s': -# if col == 1 and holecards: -# listcols[col].pack_start(textcell, expand=True) -# else: -# listcols[col].pack_start(textcell, expand=False) -# listcols[col].add_attribute(textcell, 'text', col) -# else: -# listcols[col].pack_start(numcell, expand=False) -# listcols[col].add_attribute(numcell, 'text', col) -# -# rows = len(result) # +1 for title row -# -# while sqlrow < rows: -# treerow = [] -# if(row%2 == 0): -# bgcolor = "white" -# else: -# bgcolor = "lightgrey" -# for col,column in enumerate(cols_to_show): -# if column[colalias] in colnames: -# value = result[sqlrow][colnames.index(column[colalias])] -# else: -# if column[colalias] == 'game': -# if holecards: -# value = Card.twoStartCardString( result[sqlrow][hgametypeid_idx] ) -# else: -# minbb = result[sqlrow][colnames.index('minbigblind')] -# maxbb = result[sqlrow][colnames.index('maxbigblind')] -# value = result[sqlrow][colnames.index('limittype')] + ' ' \ -# + result[sqlrow][colnames.index('category')].title() + ' ' \ -# + result[sqlrow][colnames.index('name')] + ' $' -# if 100 * int(minbb/100.0) != minbb: -# value += '%.2f' % (minbb/100.0) -# else: -# value += '%.0f' % (minbb/100.0) -# if minbb != maxbb: -# if 100 * int(maxbb/100.0) != maxbb: -# value += ' - $' + '%.2f' % (maxbb/100.0) -# else: -# value += ' - $' + '%.0f' % (maxbb/100.0) -# else: -# continue -# if value and value != -999: -# treerow.append(column[colformat] % value) -# else: -# treerow.append(' ') -# iter = liststore.append(treerow) -# sqlrow += 1 -# row += 1 +# for i in range(len(highs)): +# print "DEBUG: (%s, %s, %s, %s)" %(lows[i], opens[i], closes[i], highs[i]) +# print "DEBUG: diffs h/l: %s o/c: %s" %(lows[i] - highs[i], opens[i] - closes[i]) + + self.ax = self.fig.add_subplot(111) + + self.ax.set_title("Session candlestick graph") + + #Set axis labels and grid overlay properites + self.ax.set_xlabel("Sessions", fontsize = 12) + self.ax.set_ylabel("$", fontsize = 12) + self.ax.grid(color='g', linestyle=':', linewidth=0.2) + + candlestick2(self.ax, opens, closes, highs, lows, width=0.50, colordown='r', colorup='g', alpha=1.00) + self.graphBox.add(self.canvas) + self.canvas.show() + self.canvas.draw() + + def addTable(self, vbox, results): + row = 0 + sqlrow = 0 + colalias,colshow,colheading,colxalign,colformat = 0,1,2,3,4 + + # pre-fetch some constant values: + cols_to_show = [x for x in self.columns if x[colshow]] + + self.liststore = gtk.ListStore(*([str] * len(cols_to_show))) + for row in results: + iter = self.liststore.append(row) + + view = gtk.TreeView(model=self.liststore) + view.set_grid_lines(gtk.TREE_VIEW_GRID_LINES_BOTH) + vbox.add(view) + textcell = gtk.CellRendererText() + textcell50 = gtk.CellRendererText() + textcell50.set_property('xalign', 0.5) + numcell = gtk.CellRendererText() + numcell.set_property('xalign', 1.0) + listcols = [] + + # Create header row eg column: ("game", True, "Game", 0.0, "%s") + for col, column in enumerate(cols_to_show): + s = column[colheading] + listcols.append(gtk.TreeViewColumn(s)) + view.append_column(listcols[col]) + if column[colformat] == '%s': + if column[colxalign] == 0.0: + listcols[col].pack_start(textcell, expand=True) + listcols[col].add_attribute(textcell, 'text', col) + else: + listcols[col].pack_start(textcell50, expand=True) + listcols[col].add_attribute(textcell50, 'text', col) + listcols[col].set_expand(True) + else: + listcols[col].pack_start(numcell, expand=True) + listcols[col].add_attribute(numcell, 'text', col) + listcols[col].set_expand(True) + vbox.show_all() + +def main(argv=None): + config = Configuration.Config() + i = GuiBulkImport(settings, config) + +if __name__ == '__main__': + sys.exit(main()) + diff --git a/pyfpdb/HUD_config.xml.example b/pyfpdb/HUD_config.xml.example index e4344beb..8af81c67 100644 --- a/pyfpdb/HUD_config.xml.example +++ b/pyfpdb/HUD_config.xml.example @@ -95,359 +95,404 @@ Left-Drag to Move" /> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + bgcolor="#000000" + fgcolor="#FFFFFF" + hudopacity="1.0" + font="Sans" + font_size="8" + supported_games="holdem,razz,omahahi,omahahilo,studhi,studhilo"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + bgcolor="#000000" + fgcolor="#FFFFFF" + hudopacity="1.0" + font="Sans" + font_size="8" + supported_games="holdem,razz,omahahi,omahahilo,studhi,studhilo"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + supported_games="holdem"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + supported_games="holdem"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + supported_games="holdem"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + supported_games="holdem"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - + - + @@ -467,50 +512,50 @@ Left-Drag to Move" - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -520,6 +565,7 @@ Left-Drag to Move" + diff --git a/pyfpdb/HUD_main.py b/pyfpdb/HUD_main.py index 95a25a29..021d1ff2 100755 --- a/pyfpdb/HUD_main.py +++ b/pyfpdb/HUD_main.py @@ -59,9 +59,11 @@ import Hud # HUD params: # - Set aggregate_ring and/or aggregate_tour to True is you want to include stats from other blind levels in the HUD display -# - If aggregation is used, the value of agg_bb_mult determines how what levels are included, e.g. +# - If aggregation is used, the value of agg_bb_mult determines what levels are included. If +# agg_bb_mult is M and current blind level is L, blinds between L/M and L*M are included. e.g. # if agg_bb_mult is 100, almost all levels are included in all HUD displays -# if agg_bb_mult is 2.1, levels from half to double the current blind level are included in the HUD +# if agg_bb_mult is 2, levels from half to double the current blind level are included in the HUD +# if agg_bb_mult is 1 only the current level is included # - Set hud_style to A to see stats for all-time # Set hud_style to S to only see stats for current session (currently this shows stats for the last 24 hours) # Set hud_style to T to only see stats for the last N days (uses value in hud_days) @@ -71,14 +73,14 @@ def_hud_params = { # Settings for all players apart from program owner ('hero') , 'aggregate_tour' : True , 'hud_style' : 'A' , 'hud_days' : 90 - , 'agg_bb_mult' : 1 # 1 means no aggregation + , 'agg_bb_mult' : 10000 # 1 means no aggregation # , 'hud_session_gap' : 30 not currently used # Second set of variables for hero - these settings only apply to the program owner , 'h_aggregate_ring' : False , 'h_aggregate_tour' : True , 'h_hud_style' : 'S' # A(ll) / S(ession) / T(ime in days) - , 'h_hud_days' : 30 - , 'h_agg_bb_mult' : 1 # 1 means no aggregation + , 'h_hud_days' : 60 + , 'h_agg_bb_mult' : 10000 # 1 means no aggregation # , 'h_hud_session_gap' : 30 not currently used } @@ -114,11 +116,7 @@ class HUD_main(object): # called by an event in the HUD, to kill this specific HUD if table in self.hud_dict: self.hud_dict[table].kill() - try: - # throws exception in windows sometimes (when closing using main_window menu?) - self.hud_dict[table].main_window.destroy() - except: - pass + self.hud_dict[table].main_window.destroy() self.vb.remove(self.hud_dict[table].tablehudlabel) del(self.hud_dict[table]) self.main_window.resize(1,1) @@ -129,7 +127,7 @@ class HUD_main(object): def idle_func(): gtk.gdk.threads_enter() - try: + try: # TODO: seriously need to decrease the scope of this block.. what are we expecting to error? newlabel = gtk.Label("%s - %s" % (table.site, table_name)) self.vb.add(newlabel) newlabel.show() @@ -172,12 +170,13 @@ class HUD_main(object): # function idle_func() to be run by the gui thread, at its leisure. def idle_func(): gtk.gdk.threads_enter() - try: - self.hud_dict[table_name].update(new_hand_id, config) - [aw.update_gui(new_hand_id) for aw in self.hud_dict[table_name].aux_windows] - return False - finally: - gtk.gdk.threads_leave() +# try: + self.hud_dict[table_name].update(new_hand_id, config) + [aw.update_gui(new_hand_id) for aw in self.hud_dict[table_name].aux_windows] +# finally: + gtk.gdk.threads_leave() + return False + gobject.idle_add(idle_func) def read_stdin(self): # This is the thread function diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py index 2527f636..602a6a1a 100644 --- a/pyfpdb/Hand.py +++ b/pyfpdb/Hand.py @@ -205,14 +205,14 @@ db: a connected fpdb_db object""" #Gametypes gtid = db.getGameTypeId(self.siteId, self.gametype) - self.stats.assembleHands(self) + self.stats.getStats(self) ##### # End prep functions ##### - # HudCache data to come from DerivedStats class # HandsActions - all actions for all players for all streets - self.actions + # HudCache data can be generated from HandsActions (HandsPlayers?) # Hands - Summary information of hand indexed by handId - gameinfo hh = self.stats.getHands() @@ -223,6 +223,7 @@ db: a connected fpdb_db object""" #print hh handid = db.storeHand(hh) # HandsPlayers - ? ... Do we fix winnings? + db.storeHandsPlayers(handid, sqlids, self.stats.getHandsPlayers()) # Tourneys ? # TourneysPlayers diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py index e40694ea..0642d845 100644 --- a/pyfpdb/HandHistoryConverter.py +++ b/pyfpdb/HandHistoryConverter.py @@ -37,7 +37,13 @@ import gettext gettext.install('fpdb') import logging, logging.config -logging.config.fileConfig(os.path.join(sys.path[0],"logging.conf")) +import ConfigParser + +try: + logging.config.fileConfig(os.path.join(sys.path[0],"logging.conf")) +except ConfigParser.NoSectionError: # debian package path + logging.config.fileConfig('/usr/share/python-fpdb/logging.conf') + log = logging.getLogger("parser") import pygtk diff --git a/pyfpdb/Mucked.py b/pyfpdb/Mucked.py index c4a6e4f1..6da35f6d 100755 --- a/pyfpdb/Mucked.py +++ b/pyfpdb/Mucked.py @@ -63,7 +63,12 @@ class Aux_Window(object): card_images = 53 * [0] suits = ('s', 'h', 'd', 'c') ranks = (14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2) - pb = gtk.gdk.pixbuf_new_from_file(self.config.execution_path(self.params['deck'])) + deckimg = self.params['deck'] + try: + pb = gtk.gdk.pixbuf_new_from_file(self.config.execution_path(deckimg)) + except: + stockpath = '/usr/share/python-fpdb/' + deckimg + pb = gtk.gdk.pixbuf_new_from_file(stockpath) for j in range(0, 13): for i in range(0, 4): diff --git a/pyfpdb/RegressionTest.py b/pyfpdb/RegressionTest.py new file mode 100644 index 00000000..2b09d248 --- /dev/null +++ b/pyfpdb/RegressionTest.py @@ -0,0 +1,107 @@ +#!/usr/bin/python + +#Copyright 2008 Steffen Jobbagy-Felso +#This program is free software: you can redistribute it and/or modify +#it under the terms of the GNU Affero General Public License as published by +#the Free Software Foundation, version 3 of the License. +# +#This program is distributed in the hope that it will be useful, +#but WITHOUT ANY WARRANTY; without even the implied warranty of +#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +#GNU General Public License for more details. +# +#You should have received a copy of the GNU Affero General Public License +#along with this program. If not, see . +#In the "official" distribution you can find the license in +#agpl-3.0.txt in the docs folder of the package. + + +############################################################################ +# +# File for Regression Testing fpdb +# + +import os +import sys + +import datetime +import Configuration +import fpdb_db +import fpdb_import +import fpdb_simple +import FpdbSQLQueries + +import unittest + +class TestSequenceFunctions(unittest.TestCase): + + def setUp(self): + """Configure MySQL settings/database and establish connection""" + self.c = Configuration.Config() + self.mysql_settings={ 'db-host':"localhost", + 'db-backend':2, + 'db-databaseName':"fpdbtest", + 'db-user':"fpdb", + 'db-password':"fpdb"} + self.mysql_db = fpdb_db.fpdb_db() + self.mysql_db.connect(self.mysql_settings['db-backend'], self.mysql_settings['db-host'], + self.mysql_settings['db-databaseName'], self.mysql_settings['db-user'], + self.mysql_settings['db-password']) + self.mysqldict = FpdbSQLQueries.FpdbSQLQueries('MySQL InnoDB') + self.mysqlimporter = fpdb_import.Importer(self, self.mysql_settings, self.c) + self.mysqlimporter.setCallHud(False) + +# """Configure Postgres settings/database and establish connection""" +# self.pg_settings={ 'db-host':"localhost", 'db-backend':3, 'db-databaseName':"fpdbtest", 'db-user':"fpdb", 'db-password':"fpdb"} +# self.pg_db = fpdb_db.fpdb_db() +# self.pg_db.connect(self.pg_settings['db-backend'], self.pg_settings['db-host'], +# self.pg_settings['db-databaseName'], self.pg_settings['db-user'], +# self.pg_settings['db-password']) +# self.pgdict = FpdbSQLQueries.FpdbSQLQueries('PostgreSQL') + + + def testDatabaseConnection(self): + """Test all supported DBs""" + self.result = self.mysql_db.cursor.execute(self.mysqldict.query['list_tables']) + self.failUnless(self.result==13, "Number of tables in database incorrect. Expected 13 got " + str(self.result)) + +# self.result = self.pg_db.cursor.execute(self.pgdict.query['list_tables']) +# self.failUnless(self.result==13, "Number of tables in database incorrect. Expected 13 got " + str(self.result)) + + def testMySQLRecreateTables(self): + """Test droping then recreating fpdb table schema""" + self.mysql_db.recreate_tables() + self.result = self.mysql_db.cursor.execute("SHOW TABLES") + self.failUnless(self.result==13, "Number of tables in database incorrect. Expected 13 got " + str(self.result)) + + def testPokerStarsHHDate(self): + latest = "PokerStars Game #21969660557: Hold'em No Limit ($0.50/$1.00) - 2008/11/12 10:00:48 CET [2008/11/12 4:00:48 ET]" + previous = "PokerStars Game #21969660557: Hold'em No Limit ($0.50/$1.00) - 2008/08/17 - 01:14:43 (ET)" + older1 = "PokerStars Game #21969660557: Hold'em No Limit ($0.50/$1.00) - 2008/09/07 06:23:14 ET" + + result = fpdb_simple.parseHandStartTime(older1, "ps") + self.failUnless(result==datetime.datetime(2008,9,7,11,23,14), + "Date incorrect, expected: 2008-09-07 11:23:14 got: " + str(result)) + result = fpdb_simple.parseHandStartTime(latest, "ps") + self.failUnless(result==datetime.datetime(2008,11,12,15,00,48), + "Date incorrect, expected: 2008-11-12 15:00:48 got: " + str(result)) + result = fpdb_simple.parseHandStartTime(previous, "ps") + self.failUnless(result==datetime.datetime(2008,8,17,6,14,43), + "Date incorrect, expected: 2008-08-17 01:14:43 got: " + str(result)) + + def testImportHandHistoryFiles(self): + """Test import of single HH file""" + self.mysqlimporter.addImportFile("regression-test-files/hand-histories/ps-lhe-ring-3hands.txt") + self.mysqlimporter.runImport() + self.mysqlimporter.addImportDirectory("regression-test-files/hand-histories") + self.mysqlimporter.runImport() + +# def testPostgresSQLRecreateTables(self): +# """Test droping then recreating fpdb table schema""" +# self.pg_db.recreate_tables() +# self.result = self.pg_db.cursor.execute(self.pgdict.query['list_tables']) +# self.failUnless(self.result==13, "Number of tables in database incorrect. Expected 13 got " + str(self.result)) + +if __name__ == '__main__': + unittest.main() + diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py index bb918d97..3c25963f 100644 --- a/pyfpdb/SQL.py +++ b/pyfpdb/SQL.py @@ -1727,6 +1727,7 @@ class Sql: if db_server == 'mysql': self.query['playerDetailedStats'] = """ select AS hgametypeid + , AS pname ,gt.base ,gt.category ,upper(gt.limitType) AS limittype @@ -1777,6 +1778,7 @@ class Sql: inner join Hands h on (h.id = hp.handId) inner join Gametypes gt on (gt.Id = h.gameTypeId) inner join Sites s on (s.Id = gt.siteId) + inner join Players p on (p.Id = hp.playerId) where hp.playerId in /*and hp.tourneysPlayersId IS NULL*/ and h.seats @@ -1784,14 +1786,15 @@ class Sql: and date_format(h.handStart, '%Y-%m-%d') group by hgameTypeId - ,hp.playerId + ,pname ,gt.base ,gt.category ,plposition ,upper(gt.limitType) ,s.name - order by hp.playerId + having 1 = 1 + order by pname ,gt.base ,gt.category @@ -1807,6 +1810,7 @@ class Sql: elif db_server == 'postgresql': self.query['playerDetailedStats'] = """ select AS hgametypeid + , AS pname ,gt.base ,gt.category ,upper(gt.limitType) AS limittype @@ -1857,6 +1861,7 @@ class Sql: inner join Hands h on (h.id = hp.handId) inner join Gametypes gt on (gt.Id = h.gameTypeId) inner join Sites s on (s.Id = gt.siteId) + inner join Players p on (p.Id = hp.playerId) where hp.playerId in /*and hp.tourneysPlayersId IS NULL*/ and h.seats @@ -1864,14 +1869,15 @@ class Sql: and to_char(h.handStart, 'YYYY-MM-DD') group by hgameTypeId - ,hp.playerId + ,pname ,gt.base ,gt.category ,plposition ,upper(gt.limitType) ,s.name - order by hp.playerId + having 1 = 1 + order by pname ,gt.base ,gt.category @@ -2469,6 +2475,33 @@ class Sql: GROUP BY h.handStart, hp.handId, hp.totalProfit ORDER BY h.handStart""" + #################################### + # Session stats query + #################################### + if db_server == 'mysql': + self.query['sessionStats'] = """ + SELECT UNIX_TIMESTAMP(h.handStart) as time, hp.handId, hp.startCash, hp.winnings, hp.totalProfit + FROM HandsPlayers hp + INNER JOIN Hands h on (h.id = hp.handId) + INNER JOIN Gametypes gt on (gt.Id = h.gameTypeId) + INNER JOIN Sites s on (s.Id = gt.siteId) + INNER JOIN Players p on (p.Id = hp.playerId) + WHERE hp.playerId in + AND date_format(h.handStart, '%Y-%m-%d') + ORDER by time""" + elif db_server == 'postgresql': + self.query['sessionStats'] = """ + SELECT EXTRACT(epoch from h.handStart) as time, hp.handId, hp.startCash, hp.winnings, hp.totalProfit + FROM HandsPlayers hp + INNER JOIN Hands h on (h.id = hp.handId) + INNER JOIN Gametypes gt on (gt.Id = h.gameTypeId) + INNER JOIN Sites s on (s.Id = gt.siteId) + INNER JOIN Players p on (p.Id = hp.playerId) + WHERE hp.playerId in + AND h.handStart + ORDER by time""" + elif db_server == 'sqlite': + self.query['sessionStats'] = """ """ #################################### # Queries to rebuild/modify hudcache @@ -3110,6 +3143,44 @@ class Sql: self.query['handsPlayersTTypeId_joiner'] = " OR TourneysPlayersId+0=" self.query['handsPlayersTTypeId_joiner_id'] = " OR id=" + self.query['store_hand'] = """INSERT INTO Hands ( + tablename, + gametypeid, + sitehandno, + handstart, + importtime, + seats, + maxseats, + texture, + playersVpi, + boardcard1, + boardcard2, + boardcard3, + boardcard4, + boardcard5, + playersAtStreet1, + playersAtStreet2, + playersAtStreet3, + playersAtStreet4, + playersAtShowdown, + street0Raises, + street1Raises, + street2Raises, + street3Raises, + street4Raises, + street1Pot, + street2Pot, + street3Pot, + street4Pot, + showdownPot + ) + VALUES + (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, + %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, + %s, %s, %s, %s, %s, %s, %s, %s, %s)""" + + + if db_server == 'mysql': diff --git a/pyfpdb/Stats.py b/pyfpdb/Stats.py index 614f48ed..d54ccf12 100755 --- a/pyfpdb/Stats.py +++ b/pyfpdb/Stats.py @@ -93,7 +93,7 @@ def do_stat(stat_dict, player = 24, stat = 'vpip'): # functions that return individual stats def totalprofit(stat_dict, player): - """ Total Profit.""" + """ Total Profit.""" if stat_dict[player]['net'] != 0: stat = float(stat_dict[player]['net']) / 100 return (stat, '$%.2f' % stat, 'tp=$%.2f' % stat, 'totalprofit=$%.2f' % stat, str(stat), 'Total Profit') @@ -657,17 +657,15 @@ def ffreq4(stat_dict, player): if __name__== "__main__": c = Configuration.Config() - db_connection = Database.Database(c, 'fpdb', 'holdem') + db_connection = Database.Database(c) h = db_connection.get_last_hand() - stat_dict = db_connection.get_stats_from_hand(h) + stat_dict = db_connection.get_stats_from_hand(h, "ring") for player in stat_dict.keys(): print "player = ", player, do_stat(stat_dict, player = player, stat = 'vpip') - print "player = ", player, do_stat(stat_dict, player = player, stat = 'vpip_0') print "player = ", player, do_stat(stat_dict, player = player, stat = 'pfr') - print "player = ", player, do_stat(stat_dict, player = player, stat = 'pfr_0') print "player = ", player, do_stat(stat_dict, player = player, stat = 'wtsd') - print "player = ", player, do_stat(stat_dict, player = player, stat = 'profit100_0') + print "player = ", player, do_stat(stat_dict, player = player, stat = 'profit100') print "player = ", player, do_stat(stat_dict, player = player, stat = 'saw_f') print "player = ", player, do_stat(stat_dict, player = player, stat = 'n') print "player = ", player, do_stat(stat_dict, player = player, stat = 'fold_f') @@ -675,14 +673,13 @@ if __name__== "__main__": print "player = ", player, do_stat(stat_dict, player = player, stat = 'steal') print "player = ", player, do_stat(stat_dict, player = player, stat = 'f_SB_steal') print "player = ", player, do_stat(stat_dict, player = player, stat = 'f_BB_steal') - print "player = ", player, do_stat(stat_dict, player = player, stat = 'three_B_0') + print "player = ", player, do_stat(stat_dict, player = player, stat = 'three_B') print "player = ", player, do_stat(stat_dict, player = player, stat = 'WMsF') print "player = ", player, do_stat(stat_dict, player = player, stat = 'a_freq1') print "player = ", player, do_stat(stat_dict, player = player, stat = 'a_freq2') print "player = ", player, do_stat(stat_dict, player = player, stat = 'a_freq3') print "player = ", player, do_stat(stat_dict, player = player, stat = 'a_freq4') print "player = ", player, do_stat(stat_dict, player = player, stat = 'a_freq_123') - print "player = ", player, do_stat(stat_dict, player = player, stat = 'a_freq_123_0') print "player = ", player, do_stat(stat_dict, player = player, stat = 'cb1') print "player = ", player, do_stat(stat_dict, player = player, stat = 'cb2') print "player = ", player, do_stat(stat_dict, player = player, stat = 'cb3') @@ -694,13 +691,15 @@ if __name__== "__main__": print "\n" print "\n\nLegal stats:" + print "(add _0 to name to display with 0 decimal places, _1 to display with 1, etc)\n" for attr in dir(): if attr.startswith('__'): continue if attr in ("Configuration", "Database", "GInitiallyUnowned", "gtk", "pygtk", "player", "c", "db_connection", "do_stat", "do_tip", "stat_dict", - "h"): continue + "h", "re", "re_Percent", "re_Places"): continue print "%-14s %s" % (attr, eval("%s.__doc__" % (attr))) # print " " % (attr) + print db_connection.close_connection diff --git a/pyfpdb/Tables.py b/pyfpdb/Tables.py index e725d5b8..b9103040 100755 --- a/pyfpdb/Tables.py +++ b/pyfpdb/Tables.py @@ -132,7 +132,7 @@ def discover_posix(c): # xwininfo -root -tree -id 0xnnnnn gets the info on a single window for s in c.get_supported_sites(): params = c.get_site_parameters(s) - + # TODO: We need to make a list of phrases, shared between the WIndows and Unix code!!!!!! if re.search(params['table_finder'], listing): if 'Lobby' in listing: continue diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py index 18bc65d9..fe2ddd39 100755 --- a/pyfpdb/fpdb.py +++ b/pyfpdb/fpdb.py @@ -41,6 +41,10 @@ if os.name == 'nt' and sys.version[0:3] not in ('2.5', '2.6') and '-r' not in sy else: pass #print "debug - not changing path" + +if os.name == 'nt': + import win32api + import win32con print "Python " + sys.version[0:3] + '...\n' @@ -78,7 +82,7 @@ import FpdbSQLQueries import Configuration from Exceptions import * -VERSION = "0.11" +VERSION = "0.12" class fpdb: def tab_clicked(self, widget, tab_name): @@ -155,12 +159,6 @@ class fpdb: def dia_database_stats(self, widget, data=None): self.warning_box("Unimplemented: Database Stats") - def dia_database_sessions(self, widget, data=None): - new_sessions_thread = GuiSessionViewer.GuiSessionViewer(self.config, self.sql) - self.threads.append(new_sessions_thread) - sessions_tab=new_sessions_thread.get_vbox() - self.add_and_display_tab(sessions_tab, "Sessions") - def dia_delete_db_parts(self, widget, data=None): self.warning_box("Unimplemented: Delete Database Parts") self.obtain_global_lock() @@ -368,6 +366,7 @@ class fpdb: + @@ -377,7 +376,6 @@ class fpdb: - @@ -409,6 +407,7 @@ class fpdb: ('playerdetails', None, 'Player _Details (todo)', None, 'Player Details (todo)', self.not_implemented), ('playerstats', None, '_Player Stats (tabulated view)', 'P', 'Player Stats (tabulated view)', self.tab_player_stats), ('posnstats', None, 'P_ositional Stats (tabulated view)', 'O', 'Positional Stats (tabulated view)', self.tab_positional_stats), + ('sessionstats', None, 'Session Stats', None, 'Session Stats', self.tab_session_stats), ('sessionreplay', None, '_Session Replayer (todo)', None, 'Session Replayer (todo)', self.not_implemented), ('tableviewer', None, 'Poker_table Viewer (mostly obselete)', None, 'Poker_table Viewer (mostly obselete)', self.tab_table_viewer), ('database', None, '_Database'), @@ -417,7 +416,6 @@ class fpdb: ('createtabs', None, 'Create or Recreate _Tables', None, 'Create or Recreate Tables ', self.dia_recreate_tables), ('rebuildhudcache', None, 'Rebuild HUD Cache', None, 'Rebuild HUD Cache', self.dia_recreate_hudcache), ('stats', None, '_Statistics (todo)', None, 'View Database Statistics', self.dia_database_stats), - ('sessions', None, 'Sessions', None, 'View Sessions', self.dia_database_sessions), ('help', None, '_Help'), ('Abbrev', None, '_Abbrevations (todo)', None, 'List of Abbrevations', self.tab_abbreviations), ('About', None, 'A_bout', None, 'About the program', self.dia_about), @@ -554,6 +552,12 @@ class fpdb: ps_tab=new_ps_thread.get_vbox() self.add_and_display_tab(ps_tab, "Positional Stats") + def tab_session_stats(self, widget, data=None): + new_ps_thread = GuiSessionViewer.GuiSessionViewer(self.config, self.sql, self.window) + self.threads.append(new_ps_thread) + ps_tab=new_ps_thread.get_vbox() + self.add_and_display_tab(ps_tab, "Session Stats") + def tab_main_help(self, widget, data=None): """Displays a tab with the main fpdb help screen""" mh_tab=gtk.Label("""Welcome to Fpdb! @@ -618,7 +622,57 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt") self.window.show() self.load_profile() + + self.statusIcon = gtk.StatusIcon() + self.statusIcon.set_from_stock(gtk.STOCK_HOME) + self.statusIcon.set_tooltip("Free Poker Database") + self.statusIcon.connect('activate', self.statusicon_activate) + self.statusMenu = gtk.Menu() + menuItem = gtk.ImageMenuItem(gtk.STOCK_ABOUT) + menuItem.connect('activate', self.dia_about) + self.statusMenu.append(menuItem) + menuItem = gtk.ImageMenuItem(gtk.STOCK_QUIT) + menuItem.connect('activate', self.quit) + self.statusMenu.append(menuItem) + self.statusIcon.connect('popup-menu', self.statusicon_menu, self.statusMenu) + self.statusIcon.set_visible(True) + + self.window.connect('window-state-event', self.window_state_event_cb) sys.stderr.write("fpdb starting ...") + + def window_state_event_cb(self, window, event): + print "window_state_event", event + if event.changed_mask & gtk.gdk.WINDOW_STATE_ICONIFIED: + # -20 = GWL_EXSTYLE can't find it in the pywin32 libs + #bits = win32api.GetWindowLong(self.window.window.handle, -20) + #bits = bits ^ (win32con.WS_EX_TOOLWINDOW | win32con.WS_EX_APPWINDOW) + + #win32api.SetWindowLong(self.window.window.handle, -20, bits) + + if event.new_window_state & gtk.gdk.WINDOW_STATE_ICONIFIED: + self.window.hide() + self.window.set_skip_taskbar_hint(True) + self.window.set_skip_pager_hint(True) + else: + self.window.set_skip_taskbar_hint(False) + self.window.set_skip_pager_hint(False) + # Tell GTK not to propagate this signal any further + return True + + def statusicon_menu(self, widget, button, time, data = None): + # we don't need to pass data here, since we do keep track of most all + # our variables .. the example code that i looked at for this + # didn't use any long scope variables.. which might be an alright + # idea too sometime + if button == 3: + if data: + data.show_all() + data.popup(None, None, None, 3, time) + pass + + def statusicon_activate(self, widget, data = None): + self.window.show() + self.window.present() def warning_box(self, str, diatitle="FPDB WARNING"): diaWarning = gtk.Dialog(title=diatitle, parent=None, flags=0, buttons=(gtk.STOCK_OK,gtk.RESPONSE_OK)) diff --git a/pyfpdb/fpdb_db.py b/pyfpdb/fpdb_db.py index 986c747f..921829ef 100644 --- a/pyfpdb/fpdb_db.py +++ b/pyfpdb/fpdb_db.py @@ -162,7 +162,7 @@ class fpdb_db: #print "started fpdb_db.reconnect" self.disconnect(due_to_error) self.connect(self.backend, self.host, self.database, self.user, self.password) - + def get_backend_name(self): """Returns the name of the currently used backend""" if self.backend==2: @@ -178,5 +178,4 @@ class fpdb_db: def get_db_info(self): return (self.host, self.database, self.user, self.password) #end def get_db_info - #end class fpdb_db diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py index 878b64b2..4d384372 100644 --- a/pyfpdb/fpdb_import.py +++ b/pyfpdb/fpdb_import.py @@ -43,7 +43,13 @@ import Configuration import Exceptions import logging, logging.config -logging.config.fileConfig(os.path.join(sys.path[0],"logging.conf")) +import ConfigParser + +try: + logging.config.fileConfig(os.path.join(sys.path[0],"logging.conf")) +except ConfigParser.NoSectionError: # debian package path + logging.config.fileConfig('/usr/share/python-fpdb/logging.conf') + log = logging.getLogger('importer') # database interface modules diff --git a/pyfpdb/fpdb_save_to_db.py b/pyfpdb/fpdb_save_to_db.py new file mode 100644 index 00000000..3a7989ca --- /dev/null +++ b/pyfpdb/fpdb_save_to_db.py @@ -0,0 +1,127 @@ +#!/usr/bin/python + +#Copyright 2008 Steffen Jobbagy-Felso +#This program is free software: you can redistribute it and/or modify +#it under the terms of the GNU Affero General Public License as published by +#the Free Software Foundation, version 3 of the License. +# +#This program is distributed in the hope that it will be useful, +#but WITHOUT ANY WARRANTY; without even the implied warranty of +#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +#GNU General Public License for more details. +# +#You should have received a copy of the GNU Affero General Public License +#along with this program. If not, see . +#In the "official" distribution you can find the license in +#agpl-3.0.txt in the docs folder of the package. + +#This file contains methods to store hands into the db. decides to move this +#into a seperate file since its ugly, fairly long and just generally in the way. + +from time import time + +import fpdb_simple + +#stores a stud/razz hand into the database +def ring_stud(backend, db, cursor, base, category, site_hand_no, gametype_id, hand_start_time + ,names, player_ids, start_cashes, antes, card_values, card_suits, winnings, rakes + ,action_types, allIns, action_amounts, actionNos, hudImportData, maxSeats, tableName + ,seatNos): + fpdb_simple.fillCardArrays(len(names), base, category, card_values, card_suits) + + hands_id=fpdb_simple.storeHands(backend, db, cursor, site_hand_no, gametype_id + ,hand_start_time, names, tableName, maxSeats) + + #print "before calling store_hands_players_stud, antes:", antes + hands_players_ids=fpdb_simple.store_hands_players_stud(backend, db, cursor, hands_id, player_ids + ,start_cashes, antes, card_values + ,card_suits, winnings, rakes, seatNos) + + fpdb_simple.storeHudCache(cursor, base, category, gametype_id, player_ids, hudImportData) + + fpdb_simple.storeActions(cursor, hands_players_ids, action_types + ,allIns, action_amounts, actionNos) + return hands_id +#end def ring_stud + +def ring_holdem_omaha(backend, db, cursor, base, category, site_hand_no, gametype_id + ,hand_start_time, names, player_ids, start_cashes, positions, card_values + ,card_suits, board_values, board_suits, winnings, rakes, action_types, allIns + ,action_amounts, actionNos, hudImportData, maxSeats, tableName, seatNos): + """stores a holdem/omaha hand into the database""" + t0 = time() + fpdb_simple.fillCardArrays(len(names), base, category, card_values, card_suits) + t1 = time() + fpdb_simple.fill_board_cards(board_values, board_suits) + t2 = time() + + hands_id=fpdb_simple.storeHands(backend, db, cursor, site_hand_no, gametype_id + ,hand_start_time, names, tableName, maxSeats) + t3 = time() + hands_players_ids=fpdb_simple.store_hands_players_holdem_omaha( + backend, db, cursor, category, hands_id, player_ids, start_cashes + , positions, card_values, card_suits, winnings, rakes, seatNos) + t4 = time() + fpdb_simple.storeHudCache(cursor, base, category, gametype_id, player_ids, hudImportData) + t5 = time() + fpdb_simple.store_board_cards(cursor, hands_id, board_values, board_suits) + t6 = time() + fpdb_simple.storeActions(cursor, hands_players_ids, action_types, allIns, action_amounts, actionNos) + t7 = time() + print "cards=%4.3f board=%4.3f hands=%4.3f plyrs=%4.3f hudcache=%4.3f board=%4.3f actions=%4.3f" \ + % (t1-t0, t2-t1, t3-t2, t4-t3, t5-t4, t6-t5, t7-t6) + return hands_id +#end def ring_holdem_omaha + +def tourney_holdem_omaha(backend, db, cursor, base, category, siteTourneyNo, buyin, fee, knockout + ,entries, prizepool, tourney_start, payin_amounts, ranks, tourneyTypeId + ,siteId #end of tourney specific params + ,site_hand_no, gametype_id, hand_start_time, names, player_ids + ,start_cashes, positions, card_values, card_suits, board_values + ,board_suits, winnings, rakes, action_types, allIns, action_amounts + ,actionNos, hudImportData, maxSeats, tableName, seatNos): + """stores a tourney holdem/omaha hand into the database""" + fpdb_simple.fillCardArrays(len(names), base, category, card_values, card_suits) + fpdb_simple.fill_board_cards(board_values, board_suits) + + tourney_id=fpdb_simple.store_tourneys(cursor, tourneyTypeId, siteTourneyNo, entries, prizepool, tourney_start) + tourneys_players_ids=fpdb_simple.store_tourneys_players(cursor, tourney_id, player_ids, payin_amounts, ranks, winnings) + + hands_id=fpdb_simple.storeHands(backend, db, cursor, site_hand_no, gametype_id + ,hand_start_time, names, tableName, maxSeats) + + hands_players_ids=fpdb_simple.store_hands_players_holdem_omaha_tourney( + backend, db, cursor, category, hands_id, player_ids, start_cashes, positions + , card_values, card_suits, winnings, rakes, seatNos, tourneys_players_ids) + + fpdb_simple.storeHudCache(cursor, base, category, gametype_id, player_ids, hudImportData) + + fpdb_simple.store_board_cards(cursor, hands_id, board_values, board_suits) + + fpdb_simple.storeActions(cursor, hands_players_ids, action_types, allIns, action_amounts, actionNos) + return hands_id +#end def tourney_holdem_omaha + +def tourney_stud(backend, db, cursor, base, category, siteTourneyNo, buyin, fee, knockout, entries + ,prizepool, tourneyStartTime, payin_amounts, ranks, tourneyTypeId, siteId + ,siteHandNo, gametypeId, handStartTime, names, playerIds, startCashes, antes + ,cardValues, cardSuits, winnings, rakes, actionTypes, allIns, actionAmounts + ,actionNos, hudImportData, maxSeats, tableName, seatNos): +#stores a tourney stud/razz hand into the database + fpdb_simple.fillCardArrays(len(names), base, category, cardValues, cardSuits) + + tourney_id=fpdb_simple.store_tourneys(cursor, tourneyTypeId, siteTourneyNo, entries, prizepool, tourneyStartTime) + + tourneys_players_ids=fpdb_simple.store_tourneys_players(cursor, tourney_id, playerIds, payin_amounts, ranks, winnings) + + hands_id=fpdb_simple.storeHands(backend, db, cursor, siteHandNo, gametypeId, handStartTime, names, tableName, maxSeats) + + hands_players_ids=fpdb_simple.store_hands_players_stud_tourney(backend, db, cursor, hands_id + , playerIds, startCashes, antes, cardValues, cardSuits + , winnings, rakes, seatNos, tourneys_players_ids) + + fpdb_simple.storeHudCache(cursor, base, category, gametypeId, playerIds, hudImportData) + + fpdb_simple.storeActions(cursor, hands_players_ids, actionTypes, allIns, actionAmounts, actionNos) + return hands_id +#end def tourney_stud diff --git a/readme.txt b/readme.txt new file mode 100644 index 00000000..e69de29b diff --git a/regression-test/.directory b/regression-test/.directory new file mode 100644 index 00000000..d8ba36fb --- /dev/null +++ b/regression-test/.directory @@ -0,0 +1,5 @@ +[Dolphin] +Timestamp=2009,10,25,0,9,8 + +[Settings] +ShowDotFiles=true diff --git a/setup.py b/setup.py index 668693cf..0ba21bf0 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ from distutils.core import setup setup(name = 'fpdb', description = 'Free Poker Database', - version = '0.10.999', + version = '0.11.3', author = 'FPDB team', author_email = 'fpdb-main@lists.sourceforge.net', packages = ['fpdb'], @@ -13,5 +13,14 @@ setup(name = 'fpdb', data_files = [ ('/usr/share/doc/python-fpdb', ['docs/readme.txt', 'docs/release-notes.txt', - 'docs/tabledesign.html', 'THANKS.txt'])] + 'docs/tabledesign.html', 'THANKS.txt']), + ('/usr/share/pixmaps', + ['gfx/fpdb-icon.png']), + ('/usr/share/applications', + ['files/fpdb.desktop']), + ('/usr/share/python-fpdb', + ['pyfpdb/logging.conf', 'pyfpdb/Cards01.png', + 'pyfpdb/HUD_config.xml.example' + ]) + ] ) diff --git a/website/contact.php b/website/contact.php new file mode 100755 index 00000000..55d29da6 --- /dev/null +++ b/website/contact.php @@ -0,0 +1,29 @@ + + +
+ +

Contact

+ +

The best means of contact are on the sourceforge page: Use the bug, feature request or patch functions or just post in the forum. The forum requires a sourceforge account, but bug, feature request and patches don't seem to.

+

We also have a mailing list, to subscribe please click here. This is used for development purposes and you can also ask for help using the mailing list.

+

To be informed of fpdb updates please visit the sf download page and click on the little envelope with a plus sign in the line of the package that you want be informed off. For Windows user that will be both, Linux users should only subscribe to fpdb itself. This requires a sourceforge account, sorry.

+ +

Alternatively feel free to contact me directly:

+ +

mail: steffen(at)sycamoretest.info
+jabber/xmpp/Google Talk: steffen-laptop-temp(at)sycamoretest.info (don't email that)
+ICQ: 7806355
+MSN: steffen(at)sycamoretest.info

+ +
+ + diff --git a/website/default.conf b/website/default.conf new file mode 100644 index 00000000..dadf6290 --- /dev/null +++ b/website/default.conf @@ -0,0 +1,8 @@ +db-backend=2 +db-host=localhost +db-databaseName=fpdb +db-user=fpdb +db-password=enterYourPwHere +tv-combinedPostflop=True +bulkImport-defaultPath=default +tv-defaultPath=default diff --git a/website/docs-abreviations.php b/website/docs-abreviations.php new file mode 100755 index 00000000..0463f2be --- /dev/null +++ b/website/docs-abreviations.php @@ -0,0 +1,65 @@ + + +
+ +

Abreviations

+ +

HUD/table viewer
+================
+A3-7=3rd-7th street Complete/Raise percentage
+AF=Flop Bet/Raise percentage
+AT=River Bet/Raise percentage
+AR=Turn Bet/Raise percentage
+F3-7=3rd-7th street Fold percentage
+FF=Flop Fold percentage
+FR=River Fold percentage
+FT=Turn Fold percentage
+HD=Hands
+PF3B4B=Pre Flop 3Bet or 4Bet
+PFR=Pre Flop Raise
+Postf A=Postflop (ie. flop+turn+river) Aggression%
+Postf F=Postflop Fold %
+SD/F=Showdown/Flop=WtSD=How often player went to showdown when he saw the flop
+W$wsF=Won $ when he saw flop
+W$@SD=Won $ at showdown
+VPI3=Voluntary Put In on 3rd Street (ie. call+complete+raise)
+VPIP=Voluntary Put In Preflop (ie. call+raise)
+
+Other
+=====
+CLI=Command Line Interface (Shell, Terminal, "DOS-window")
+FTP=Full Tilt Poker
+GUI=Graphical User Interface (normal interface with buttons and menus)
+HUD=Heads-Up Display (shows stats directly in the poker software)
+PS=PokerStars
+MTT=Multi Table Tournament
+SnG=Sit and Go
+
+License
+=======
+Trademarks of third parties have been used under Fair Use or similar laws.
+
+Copyright 2008 Steffen Jobbagy-Felso
+Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License,
+Version 1.2 as published by the Free Software Foundation; with
+no Invariant Sections, no Front-Cover Texts, and with no Back-Cover
+Texts. A copy of the license can be found in fdl-1.2.txt
+
+The program itself is licensed under AGPLv3, see agpl-3.0.txt
+

+ +
+ + diff --git a/website/docs-benchmarks.php b/website/docs-benchmarks.php new file mode 100755 index 00000000..a3629827 --- /dev/null +++ b/website/docs-benchmarks.php @@ -0,0 +1,23 @@ + + +
+ +

Benchmarks

+ +

Check this page from time to time and they will come.

+ + +
+ + diff --git a/website/docs-git-instructions.php b/website/docs-git-instructions.php new file mode 100755 index 00000000..be2de79d --- /dev/null +++ b/website/docs-git-instructions.php @@ -0,0 +1,61 @@ + + +
+ +

Git Instructions

+ +

Hi, welcome to my minimal git guide for fpdb devs!
+You can use a git version just as user as well of course, but as there are generally hardly tested it is not advised.
+I'll expand this on request, if you have any questions just send me a mail at steffen(at)sycamoretest.info. There's also a bunch of instructions at http://www.assembla.com/spaces/fpdb/trac_git_tool

+ +

0. Getting it

+

To get git for gentoo just do emerge git -av
+To get it for Windows go to http://code.google.com/p/msysgit/downloads/list and install it. +

1. Cloning the fpdb git tree

+

Just create a new directory (lets say ~/fpdb/ ), go into it and type:
+git clone git://git.assembla.com/fpdb.git

+

2. Making your changes

+

You can use whatever you want to do edit the files. I personally use nedit and occassionally Eclipse.

+

3. Making a (local) commit

+

Unlike in svn you don't need to be online to make your commits. First we need to tell git what to commit, so go to the root of your fpdb directory and type:
+git-add--interactive
+Now press u and enter. It will display a list of all changed files. If you want to commit all files just press * and enter twice to return to the main menu. If you want to commit only certain ones press the number of the file and enter and repeat until you have all the files. Then press enter again to return to the main menu.
+If you added any new files press a and Enter, then type the number of your new file and press Enter twice. Press q to leave git-add--interactive.
+Now create a file for your commit message (I call it since_last_commit.txt) but don't add this to the repository. In the first line of this file put a summary of your changes. Then give some details of your changes, try to mention anything non-trivial and definitely any user-visible bug fixes.
+Then run this:
+git-commit -F since_last_commit.txt
+

4a. Pushing the changes to your own public git tree

+

Do this OR 4b, not both.
+todo

+

4b. Preparing changeset for emailing/uploading

+

Do this OR 4a, not both.
+todo

+

5. Pulling updates from the main tree

+

todo

+

License

+

Trademarks of third parties have been used under Fair Use or similar laws.
+
+Copyright 2008 Steffen Jobbagy-Felso
+Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License,
+Version 1.2 as published by the Free Software Foundation; with
+no Invariant Sections, no Front-Cover Texts, and with no Back-Cover
+Texts. A copy of the license can be found in fdl-1.2.txt
+
+The program itself is licensed under AGPLv3, see agpl-3.0.txt

+ + +
+ + diff --git a/website/docs-hudHowTo.php b/website/docs-hudHowTo.php new file mode 100755 index 00000000..cf501c44 --- /dev/null +++ b/website/docs-hudHowTo.php @@ -0,0 +1,169 @@ + + +
+ +

How To Use the HUD

+ +

3 September, 2008

+ +

fpdb version alpha 3

+ +

Initial Configuration

+ +

Install and configure the import/tracker program as detailed elsewhere. You should have this line in your default.conf file.

+ +imp-callFpdbHud=True + +

When you downloaded fpdb you got an example HUD configuration file named HUD_config.xml.

+ +

1. Open the subdirectory where you installed fpdb.

+ +

2. Make a backup copy of HUD_config.xml.

+ +

3. Check that the db_user and db_pass parameters are the ones you specified during database setup. This line is near the bottom of your config file and specifies the database parameters to be used.

+ +<database db_name="fpdb" db_server="mysql" db_ip="localhost" db_user="fpdb" db_pass="fpdb" db_type="fpdb"></database> + +

This should allow you to use the HUD with the stats and layout in the example configuration file.

+ +

Running the HUD

+ +

1. Open fpdb and select Auto Import from the menu. The fpdb main screen will change to show the autoimport dialog.

+ +Image of HUD + +

Check that the path is pointing to your hand history subdirectory, if it is not, then click the browse button and select it. ?You can also adjust the interval between imports. Smaller intervals will get your updated HUD data more often, but might cause lag. If you experience lag, increase the interval.

+ +

2. Click "Start Autoimport" to start the import. fpdb will automatically start the HUD. When the HUD starts it will open a HUD main window.

+ +Image of HUD + +

2. This window currently has no purpose other than providing a close button that will cause the HUD to exit.

+ +

3. Play a hand of poker (good luck). A few seconds after the completion of the hand the stat windows should overlay the poker client window.

+ +Image of HUD + +

You will also see a small main window for each table that has a HUD. Clicking the close button on that window will kill the HUD stat windows for that table. The stat windows will not go away automatically when you close the table.

+ + + +

4. Adjust the positions of the stat windows. By default, the stat windows are created without decorations (title bar, border, etc.). Double clicking on a stat will add the decorations to that stat window. You can then use the title bar to move the window and double click again to make the decorations disappear.

+ + + + + +

5. So play some poker: raise, bet, float, get all-in. You can find out what each stat is by hovering the mouse over the stat and looking at the tool tip. The tool tip also has the name of the player that the stat corresponds to, so it is useful in figuring out which stat window goes where if your windows are not in the right place. You can also get a pop up window with additional stats by single clicking on a stat.

+ + + +

These windows do not automatically update when a new hand is imported, but they can be moved around the same way the stat window are moved. Single clicking anywhere on the popup will make it disappear.

+ +

Configuring Stat Layouts

+ +

OK, back to the HUD_config.xml file--saving a backup would be a good idea. Before you ask, yes, there will be a neat configuration function in the HUD, to make this quicker and easier. We thought you would prefer to have the HUD now rather than wait for us to write the configuration code.

+ +

1. Open your HUD_config.xml file in you text editor and scroll down to site entry for the layout you want to configure. For example, if you want to change a layout for Pokerstars, find the line that starts like this.

+ +<site site_name="PokerStars" ... + +

Below that line you will find several blocks of lines defining the stat layouts for tables with the various numbers of seats. For example the layout for 6-seated tables looks like this:

+ +<layout max="6" width="792" height="546" fav_seat="0>
+<location seat="1" x="681" y="119"> </location>
+<location seat="2" x="681" y="301"> </location>
+<location seat="3" x="487" y="369"> </location>
+<location seat="4" x="226" y="369"> </location>
+<location seat="5" x="0" y="301"> </location>
+<location seat="6" x="0" y="119"> </location>
+</layout> + +

The first line of this layout specifies that it is for a 6-max (max="6") table that has been sized to 792 x 546 (width="792" height="546"). The fav_seat parameter is not used at this time.

+ +

The next 6 lines specify where the stat windows are placed on the poker client window. The x and y positions are measured from the inside upper left of the poker client window. That is x = 0, y = 0 would be the first usable pixel to the right of the window border and below the title bar.

+ +

So if you are using the layout in the example above and decide that the stat window for seat 3 is being place 9 pixels too high, you would change the line for seat="3" to be:

+ +<location seat="3" x="487" y="378"> </location> + +

If you use smaller or larger client windows you should correct the width and height parameters so that they are up-to-date when automatic resizing is implemented.

+ +

Configuring the Stats Shown in the stat windows

+ +

The definition of the stat window stats is in the "supported games" paragraph of the HUD_config.xml file. For example:

+ +<game game_name="studhilo" db="fpdb" rows="2" cols="3">
+<stat row="0" col="0" stat_name="vpip" tip="tip1" click="tog_decorate" popup="default"> </stat>
+<stat row="0" col="1" stat_name="pfr" tip="tip1" click="tog_decorate" popup="default"> </stat>
+<stat row="0" col="2" stat_name="ffreq_1" tip="tip1" click="tog_decorate" popup="default"> </stat>
+<stat row="1" col="0" stat_name="n" tip="tip1" click="tog_decorate" popup="default"> </stat>
+<stat row="1" col="1" stat_name="wtsd" tip="tip1" click="tog_decorate" popup="default"> </stat>
+<stat row="1" col="2" stat_name="wmsd" tip="tip1" click="tog_decorate" popup="default"> </stat>
+</game> + +

The first line specifies the game that this stat paragraph is used for (game = "studhilo") and the number of rows and columns in the stat window. In this case we have specified 2 rows and 3 columns so we can have 2x3 = 6 stats. Rows and columns are numbered from 0, so the 3 columns are numbered 0, 1, and 2.

+ +

The subsequent lines in the stat paragraph specify which stats are displayed in the various parts of the window. In this example, vpip is displayed in col 0, row 0.

+ +

So to create stat windows with 4 columns of 2 rows you would change the cols parameter in the first line to cols = "4" and add 2 additional rows to specify the stats for row 2, col 3 and row 1, col 3.

+ +

The click and tip parameters in this paragraph are not currently used. The popup parameter is explained in the next section.

+ +

Configuring Popup Windows

+ +

Each stat location can display a different popup window when clicked. In the example just above, each of the stats has the "default" popup specified. You can see the definition of the default popup by scrolling farther down in your config file. It should look like this.

+ +<popup_windows>
+<pu pu_name="default">
+<pu_stat pu_stat_name = "n"> </pu_stat>
+<pu_stat pu_stat_name = "vpip"> </pu_stat>
+<pu_stat pu_stat_name = "pfr"> </pu_stat>
+...
+<pu_stat pu_stat_name = "ffreq_4"> </pu_stat>
+</pu>
+</popup_windows> + +

You can create a new popup by making a new pu elelment, with a new name and a new list of stats. You then specify that popup name in the popup parameter in one or more of your stats.

+ +

Currently Supported Stats

+ +
+
a_freq_1
Flop/4th aggression frequency.
+
a_freq_2
Turn/5th aggression frequency.
+
a_freq_3
River/6th aggression frequency.
+
a_freq_4
7th street aggression frequency.
+
cb_1
Flop continuation bet.
+
cb_2
Turn continuation bet.
+
cb_3
River continuation bet.
+
cb_4
7th street continuation bet.
+
f_BB_steal
Folded BB to steal.
+
f_SB_steal
Folded SB to steal.
+
ffreq_1
Flop/4th fold frequency.
+
ffreq_2
Turn/5th fold frequency.
+
ffreq_3
River/6th fold frequency.
+
ffreq_4
7th fold frequency.
+
n
Number of hands played.
+
pfr
Preflop (3rd street) raise.
+
saw_f
Saw flop/4th.
+
steal
Steal %.
+
three_B_0
Three bet preflop/3rd.
+
vpip
Voluntarily put $ in the pot.
+
wmsd
Won $ at showdown.
+
wtsd
Went to SD when saw flop/4th.
+
WMsF
Won $ when saw flop/4th.
+
+ + + \ No newline at end of file diff --git a/website/docs-install-gentoo.php b/website/docs-install-gentoo.php new file mode 100755 index 00000000..43d2f02b --- /dev/null +++ b/website/docs-install-gentoo.php @@ -0,0 +1,85 @@ + + +
+ +

Installing in Gentoo Linux

+ +

Last checked: 3 Aug 2008, git99

+ +These instructions are for Gentoo GNU/Linux, but if you adapt the steps installing and starting stuff it should work on any other OS as well.

+ +1. Install everything. Check if anything is already installed and if it is remove it from the command.

+ +For mysql:
+emerge mysql mysql-python pygtk -av
+/etc/init.d/mysql start
+rc-update add mysql default

+ +For postgresql:
+emerge postgresql pygresql pygtk
+/etc/init.d/postgresql start
+rc-update add postgresql default
+ +

+2. Manual configuration steps
+
+emerge --config mysql
+The --config step will ask you for the mysql root user - set this securely, we will create a seperate account for fpdb
+

+3. Create a mysql user and a database
+Now open a shell (aka command prompt aka DOS window):
+Click Start, then Run. In the opening window type "cmd" (without the inverted commas) and then click OK. A windows with a black background should open.

+ +Type (replacing yourPassword with the root password for MySQL you specified during installation):
+mysql --user=root --password=yourPassword

+ +It should say something like this:
+Welcome to the MySQL monitor. Commands end with ; or \g.
+Your MySQL connection id is 4
+Server version: 5.0.60-log Gentoo Linux mysql-5.0.60-r1
+
+Type 'help;' or '\h' for help. Type '\c' to clear the buffer.
+
+mysql>
+
+Now create the actual database. The default name is fpdb, I recommend you keep it. Type this:
+CREATE DATABASE fpdb;
+ +Next you need to create a user. I recommend you use the default fpdb. Type this (replacing newPassword with the password you want the fpdb user to have - this can, but for security shouldn't, be the same as the root mysql password):
+GRANT ALL PRIVILEGES ON fpdb.* TO 'fpdb'@'localhost' IDENTIFIED BY 'newPassword' WITH GRANT OPTION;

+ +Copy the .conf file from this directory to ~/.fpdb/profiles/default.conf and edit it according to what you configured just now, in particular you will definitely have to put in the password you configured. I know this is insecure, will fix it before stable release.
+
+4. Guided installation steps
+Run the GUI as described in readme-user and click the menu database -> recreate tables
+
+That's it! Now see readme-user.txt for usage instructions.
+
+License
+=======
+Trademarks of third parties have been used under Fair Use or similar laws.
+
+Copyright 2008 Steffen Jobbagy-Felso
+Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License,
+Version 1.2 as published by the Free Software Foundation; with
+no Invariant Sections, no Front-Cover Texts, and with no Back-Cover
+Texts. A copy of the license can be found in fdl-1.2.txt
+
+The program itself is licensed under AGPLv3, see agpl-3.0.txt

+ + +
+ + diff --git a/website/docs-install-windows.php b/website/docs-install-windows.php new file mode 100755 index 00000000..341e2f15 --- /dev/null +++ b/website/docs-install-windows.php @@ -0,0 +1,208 @@ + + +
+ +

Before You Begin

+

Most people should install using the Installer. These instructions have not been updated recently, but can serve as a guide to someone who knows what he is doing. Unless you have a special reason for installing manually, you really should be using the installer.

+ +

Vista Users

+

The installer does not install mysql properly on Microsoft Vista installations, due to the UAC. You should first install mysql using this how to (pdf). Then run the installer. The installer will detect the mysql installation and not reintstall.

+ +

Installing in Windows

+ +
+

These instructions were made with Windows XP. They should also work with Windows NT / 2000 / 2003 and 2008. Please report any differences to gmic at users.sourceforge.net. +

If you're still using Win3/95/98/ME then you should switch to GNU/Linux, *BSD or WinXP.

+ +
+windows install guide screenshot +

1. Click here to open the MySQL Download Page. Click on the "No, thanks..." link to see the download links for the MySQL installer.

+
+ +
+windows install guide screenshot +

2. Click on one of the HTTP or FTP download links to download the zip file (mysql-5.0.67-win32.zip).

+
+ +
+windows install guide screenshot +

3. Unzip the setup file to a folder of your choice and double-click on it. On the welcome screen click "Next".

+
+ +
+windows install guide screenshot +

4. As the setup type "Typical" should be selected. Then click "Next". On the following screen click "Install" and installation will begin.

+
+ +
+windows install guide screenshot +

5. Before the installation ends an ad for MySQL Enterprise edition will appear. Just click "Next" two times.

+
+ +
+windows install guide screenshot +

6. Now make sure that "Configure the MySQL Server now" is checked and click "Finish".

+
+ +
+windows install guide screenshot +

7. You are now looking at the MySQL Configuration Wizard. Click "Next".

+
+ +
+windows install guide screenshot +

8. Make sure "Detailed Configuration" is selected. Then click "Next. Now "Developer machine" should be selected. Click "Next".

+
+ +
+windows install guide screenshot +

9. On this screen "Multifunctional Database should be selected. Click "Next". On the next screen (InnoDB Tablespace) just click "Next".

+
+ +
+windows install guide screenshot +

10. Now "Decision Support" should be selected. Click "Next". Now make sure "Enable TCP/IP Networking" IS selected. Then click "Next".

+
+ +
+windows install guide screenshot +

11. Here "Standard Character Set" should be selected. Click "Next". Now make sure "Install As Windows Service" is selected.

+
+ +
+windows install guide screenshot +

12. Now choose a root password. This will NOT be the password for your poker database. Click "Next".

+
+ +
+windows install guide screenshot +

13. On this last screen of the Configuration Wizard just click "Execute." A few success messages will appear. Click "Finish".

+
+ +
+windows install guide screenshot +

14. Now click the Windows Start Button and then click "Run". Click into the white space of the new window, type cmd and hit ENTER.

+
+ +
+windows install guide screenshot +

15. In the newly appeared console window type cd "%PROGRAMFILES%\MySQL\MySQL Server 5.0\bin" and hit ENTER.

+
+ +
+windows install guide screenshot +

16. Type mysql --user=root --password=yourPassword and hit ENTER (replace yourPassword with your chosen root password).

+
+ +
+windows install guide screenshot +

17. A few lines followed by mysql> will appear. This is the MySQL command prompt.

+
+ +
+windows install guide screenshot +

18. We will now create your poker database. Type CREATE DATABASE fpdb; and hit ENTER. "Query OK" says we were successful.

+
+ +
+windows install guide screenshot +

19. Type the following, replace newPassword with a password of your choice and hit ENTER:

+

GRANT ALL PRIVILEGES ON fpdb.* TO 'fpdb'@'localhost' IDENTIFIED BY 'newPassword' WITH GRANT OPTION;

+
+ +
+windows install guide screenshot +

20. Again it says "Query OK". Type exit and hit ENTER to exit the MySQL prompt. Leave this window open. We will need it later.

+
+ +
+windows install guide screenshot +

21. Click here, save the file python-2.5.2.msi where you want and double-click on it. In case of a warning window click "Execute".

+
+ +
+windows install guide screenshot +

22.Click "Next" three times. Python will install. Then click finish.

+
+ +
+windows install guide screenshot +

23. Click here, save MySQL-python-1.2.2.win32-py2.5.exe to a folder of your choice and double click it. In case of a warning window click "Execute". Click "Next" three times. The Python API for MySQL will install. Click "Finish".

+
+ +
+windows install guide screenshot +

24. In the console window (which we left open) now type: mkdir c:\gtk and hit ENTER. Leave the window open again, we'll need it.

+

Now click here and save the gtk zip file gtk+-bundle-2.12.11.zip to a folder of your choice. Unzip its contents to C:\gtk

+
+ +
+windows install guide screenshot +

25. Now right-click "My Computer" (on your Desktop) and click on "Properties". Now click on the tab "Advanced".

+
+ +
+windows install guide screenshot +

26. Click the button "Environ Variables". In the lower list of the new window click on "Path" (possibly you need to scroll).

+
+ +
+windows install guide screenshot +

27.Now click on the"Edit" button and a new window will pop up. To the value of the variable append ;C:\gtk\bin Click Ok three times.

+
+ +
+windows install guide screenshot +

28. Click here, save the file pycairo-1.4.12-1.win32-py2.5.exe to a folder of your choice and double click on it. In case of a warning window click "Execute". Now click "Next" three times. The pycairo graphics library API for Python will install. Click "Finish".

+
+ +
+windows install guide screenshot +

29. Click here, save the file pygobject-2.14.1-1.win32-py2.5.exe to a folder of your choice and double click on it. In case of a warning click "Execute". Now click "Next" three times. The Python Gobject API will install. Click "Finish".

+
+ +
+windows install guide screenshot +

30. Click here, save the file pygtk-2.12.1-2.win32-py2.5.exe to a folder of your choice and double click on it. In case of a warning click "Execute". Now click "Next" three times. The Python API for Gtk+ will install. Click "Finish".

+
+ +
windows install guide screenshot +

31. In the console window now type: mkdir "%homepath%\Application Data\fpdb" and hit ENTER. Copy the file "default.conf" from the docs folder of your fpdb git to the directory C:\%homepath%\Application Data\fpdb\.

+
+ +
+windows install guide screenshot +

32. Now open the file "default.conf" in WordPad (Start > Programs > Accessoirs > WordPad) and replace the password in the dbpassword line with your chosen password for the fpdb user.

+
+ +
+windows install guide screenshot +

33. Now start FPDB by double-clicking on the file fpdb.py in the folder fpdb. A console window should open up and shortly thereafter the fpdb application window should be visible. Click on the menu "Database" and select "Create or Recreate Tables".

+
+

Congratulations! Your fpdb installation is complete! Now you can use the bulk importer to import your hands into fpdb. +

+
+ +

A word on privelege separation: fpdb should not require root/Administrator rights to run. If it does it is a bug or serious misconfiguration, please let us know.

+

License

+

Trademarks of third parties have been used under Fair Use or similar laws.

+

Copyright 2008 Steffen Jobbagy-Felso

+

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 as published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and with no Back-Cover Texts. A copy of the license can be found in fdl-1.2.txt. The program itself is licensed under AGPLv3, see agpl-3.0.txt

+ + + + + diff --git a/website/docs-overview.php b/website/docs-overview.php new file mode 100755 index 00000000..3d2781d2 --- /dev/null +++ b/website/docs-overview.php @@ -0,0 +1,84 @@ + + +
+ +

Overview

+

+Summary
+=======
+A database program to track your online poker games, the behaviour of the other players and your winnings/losses. Supports Holdem, Omaha, Stud and Razz for cash games as well as SnG and MTT tournaments with more possibly coming in the future. Some of this is not yet working though, please see status.txt and known-bugs-and-planned-features.txt
+
+But you could send all my hand histories to yourself!
+=====================================================
+At the end of the day this comes down to a question of trust, but unlike Windows and the poker client software you don't have to trust fpdb blindly. You can:
+- Verify the source code yourself.
+- Convince or pay someone to verify the source code for you.
+- Use a personal firewall to completely block fpdb from the Internet
+- (for the uber-paranoid) Get yourself the free virtualisation software VirtualBox, set up a VM (virtual machine) to run fpdb but run the poker software on your real PC. Then cut the VM off the Internet, fpdb doesn't need it. If you have a PC made in the last few years this should run fast enough as well. Note that most Windows licenses do NOT permit you to use two Windows installations at once, even if they are on the same PC.
+
+Requirements
+============
+Software requirements are listed in requirements.txt
+As for hardware, my main test machine is a Pentium 3-M 800 with 256 RAM and Gentoo GNU/Linux
+(running the poker client through what most people will call emulation). So this
+program will have to work on that. If you run an even more ancient machine and
+its too slow let me know and I'll see what I can do :)
+
+Why Free Software?
+==================
+This program is released under the terms of the free/libre software license AGPL3 as released by the FSF. The AGPL3 protects your rights and those of the wider community. As Richard Stallman, one of the founders of the free software movement, put it: "Free software is a matter of liberty, not price. To understand the concept, you should think of free as in free speech, not as in free beer." (well, it is both really, like the right to vote used to be free)
+
+For example, a "pirated" copy of proprietary software X is free of charge, but you don't actually have a legal right to use it, you don't have any possibility to fix its bugs and you certainly don't have any legal right to share it with your friends. You also won't be able to get support, often not even security fixes. Actually, even if you pay hundreds of pounds for your program they deny your right to fix their errors for them. Imagine buying a car where you're not permitted (under threat of jail) to replace broken parts..
+
+With free/libre software (also known as open source software, or short FOSS or FLOSS) on the other hand you get all these freedoms:
+(note: the legally binding terms are in the license text, this is merely an amateur summary so normal people don't have to read pages of legalese)
+
+Freedom 0: The freedom to use: To run the program, for any purpose. Free of Charge.
+Freedom 1: The freedom to study and help yourself. This freedom guarantees your right to study and learn from the source code of the program, and to fix it if it is broken. If you're not a programmer yourself the developers will generally be happy to fix it for you, often even for free. Failing that you can always pay someone from the money you saved on not having to pay for it.
+Freedom 2: The freedom to be a decent human being and help your neighbour: I don't threaten you with lawsuits or jail time if you share with your friends and neighbours, subject to the very modest restrictions of the AGPL3.
+Freedom 3: The freedom to improve the program and release your improvements to the public (or parts thereof) so that the whole community benefits. Note that you are PERMITTED, but not REQUIRED to distribute your changes. If you do distribute your changes you must do so under the terms of the AGPL3 however.
+
+Note that this is the license - I retain full copyright over my code, including the right to change the license for future versions. I do not intend to do this however. In any case, any version I released under AGPL3 remains available under that license forever, or more accurately until my copyright expires at which point it goes into the public domain.
+
+I reject the concept of software patents as a crime and under the European Patent Agreement software patents - even if you mislabel them as "computer-implemented inventions" or whatever - are explicitly prohibited.
+
+Can I get/use this under a different license?
+=============================================
+The short answer: Maybe.
+The long one: As detailed, I fully support what the FSF does and aims to achieve with the GPL. However, I realise that many free software developers don't object to closed source, some don't even object to closed source profiteering of their charity, and I don't think I have any right to go and tell them they're wrong.
+So if anyone wishes to use all or part of my code in another free software/open source project with an AGPL3-incompatible license such as BSD then let me know and we'll figure out a solution that makes everyone happy.
+If you wish to use all or part of this in closed source let me know how much if anything that is worth to you and I'm sure we'll be able to reach an agreement. Note that you are NOT permitted to just use fpdb code in closed source development whether in-house or by an independent software developer, you will NEED an additionally agreement with me to get fpdb under different licensing conditions.
+
+
+License of this Document
+========================
+The views expressed in this document are those of Steffen Jobbagy-Felso, other members of the fpdb team and external contributors may or may not agree.
+
+Trademarks of third parties have been used under Fair Use or similar laws.
+
+Copyright 2008 Steffen Jobbagy-Felso
+Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License,
+Version 1.2 as published by the Free Software Foundation; with
+no Invariant Sections, no Front-Cover Texts, and with no Back-Cover
+Texts. A copy of the license can be found in fdl-1.2.txt
+
+The program itself is licensed under AGPLv3, see agpl-3.0.txt
+

+ + + +
+ + diff --git a/website/docs-requirements.php b/website/docs-requirements.php new file mode 100755 index 00000000..166424af --- /dev/null +++ b/website/docs-requirements.php @@ -0,0 +1,170 @@ + + +
+ +

Requirements

+

+I recommend using a free/libre operating system, meaning a GNU/Linux distribution or a BSD variant (e.g. Gentoo GNU/Linux or OpenBSD) for ethical and practical reasons. Would you buy a car where you're prohibited from opening the bonnet under threat of jail? If the answer is no you should by the same logic not use closed source software for real money Poker :)
+
+Unfortunately you will always need one piece of unfree software: The poker client itself. Although not a direct dependency of fpdb you obviously will have a hard time putting this to productive use without running some poker client. As far as I know, only unfree clients are available. If you know better please let me know!
+
+If you can be bothered please do contact your poker site(s) and ask them to release free/libre clients, even if it is only for Windows. But lets be realistic, the chance of a positive answer is very low. Also, even unfree Linux client would of course be a great step forward
+
+In Windows use of the environment installer is recommended, pls see our sf download page. For Gentoo Linux we have an ebuild and for Ubuntu Linux we have (partial) instructions. If you use a different Linux or a BSD and have trouble please IM, email or post in the forums. Fpdb has been reported to work on MacOSX, but installation of the requirements is relatively painful. Any instructions for people to use would be much appreciated.
+
+Make new entries in this format:
+Program Name
+a. Optional?
+b. Required Version and Why
+c. Project Webpage
+d. License

+

Database backend - MySQL

+

These two are required if you want to use MySQL as backend, which is the recommended choice due to lack of testing and polish of PostgreSQL support.

+

MySQL
+a. Optional?
+ Choose MySQL or PostgreSQL
+b. Required Version and Why
+ At least 3.23 required due to mysql-python.
+ I use 5.0.54 and 5.0.60-r1 (GNU/Linux) and 5.0.51b (Windows).
+c. Project Webpage
+ http://www.mysql.com
+d. License
+ GPL2
+
+mysql-python
+a. Optional?
+ Required if you want to use MySQL backend
+b. Required Version and Why
+ I use 1.2.2 but I am not aware of any incompatibilities with older or newer versions, pls report success/failure.
+c. Project Webpage
+ http://sourceforge.net/projects/mysql-python/
+d. License
+ SF lists GNU General Public License (GPL), Python License (CNRI Python License), Zope Public License.
+ Project states GPL without version in Pkg-info.

+ +

Database backend - PostgreSQL

+

These two are required if you want to use PostgreSQL as backend

+

PostgreSQL
+a. Optional?
+ Choose MySQL or PostgreSQL
+b. Required Version and Why
+ I use 8.0.15 (GNU/Linux) and 8.3.3 (Windows) but I am not aware of any incompatibilities
+ with older or newer versions, pls report success/failure.
+c. Project Webpage
+ http://www.postgresql.org
+d. License
+ BSD License
+
+psycopg
+a. Optional?
+ Required if you want to use PostgreSQL backend
+b. Required Version and Why
+ I use 2.0.2 but I am not aware of any incompatibilities with older or newer versions, pls report success/failure.
+c. Project Webpage
+ http://initd.org/projects/psycopg2
+d. License
+ GPL2 according to Gentoo's ebuilds
+
+

Required for everyone

+

Python
+a. Optional?
+ Required.
+b. Required Version and Why
+ I use 2.4.4 and 2.5.2 but I am not aware of any incompatibilities with older or newer versions, pls report success/failure.
+c. Project Webpage
+ http://www.python.org
+d. License
+ Python License
+
+

GTK+ and dependencies
+a. Optional?
+ Required.
+b. Required Version and Why
+ I use 2.12.9 but it should run with 2.10 or higher. That is needed as I used MessageDialog updates
+c. Project Webpage
+ Main: http://www.gtk.org/
+ API spec: http://library.gnome.org/devel/gtk/2.12/
+ Windows DLs (get the bundle unless you know what you're doing): http://www.gtk.org/download-windows.html
+d. License
+ LGPL2
+
+PyCairo
+a. Optional?
+ Required.
+b. Required Version and Why
+ ?
+c. Project Webpage
+ main: http://www.pygtk.org
+d. License
+ LGPL2.1
+
+PyGObject
+a. Optional?
+ Required.
+b. Required Version and Why
+ ?
+c. Project Webpage
+ main: http://www.pygtk.org
+d. License
+ LGPL2.1
+
+PyGTK
+a. Optional?
+ Required.
+b. Required Version and Why
+ ?
+c. Project Webpage
+ main: http://www.pygtk.org
+d. License
+ LGPL2.1

+

Requirements for the graphing function

+

These are only required if you wish to use the graphing function, and fpdb will otherwise function without them

+

Numpy
+a. Optional?
+ Optional.
+b. Required Version and Why
+ I use 1.0.4 but I am not aware of any incompatibilities with older or newer versions, pls report success/failure.
+c. Project Webpage
+ http://numeric.scipy.org/
+d. License
+ BSD according to Gentoo's ebuild
+
+matplotlib
+a. Optional?
+ Optional.
+b. Required Version and Why
+ I use 0.91.2 but I am not aware of any incompatibilities with older or newer versions, pls report success/failure.
+c. Project Webpage
+ http://matplotlib.sourceforge.net/
+d. License
+ BSD according to Gentoo's ebuild

+ +License (of this file)
+=======
+Trademarks of third parties have been used under Fair Use or similar laws.
+
+Copyright 2008 Steffen Jobbagy-Felso
+Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License,
+Version 1.2 as published by the Free Software Foundation; with
+no Invariant Sections, no Front-Cover Texts, and with no Back-Cover
+Texts. A copy of the license can be found in fdl-1.2.txt
+
+The program itself is licensed under AGPLv3, see agpl-3.0.txt

+ + + +
+ + diff --git a/website/docs-usage.php b/website/docs-usage.php new file mode 100755 index 00000000..a9132f2c --- /dev/null +++ b/website/docs-usage.php @@ -0,0 +1,64 @@ + + +
+ +

Usage instructions

+ +

Before you do this make sure you setup the dependencies, the database, user, tables and config file.
+
+Running it
+==========
+If you have python setup properly you can execute it by double clicking pyfpdb/fpdb.py.
+
+Note however that all error messages are currently only printed if you call it from a shell. It'll be much easier to diagnose possible problems (which are likely in alpha stage) if you run it from a shell. In Windows XP it seems to automatically open a shell window with the fpdb window where you can see the command line output.
+
+In Linux/MacOS/*BSD, e.g. if its in /home/sycamore/fpdb/, do this:
+cd /home/sycamore/fpdb/pyfpdb
+python fpdb.py
+
+That will start the main GUI.
+
+Have a look at the menus, the stuff that is marked todo is not yet implemented.
+
+The main things are the bulk importer and the table viewer. To use the importer open it from the menu (import files and directories). You can set a few options at the bottom, then select a folder or single file in the main are and click Import. Please report any errors by one of the contacts listed in readme-overview.txt.
+Currently this will block the interface, but you can open another instance of this program e.g. if you wanna play whilst a big import is running.
+
+Please check the output at the shell for errors, if there are any please get in touch by one of the methods listed in readme-overview.txt
+
+Table Viewer (tv)
+=================v +To use the table viewer open it from the menu, select the hand history file of the table you're at, and click the Import&Read&Refresh button. The abbreviations there are explained in abbreviations.txt, but feel free to ask. Note that most poker software will only create the file once the first hand you payed to play is finished.
+In each column there is either just the number (hand count for current stake, range of seats and type of game) or a percentage and the number of hands that this percentage is based on. For example, in W$@SD (won $ at shodown) the number in brackets is how many showdowns that player has seen.
+
+Reimporting
+===========
+Currently on most updates a reimport of the whole database is required. To do this open fpdb, click the menu Database and select Create/Recreate tables. Then import all your history files again.
+
+License
+======= +Trademarks of third parties have been used under Fair Use or similar laws.
+
+Copyright 2008 Steffen Jobbagy-Felso
+Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License,
+Version 1.2 as published by the Free Software Foundation; with
+no Invariant Sections, no Front-Cover Texts, and with no Back-Cover
+Texts. A copy of the license can be found in fdl-1.2.txt
+
+The program itself is licensed under AGPLv3, see agpl-3.0.txt

+ + +
+ + diff --git a/website/docs.php b/website/docs.php new file mode 100755 index 00000000..d0749d68 --- /dev/null +++ b/website/docs.php @@ -0,0 +1,37 @@ + + +
+ +

Documentation

+ + + + + + + +
+ + diff --git a/website/features.php b/website/features.php new file mode 100755 index 00000000..e1df9f1e --- /dev/null +++ b/website/features.php @@ -0,0 +1,47 @@ + + +
+ +

Features

+ +

Backend, Distribution
+=====================
+- Choice of MySQL/InnoDB or PostgreSQL. (not tested on PostgreSQL)
+- It is possible to run the database on one PC, the importer on another, and then access the database with the table viewer or HUD from a third PC. (note: do NOT do this unencrypted over an untrusted network like your employer's LAN or the Internet!)
+
+Site/Game Support
+=================
+- Initially only full support for PS, FTP coming soon
+- Supports Holdem, Omaha Hi and Omaha Hi/Lo. Stud and Razz coming soon.
+ +- Supports No Limit, Pot Limit, Fixed Limit NL, Cap NL and Cap PL
+ Note that currently it does not display extra stats for NL/PL so usefulness is limited for these limit types. Suggestions welcome, I don't play these.
+- Supports ring/cash games, SnG/MTT coming soon
+
+Tableviewer (tv)
+===========
+Tv takes a history filename and loads the appropriate players' stats and displays them in a tabular format. These stats currently are:
+ - VPIP, PFR and Preflop 3B/4B (3B/4B is not quite correct I think)
+ + - Raise and Fold % on flop, turn and river. Fold only counts hands when someone raised. This can be displayed per street or as one combined value each for aggression and folding.
+ - Number of hands this is based on.
+ - SD/F (aka WtSD, proportion of hands where player went to showdown after seeing flop)
+ - W$wSF (Won $ when seen Flop)
+ - W$@SD (Won $ at showdown)
+ For all stats it also displays how many hands this particular is based on

+ + +
+ + diff --git a/website/footer.php b/website/footer.php new file mode 100755 index 00000000..abe37b45 --- /dev/null +++ b/website/footer.php @@ -0,0 +1 @@ + diff --git a/website/fpdb.png b/website/fpdb.png new file mode 100644 index 00000000..24de1545 Binary files /dev/null and b/website/fpdb.png differ diff --git a/website/header.php b/website/header.php new file mode 100755 index 00000000..df88b6cb --- /dev/null +++ b/website/header.php @@ -0,0 +1,17 @@ + + + + + + + fpdb - The free poker database - <?php echo ($PAGE_TITLE) ?> + + + + + + + + diff --git a/website/img/00.mySqlWebsite1.jpg b/website/img/00.mySqlWebsite1.jpg new file mode 100644 index 00000000..2b83b68a Binary files /dev/null and b/website/img/00.mySqlWebsite1.jpg differ diff --git a/website/img/01.mySqlWebsite2.jpg b/website/img/01.mySqlWebsite2.jpg new file mode 100644 index 00000000..458a9e90 Binary files /dev/null and b/website/img/01.mySqlWebsite2.jpg differ diff --git a/website/img/02.mySqlSetup1.jpg b/website/img/02.mySqlSetup1.jpg new file mode 100644 index 00000000..f98a8e0a Binary files /dev/null and b/website/img/02.mySqlSetup1.jpg differ diff --git a/website/img/03.mySqlSetup3.jpg b/website/img/03.mySqlSetup3.jpg new file mode 100644 index 00000000..295306f3 Binary files /dev/null and b/website/img/03.mySqlSetup3.jpg differ diff --git a/website/img/04.mySqlSetup5.jpg b/website/img/04.mySqlSetup5.jpg new file mode 100644 index 00000000..a236687c Binary files /dev/null and b/website/img/04.mySqlSetup5.jpg differ diff --git a/website/img/05.mySqlSetup7.jpg b/website/img/05.mySqlSetup7.jpg new file mode 100644 index 00000000..17db5ea5 Binary files /dev/null and b/website/img/05.mySqlSetup7.jpg differ diff --git a/website/img/06.mySqlConfig1.jpg b/website/img/06.mySqlConfig1.jpg new file mode 100644 index 00000000..eaa02523 Binary files /dev/null and b/website/img/06.mySqlConfig1.jpg differ diff --git a/website/img/07.mySqlConfig2.jpg b/website/img/07.mySqlConfig2.jpg new file mode 100644 index 00000000..5ee23448 Binary files /dev/null and b/website/img/07.mySqlConfig2.jpg differ diff --git a/website/img/08.mySqlConfig4.jpg b/website/img/08.mySqlConfig4.jpg new file mode 100644 index 00000000..36a0aaea Binary files /dev/null and b/website/img/08.mySqlConfig4.jpg differ diff --git a/website/img/09.mySqlConfig7.jpg b/website/img/09.mySqlConfig7.jpg new file mode 100644 index 00000000..ae39d7dc Binary files /dev/null and b/website/img/09.mySqlConfig7.jpg differ diff --git a/website/img/10.mySqlConfig8.jpg b/website/img/10.mySqlConfig8.jpg new file mode 100644 index 00000000..5fe1dae1 Binary files /dev/null and b/website/img/10.mySqlConfig8.jpg differ diff --git a/website/img/11.mySqlConfig10.jpg b/website/img/11.mySqlConfig10.jpg new file mode 100644 index 00000000..7bd1066c Binary files /dev/null and b/website/img/11.mySqlConfig10.jpg differ diff --git a/website/img/12.mySqlConfig11.jpg b/website/img/12.mySqlConfig11.jpg new file mode 100644 index 00000000..74ed5781 Binary files /dev/null and b/website/img/12.mySqlConfig11.jpg differ diff --git a/website/img/13.run.jpg b/website/img/13.run.jpg new file mode 100644 index 00000000..71f66ee4 Binary files /dev/null and b/website/img/13.run.jpg differ diff --git a/website/img/14.shellCdToMySql.jpg b/website/img/14.shellCdToMySql.jpg new file mode 100644 index 00000000..6c0b104f Binary files /dev/null and b/website/img/14.shellCdToMySql.jpg differ diff --git a/website/img/15.shellMySqlRootLogin.jpg b/website/img/15.shellMySqlRootLogin.jpg new file mode 100644 index 00000000..3710b16a Binary files /dev/null and b/website/img/15.shellMySqlRootLogin.jpg differ diff --git a/website/img/16.shellMySqlPrompt.jpg b/website/img/16.shellMySqlPrompt.jpg new file mode 100644 index 00000000..772f861c Binary files /dev/null and b/website/img/16.shellMySqlPrompt.jpg differ diff --git a/website/img/17.shellMySqlCreateDB.jpg b/website/img/17.shellMySqlCreateDB.jpg new file mode 100644 index 00000000..05c654d7 Binary files /dev/null and b/website/img/17.shellMySqlCreateDB.jpg differ diff --git a/website/img/18.shellMySqlCreateUser.jpg b/website/img/18.shellMySqlCreateUser.jpg new file mode 100644 index 00000000..7d637f8e Binary files /dev/null and b/website/img/18.shellMySqlCreateUser.jpg differ diff --git a/website/img/19.shellMySqlUserCreated.jpg b/website/img/19.shellMySqlUserCreated.jpg new file mode 100644 index 00000000..099b01c7 Binary files /dev/null and b/website/img/19.shellMySqlUserCreated.jpg differ diff --git a/website/img/20.pythonInst.jpg b/website/img/20.pythonInst.jpg new file mode 100644 index 00000000..cc9c518d Binary files /dev/null and b/website/img/20.pythonInst.jpg differ diff --git a/website/img/21.pythonInst4.jpg b/website/img/21.pythonInst4.jpg new file mode 100644 index 00000000..7c5d2582 Binary files /dev/null and b/website/img/21.pythonInst4.jpg differ diff --git a/website/img/22.mySqlPythonInst1.jpg b/website/img/22.mySqlPythonInst1.jpg new file mode 100644 index 00000000..f74f01a5 Binary files /dev/null and b/website/img/22.mySqlPythonInst1.jpg differ diff --git a/website/img/23.shellMkDirGtk.jpg b/website/img/23.shellMkDirGtk.jpg new file mode 100644 index 00000000..cb8317cc Binary files /dev/null and b/website/img/23.shellMkDirGtk.jpg differ diff --git a/website/img/24.setGtkPath1.jpg b/website/img/24.setGtkPath1.jpg new file mode 100644 index 00000000..030b2a00 Binary files /dev/null and b/website/img/24.setGtkPath1.jpg differ diff --git a/website/img/25.setGtkPath2.jpg b/website/img/25.setGtkPath2.jpg new file mode 100644 index 00000000..d88a8382 Binary files /dev/null and b/website/img/25.setGtkPath2.jpg differ diff --git a/website/img/26.setGtkPath3.jpg b/website/img/26.setGtkPath3.jpg new file mode 100644 index 00000000..29439d2e Binary files /dev/null and b/website/img/26.setGtkPath3.jpg differ diff --git a/website/img/27.pycairoInst.jpg b/website/img/27.pycairoInst.jpg new file mode 100644 index 00000000..71eb8e8d Binary files /dev/null and b/website/img/27.pycairoInst.jpg differ diff --git a/website/img/28.pygobjectInst.jpg b/website/img/28.pygobjectInst.jpg new file mode 100644 index 00000000..87fb4cb7 Binary files /dev/null and b/website/img/28.pygobjectInst.jpg differ diff --git a/website/img/29.pyGtkInst.jpg b/website/img/29.pyGtkInst.jpg new file mode 100644 index 00000000..593bacf4 Binary files /dev/null and b/website/img/29.pyGtkInst.jpg differ diff --git a/website/img/30.shellMkDirProfiles.jpg b/website/img/30.shellMkDirProfiles.jpg new file mode 100644 index 00000000..c5e25a19 Binary files /dev/null and b/website/img/30.shellMkDirProfiles.jpg differ diff --git a/website/img/31.editDbProfile.jpg b/website/img/31.editDbProfile.jpg new file mode 100644 index 00000000..db20e795 Binary files /dev/null and b/website/img/31.editDbProfile.jpg differ diff --git a/website/img/32.startFpdb.jpg b/website/img/32.startFpdb.jpg new file mode 100644 index 00000000..d95fdf40 Binary files /dev/null and b/website/img/32.startFpdb.jpg differ diff --git a/website/img/Screenshot-2-Site-HUD.png b/website/img/Screenshot-2-Site-HUD.png new file mode 100644 index 00000000..5c1283a5 Binary files /dev/null and b/website/img/Screenshot-2-Site-HUD.png differ diff --git a/website/img/Screenshot-Graph-v137.png b/website/img/Screenshot-Graph-v137.png new file mode 100644 index 00000000..5faaf758 Binary files /dev/null and b/website/img/Screenshot-Graph-v137.png differ diff --git a/website/img/Screenshot-Stacked-Everleaf-137.jpg b/website/img/Screenshot-Stacked-Everleaf-137.jpg new file mode 100644 index 00000000..1db7358f Binary files /dev/null and b/website/img/Screenshot-Stacked-Everleaf-137.jpg differ diff --git a/website/img/docs.HudHowTo1.png b/website/img/docs.HudHowTo1.png new file mode 100644 index 00000000..078a4429 Binary files /dev/null and b/website/img/docs.HudHowTo1.png differ diff --git a/website/img/docs.HudHowTo2.png b/website/img/docs.HudHowTo2.png new file mode 100644 index 00000000..b6e88564 Binary files /dev/null and b/website/img/docs.HudHowTo2.png differ diff --git a/website/img/docs.HudHowTo3.png b/website/img/docs.HudHowTo3.png new file mode 100644 index 00000000..aa768736 Binary files /dev/null and b/website/img/docs.HudHowTo3.png differ diff --git a/website/img/docs.HudHowTo4.png b/website/img/docs.HudHowTo4.png new file mode 100644 index 00000000..2610a30a Binary files /dev/null and b/website/img/docs.HudHowTo4.png differ diff --git a/website/img/docs.HudHowTo5.png b/website/img/docs.HudHowTo5.png new file mode 100644 index 00000000..29e42675 Binary files /dev/null and b/website/img/docs.HudHowTo5.png differ diff --git a/website/img/docs.HudHowTo6.png b/website/img/docs.HudHowTo6.png new file mode 100644 index 00000000..f4248931 Binary files /dev/null and b/website/img/docs.HudHowTo6.png differ diff --git a/website/img/docs.HudHowTo7.png b/website/img/docs.HudHowTo7.png new file mode 100644 index 00000000..e3bada61 Binary files /dev/null and b/website/img/docs.HudHowTo7.png differ diff --git a/website/index.php b/website/index.php new file mode 100755 index 00000000..14764ed1 --- /dev/null +++ b/website/index.php @@ -0,0 +1,24 @@ + + +
+ +

Welcome!

+ +

fpdb is a database program to track your online poker games, the behaviour of the other players and your winnings/losses. Supports Holdem, Omaha, Stud and Razz for cash games as well as SnG and MTT tournaments with more possibly coming in the future. The software is currently in alpha status, which means some of the features are not working yet. As it's open source you're free to add any feature you like or modify the existing ones to fit your needs.

+ +

To see what fpdb can do, go to the features page. If you're ready to test it, take a look at the documentation.

+ +
+ + diff --git a/website/license.php b/website/license.php new file mode 100755 index 00000000..d7c3fa9b --- /dev/null +++ b/website/license.php @@ -0,0 +1,687 @@ + + +
+ +

License

+ +
+
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
+
+
+
+ +
+ + diff --git a/website/screenshots.php b/website/screenshots.php new file mode 100755 index 00000000..fb13138e --- /dev/null +++ b/website/screenshots.php @@ -0,0 +1,25 @@ + + +

Screenshots

+ +

Importing hands:

+

Table viewer:

+

HUD:

+

Graph viewer:

+

Working with 2 sites:

+

Working stacked:

+ +
+ + diff --git a/website/sidebar.php b/website/sidebar.php new file mode 100755 index 00000000..06bd6ca4 --- /dev/null +++ b/website/sidebar.php @@ -0,0 +1,13 @@ + diff --git a/website/style.css b/website/style.css new file mode 100644 index 00000000..d12f4779 --- /dev/null +++ b/website/style.css @@ -0,0 +1,52 @@ +body {margin: 0px; padding: 0px; background-color: #fff; font-family: "Verdana", "Arial", sans-serif; font-size: 13px; color: #333;} + +a {text-decoration: none; color: #336984;} + +a:hover {color: #e00000;} + +img {border: 0px;} + +h1 {font-size: 23px;} + +li {padding: 3px;} + + +/* ------------------------------------------------- */ +#header { + padding: 20px 20px 10px 20px; + background-color: #8BB9D1; + border-bottom: 10px solid #4690B5; + color: #fff; + font-size: 31px; +} + +#logo a { + font-size: 32px; + color: #5C5C49; +} + + +/* ------------------------------------------------- */ +#main { margin-left: 210px; margin-right: 15px; } +.winInst div { width: 906px; } +.screenshot { background-color: #E8F1F6; padding: 0px; margin: 10px auto; padding: 10px; } +.screenshot img { padding: 2px; border: 1px solid #87aade; } +.screenshot p { margin: 0; } +#screens { float: left; margin: 1em; text-align: center; } + +/* ------------------------------------------------- */ +#sidebar {background-color: #E8F1F6; width: 180px; padding: 10px; float: left;} + +#sidebar ul {padding: 0px; margin: 0px; list-style-position: inside;} + +#sidebar ul li {border-bottom: 1px solid #D1E3EC; padding: 3px;} + +#sidebar ul li:hover {background-color: #fff;} + +#sidebar a {text-decoration: none;} + +dl dt { float: left; width: 200px; font-weight: bold; } + + +/* ------------------------------------------------- */ +#footer { clear: both; text-align: right; padding: 1em 2em; }