evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://github.com/swolchok/fpdb into scott

Browse Source 
Conflicts:
	pyfpdb/Database.py
	pyfpdb/decimal_wrapper.py
This commit is contained in:
Steffen Schaumburg 2011-02-26 01:09:40 +01:00
commit 99a0e04e3e
18 changed files with 39 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pyfpdb/AlchemyFacilities.py
View File

@ -17,7 +17,7 @@
#TODO: gettextify if file is used again #TODO: gettextify if file is used again
from decimal import Decimal from decimal_wrapper import Decimal
from sqlalchemy import types from sqlalchemy import types
from sqlalchemy.orm.exc import NoResultFound from sqlalchemy.orm.exc import NoResultFound

2
pyfpdb/AlchemyMappings.py
View File

@ -23,7 +23,7 @@ This package contains all classes to be mapped and mappers themselves
import logging import logging
import re import re
from decimal import Decimal from decimal_wrapper import Decimal
from sqlalchemy.orm import mapper, relation, reconstructor from sqlalchemy.orm import mapper, relation, reconstructor
from sqlalchemy.sql import select from sqlalchemy.sql import select
from collections import defaultdict from collections import defaultdict

2
pyfpdb/CarbonToFpdb.py
View File

@ -53,7 +53,7 @@ _ = L10n.get_translation()
import sys import sys
import logging import logging
from HandHistoryConverter import * from HandHistoryConverter import *
from decimal import Decimal from decimal_wrapper import Decimal
class Carbon(HandHistoryConverter): class Carbon(HandHistoryConverter):

7
pyfpdb/Database.py
View File

@ -38,12 +38,7 @@ import sys
import traceback import traceback
from datetime import datetime, date, time, timedelta from datetime import datetime, date, time, timedelta
from time import time, strftime, sleep from time import time, strftime, sleep
from decimal_wrapper import Decimal
try:
from cdecimal import *
except ImportError:
from decimal import *
import string import string
import re import re
import Queue import Queue

2
pyfpdb/DerivedStats.py
View File

@ -17,7 +17,7 @@
#fpdb modules #fpdb modules
import Card import Card
from decimal import Decimal from decimal_wrapper import Decimal
import logging import logging
# logging has been set up in fpdb.py or HUD_main.py, use their settings: # logging has been set up in fpdb.py or HUD_main.py, use their settings:

2
pyfpdb/EverestToFpdb.py
View File

@ -25,7 +25,7 @@ _ = L10n.get_translation()
import sys import sys
import logging import logging
from HandHistoryConverter import * from HandHistoryConverter import *
from decimal import Decimal from decimal_wrapper import Decimal
class Everest(HandHistoryConverter): class Everest(HandHistoryConverter):

2
pyfpdb/FullTiltPokerSummary.py
View File

@ -20,7 +20,7 @@
import L10n import L10n
_ = L10n.get_translation() _ = L10n.get_translation()
from decimal import Decimal from decimal_wrapper import Decimal
import datetime import datetime
from Exceptions import FpdbParseError from Exceptions import FpdbParseError

2
pyfpdb/Hand.py
View File

@ -25,7 +25,7 @@ import sys
import traceback import traceback
import os import os
import os.path import os.path
from decimal import Decimal from decimal_wrapper import Decimal
import operator import operator
import time,datetime import time,datetime
from copy import deepcopy from copy import deepcopy

2
pyfpdb/HandHistoryConverter.py
View File

@ -26,7 +26,7 @@ import os
import os.path import os.path
import xml.dom.minidom import xml.dom.minidom
import codecs import codecs
from decimal import Decimal from decimal_wrapper import Decimal
import operator import operator
from xml.dom.minidom import Node from xml.dom.minidom import Node

2
pyfpdb/OnGameToFpdb.py
View File

@ -31,7 +31,7 @@ log = logging.getLogger("parser")
import Configuration import Configuration
from HandHistoryConverter import * from HandHistoryConverter import *
from decimal import Decimal from decimal_wrapper import Decimal
# OnGame HH Format # OnGame HH Format

2
pyfpdb/PokerStarsSummary.py
View File

@ -20,7 +20,7 @@
import L10n import L10n
_ = L10n.get_translation() _ = L10n.get_translation()
from decimal import Decimal from decimal_wrapper import Decimal
import datetime import datetime
from Exceptions import FpdbParseError from Exceptions import FpdbParseError

43
pyfpdb/PokerStarsToFpdb.py
View File

