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

Finish button now finishes playback also when on loop

Browse source
This commit is contained in:
Ruben van de Ven 2019-08-26 15:22:40 +02:00
parent 06f1e92fcd
commit db16887c91
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
hugvey/central_command.py
View file

@ -491,6 +491,8 @@ class HugveyState(object):
self.lightStatus = 0 self.lightStatus = 0
self.eventLogger = eventLogger.getChild(f"{self.id}") self.eventLogger = eventLogger.getChild(f"{self.id}")
self.blockRestart = False
self.setStatus(self.STATE_GONE) self.setStatus(self.STATE_GONE)
self.requireRestartAfterStop = None self.requireRestartAfterStop = None
@ -630,6 +632,7 @@ class HugveyState(object):
if event['event'] == 'restart': if event['event'] == 'restart':
self.restart() self.restart()
if event['event'] == 'finish': if event['event'] == 'finish':
self.blockRestart = True
self.story._finish() # finish story AND hugvey state self.story._finish() # finish story AND hugvey state
if event['event'] == 'resume': if event['event'] == 'resume':
self.resume() self.resume()
@ -819,8 +822,14 @@ class HugveyState(object):
await self.story.run(startMsgId, resuming) await self.story.run(startMsgId, resuming)
if self.command.config['story']['loop']: if self.command.config['story']['loop']:
if not self.blockRestart:
self.logger.info("Loop story") self.logger.info("Loop story")
self.restart() self.restart()
else:
self.logger.info("Don't loop on manual finish")
# reset a potential setting of blockRestart
self.blockRestart = False
# self.story = None # self.story = None
def getStreamer(self): def getStreamer(self):

1
hugvey/story.py
View file

@ -1273,6 +1273,7 @@ class Story(object):
self.diversions = [] self.diversions = []
self.interruptionDiversions = [] self.interruptionDiversions = []
self.variables = {} self.variables = {}
self.variableValues = {} # captured variables from replies
def pause(self): def pause(self):
self.logger.debug('pause hugvey') self.logger.debug('pause hugvey')