upgrade to latest

This commit is contained in:
Your Name
2019-11-21 21:23:25 +03:00
parent 3b5104a10d
commit 3c61041a51
9 changed files with 30 additions and 11 deletions
+4
View File
@@ -2,6 +2,10 @@ logs:
main_log:
filename: STDOUT
namespaces:
- worktime_namespace:
writeback: safe
appdaemon:
threads: 10
latitude: !secret home_latitude
+1 -1
View File
@@ -58,7 +58,7 @@ class Groups(hass.Hass):
self.set_state(name,state="on",attributes={"view": view,"hidden": hidden,"assumed_state": assumed_state,"friendly_name": friendly_name,"entity_id": entitylist, 'description': 'Created and updated from appdaemon ({})'.format(__name__)})
def sortByFriendlyName(self, entity):
return self.get_state(entity, 'friendly_name')
return self.get_state(entity, attribute='friendly_name')
def append_entity(self, entitylist, entity, expand_group):
entity = entity.lower()
@@ -4,10 +4,10 @@
balance_low_report:
class: Balance
module: balance
constraint: input_boolean.balance_report
entity_ids:
mosenergosbyt_balance: sensor.power_mosenergosbyt_balance
epd_balance: sensor.epd_balance
always_send: 0
threshold: -100
notify: telegram_monster
@@ -23,20 +23,25 @@ class WorkTime(hass.Hass):
notify_before_leave_in_minutes = 15
notify_every_seconds = 300
timers = []
listen_event_handle_list = []
def initialize(self):
if 'notify' not in self.args or "arrive_event" not in self.args or "leave_event" not in self.args:
self.error("Please provide arrive_event, leave_event in config!")
return
self.listen_event(self.arrive_event, self.args['arrive_event'])
self.listen_event(self.leave_event, self.args['leave_event'])
self.listen_event_handle_list.append(self.listen_event(self.arrive_event, self.args['arrive_event']))
self.listen_event_handle_list.append(self.listen_event(self.leave_event, self.args['leave_event']))
self.run_daily(self.reset_timer_tick, self.parse_time("23:59:59"))
self.load_state()
self.run_timer()
def terminate(self):
self.cancel_timers()
def arrive_event(self, event_id, event_args, kwargs):
if self.arrive_time != None:
self.log('You have already arrived to the work today at {}'.format(self.arrive_time))
self.notify("Добро пожаловать в офис еще раз. Сегодня работаешь до {}.".format(self.format_time(self.leave_time)), name = self.args['notify'])
self.run_timer()
return
@@ -58,6 +63,9 @@ class WorkTime(hass.Hass):
timer_start = self.notify_time
if timer_start<self.datetime():
timer_start=self.datetime()+datetime.timedelta(seconds=self.notify_every_seconds)
timers_count = len(self.timers)
self.cancel_timers()
self.log("Canceling previous timers({}), start notify timer at: {}".format(timers_count, timer_start))
self.timers.append(self.run_every(self.timer_tick, timer_start, self.notify_every_seconds))
def leave_event(self, event_id, event_args, kwargs):
+1
View File
@@ -4,6 +4,7 @@ from notification import send_notification
import datetime
import sys, locale
import logging, codecs
import os
#import unicode
# from automation import Automation # type: ignore