From 225eaab491fe0980acdccc737a23bf3c263acbb7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 16 Dec 2009 13:07:37 -0700
Subject: [PATCH] Linux: Preferentially use desktop specific notification
 daemons

---
 resources/images/notify.png     | Bin 0 -> 3891 bytes
 setup/installer/linux/freeze.py |   2 +-
 src/calibre/gui2/notify.py      | 111 ++++++++++++++++++++++++++++++++
 src/calibre/gui2/status.py      |   6 +-
 4 files changed, 116 insertions(+), 3 deletions(-)
 create mode 100644 resources/images/notify.png
 create mode 100644 src/calibre/gui2/notify.py

diff --git a/resources/images/notify.png b/resources/images/notify.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ced8ea8c27fccbc1452eb79bef29828d0538fcf
GIT binary patch
literal 3891
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
BXs!SN

literal 0
HcmV?d00001

diff --git a/setup/installer/linux/freeze.py b/setup/installer/linux/freeze.py
index 632009a300..2c691e47de 100644
--- a/setup/installer/linux/freeze.py
+++ b/setup/installer/linux/freeze.py
@@ -108,7 +108,7 @@ class LinuxFreeze(Command):
                     'glib', 'gobject']
 
         packages = ['calibre', 'encodings', 'cherrypy', 'cssutils', 'xdg',
-                    'dateutil', 'dns', 'email']
+                    'dateutil', 'dns', 'email', 'dbus']
 
         includes += ['calibre.gui2.convert.'+x.split('/')[-1].rpartition('.')[0] for x in \
                 glob.glob('src/calibre/gui2/convert/*.py')]
diff --git a/src/calibre/gui2/notify.py b/src/calibre/gui2/notify.py
new file mode 100644
index 0000000000..fe7b3c78a7
--- /dev/null
+++ b/src/calibre/gui2/notify.py
@@ -0,0 +1,111 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+from __future__ import with_statement
+
+__license__   = 'GPL v3'
+__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+
+from calibre.constants import islinux
+
+class Notifier(object):
+
+    DEFAULT_TIMEOUT = 5000
+
+    def get_msg_parms(self, timeout, body, summary):
+        if summary is None:
+            summary = 'calibre'
+        if timeout == 0:
+            timeout = self.DEFAULT_TIMEOUT
+        return timeout, body, summary
+
+    def __call__(self, body, summary=None, replaces_id=None, timeout=0):
+        raise NotImplementedError
+
+
+class DBUSNotifier(Notifier):
+
+    ICON = I('notify.png')
+
+    def __init__(self, server, path):
+        self.ok, self.err = True, None
+        try:
+            import dbus
+            self.dbus = dbus
+            self._notify = dbus.SessionBus().get_object(server, path)
+        except Exception, err:
+            self.ok = False
+            self.err = str(err)
+
+
+class KDENotifier(DBUSNotifier):
+
+    def __init__(self):
+        DBUSNotifier.__init__(self, 'org.kde.VisualNotifications',
+                '/VisualNotifications')
+
+    def __call__(self, body, summary=None, replaces_id=None, timeout=0):
+        if replaces_id is None:
+            replaces_id = self.dbus.UInt32()
+        event_id = ''
+        timeout, body, summary = self.get_msg_parms(timeout, body, summary)
+        self._notify.Notify('calibre', replaces_id, event_id, self.ICON, summary, body,
+                self.dbus.Array(signature='s'), self.dbus.Dictionary(signature='sv'),
+                timeout)
+
+class FDONotifier(DBUSNotifier):
+
+    def __init__(self):
+        DBUSNotifier.__init__(self, 'org.freedesktop.Notifications',
+                '/org/freedesktop/Notifications')
+
+    def __call__(self, body, summary=None, replaces_id=None, timeout=0):
+        if replaces_id is None:
+            replaces_id = self.dbus.UInt32()
+        timeout, body, summary = self.get_msg_parms(timeout, body, summary)
+        self._notify.Notify('calibre', replaces_id, self.ICON, summary, body,
+                self.dbus.Array(signature='s'), self.dbus.Dictionary(signature='sv'),
+                timeout)
+
+class QtNotifier(Notifier):
+
+    def __init__(self, systray=None):
+        self.systray = systray
+        self.ok = self.systray is not None and self.systray.supportsMessages()
+
+    def __call__(self, body, summary=None, replaces_id=None, timeout=0):
+        timeout, body, summary = self.get_msg_parms(timeout, body, summary)
+        if self.systray is not None:
+            self.systray.showMessage(summary, body, self.systray.Information,
+                    timeout)
+
+def get_notifier(systray=None):
+    ans = None
+    if islinux:
+        ans = KDENotifier()
+        if not ans.ok:
+            ans = FDONotifier()
+            if not ans.ok:
+                ans = None
+    if ans is None:
+        ans = QtNotifier(systray)
+        if not ans.ok:
+            ans = None
+    return ans
+
+
+if __name__ == '__main__':
+    n = KDENotifier()
+    n('hello')
+    n = FDONotifier()
+    n('hello')
+    '''
+    from PyQt4.Qt import QApplication, QSystemTrayIcon, QIcon
+    app = QApplication([])
+    ic = QIcon(I('notify.png'))
+    tray = QSystemTrayIcon(ic)
+    tray.setVisible(True)
+    n = QtNotifier(tray)
+    n('hello')
+    '''
diff --git a/src/calibre/gui2/status.py b/src/calibre/gui2/status.py
index 3b421d1afd..af161db818 100644
--- a/src/calibre/gui2/status.py
+++ b/src/calibre/gui2/status.py
@@ -9,6 +9,7 @@ from calibre import fit_image, preferred_encoding, isosx
 from calibre.gui2 import qstring_to_unicode, config
 from calibre.gui2.widgets import IMAGE_EXTENSIONS
 from calibre.gui2.progress_indicator import ProgressIndicator
+from calibre.gui2.notify import get_notifier
 from calibre.ebooks import BOOK_EXTENSIONS
 
 class BookInfoDisplay(QWidget):
@@ -218,6 +219,7 @@ class StatusBar(QStatusBar):
     def __init__(self, jobs_dialog, systray=None):
         QStatusBar.__init__(self)
         self.systray = systray
+        self.notifier = get_notifier(systray)
         self.movie_button = MovieButton(jobs_dialog)
         self.cover_flow_button = CoverFlowButton()
         self.tag_view_button = TagViewButton()
@@ -247,13 +249,13 @@ class StatusBar(QStatusBar):
 
     def showMessage(self, msg, timeout=0):
         ret = QStatusBar.showMessage(self, msg, timeout)
-        if self.systray is not None and not config['disable_tray_notification']:
+        if self.notifier is not None and not config['disable_tray_notification']:
             if isosx and isinstance(msg, unicode):
                 try:
                     msg = msg.encode(preferred_encoding)
                 except UnicodeEncodeError:
                     msg = msg.encode('utf-8')
-            self.systray.showMessage('calibre', msg, self.systray.Information, 10000)
+            self.notifier(msg)
         return ret
 
     def jobs(self):