evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,940 Commits 1 Branch 0 Tags 14 MiB
37e098fce9
Commit Graph

2619 Commits

Author SHA1 Message Date
Eratosthenes
3626401096 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2010-02-07 11:40:48 -05:00
sqlcoder
9201364055 fix bugs in error reporting (not helpful if the error logging causes errors\!) 2010-02-07 11:21:50 +00:00
Worros
b996a884de PokerStarsTo? Fpdb: Fix subtle bug in re_Action 
The bet action could become multiline greedy if there was a playername starting with 'card' in the next line.

"""
danny purse: bets $0.50
cardjunkie25: calls $0.50
"""

Would match "danny purse: bets $0.50\ncard", and the rest of that line would be ignored.

Added '$' to the end of the regex to make sure that it is limited to 1 line
 2010-02-07 19:21:32 +08:00
Worros
ee66abfecc Revert "PokerStarsTo Fpdb: Fix subtle bug in re_Action" 
This reverts commit ac51876200.
 2010-02-07 19:19:00 +08:00
Worros
ac51876200 PokerStarsTo Fpdb: Fix subtle bug in re_Action 
The bet action could become multiline greedy if there was a playername starting with 'card' in the next line.

"""
danny purse: bets $0.50
cardjunkie25: calls $0.50
"""

Would match "danny purse: bets $0.50\ncard", and the rest of that line would be ignored.

Added '$' to the end of the regex to make sure that it is limited to 1 line, and wrap 'cards' as a group.
 2010-02-07 19:08:23 +08:00
sqlcoder
fbeaa5590f move run_fpdb.bat up a directory to /fpdb/ 2010-02-07 01:06:36 +00:00
sqlcoder
ef26c05181 be more tolerant of errors when translating for gui, add encode exception handlers 2010-02-06 23:12:11 +00:00
Eratosthenes
8794a075e7 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-06 16:32:37 -05:00
sqlcoder
4ecd713dab forgot to add the new .bat file 2010-02-06 21:29:17 +00:00
Eratosthenes
bfe25b0ff2 Merge branch 'master' of git://git.assembla.com/fpdb-sql 
Conflicts:
	pyfpdb/GuiAutoImport.py
	pyfpdb/py2exe_setup.py
 2010-02-06 15:34:57 -05:00
Eratosthenes
120d05f9cd Changes for py2exe exe. 2010-02-06 14:55:48 -05:00
sqlcoder
f1d4f08d1c trivial change to output dir name 2010-02-06 19:00:30 +00:00
sqlcoder
a3ec32b7b9 change print to log 2010-02-06 18:59:33 +00:00
sqlcoder
8b28427ff9 use log instead of print 2010-02-06 18:46:27 +00:00
sqlcoder
d9fddd6595 miniscule print change 2010-02-06 18:07:48 +00:00
sqlcoder
d25611dd38 get py2exe working better - nice :-) 2010-02-06 18:07:00 +00:00
sqlcoder
49e4a7db69 change a few prints to logs 2010-02-06 18:06:21 +00:00
sqlcoder
1e832952dd add newline in error reporting message 2010-02-06 15:55:32 +00:00
sqlcoder
752e5ad088 make sure fpdb icon works in py2exe 2010-02-06 12:27:15 +00:00
sqlcoder
4d74437845 run HUD_main.exe if running fpdb.exe (created by py2exe) 2010-02-06 10:33:00 +00:00
sqlcoder
4a0fcd62a0 sqlite seems to perform ok for me 2010-02-06 10:28:17 +00:00
Eratosthenes
8a2c24ceff Merge branch 'master' of git://git.assembla.com/fpdboz 2010-02-05 23:21:55 -05:00
Eratosthenes
8aa18b95d8 Changes to make running py2exe exe happy. 2010-02-05 23:19:58 -05:00
Eratosthenes
4df991517e Changes to make the py2exe exe happy. 2010-02-05 23:13:53 -05:00
Eratosthenes
08078cfee4 Configure for python 2.5. Add icon for fpdb.exe. 2010-02-05 23:03:55 -05:00
Eric Blade
5c26fee853 handle mysql error on close if connection was timed out 2010-02-05 08:58:47 -05:00
Worros
ac458386da Add config path to test2.py display 2010-02-05 21:29:07 +08:00
Worros
e0a125faf0 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-05 17:32:05 +08:00
Worros
ab693e3b3c test_PokerStars.py - Fix calls to HHC. 
sqlcoder added config as a parameter to HHC and Hand
 2010-02-05 11:51:12 +08:00
