Skip to content
Snippets Groups Projects
Commit cdc892c6 authored by Yann Leboulanger's avatar Yann Leboulanger
Browse files

add 1 day timeout for reminders and prevent some traceback when date format is not correct

parent 7d176c53
No related branches found
No related tags found
No related merge requests found
[info] [info]
name: Birthday reminder name: Birthday reminder
short_name: birthday_reminder short_name: birthday_reminder
version: 0.0.1 version: 0.0.2
description: Birthday reminder plugin description: Birthday reminder plugin
authors: Evgeniy Popov <evgeniypopov@gmail.com> authors: Evgeniy Popov <evgeniypopov@gmail.com>
homepage: https://bitbucket.org/axce1/bday homepage: https://bitbucket.org/axce1/bday
...@@ -2,6 +2,7 @@ import os ...@@ -2,6 +2,7 @@ import os
import glob import glob
import datetime import datetime
from xml.dom.minidom import * from xml.dom.minidom import *
import gobject
from plugins import GajimPlugin from plugins import GajimPlugin
from plugins.helpers import log_calls from plugins.helpers import log_calls
...@@ -20,11 +21,9 @@ class BirthDayPlugin(GajimPlugin): ...@@ -20,11 +21,9 @@ class BirthDayPlugin(GajimPlugin):
configpath = configpaths.ConfigPaths() configpath = configpaths.ConfigPaths()
cache_path = configpath.cache_root cache_path = configpath.cache_root
self.vcard_path = os.path.join(cache_path, 'vcards') + os.sep self.vcard_path = os.path.join(cache_path, 'vcards') + os.sep
self.timeout_id = 0
def check_birthdays(self):
@log_calls('BirthDayPlugin')
def activate(self):
vcards = [] vcards = []
date_dict = {} date_dict = {}
for jid in glob.glob(self.vcard_path + '*@*'): for jid in glob.glob(self.vcard_path + '*@*'):
...@@ -34,24 +33,26 @@ class BirthDayPlugin(GajimPlugin): ...@@ -34,24 +33,26 @@ class BirthDayPlugin(GajimPlugin):
for xmldoc in vcards: for xmldoc in vcards:
try: try:
xml = parse(xmldoc) xml = parse(xmldoc)
except: except:
pass pass
else: else:
name = xml.getElementsByTagName('BDAY') name = xml.getElementsByTagName('BDAY')
for node in name: for node in name:
try: try:
data = node.childNodes[0].nodeValue data = node.childNodes[0].nodeValue
date_dict[xmldoc[len(self.vcard_path):]] = data date_dict[xmldoc[len(self.vcard_path):]] = data
except: pass except:
pass
today = datetime.date.today() today = datetime.date.today()
for key, value in date_dict.iteritems(): for key, value in date_dict.iteritems():
convert_date = datetime.datetime.strptime(value, "%Y-%m-%d") try:
user_bday = datetime.date( convert_date = datetime.datetime.strptime(value, "%Y-%m-%d")
today.year, convert_date.month, convert_date.day) user_bday = datetime.date(today.year, convert_date.month,
convert_date.day)
except:
continue
if user_bday < today: if user_bday < today:
user_bday = user_bday.replace(year=today.year+1) user_bday = user_bday.replace(year=today.year+1)
...@@ -72,8 +73,16 @@ class BirthDayPlugin(GajimPlugin): ...@@ -72,8 +73,16 @@ class BirthDayPlugin(GajimPlugin):
text = "Today BDay %s" % key text = "Today BDay %s" % key
if text: if text:
popup('', key, key, title=title, text=text) popup('', key, key, title=title, text=text)
return True
@log_calls('BirthDayPlugin')
def activate(self):
self.check_birthdays()
self.timeout_id = gobject.timeout_add_seconds(24*3600,
self.check_birthdays)
@log_calls('BirthDayPlugin') @log_calls('BirthDayPlugin')
def deactivate(self): def deactivate(self):
pass if self.timeout_id > 0:
gobject.source_remove(self.timeout_id)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment