Эх сурвалжийг харах

update system date neuron

nico 8 жил өмнө
parent
commit
d8fcb775ca
3 өөрчлөгдсөн 24 нэмэгдсэн , 23 устгасан
  1. 1 4
      brain.yml
  2. 16 4
      neurons/systemdate/systemdate.py
  3. 7 15
      test.py

+ 1 - 4
brain.yml

@@ -39,16 +39,13 @@
       - systemdate:
           say_template:
             - "il est {{ hours }} heure et {{ minutes }} minute"
-          cache: False
     signals:
       - order: "what time is it"
 
   - name: "Say local date from template"
     neurons:
       - systemdate:
-          file_template: fr_systemdate_template_example.j2
-          tts: "voxygen"
-          cache: False
+          file_template: en_systemdate_template_example.j2
     signals:
       - order: "test heure"
 

+ 16 - 4
neurons/systemdate/systemdate.py

@@ -6,17 +6,29 @@ from core.NeuronModule import NeuronModule
 
 class Systemdate(NeuronModule):
     def __init__(self, **kwargs):
-        super(Systemdate, self).__init__(**kwargs)
+        # get the cache if set by the user, if not, set it to false as it is not necessary
+        cache = kwargs.get('cache', None)
+        if cache is None:
+            cache = False
+        super(Systemdate, self).__init__(cache=cache, **kwargs)
 
-        # get hours and minutes
 
-        hour = time.strftime("%H")
-        minute = time.strftime("%M")
 
+        # local time and date
+        hour = time.strftime("%H")          # Hour (24-hour clock) as a decimal number [00,23].
+        minute = time.strftime("%M")        # Minute as a decimal number [00,59].
+        weekday = time.strftime("%w")       # Weekday as a decimal number [0(Sunday),6].
+        day_month = time.strftime("%d")     # Day of the month as a decimal number [01,31].
+        month = time.strftime("%m")         # Month as a decimal number [01,12].
+        year = time.strftime("%Y")          # Year with century as a decimal number. E.g: 2016
 
         message = {
             "hours": hour,
             "minutes": minute,
+            "weekday": weekday,
+            "month": month,
+            "day_month": day_month,
+            "year": year
         }
         
         self.say(message)

+ 7 - 15
test.py

@@ -4,6 +4,7 @@ import re
 from collections import Counter
 
 from core import OrderAnalyser
+from neurons import Systemdate
 from neurons.tasker_autoremote.tasker_autoremote import Tasker_autoremote
 
 logging.basicConfig()
@@ -11,21 +12,12 @@ logger = logging.getLogger("kalliope")
 logger.setLevel(logging.DEBUG)
 
 
-# # This does not work because of different encoding when using accent
-# from core import OrderAnalyser
-# # order = "kalliope régle le réveil pour sept heures et vingt minutes"
-# # order = "mais nous de la musique"
-#
-# order = "arrête la musique"
-# # order = order.decode('utf-8')
-# # print type(order)
-# oa = OrderAnalyser(order)
-#
-# oa.start()
-key = "mykey"
-message = "lost my phone"
-
-tk = Tasker_autoremote(key=key, message=message)
+
+order = "test heure"
+oa = OrderAnalyser(order)
+oa.start()
+
+