Worros
fde72003f7 test2.py - Add more tests 
Added most imports, and printed some formatted output for assiting diagnosis of new user installs
 2010-02-05 11:44:27 +08:00
Worros
afde406cc9 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2010-02-05 11:01:52 +08:00
sqlcoder
ef2a8aca14 remove duplicate db calls which were slowing the hud down 2010-02-04 23:37:45 +00:00
sqlcoder
4d45bd39d3 make enabled sites come first in drop-down (i.e. more chance of the default being the one you want) 2010-02-04 23:08:09 +00:00
Eric Blade
c10665935f stop clobbering search_string in TableWindow::__init__ . Thanks Ray! 2010-02-04 16:33:21 -05:00
Eratosthenes
9dfa0967b8 Correct data files. 2010-02-04 13:08:26 -05:00
Worros
b2e409ae00 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-04 00:36:51 +08:00
Eratosthenes
8c1ce3df7d Merge branch 'master' of git://git.assembla.com/fpdboz 2010-02-03 11:17:10 -05:00
Worros
1cefb2e857 Fix playername siteid insert 
From Gerko on mailing list:
> I just did a trial. Use bulkimport for a single Pokerstars file
> switch setting and bulkimport a single Full tilt file.
> When screening the db all players in the database show the same siteId
> (2 for pokerstars)
> Or the other way if the first site was Full Tilt.

The Lambda function wasn't initialising the lambda function correctly.
 2010-02-03 23:48:39 +08:00
Eratosthenes
5c6d4e4744 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-02-03 10:37:54 -05:00
Worros
33455cb1ac PokerStars: Fix tablename regex to allow a # 
Occasionally Stars throws up a cash table that looks like

PokerStars Game #22920951206:  Triple Draw 2-7 Lowball Limit ($0.10/$0.20) - 2008/12/14 17:44:00 ET
Table 'T #252691988' 6-max Seat #2 is the button

a # was previously excluded from the regex.
 2010-02-03 21:52:44 +08:00
