Bug fix: Refix accepting messages from non-Pesterchum users, this time keeping ? times

This commit is contained in:
Kiooeht 2011-05-17 10:56:43 -07:00
parent ae93fceee7
commit c6342f5305

View file

@ -123,14 +123,20 @@ class TimeTracker(list):
def setCurrent(self, timed): def setCurrent(self, timed):
self.current = self.index(timed) self.current = self.index(timed)
def addRecord(self, timed): def addRecord(self, timed):
try:
(temporal, pcf, when) = pcfGrammar(timed - timedelta(0)) (temporal, pcf, when) = pcfGrammar(timed - timedelta(0))
except TypeError:
(temporal, pcf, when) = pcfGrammar(mysteryTime())
if pcf == "C" or pcf == "?": if pcf == "C" or pcf == "?":
return return
if timed in self.timerecord[pcf]: if timed in self.timerecord[pcf]:
return return
self.timerecord[pcf].append(timed) self.timerecord[pcf].append(timed)
def getRecord(self, timed): def getRecord(self, timed):
try:
(temporal, pcf, when) = pcfGrammar(timed - timedelta(0)) (temporal, pcf, when) = pcfGrammar(timed - timedelta(0))
except TypeError:
(temporal, pcf, when) = pcfGrammar(mysteryTime())
if pcf == "C" or pcf == "?": if pcf == "C" or pcf == "?":
return 0 return 0
if len(self.timerecord[pcf]) > 1: if len(self.timerecord[pcf]) > 1:
@ -163,10 +169,11 @@ class TimeTracker(list):
timed = self.getTime() timed = self.getTime()
return self.getGrammarTime(timed) return self.getGrammarTime(timed)
def getGrammarTime(self, timed): def getGrammarTime(self, timed):
if not timed:
timed = timedelta(0)
mytime = timedelta(0) mytime = timedelta(0)
try:
(temporal, pcf, when) = pcfGrammar(timed - mytime) (temporal, pcf, when) = pcfGrammar(timed - mytime)
except TypeError:
(temporal, pcf, when) = pcfGrammar(mysteryTime())
if timed == mytime: if timed == mytime:
return TimeGrammar(temporal, pcf, when, 0) return TimeGrammar(temporal, pcf, when, 0)
return TimeGrammar(temporal, pcf, when, self.getRecord(timed)) return TimeGrammar(temporal, pcf, when, self.getRecord(timed))