Skip to content

Commit

Permalink
fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
@JarbasAl
JarbasAl committed Nov 11, 2024
1 parent 3905082 commit 424224d
Showing 1 changed file with 36 additions and 60 deletions.
96 changes: 36 additions & 60 deletions __init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,12 +274,14 @@ def _init_dav_clients(self):
if services:
self.speak_dialog(dialog,
{"services": join_word_list(services,
connector="and", sep=",", lang=self.lang)})
connector="and",
sep=",",
lang=self.lang)})
self.dav_services = dav_services
self.sync_frequency = sync_frequency

# Intent Handlers
# @killable_intent()
#@killable_intent()
@intent_handler(IntentBuilder("CreateAlarm").require("alarm")
.require("create").optionally("question")
.optionally("playable").optionally("weekdays")
Expand Down Expand Up @@ -348,7 +350,7 @@ def handle_ocp_alarm(self, message: Message):
def handle_ocp_alarm_alt(self, message: Message):
return self.handle_ocp_alarm(message)

# @killable_intent()
#@killable_intent()
@intent_handler(IntentBuilder("CreateTimer").require("create")
.require("timer").optionally("question")
.optionally("until"))
Expand All @@ -369,7 +371,7 @@ def handle_create_timer(self, message: Message):

self.confirm_alert(alert, message)

# @killable_intent()
#@killable_intent()
@intent_handler(IntentBuilder("CreateReminder").require("create")
.require("reminder").optionally("question")
.optionally("playable").optionally("weekdays")
Expand All @@ -391,7 +393,7 @@ def handle_create_reminder(self, message: Message):
time_ = self.get_response(
"reminder_ask_time", validator=validate_dt_or_delta, num_retries=0
)
# if response and response != "no":
#if response and response != "no":
if isinstance(time_, datetime):
alert.expiration = time_
elif isinstance(time_, timedelta):
Expand All @@ -409,23 +411,19 @@ def handle_create_reminder(self, message: Message):
alert_type)

if overlapping:
dialog_data = {"event": join_word_list([r.alert_name
for r in overlapping], connector="and", sep=",", lang=self.lang)}
dialog_data = {"event": join_word_list([r.alert_name for r in overlapping],
connector="and", sep=",", lang=self.lang)}
end = [a.until for a in overlapping if a.until]
if end:
dialog_data["begin"] = nice_time(min([a.expiration
for a in overlapping]))
dialog_data["begin"] = nice_time(min([a.expiration for a in overlapping]))
dialog_data["end"] = nice_time(max(end))
dialog = "alert_overlapping_duration_ask"
else:
dialog_data["begin"] = join_word_list([nice_time(a.expiration)
for a in overlapping], connector="and", sep=",", lang=self.lang)
dialog_data["begin"] = join_word_list([nice_time(a.expiration) for a in overlapping],
connector="and", sep=",", lang=self.lang)
dialog = "alert_overlapping_ask"

if self.ask_yesno(dialog, dialog_data) in (
"no",
None,
):
if self.ask_yesno(dialog, dialog_data) in ("no", None):
return

if alert.alert_type == AlertType.EVENT:
Expand All @@ -434,7 +432,7 @@ def handle_create_reminder(self, message: Message):
self.specify_dav_attributes(alert, spoken_type)
self.confirm_alert(alert, message)

# @killable_intent()
#@killable_intent()
@intent_handler(IntentBuilder("CreateReminderAlt").require("remind")
.optionally("question").optionally("playable")
.optionally("weekdays").optionally("weekends")
Expand All @@ -447,7 +445,7 @@ def handle_create_reminder_alt(self, message: Message):
"""
self.handle_create_reminder(message)

# @killable_intent()
#@killable_intent()
@intent_handler(IntentBuilder("CreateEvent")
.require("create").require("event")
.optionally("question").optionally("playable")
Expand Down Expand Up @@ -492,25 +490,19 @@ def handle_reschedule_alert(self, message: Message):
dialog = "alert_rescheduled_all_day"
else:
alert.is_all_day = False
rescheduled_time = \
parse_relative_time_from_message(message,
anchor_time=anchor_time)
rescheduled_time = parse_relative_time_from_message(message, anchor_time=anchor_time)
dialog = "alert_rescheduled"

if rescheduled_time is None:
return self.speak_dialog("error_no_time",
{"kind": spoken_type}, wait=True)
return self.speak_dialog("error_no_time", {"kind": spoken_type}, wait=True)

once = True
if alert.has_repeat and \
self.ask_yesno("reschedule_recurring_ask",
{"type": spoken_type}) == "yes":
once = False

rescheduled = \
self.alert_manager.reschedule_alert(alert,
rescheduled_time,
once)
rescheduled = self.alert_manager.reschedule_alert(alert, rescheduled_time, once)
self._display_alert(rescheduled)
dialog_data = get_alert_dialog_data(rescheduled, self.lang)
self.speak_dialog(dialog, dialog_data, wait=True)
Expand Down Expand Up @@ -723,9 +715,7 @@ def handle_next_alert(self, message: Message):

self.speak_dialog(dialog, data, wait=True)

@intent_handler(IntentBuilder("TimerStatus").one_of("time", "timer")
.require("remaining").optionally("query")
)
@intent_handler(IntentBuilder("TimerStatus").one_of("time", "timer").require("remaining").optionally("query"))
def handle_timer_status(self, message: Message):
"""
Intent handler to handle request for timer status (name optional)
Expand Down Expand Up @@ -795,8 +785,7 @@ def handle_cancel_alert(self, message: Message):
# TODO add saveguard for DAV conten?
for alert in alerts:
self._dismiss_alert(alert.ident, drop_dav=True)
return self.speak_dialog("confirm_cancel_timeframe" if begin else \
"confirm_cancel_all",
return self.speak_dialog("confirm_cancel_timeframe" if begin else "confirm_cancel_all",
{"kind": spoken_type, "num": len(alerts)},
wait=True)
# Only one candidate alert
Expand All @@ -819,7 +808,7 @@ def handle_cancel_alert(self, message: Message):
'name': name}, wait=True)

# Todo Lists
# @killable_intent()
#@killable_intent()
@intent_handler(IntentBuilder("CreateList").require("create").require("list"))
def handle_create_todo(self, message: Message, alert: Optional[Alert] = None):
"""
Expand Down Expand Up @@ -851,7 +840,7 @@ def handle_create_todo(self, message: Message, alert: Optional[Alert] = None):

self.speak_dialog("confirm_todo_set", wait=True)

# @killable_intent()
#@killable_intent()
@intent_handler(
IntentBuilder("AddListSubitems")
.require("create").require("list").require("items")
Expand Down Expand Up @@ -942,8 +931,7 @@ def handle_query_todo_reminder_names(self, message: Message):
IntentBuilder("QueryListEntries")
.require("query").require("list").require("items")
)
def handle_todo_list_entries(self, message: Optional[Message] = None,
alert: Optional[Alert] = None):
def handle_todo_list_entries(self, message: Optional[Message] = None, alert: Optional[Alert] = None):
"""
Intent to get the items from a specific todo list
:param message: Message associated with request
Expand Down Expand Up @@ -971,7 +959,7 @@ def handle_todo_list_entries(self, message: Optional[Message] = None,
# delay if this handler is used in context
time.sleep(2)

# @killable_intent()
#@killable_intent()
@intent_handler(
IntentBuilder("DeleteListEntries")
.require("delete").require("items").require("list").optionally("stored")
Expand Down Expand Up @@ -1014,7 +1002,7 @@ def handle_delete_todo_list_entries(self, message: Message):
self.speak_dialog("list_todo_num_deleted",
{"num": pronounce_number(len(deleted))})

# @killable_intent()
#@killable_intent()
@intent_handler(
IntentBuilder("DeleteList")
.require("delete").require("list")
Expand All @@ -1032,8 +1020,7 @@ def handle_delete_todo_list(self, message: Message):
self.alert_manager.mark_todo_complete(todo)
self.speak_dialog("list_deleted", {"name": todo.alert_name})

# @killable_intent()

#@killable_intent()
@intent_handler(
IntentBuilder("DeleteTodoEntries")
.require("delete").require("todo").optionally("items").optionally("stored")
Expand Down Expand Up @@ -1273,8 +1260,7 @@ def converse(self, message: Message):
for alert in active:
self._snooze_alert(alert, snooze_duration)
self.speak_dialog("confirm_snooze_alert",
{"duration": nice_duration(
round(duration.total_seconds()))})
{"duration": nice_duration(round(duration.total_seconds()))})
return True
return False

Expand Down Expand Up @@ -1309,8 +1295,7 @@ def _resolve_requested_alert(
:returns: best matched Alert from alerts or None
"""
tokens = tokens or tokenize_utterance(message)
requested_time, requested_name = \
parse_alert_name_and_time_from_message(message, tokens)
requested_time, requested_name = parse_alert_name_and_time_from_message(message, tokens)

alerts = self._get_alerts_list(alert_type,
disposition=disposition)
Expand Down Expand Up @@ -1478,8 +1463,7 @@ def _get_alerts_list(self,
def _display_alert(self, alert: Alert):
return self._display_alerts(alert.alert_type, [alert])

def _display_alerts(self, alert_type: AlertType,
alerts: Optional[List[Alert]] = None):
def _display_alerts(self, alert_type: AlertType, alerts: Optional[List[Alert]] = None):
if alerts is None:
alerts = self.alert_manager.get_pending_alerts(alert_type=alert_type)

Expand All @@ -1488,8 +1472,7 @@ def _display_alerts(self, alert_type: AlertType,
elif alert_type == AlertType.TIMER:
self._display_timers(alerts)
elif alert_type != AlertType.ALL:
self._display_list(alerts,
header=spoken_alert_type(alert_type))
self._display_list(alerts, header=spoken_alert_type(alert_type))

def _display_alarms(self, alarms: List[Alert]):
"""
Expand Down Expand Up @@ -1561,8 +1544,7 @@ def _display_list(self, alerts: List[Alert], header: str = "Todo"):
self.gui["header"] = header
self.gui.show_page("ListView")

def _update_homescreen(self, alert: Alert = None,
dismiss_notification=False):
def _update_homescreen(self, alert: Alert = None, ismiss_notification=False):
"""
Update homescreen widgets with the current alarms and timers counts.
Expand Down Expand Up @@ -1656,8 +1638,7 @@ def _gui_cancel_timer(self, message: Message):
"""
alert_id = message.data['timer']['alertId']
self._dismiss_alert(alert_id, speak=True)
LOG.debug(("Timers still active on GUI: "
f"{self.alert_manager.active_gui_timers}"))
LOG.debug(f"Timers still active on GUI: {self.alert_manager.active_gui_timers}")

def _event_cancel_alarm(self, message: Message):
"""
Expand Down Expand Up @@ -1722,7 +1703,7 @@ def _gui_dismiss_notification(self, message):
self.speak_dialog("confirm_dismiss_alert",
{"kind": spoken_alert_type(alert.alert_type)})
elif alert_id in self.alert_manager.missed_alerts:
# self.alert_manager.dismiss_missed_alert(alert_id)
#self.alert_manager.dismiss_missed_alert(alert_id)
self.alert_manager.rm_alert(alert_id)
# the notification has to be explicitly removed to not force the user to
# additionally push the trashbin button
Expand Down Expand Up @@ -1862,8 +1843,7 @@ def _play_notify_expired(self, alert: Alert):

# reset volume
if not to_play == "ocp":
self.bus.emit(Message("mycroft.volume.set",
{"percent": self.original_volume}))
self.bus.emit(Message("mycroft.volume.set", {"percent": self.original_volume}))

def _speak_notify_expired(self, alert: Alert):

Expand Down Expand Up @@ -1915,8 +1895,7 @@ def _ocp_query(self, message: Message):
dialog = "ocp_request_retry"
return result

def _snooze_alert(self, alert: Alert,
duration: Optional[timedelta] = None):
def _snooze_alert(self, alert: Alert, duration: Optional[timedelta] = None):
"""
Helper to snooze an alert for the specified duration calling the
alert manager, update widgets and handle media state
Expand Down Expand Up @@ -1944,16 +1923,13 @@ def _snooze_alert(self, alert: Alert,
if not self.alert_manager.get_active_alerts():
self.deactivate()

def _dismiss_alert(self, alert_id: str,
drop_dav: bool = False,
speak: bool = False):
def _dismiss_alert(self, alert_id: str, drop_dav: bool = False, speak: bool = False):
"""
Handle a request to dismiss an alert. Removes the first valid entry in
active, missed, or pending lists.
Also handles GUI pages and homescreen widgets
:param alert_id: ID of alert to dismiss
:param alert_type: AlertType of dismissed alert (used in spoken dialog)
:param drop_dav: if True, remove from DAV service
:param speak: if True, speak confirmation of alert dismissal
"""
Expand Down

0 comments on commit 424224d

Please sign in to comment.