Skip to content

Refactor more speech functions #10593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
feerrenrut merged 18 commits into from
Jan 29, 2020
Merged

Refactor more speech functions #10593

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
01a56c0
Fix getTextWithFields docstring
feerrenrut Dec 5, 2019
e7a18f5
Add names for callback commands to give context in logging.
feerrenrut Dec 18, 2019
94ba656
Add debug logging and formatting to sayAllHandler
feerrenrut Dec 16, 2019
c7b9ac8
Rename _speakTextInfo_addMath -> _extendSpeechSequence_addMathForText…
feerrenrut Dec 5, 2019
e15b907
Add return type annotation: getSpeechForSpelling
feerrenrut Dec 6, 2019
c9812f1
Rename getSpeechForSpelling -> getSpellingSpeech
feerrenrut Dec 16, 2019
2b49f68
Encapsulate speakWithoutPauses in a class
feerrenrut Dec 5, 2019
761179d
Extract stages of speakWithoutPauses
feerrenrut Dec 27, 2019
ca361cb
Remove recursive calls
feerrenrut Dec 27, 2019
e1974d8
Use flush instead of directly manipulating member var
feerrenrut Dec 17, 2019
0f6a7b0
Refactor getSpeechWithoutPauses to use generators
feerrenrut Dec 27, 2019
1270083
Split speakTextInfo: getTextInfoSpeech is a generator with return value.
feerrenrut Dec 6, 2019
d6b36d7
Split speakObjectProperties to return a speech sequence
feerrenrut Dec 6, 2019
2fe9e9a
Split speakMessage to return speechSequence
feerrenrut Dec 6, 2019
ed9b9ff
Split speakSelectionMessage and speakPreselectedText to return speech…
feerrenrut Dec 7, 2019
c47c346
Extract 'allowed properties' calc from speakObject
feerrenrut Dec 7, 2019
cd203bd
Format extracted 'allowed properties' calc
feerrenrut Dec 7, 2019
9a884eb
Split speakObject to return a speech sequence
feerrenrut Dec 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add names for callback commands to give context in logging.
  • Loading branch information
@feerrenrut
feerrenrut committed Jan 29, 2020
commit e7a18f52c9ca5674fa8726be60082493fc900c9d
11 changes: 7 additions & 4 deletions source/sayAllHandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def next(self):
if not obj:
return
# Call this method again when we start speaking this object.
callbackCommand = speech.CallbackCommand(self.next)
callbackCommand = speech.CallbackCommand(self.next, name="say-all:next")
speech.speakObject(obj, reason=controlTypes.REASON_SAYALL, _prefixSpeechCommand=callbackCommand)

def stop(self):
Expand Down Expand Up @@ -135,14 +135,17 @@ def nextLine(self):
# No more text.
if isinstance(self.reader.obj, textInfos.DocumentWithPageTurns):
# Once the last line finishes reading, try turning the page.
cb = speech.CallbackCommand(self.turnPage)
cb = speech.CallbackCommand(self.turnPage, name="say-all:turnPage")
speech.speakWithoutPauses([cb, speech.EndUtteranceCommand()])
else:
self.finish()
return
# Call lineReached when we start speaking this line.
# lineReached will move the cursor and trigger reading of the next line.
cb = speech.CallbackCommand(lambda obj=self.reader.obj, state=self.speakTextInfoState.copy(): self.lineReached(obj,bookmark, state))
cb = speech.CallbackCommand(
lambda obj=self.reader.obj, state=self.speakTextInfoState.copy(): self.lineReached(obj, bookmark, state),
name="say-all:lineReached"
)
spoke = speech.speakTextInfo(self.reader, unit=textInfos.UNIT_READINGCHUNK,
reason=controlTypes.REASON_SAYALL, _prefixSpeechCommand=cb,
useCache=self.speakTextInfoState)
Expand Down Expand Up @@ -198,7 +201,7 @@ def finish(self):
# Otherwise, if a different synth is being used for say all,
# we might switch synths too early and truncate the final speech.
# We do this by putting a CallbackCommand at the start of a new utterance.
cb = speech.CallbackCommand(self.stop)
cb = speech.CallbackCommand(self.stop, name="say-all:stop")
speech.speakWithoutPauses([speech.EndUtteranceCommand(), cb,
speech.EndUtteranceCommand()])

Expand Down
8 changes: 7 additions & 1 deletion source/speech/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,12 +253,18 @@ class CallbackCommand(BaseCallbackCommand):
otherwise it will block production of further speech and or other functionality in NVDA.
"""

def __init__(self, callback):
def __init__(self, callback, name: Optional[str] = None):
self._callback = callback
self._name = name if name else repr(callback)

def run(self,*args, **kwargs):
return self._callback(*args,**kwargs)

def __repr__(self):
return "CallbackCommand(name={name})".format(
name=self._name
)

class BeepCommand(BaseCallbackCommand):
"""Produce a beep.
"""
Expand Down