diff options
| author | schneefux <schneefux+commit@schneefux.xyz> | 2014-09-10 20:26:43 +0200 |
|---|---|---|
| committer | schneefux <schneefux+commit@schneefux.xyz> | 2014-09-26 13:34:45 +0200 |
| commit | 78364574c3ed067cf7f607c28b2965010dbbcbd7 (patch) | |
| tree | ebf848a51ffc1fbc1a2d0a0adb43a2f7baf83bec | |
| parent | 7cafe838582598a6881182e48dda360f74c0a312 (diff) | |
| download | jasper-client-78364574c3ed067cf7f607c28b2965010dbbcbd7.tar.gz jasper-client-78364574c3ed067cf7f607c28b2965010dbbcbd7.zip | |
Improve is_available method
| -rw-r--r-- | client/speaker.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/client/speaker.py b/client/speaker.py index 027e973..2a296c8 100644 --- a/client/speaker.py +++ b/client/speaker.py @@ -33,7 +33,7 @@ class AbstractSpeaker(object): @classmethod @abstractmethod def is_available(cls): - pass + return True @abstractmethod def say(self, phrase, *args): @@ -62,7 +62,7 @@ class AbstractMp3Speaker(AbstractSpeaker): """ @classmethod def is_available(cls): - return True if 'mad' in sys.modules.keys() else False + return (super(AbstractMp3Speaker, cls).is_available() and 'mad' in sys.modules.keys()) def play_mp3(cls, filename): f = mad.MadFile(filename) @@ -92,7 +92,7 @@ class eSpeakSpeaker(AbstractSpeaker): @classmethod def is_available(cls): - return (super(cls, cls).is_available() and subprocess.call(['which','espeak']) == 0) + return (super(eSpeakSpeaker, cls).is_available() and subprocess.call(['which','espeak']) == 0) def say(self, phrase, voice='default+m3', pitch_adjustment=40, words_per_minute=160): with tempfile.NamedTemporaryFile(suffix='.wav', delete=False) as f: @@ -115,7 +115,7 @@ class saySpeaker(AbstractSpeaker): @classmethod def is_available(cls): - return (subprocess.call(['which','say']) == 0) + return (super(saySpeaker, cls).is_available() and subprocess.call(['which','say']) == 0) def say(self, phrase): cmd = ['say', str(phrase)] @@ -135,7 +135,7 @@ class picoSpeaker(AbstractSpeaker): @classmethod def is_available(cls): - return (super(cls, cls).is_available() and subprocess.call(['which','pico2wave']) == 0) + return (super(picoSpeaker, cls).is_available() and subprocess.call(['which','pico2wave']) == 0) @property def languages(self): @@ -177,7 +177,7 @@ class googleSpeaker(AbstractMp3Speaker): @classmethod def is_available(cls): - return (super(cls, cls).is_available() and 'gtts' in sys.modules.keys()) + return (super(googleSpeaker, cls).is_available() and 'gtts' in sys.modules.keys()) @property def languages(self): @@ -209,3 +209,4 @@ def newSpeaker(): if cls.is_available(): return cls() raise ValueError("Platform is not supported") +
\ No newline at end of file |