r/hugvey
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use label in eventLog/timeline

Browse source
This commit is contained in:
Ruben van de Ven 2019-11-30 18:15:09 +01:00
parent ca6fd3e527
commit d0cd1a25d7
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
hugvey/story.py
View file

@ -57,6 +57,7 @@ class Message(object):
def __init__(self, id, text): def __init__(self, id, text):
self.id = id self.id = id
self.text = text self.text = text
self.label = None
self.isStart = False self.isStart = False
self.isStrandStart = False self.isStrandStart = False
self.chapterStart = False self.chapterStart = False
@ -106,6 +107,7 @@ class Message(object):
msg.chapterStart = bool(data['chapterStart']) if 'chapterStart' in data else False msg.chapterStart = bool(data['chapterStart']) if 'chapterStart' in data else False
msg.afterrunTime = data['afterrun'] if 'afterrun' in data else 0. # TODO: investigate deprecation? msg.afterrunTime = data['afterrun'] if 'afterrun' in data else 0. # TODO: investigate deprecation?
msg.color = data['color'] if 'color' in data else None msg.color = data['color'] if 'color' in data else None
msg.label = data['label'] if 'label' in data else None
if 'audio' in data and data['audio'] is not None: if 'audio' in data and data['audio'] is not None:
msg.audioFile = data['audio']['file'] msg.audioFile = data['audio']['file']
msg.setStory(story) msg.setStory(story)
@ -164,6 +166,14 @@ class Message(object):
text = text.replace('$'+var, replacement) text = text.replace('$'+var, replacement)
return text return text
def getLabel(self):
"""
When a label is set, return that, else the original text
"""
if self.label and len(self.label):
return self.label
return self.getText()
def setReply(self, reply): def setReply(self, reply):
self.reply = reply self.reply = reply
@ -1878,7 +1888,7 @@ class Story(object):
if message.id != self.startMessage.id: if message.id != self.startMessage.id:
self.addToLog(message) self.addToLog(message)
self.hugvey.eventLogger.info(f"message: {message.id} {message.uuid} start \"{message.getText()}\"") self.hugvey.eventLogger.info(f"message: {message.id} {message.uuid} start \"{message.getLabel()}\"")
# TODO: prep events & timer etc. # TODO: prep events & timer etc.
fn = await message.getAudioFilePath() fn = await message.getAudioFilePath()