Eratosthenes
7e5e9ed93a Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-03 08:40:16 -05:00
Eratosthenes
7aa67c38b1 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2010-02-03 08:40:02 -05:00
sqlcoder
864454f31c change 2 commits to 1, may help sqlite stop locking up 2010-02-03 01:03:36 +00:00
sqlcoder
e3679a99fb fix steal calcs 2010-02-03 00:48:45 +00:00
sqlcoder
fece7c9147 move fpdb-error-log and HUD-error to APPDATA, renamed as fpdb-errors.txt and HUD-errors.txt to be consistent 2010-02-02 21:53:03 +00:00
Eric Blade
76f9517655 WinTables will no longer accept trying to attach to "FPDBHUD" titled windows 2010-02-02 14:54:27 -05:00
Eric Blade
e88d745e7d Merge branch 'master' of git://git.assembla.com/fpdb-sql.git 2010-02-02 10:51:22 -05:00
Eric Blade
6e30bb2067 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-02-02 10:48:17 -05:00
Eratosthenes
8c81761c1b Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-01 18:38:23 -05:00
Eratosthenes
aea7db22e3 Options for logging level and version. Not connected yet. 2010-02-01 18:37:36 -05:00
sqlcoder
96d0e0f181 fix key error and add filter to logging.conf 2010-02-01 22:56:40 +00:00
sqlcoder
d4248706e4 remove surplus get_logger calls, tidy up log messages some more 2010-02-01 22:31:00 +00:00
sqlcoder
86330e536a tidy up logging so that log isn't created in /fpdb/log/ unless it is being used 2010-02-01 21:03:51 +00:00
sqlcoder
7e5f63ce89 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-02-01 19:49:57 +00:00
Eratosthenes
2a9c00953a Merge branch 'master' of git://git.assembla.com/fpdb-eric 2010-02-01 10:47:49 -05:00
Eratosthenes
03967fc227 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-02-01 10:47:35 -05:00
Eratosthenes
f406ba293e Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-01 10:47:26 -05:00
Eric Blade
eff216919d Everleaf: Change "EUR"(old) to "EURO"(new), still doesn't seem to allow eur import (is that because my site config is set for usd ?) 2010-02-01 09:57:28 -05:00
Eric Blade
81ff8e632c remove my misunderstanding of how compileplayerregexs worked 2010-02-01 09:41:33 -05:00
Eric Blade
e3be7db2a0 fix bug i introduced that caused everleaf cash hands to fail 2010-02-01 09:17:42 -05:00
Eric Blade
1656a0e6d1 Everleaf: adjust Everleaf regexs to support tournaments, add error printing on failure of compilePlayerRegexs, add ring omahahilo pl and tour hold nl to supported games list, determine tournament number/table number from processing filename, fix getTableTitleRe 2010-02-01 08:51:06 -05:00
Eric Blade
27f95c51b2 whitespace 2010-02-01 08:48:28 -05:00
Eric Blade
9cf75f7303 fix getTableTitleRe calling in HUD_main:read_stdin, to use site_name (currently processing site name) instead of "site" which was always last site_name on list 
(this may break some people's HHC's, now that it works right)
 2010-02-01 08:47:55 -05:00
