Skip to content
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

Handle missing regexes #164

Open
wants to merge 2 commits into
base: 20.08
Choose a base branch
from
Open

Handle missing regexes #164

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d3526d
Handle missing device-name (unpaired)
forslund May 16, 2021
6456739
Add handling for missing regexes
forslund May 16, 2021
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
130 changes: 88 additions & 42 deletions __init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ class SpotifyNotAuthorizedError(Exception):
pass


class MissingRegexpError(Exception):
pass


# Platforms for which the skill should start the spotify player
MANAGED_PLATFORMS = ['mycroft_mark_1', 'mycroft_mark_2pi']
# Return value definition indication nothing was found
Expand Down Expand Up @@ -180,13 +184,17 @@ def __init__(self):
self.__saved_tracks_fetched = 0

def translate_regex(self, regex):
if regex not in self.regexes:
path = self.find_resource(regex + '.regex')
if path:
with open(path) as f:
string = f.read().strip()
self.regexes[regex] = string
return self.regexes[regex]
try:
if regex not in self.regexes:
path = self.find_resource(regex + '.regex')
if path:
with open(path) as f:
string = f.read().strip()
self.regexes[regex] = string
return self.regexes[regex]
except KeyError as e:
raise MissingRegexError('Missing regex: {}'.format(regex)) \
from e

def launch_librespot(self):
"""Launch the librespot binary for the Mark-1."""
Expand Down Expand Up @@ -496,46 +504,84 @@ def specific_query(self, phrase, bonus):

Returns: Tuple with confidence and data or NOTHING_FOUND
"""
# Check if saved
match = re.match(self.translate_regex('saved_songs'), phrase,
re.IGNORECASE)
if match and self.saved_tracks:
return (1.0, {'data': None,
'type': 'saved_tracks'})

# Check if playlist
match = re.match(self.translate_regex('playlist'), phrase,
re.IGNORECASE)
if match:
return self.query_playlist(match.groupdict()['playlist'])

# Check album
match = re.match(self.translate_regex('album'), phrase,
return (self._specific_saved_songs(phrase, bonus) or
self._specific_playlist(phrase, bonus) or
self._specific_album(phrase, bonus) or
self._specific_artist(phrase, bonus) or
self._specific_podcast(phrase, bonus) or
self._specific_track(phrase, bonus)
or NOTHING_FOUND)

def _specific_saved_songs(self, phrase, bonus):
"""Check for request for saved track (liked)."""
try:
match = re.match(self.translate_regex('saved_songs'), phrase,
re.IGNORECASE)
if match and self.saved_tracks:
return (1.0, {'data': None,
'type': 'saved_tracks'})
except MissingRegexpError as e:
LOG.error('Could not check for saved songs ({})'.format(repr(e)))
return None

def _specific_playlist(self, phrase, bonus):
"""Check for request for playlist."""
try:
match = re.match(self.translate_regex('playlist'), phrase,
re.IGNORECASE)
if match:
return self.query_playlist(match.groupdict()['playlist'])
except MissingRegexpError as e:
LOG.error('Could not specifically check for playlists, '
'Missing translation ({})'.format(repr(e)))
return None

def _specific_album(self, phrase, bonus):
"""Check request for album."""
try:
match = re.match(self.translate_regex('album'), phrase,
re.IGNORECASE)
if match:
bonus += 0.1
album = match.groupdict()['album']
return self.query_album(album, bonus)

except MissingRegexpError as e:
LOG.error('Could not specifically check for albums, '
'Missing translation ({})'.format(repr(e)))
return None

def _specific_artist(self, phrase, bonus):
"""Check request for artist."""
try:
match = re.match(self.translate_regex('artist'), phrase,
re.IGNORECASE)
if match:
artist = match.groupdict()['artist']
return self.query_artist(artist, bonus)
match = re.match(self.translate_regex('song'), phrase,
re.IGNORECASE)
if match:
song = match.groupdict()['track']
return self.query_song(song, bonus)
except MissingRegexpError as e:
LOG.error('Could not specifically check for artists, '
'Missing translation ({})'.format(repr(e)))
return None

def _specific_podcast(self, phrase, bonus):
"""Check request for podcast."""
match = re.match(self.translate_regex('podcast'), phrase,
re.IGNORECASE)
if match:
bonus += 0.1
album = match.groupdict()['album']
return self.query_album(album, bonus)
return self.query_show(match.groupdict()['podcast'])

# Check artist
match = re.match(self.translate_regex('artist'), phrase,
re.IGNORECASE)
if match:
artist = match.groupdict()['artist']
return self.query_artist(artist, bonus)
def _specific_track(self, phrase, bonus):
"""Check if request asks for a song."""
match = re.match(self.translate_regex('song'), phrase,
re.IGNORECASE)
if match:
song = match.groupdict()['track']
return self.query_song(song, bonus)

# Check if podcast
match = re.match(self.translate_regex('podcast'), phrase,
re.IGNORECASE)
if match:
return self.query_show(match.groupdict()['podcast'])

return NOTHING_FOUND
return self.query_song(match.groupdict()['track'])

def generic_query(self, phrase, bonus):
"""Check for a generic query, not asking for any special feature.
Expand Down Expand Up @@ -898,7 +944,7 @@ def get_default_device(self):
device_type = DeviceType.DEFAULT
# if not set or missing try playing on this device
if not dev:
dev = self.device_by_name(self.device_name)
dev = self.device_by_name(self.device_name or '')
self.is_player_remote = False
device_type = DeviceType.MYCROFT
# if not check if a desktop spotify client is playing
Expand Down