DenverCoderOne
diff --git a/‎timer/__init__.py‎
Lines changed: 11 additions & 16 deletions b/‎timer/__init__.py‎
Lines changed: 11 additions & 16 deletions
diff --git a/‎timer/bing.wav‎
-249 KB b/‎timer/bing.wav‎
-249 KB
@@ -10,23 +10,22 @@
 - `120:` starts a 2 hours timer
 """
 
-import subprocess
 import threading
 from datetime import timedelta
 from pathlib import Path
-from sys import platform
 from time import strftime, time, localtime
 
 from albert import *
 
 md_iid = '2.0'
-md_version = "1.6"
+md_version = "1.7"
 md_name = "Timer"
 md_description = "Set up timers"
 md_license = "BSD-2"
 md_url = "https://github.com/albertlauncher/python/tree/master/timer"
 md_maintainers = ["@manuelschneid3r", "@googol42", "@uztnus"]
 
+
 class Timer(threading.Timer):
 
     def __init__(self, interval, name, callback):
@@ -51,6 +50,7 @@ def __init__(self):
         self.iconUrls = [f"file:{Path(__file__).parent}/time.svg"]
         self.soundPath = Path(__file__).parent / "bing.wav"
         self.timers = []
+        self.notification = None
 
     def finalize(self):
         for timer in self.timers:
@@ -65,15 +65,10 @@ def deleteTimer(self, timer):
         timer.cancel()
 
     def onTimerTimeout(self, timer):
-        title = 'Timer "%s"' % timer.name if timer.name else 'Timer'
-        text = "Timed out at %s" % strftime("%X", localtime(timer.end))
-        sendTrayNotification(title, text)
-
-        if platform == "linux":
-            subprocess.Popen(["aplay", self.soundPath])
-        elif platform == "darwin":
-            subprocess.Popen(["afplay", self.soundPath])
-
+        self.notification = Notification(
+            title=f"Timer '{timer.name if timer.name else 'Timer'}'",
+            subtitle=f"Timed out at {strftime('%X', localtime(timer.end))}"
+        )
         self.deleteTimer(timer)
 
     def handleTriggerQuery(self, query):
@@ -86,7 +81,7 @@ def handleTriggerQuery(self, query):
             name = args[1] if 1 < len(args) else ''
             if not all(field.isdigit() or field == '' for field in fields):
                 return StandardItem(
-                    id=self.name(),
+                    id=self.name,
                     text="Invalid input",
                     subtext="Enter a query in the form of '%s[[hours:]minutes:]seconds [name]'" % self.defaultTrigger(),
                     iconUrls=self.iconUrls,
@@ -98,7 +93,7 @@ def handleTriggerQuery(self, query):
                 seconds += int(fields[i] if fields[i] else 0)*(60**i)
 
             query.add(StandardItem(
-                id=self.name(),
+                id=self.name,
                 text=str(timedelta(seconds=seconds)),
                 subtext='Set a timer with name "%s"' % name if name else 'Set a timer',
                 iconUrls=self.iconUrls,
@@ -115,11 +110,11 @@ def handleTriggerQuery(self, query):
 
             timer_name_with_quotes = '"%s"' % timer.name if timer.name else ''
             items.append(StandardItem(
-                id=self.name(),
+                id=self.name,
                 text='Delete timer %s [%s]' % (timer_name_with_quotes, identifier),
                 subtext="Times out %s" % strftime("%X", localtime(timer.end)),
                 iconUrls=self.iconUrls,
-                actions=[Action("delete-timer", "Delete timer", lambda timer=timer: self.deleteTimer(timer))]
+                actions=[Action("delete-timer", "Delete timer", lambda t=timer: self.deleteTimer(t))]
             ))
 
         if items: