Commit Graph

4891 Commits

Author SHA1 Message Date
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
Eric Blade
f2f16b599c Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-01-27 06:26:28 -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
Eric Blade
79494ea7f9 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-01-27 02:23:50 -05: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
sqlcoder
45397695d3 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-01-26 20:38:10 +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
e5071d6d09 *#$@ merge 2010-01-26 20:28:41 +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
Eratosthenes
3630a289ad Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-01-26 10:01:39 -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
Eric Blade
e5b485365f Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-01-26 00:48:19 -05: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
Gerko de Roo
9b89a5d1b7 Merge branch 'master' of git://git.assembla.com/fpdb-sql.git 2010-01-24 21:34:17 +01: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
Mika Bostrom
33277ce68b 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:11:46 +02:00
Mika Bostrom
6dcec48005 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 19:59:49 +02:00
sqlcoder
602d72d911 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-01-24 16:12:29 +00:00
Gerko de Roo
80ba4aa24f Merge branch 'master' of git@github.com:kangaderoo/fpdb-kangaderoo.git 2010-01-24 13:38:21 +01:00
Gerko de Roo
73ae88e47a Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-01-24 13:37:27 +01:00
Worros
dbaad2d430 Remove NEWIMPORT variable.
No going back now :)
2010-01-24 13:36:21 +01:00
Mika Bostrom
c36c60155c Use a different "unicoder" for db strings
It seems that running encoder.encode() on a latin1/latin9 string results
in, yes a bloody UnicodeDecodeError. Decode error on .encode()...
Really. This way the modification from non-unicode string to real
unicode appears to work better.
2010-01-24 13:35:10 +01:00