sqlcoder
a06aac6da8 correct case in SQL 2010-02-01 08:22:14 +00:00
Worros
12a9cd2e3e Fix case-sensitive MySQL tables on Linux 2010-02-01 16:06:09 +08:00
Worros
c46c4b05d4 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-01 16:04:17 +08:00
sqlcoder
9f3c5924b0 oops! missed out SQL.py from last release 2010-02-01 07:59:09 +00:00
Worros
6179823d92 Fix test harness after fpdb_db removal 2010-02-01 14:47:04 +08:00
Eratosthenes
428d228de8 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-01-31 22:56:01 -05:00
sqlcoder
e4c6419074 try to improve tourney handling in filter (now displays buyin, but this is not yet used by playerstats when fetching stats 2010-02-01 00:17:55 +00:00
sqlcoder
264b75b5b0 fix some sqlite and unicode issues (thanks to Gerko) 2010-01-31 23:46:51 +00:00
Eratosthenes
3102ff733f Merge branch 'master' of git://git.assembla.com/fpdb-eric 2010-01-31 14:16:39 -05:00
Eratosthenes
c7a9942f3a Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-01-31 14:16:21 -05:00
Eratosthenes
64bfa9cd52 Import mucked cards. 2010-01-31 13:37:59 -05:00
sqlcoder
002a84ba5a set rotating logs to max 5 files of 100MB each 2010-01-31 12:31:49 +00:00
sqlcoder
6f0ea2580b display dialog when .example config has been copied, this could work 'out-of-the-box' if the user already has gtk?? 2010-01-31 12:24:32 +00:00
sqlcoder
bbc84fef14 comment out debug message 2010-01-31 12:22:24 +00:00
sqlcoder
f7b402bcdb remove execute from permissions on some files in last commit 2010-01-31 11:27:37 +00:00
sqlcoder
5e9486aa3d config changes for logging: logs rotate and go to APPDATA, hud_config now goes in /fpdb/ if they must use it but logging.conf stays in /pyfpdb/. TODO: Some logging still into /fpdb/log/ 2010-01-31 11:25:24 +00:00
sqlcoder
cc5f77e950 fix windows problem starting hud 2010-01-31 11:16:42 +00:00
Eratosthenes
121d05596d Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-01-30 14:55:31 -05:00
Eratosthenes
6d9cdd9587 Fix problem where Qc is not encoded correctly. 2010-01-30 14:54:46 -05:00
sqlcoder
e0c5f52d0f uncommented sqlite unicode fix (fix only tested on Windows XP, cp1252) 2010-01-30 11:11:21 +00:00
sqlcoder
9932025271 move sqlite charset fix to Configuration.py from Database.py, make separate not_needed variables in Charset.py in case we want to update them separately 2010-01-30 11:05:34 +00:00
sqlcoder
d147187a71 add extra comment/suggestion 2010-01-29 23:36:39 +00:00
sqlcoder
a7d4c6243a add assignment (but commented out) that fixes unicode probs for me with sqlite 2010-01-29 23:29:37 +00:00
Eric Blade
72b890c561 add "HUD Test mode" checkbox to bulk import, doesn't currently do anything. intent is to make the program auto open a dummy window for a hud to attach to, so we can bulk import files to investigate hud issues 2010-01-29 17:45:49 -05:00
Eric Blade
f7ac36f3bb add getTableTitleRe to everleaf filter, doesn't seem to work 2010-01-29 17:44:58 -05:00
sqlcoder
2e970baa82 remove sqlite specific test to skip unicode encoding 2010-01-29 22:29:14 +00:00
Eric Blade
e56cb24ed1 to_utf8 returns what was passed in if unicode() errors because it's already encoded 2010-01-29 12:01:51 -05:00
Worros
23e0611978 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-01-29 17:20:57 +08:00
sqlcoder
52a176fd0a tidy up filter, add ability to refresh (eg after importing more gametypes) 2010-01-29 09:12:08 +00:00
Worros
a23d96e85d Add Carbon back in as default data. 
Also add PKR
 2010-01-29 17:00:37 +08:00
Worros
17bc9af88e Merge branch 'master' of git://github.com/kangaderoo/fpdb-kangaderoo 
Conflicts:
	run_fpdb.py
 2010-01-29 13:01:38 +08:00
Gerko de Roo
bacca69c49 Default graph created for empty data query 2010-01-29 12:33:15 +08:00
Eric Blade
e29491c25c use getpreferredencoding() instead of getdefaultlocale() to get LOCALE_ENCODING, default to cp1252 if it comes back with US-ASCII (Mac) 2010-01-28 20:29:43 -05:00
Eric Blade
725fb04bb8 Merge branch 'master' of git://git.assembla.com/fpdb-sql.git 
Conflicts:
	pyfpdb/Configuration.py
	pyfpdb/Database.py
 2010-01-28 16:28:23 -05:00
Eric Blade
f5d61b5bfc Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2010-01-28 16:25:47 -05:00
Eric Blade
8673cc3437 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-01-28 16:25:04 -05:00
Eratosthenes
7570db60f6 Make the StudMucked not crash with newimport. 2010-01-28 14:37:45 -05:00
Worros
28a7d1e353 Hopefully fully fix the FTP playername parsing. 
Split hand text for FTP, as the regex matches the player names incorrectly, and differentiating the lines is non-trivial.

The split should ensure that only the first version is available
 2010-01-28 23:38:52 +08:00
Worros
cee610d401 Add Carbon bits to example config file 2010-01-28 22:11:04 +08:00
Worros
ad75bedbf1 CarbonToFpdb.py - Converter for Carbon poker 
Currently only supports NLHE cash games. Further hand hstories required.

Plugin contributed by Matthew Boss.
 2010-01-28 21:36:02 +08:00
Eric Blade
3381527afc raise FpdbHandDuplicate error on duplicate insert attempt, catch it in import_file_dict, increment duplicates count 2010-01-28 05:56:17 -05:00
Eric Blade
d36ac3f927 rename DuplicateError to FpdbHandDuplicate, add matching FpdbHandError and FpdbHandPartial (not sure where to implement catching those though) 2010-01-28 05:55:06 -05:00
Eric Blade
2be8b9d33b get fpdb icon from absolute path instead of relative to cwd 2010-01-28 05:19:39 -05:00
Eric Blade
997483f909 make import timer work again 2010-01-28 05:19:19 -05:00
Eric Blade
803fcec6dc make hud_main call with full path in windows, as has been done in unix 2010-01-28 04:45:33 -05:00
Worros
7c90102677 Preliminary Carbon functions. 
- Add the SITEID for Carbon

- Add function addAllIn():
"For sites which record "all in" as a special action, which can mean either "calls and is all in" or "raises all in".
"
 2010-01-28 15:13:49 +08:00
Eratosthenes
92e20bcd12 Add more chars to player name in prev commit. 2010-01-27 23:16:11 -05:00
Eratosthenes
d50e70fdd4 Another fix of FTP playername reg ex. 2010-01-27 20:10:07 -05:00
sqlcoder
1df418c8e4 create fpdb dir if required, improve sqlite performance :-) 2010-01-27 23:48:39 +00:00
Worros
a9f2a261d4 Regex fix for Fulltilt player names 
"Seat 7: moletrapper collected ($2.50)"
vs
"Seat 7: moletrapper ($2.50)"

The regex update should match the second and not the first.
 2010-01-28 01:44:14 +08:00
Gerko de Roo
6f78749ebd Default graph created for empty data query 2010-01-27 18:37:23 +01:00
Worros
cd05c1da48 Remove unused variable 2010-01-28 01:36:42 +08:00
Gerko de Roo
92b5a43a22 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-01-27 16:46:45 +01:00
Eratosthenes
2ad7e430a2 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-01-27 09:49:14 -05:00
Eratosthenes
2adf0158a4 Merge branch 'master' of git://git.assembla.com/fpdb-sql 
Conflicts:
	pyfpdb/Database.py
	pyfpdb/PartyPokerToFpdb.py
 2010-01-27 09:48:31 -05:00
Eratosthenes
080b7f80c9 Compile the " collected" reg ex. 2010-01-27 09:23:12 -05:00
Worros
929e182a28 FulltiltToFpdb: Fix tourney player matching for players sitting out 2010-01-27 18:20:48 +08:00
Worros
8dea509245 FulltiltToFpdb: partially fix player ids 
_mysql_exceptions.IntegrityError: (1062, "Duplicate entry 'romatrifon (small blind) showed -1' for key 'name'")

Previous regex was matching past the name.
 2010-01-27 18:02:30 +08:00
sqlcoder
e82d276cf9 pull and merge from carl (nothing changed) 2010-01-27 08:56:51 +00:00
Eratosthenes
d75e5e3920 Fixed typos, pylint complaints, and obsolete TODOs. 2010-01-27 01:10:58 -05:00
Eratosthenes
30de5142db Ugly fix to ugly edge case where winner voluntarily showed cards. 2010-01-27 00:57:58 -05:00
Eratosthenes
e0d11fe9a3 Fix problem with finding HHs for utf-16 files. 2010-01-27 13:10:50 +08:00
Gerko de Roo
6c5c479ee8 Autocomplete Hero names only lists the valid names for that pokersite 
SiteID list needed to be filled before the Hero field was filled.
 2010-01-27 13:04:21 +08:00
Worros
fb7aae9186 clean-up code to get playerId in gui-stats and gui-graphs 
Conflicts:

	pyfpdb/GuiGraphViewer.py
 2010-01-27 13:04:13 +08:00
Gerko de Roo
241dc1e717 Fixed limit and freeroll support for Partypoker tourney's 2010-01-27 11:33:15 +08:00
Eratosthenes
1ec6a36ece Merge branch 'master' of git://git.assembla.com/fpdb-sql 
Conflicts:
	pyfpdb/Configuration.py
	pyfpdb/Database.py
 2010-01-26 20:13:21 -05:00