@ -25,7 +25,7 @@ _ = L10n.get_translation()
import sys import sys
from HandHistoryConverter import * from HandHistoryConverter import *
from decimal import Decimal from decimal_wrapper import Decimal
# PokerStars HH Format # PokerStars HH Format
@ -131,34 +131,29 @@ class PokerStars(HandHistoryConverter):
# revised re including timezone (not currently used): # revised re including timezone (not currently used):
#re_DateTime = re.compile("""(?P<Y>[0-9]{4})\/(?P<M>[0-9]{2})\/(?P<D>[0-9]{2})[\- ]+(?P<H>[0-9]+):(?P<MIN>[0-9]+):(?P<S>[0-9]+) \(?(?P<TZ>[A-Z0-9]+)""", re.MULTILINE) #re_DateTime = re.compile("""(?P<Y>[0-9]{4})\/(?P<M>[0-9]{2})\/(?P<D>[0-9]{2})[\- ]+(?P<H>[0-9]+):(?P<MIN>[0-9]+):(?P<S>[0-9]+) \(?(?P<TZ>[A-Z0-9]+)""", re.MULTILINE)
def compilePlayerRegexs(self, hand): # These used to be compiled per player, but regression tests say
players = set([player[1] for player in hand.players]) # we don't have to, and it makes life faster.
if not players <= self.compiledPlayers: # x <= y means 'x is subset of y' short_subst = {'PLYR': r'(?P<PNAME>.+?)', 'CUR': '\$?'}
# we need to recompile the player regexs. re_PostSB = re.compile(r"^%(PLYR)s: posts small blind %(CUR)s(?P<SB>[.0-9]+)" % short_subst, re.MULTILINE)
# TODO: should probably rename re_HeroCards and corresponding method, re_PostBB = re.compile(r"^%(PLYR)s: posts big blind %(CUR)s(?P<BB>[.0-9]+)" % short_subst, re.MULTILINE)
# since they are used to find all cards on lines starting with "Dealt to:" re_Antes = re.compile(r"^%(PLYR)s: posts the ante %(CUR)s(?P<ANTE>[.0-9]+)" % short_subst, re.MULTILINE)
# They still identify the hero. re_BringIn = re.compile(r"^%(PLYR)s: brings[- ]in( low|) for %(CUR)s(?P<BRINGIN>[.0-9]+)" % short_subst, re.MULTILINE)
self.compiledPlayers = players re_PostBoth = re.compile(r"^%(PLYR)s: posts small \& big blinds %(CUR)s(?P<SBBB>[.0-9]+)" % short_subst, re.MULTILINE)
player_re = "(?P<PNAME>" + "|".join(map(re.escape, players)) + ")" re_HeroCards = re.compile(r"^Dealt to %(PLYR)s(?: \[(?P<OLDCARDS>.+?)\])?( \[(?P<NEWCARDS>.+?)\])" % short_subst, re.MULTILINE)
subst = {'PLYR': player_re, 'CUR': self.sym[hand.gametype['currency']]} re_Action = re.compile(r"""
log.debug("player_re: " + player_re)
self.re_PostSB = re.compile(r"^%(PLYR)s: posts small blind %(CUR)s(?P<SB>[.0-9]+)" % subst, re.MULTILINE)
self.re_PostBB = re.compile(r"^%(PLYR)s: posts big blind %(CUR)s(?P<BB>[.0-9]+)" % subst, re.MULTILINE)
self.re_Antes = re.compile(r"^%(PLYR)s: posts the ante %(CUR)s(?P<ANTE>[.0-9]+)" % subst, re.MULTILINE)
self.re_BringIn = re.compile(r"^%(PLYR)s: brings[- ]in( low|) for %(CUR)s(?P<BRINGIN>[.0-9]+)" % subst, re.MULTILINE)
self.re_PostBoth = re.compile(r"^%(PLYR)s: posts small \& big blinds %(CUR)s(?P<SBBB>[.0-9]+)" % subst, re.MULTILINE)
self.re_HeroCards = re.compile(r"^Dealt to %(PLYR)s(?: \[(?P<OLDCARDS>.+?)\])?( \[(?P<NEWCARDS>.+?)\])" % subst, re.MULTILINE)
self.re_Action = re.compile(r"""
^%(PLYR)s:(?P<ATYPE>\sbets|\schecks|\sraises|\scalls|\sfolds|\sdiscards|\sstands\spat) ^%(PLYR)s:(?P<ATYPE>\sbets|\schecks|\sraises|\scalls|\sfolds|\sdiscards|\sstands\spat)
(\s(%(CUR)s)?(?P<BET>[.\d]+))?(\sto\s%(CUR)s(?P<BETTO>[.\d]+))? # the number discarded goes in <BET> (\s(%(CUR)s)?(?P<BET>[.\d]+))?(\sto\s%(CUR)s(?P<BETTO>[.\d]+))? # the number discarded goes in <BET>
\s*(and\sis\sall.in)? \s*(and\sis\sall.in)?
(and\shas\sreached\sthe\s[%(CUR)s\d\.]+\scap)? (and\shas\sreached\sthe\s[%(CUR)s\d\.]+\scap)?
(\scards?(\s\[(?P<DISCARDED>.+?)\])?)?\s*$""" (\scards?(\s\[(?P<DISCARDED>.+?)\])?)?\s*$"""
% subst, re.MULTILINE|re.VERBOSE) % short_subst, re.MULTILINE|re.VERBOSE)
self.re_ShowdownAction = re.compile(r"^%s: shows \[(?P<CARDS>.*)\]" % player_re, re.MULTILINE) re_ShowdownAction = re.compile(r"^%s: shows \[(?P<CARDS>.*)\]" % short_subst['PLYR'], re.MULTILINE)
self.re_CollectPot = re.compile(r"Seat (?P<SEAT>[0-9]+): %(PLYR)s (\(button\) |\(small blind\) |\(big blind\) |\(button\) \(small blind\) |\(button\) \(big blind\) )?(collected|showed \[.*\] and won) \(%(CUR)s(?P<POT>[.\d]+)\)(, mucked| with.*|)" % subst, re.MULTILINE) re_sitsOut = re.compile("^%s sits out" % short_subst['PLYR'], re.MULTILINE)
self.re_sitsOut = re.compile("^%s sits out" % player_re, re.MULTILINE) re_ShownCards = re.compile("^Seat (?P<SEAT>[0-9]+): %s (\(.*\) )?(?P<SHOWED>showed|mucked) \[(?P<CARDS>.*)\].*" % short_subst['PLYR'], re.MULTILINE)
self.re_ShownCards = re.compile("^Seat (?P<SEAT>[0-9]+): %s (\(.*\) )?(?P<SHOWED>showed|mucked) \[(?P<CARDS>.*)\].*" % player_re, re.MULTILINE) re_CollectPot = re.compile(r"Seat (?P<SEAT>[0-9]+): %(PLYR)s (\(button\) |\(small blind\) |\(big blind\) |\(button\) \(small blind\) |\(button\) \(big blind\) )?(collected|showed \[.*\] and won) \(%(CUR)s(?P<POT>[.\d]+)\)(, mucked| with.*|)" % short_subst, re.MULTILINE)
def compilePlayerRegexs(self, hand):
pass
def readSupportedGames(self): def readSupportedGames(self):
return [["ring", "hold", "nl"], return [["ring", "hold", "nl"],

2
pyfpdb/SitenameSummary.py
View File

@ -20,7 +20,7 @@
import L10n import L10n
_ = L10n.get_translation() _ = L10n.get_translation()
from decimal import Decimal from decimal_wrapper import Decimal
import datetime import datetime
from Exceptions import FpdbParseError from Exceptions import FpdbParseError

2
pyfpdb/TourneySummary.py
View File

@ -28,7 +28,7 @@ import traceback
import logging import logging
import os import os
import os.path import os.path
from decimal import Decimal from decimal_wrapper import Decimal
import operator import operator
import time,datetime import time,datetime
from copy import deepcopy from copy import deepcopy

2
pyfpdb/WinamaxSummary.py
View File

@ -18,7 +18,7 @@
import L10n import L10n
_ = L10n.get_translation() _ = L10n.get_translation()
from decimal import Decimal from decimal_wrapper import Decimal
import datetime import datetime
from BeautifulSoup import BeautifulSoup from BeautifulSoup import BeautifulSoup

2
pyfpdb/WinamaxToFpdb.py
View File

@ -29,7 +29,7 @@ import logging
import Configuration import Configuration
from HandHistoryConverter import * from HandHistoryConverter import *
from decimal import Decimal from decimal_wrapper import Decimal
import time import time
# Winamax HH Format # Winamax HH Format

4
pyfpdb/decimal_wrapper.py Normal file
View File

@ -0,0 +1,4 @@
try:
from cdecimal import *
except ImportError:
from decimal import *

2
pyfpdb/iPokerToFpdb.py
View File

@ -46,7 +46,7 @@ _ = L10n.get_translation()
import sys import sys
import logging import logging
from HandHistoryConverter import * from HandHistoryConverter import *
from decimal import Decimal from decimal_wrapper import Decimal
class iPoker(HandHistoryConverter): class iPoker(HandHistoryConverter):