Q&D hack to fix FTP file reads after update
Contributed by grindi on 2+2 http://forumserver.twoplustwo.com/showpost.php?p=12156328&postcount=166 Removes u'\xff\xfe' from the end of file if they exist.
This commit is contained in:
parent
73e6666cbc
commit
68ac5ff554
|
@ -118,7 +118,7 @@ follow : whether to tail -f the input"""
|
||||||
if not m:
|
if not m:
|
||||||
return None
|
return None
|
||||||
mg = m.groupdict()
|
mg = m.groupdict()
|
||||||
|
|
||||||
# translations from captured groups to our info strings
|
# translations from captured groups to our info strings
|
||||||
limits = { 'No Limit':'nl', 'Pot Limit':'pl', 'Limit':'fl' }
|
limits = { 'No Limit':'nl', 'Pot Limit':'pl', 'Limit':'fl' }
|
||||||
games = { # base, category
|
games = { # base, category
|
||||||
|
@ -142,6 +142,24 @@ follow : whether to tail -f the input"""
|
||||||
# NB: SB, BB must be interpreted as blinds or bets depending on limit type.
|
# NB: SB, BB must be interpreted as blinds or bets depending on limit type.
|
||||||
return info
|
return info
|
||||||
|
|
||||||
|
#Following function is a hack, we should be dealing with this in readFile (i think correct codepage....)
|
||||||
|
# Same function as parent class, removing the 2 end characters. - CG
|
||||||
|
def allHandsAsList(self):
|
||||||
|
"""Return a list of handtexts in the file at self.in_path"""
|
||||||
|
#TODO : any need for this to be generator? e.g. stars support can email one huge file of all hands in a year. Better to read bit by bit than all at once.
|
||||||
|
self.readFile()
|
||||||
|
|
||||||
|
# FIXME: it's a hack
|
||||||
|
if self.obs[:2] == u'\xff\xfe':
|
||||||
|
self.obs = self.obs[2:].replace('\x00', '')
|
||||||
|
|
||||||
|
self.obs = self.obs.strip()
|
||||||
|
self.obs = self.obs.replace('\r\n', '\n')
|
||||||
|
if self.obs == "" or self.obs == None:
|
||||||
|
logging.info("Read no hands.")
|
||||||
|
return
|
||||||
|
return re.split(self.re_SplitHands, self.obs)
|
||||||
|
|
||||||
def readHandInfo(self, hand):
|
def readHandInfo(self, hand):
|
||||||
m = self.re_HandInfo.search(hand.handText,re.DOTALL)
|
m = self.re_HandInfo.search(hand.handText,re.DOTALL)
|
||||||
if(m == None):
|
if(m == None):
|
||||||
|
|
Loading…
Reference in New Issue
Block a user