sqlcoder
5a9836862f sqlite mods, made sqlite the default in HUD_config.xml.example - works (roughly) straight out of the box 2010-01-27 00:48:02 +00:00
sqlcoder
11bc48e126 merge fpdb_db.py into Database.py 2010-01-26 23:54:04 +00:00
sqlcoder
47baee65f9 add tourneyid to hands table (REQUIRES REIMPORT) and fix sqlite db access 2010-01-26 22:46:48 +00:00
Gerko de Roo
f5c910bff0 clean-up code to get playerId in gui-stats and gui-graphs 2010-01-26 23:36:38 +01:00
Gerko de Roo
b248270135 Sorting routine caused errors when sorted on gametype, 
since it used the starthand sort routine
 2010-01-26 23:34:08 +01:00
sqlcoder
de2b807c9b refine hud_config handling some more (copies .exmaple to proper dir) 2010-01-26 21:54:58 +00:00
sqlcoder
5c88c6b0ad put database directory next to HUD_config.xml file 2010-01-26 21:02:37 +00:00
Mika Bostrom
ff9305924c Use proper encoding name 
When system is unicode, the second item in locale.getdefaultlocale() is
"UTF8", not "utf-8".
 2010-01-26 20:31:11 +01:00
Gerko de Roo
88cf6ec3a5 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-01-26 20:29:19 +01:00
Gerko de Roo
4814c30d8f Autocomplete Hero names only lists the valid names for that pokersite 
SiteID list needed to be filled before the Hero field was filled.
 2010-01-26 20:25:04 +01:00
Gerko de Roo
12c93ea9a6 Support for same hero name on multiple sites also implemented in GuiGraph 2010-01-26 20:20:17 +01:00
Eratosthenes
7d7ba94da1 Fix problem with finding HHs for utf-16 files. 2010-01-26 10:56:07 -05:00
Mika Bostrom
7f04ed88f4 Use proper encoding name 
When system is unicode, the second item in locale.getdefaultlocale() is
"UTF8", not "utf-8".
 2010-01-26 08:01:46 +02:00
Eratosthenes
7683590898 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:
	pyfpdb/Configuration.py
 2010-01-25 12:06:11 -05:00
Eratosthenes
90ea33c74b Needs to be executable. 2010-01-25 12:04:21 -05:00
Mika Bostrom
12367d6f37 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-01-25 19:03:21 +02:00
Worros
896de37d0d Fix hudCache update semantics 2010-01-26 01:00:22 +08:00
Mika Bostrom
b58edb53ae Write charmap-related errors directly to stderr 
This change is needed to skip a nasty behaviour: if the string triggered
a decoding error, it will trigger one *AGAIN* if the string is printed
to console. By writing directly to sys.stderr we skip the
locale/conversion issues and get the troublesome string directly in a
file where it is stored as a raw sequence of octets.
 2010-01-24 21:28:08 +01:00
Mika Bostrom
2c7287c351 Add new encoder 
This encoder is used to handle input from HH conversion, which needs to
end up as UTF-8 in the database. Switch the open-coded routine from
Database.py to this common routine so all encodings now take place in
the same file.
 2010-01-24 21:27:40 +01:00
Mika Bostrom
860b5737b7 Use common encoding routine everywhere 
The string/locale manipulation in Database.py was open-coded and did not
use Charset.to_utf8() like the rest of the code.
 2010-01-24 21:27:35 +01:00
Mika Bostrom
85c9070ec8 Write charmap-related errors directly to stderr 
This change is needed to skip a nasty behaviour: if the string triggered
a decoding error, it will trigger one *AGAIN* if the string is printed
to console. By writing directly to sys.stderr we skip the
locale/conversion issues and get the troublesome string directly in a
file where it is stored as a raw sequence of octets.
 2010-01-24 22:17:03 +02:00