Few fixes

2 files changed, 29 insertions, 9 deletions

diff --git a/beinc_poller.py b/beinc_poller.py
index aba6353..16cacd8 100755
--- a/beinc_poller.py
+++ b/beinc_poller.py
@@ -35,7 +35,8 @@ import urllib2
 try:
     import pynotify
 except ImportError as e:
-    sys.stderr.write('A working pynotify library is required by BEINC-poller\n')
+    sys.stderr.write(
+        'A working pynotify library is required by BEINC-poller\n')
     sys.exit(1)
 
 
@@ -74,7 +75,7 @@ class ValidHTTPSHandler(urllib2.HTTPSHandler):
         return self.do_open(ValidHTTPSConnection, req)
 
 
-def poll_notifications(scheduler, args):
+def poll_notifications(scheduler, args, notification_obj):
     """
     """
     try:
@@ -93,13 +94,16 @@ def poll_notifications(scheduler, args):
         if res_code == 200 and args.debug:
             print('Server responded: OK')
             print('Body:\n{0}'.format(res_str))
-        res_list = json.loads(res_str)
-        print(type(res_list))
         response.close()
+        res_list = json.loads(res_str)
+        for entry in res_list:
+            notification_obj.set_properties(summary=entry.get('title', ''),
+                                            body=entry.get('message', ''))
+            notification_obj.show()
         scheduler.enter(args.frequency,
-                        1, 
+                        1,
                         poll_notifications,
-                        (scheduler, args))
+                        (scheduler, args, notification_obj))
     except urllib2.HTTPError as e:
         sys.stderr.write('BEINC-server error ({0} - {1})\n'.format(e.code,
                                                                    e.reason))
@@ -173,8 +177,22 @@ def main():
         sys.stderr.write('There was a problem with libnotify\n')
         sys.exit(1)
 
+    try:
+        notification_obj = pynotify.Notification(' ')
+        notification_obj.set_timeout(args.osd_timeout)
+        notification_obj.set_property(
+            'app_name',
+            '{0} {1}'.format(sys.argv[0], __version__))
+    except Exception as e:
+        sys.stderr.write(
+            'Unable to create pynotify Notification-object: {0}\n'.format(e))
+        sys.exit(1)
+
     sc = sched.scheduler(time.time, time.sleep)
-    sc.enter(args.frequency, 1, poll_notifications, (sc, args))
+    sc.enter(args.frequency,
+             1,
+             poll_notifications,
+             (sc, args, notification_obj))
     sc.run()
 
 
diff --git a/beinc_weechat.py b/beinc_weechat.py
index 7c0841d..ceffef6 100644
--- a/beinc_weechat.py
+++ b/beinc_weechat.py
@@ -266,7 +266,7 @@ class WeechatTarget(object):
                         '%n': values['own_nick']}
         for key, value in replacements.items():
             template = template.replace(key, value)
-        return template
+        return template.encode('utf-8')
 
     def __send_beinc_message(self, data):
         """
@@ -276,6 +276,8 @@ class WeechatTarget(object):
         try:
             req = urllib2.Request(self.__url, data)
             if self.__cert_file:
+                global global_beinc_cert_file
+                global_beinc_cert_file = self.__cert_file
                 opener = urllib2.build_opener(ValidHTTPSHandler)
                 response = opener.open(req)
             else:
@@ -381,7 +383,7 @@ def beinc_privmsg_handler(data, signal, signal_data):
     ph_values['channel'] = prvmsg_dict['arguments'].split(':')[0].strip()
     ph_values['source_nick'] = prvmsg_dict['nick']
     ph_values['message'] = ':'.join(
-        prvmsg_dict['arguments'].split(':')[1:]).strip()
+        prvmsg_dict['arguments'].split(':')[1:]).strip().encode('utf-8')
     if ph_values['channel'] == ph_values['own_nick']:
         # priv messages are handled here
         if not global_values['global_private_messages_policy']: