Generating compiled files during install (#13)

17 files changed, 382 insertions, 8 deletions

diff --git a/scudcloud-1.0/debian/changelog b/scudcloud-1.0/debian/changelog
index 092f7ac..e40a4e3 100644
--- a/scudcloud-1.0/debian/changelog
+++ b/scudcloud-1.0/debian/changelog
@@ -1,3 +1,9 @@
+scudcloud (1.0-4) trusty; urgency=low
+
+  * Removing compiled files from package source (#13)
+
+ -- Rael Gugelmin Cunha <rael.gc@gmail.com>  Wed, 04 Mar 2015 10:55:30 -0300
+
 scudcloud (1.0-3) trusty; urgency=low
 
   * Adding support to other DEs (#12)
diff --git a/scudcloud-1.0/debian/control b/scudcloud-1.0/debian/control
index 8683683..76425bf 100644
--- a/scudcloud-1.0/debian/control
+++ b/scudcloud-1.0/debian/control
@@ -2,7 +2,7 @@ Source: scudcloud
 Section: utils
 Priority: optional
 Maintainer: Rael Gugelmin Cunha <rael.gc@gmail.com>
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper (>= 9), python3 | python3-all | python3-dev | python3-all-dev
 Standards-Version: 3.9.5
 Homepage: https://github.com/raelgc/scudcloud
 
diff --git a/scudcloud-1.0/debian/install b/scudcloud-1.0/debian/install
index 82eaea0..facd9c4 100644
--- a/scudcloud-1.0/debian/install
+++ b/scudcloud-1.0/debian/install
@@ -1,14 +1,14 @@
-lib/cookiejar.pyc opt/scudcloud/lib
-lib/launcher.pyc opt/scudcloud/lib
-lib/notify2.pyc opt/scudcloud/lib
-lib/systray.pyc opt/scudcloud/lib
-lib/wrapper.pyc opt/scudcloud/lib
+lib/cookiejar.py opt/scudcloud/lib
+lib/launcher.py opt/scudcloud/lib
+lib/notify2.py opt/scudcloud/lib
+lib/scudcloud.py opt/scudcloud/lib
+lib/systray.py opt/scudcloud/lib
+lib/wrapper.py opt/scudcloud/lib
 LICENSE opt/scudcloud
 resources/login.css opt/scudcloud/resources
 resources/scudcloud.js opt/scudcloud/resources
 resources/scudcloud.png opt/scudcloud/resources
 scudcloud opt/scudcloud
-scudcloud.pyc opt/scudcloud
 scudcloud.desktop usr/share/applications
 systray/mono-dark/scudcloud.svg usr/share/icons/ubuntu-mono-dark/scalable/apps
 systray/mono-dark/scudcloud-attention.svg usr/share/icons/ubuntu-dark-light/scalable/apps 
diff --git a/scudcloud-1.0/debian/postinst b/scudcloud-1.0/debian/postinst
index 2da5fa6..82e802f 100644
--- a/scudcloud-1.0/debian/postinst
+++ b/scudcloud-1.0/debian/postinst
@@ -21,6 +21,7 @@ set -e
 case "$1" in
     configure)
         xdg-icon-resource forceupdate
+        python3 -m compileall /opt/scudcloud/lib/
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/scudcloud-1.0/lib/cookiejar.py b/scudcloud-1.0/lib/cookiejar.py
new file mode 100644
index 0000000..bd355f2
--- /dev/null
+++ b/scudcloud-1.0/lib/cookiejar.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python3
+from PyQt4 import QtCore, QtNetwork
+
+class PersistentCookieJar(QtNetwork.QNetworkCookieJar):
+
+    def __init__(self, parent):
+        super(PersistentCookieJar, self).__init__(parent)
+        self.mainWindow = parent
+        self.load()
+        self.save()
+
+    def save(self):
+        listCookies = self.allCookies()
+        data = QtCore.QByteArray()
+        for cookie in  listCookies:
+            if not cookie.isSessionCookie():
+                data.append(cookie.toRawForm()+ "\n")
+        self.mainWindow.settings.setValue("Cookies",data)
+
+    def load(self):
+        data = self.mainWindow.settings.value("Cookies")
+        if data is not None:
+            self.setAllCookies(QtNetwork.QNetworkCookie.parseCookies(data))
+
diff --git a/scudcloud-1.0/lib/cookiejar.pyc b/scudcloud-1.0/lib/cookiejar.pyc
deleted file mode 100644
index 8073123..0000000
--- a/scudcloud-1.0/lib/cookiejar.pyc
+++ /dev/null
diff --git a/launcher.py b/scudcloud-1.0/lib/launcher.py
index 32257fd..32257fd 100644
--- a/launcher.py
+++ b/scudcloud-1.0/lib/launcher.py
diff --git a/scudcloud-1.0/lib/launcher.pyc b/scudcloud-1.0/lib/launcher.pyc
deleted file mode 100644
index ac09a22..0000000
--- a/scudcloud-1.0/lib/launcher.pyc
+++ /dev/null
diff --git a/scudcloud-1.0/lib/notify2.py b/scudcloud-1.0/lib/notify2.py
new file mode 100644
index 0000000..1b40269
--- /dev/null
+++ b/scudcloud-1.0/lib/notify2.py
@@ -0,0 +1,342 @@
+"""This is a pure-python replacement for notify-python, using python-dbus
+to communicate with the notifications server directly. It's compatible with
+Python 2 and 3, and its callbacks can work with Gtk 3 or Qt 4 applications.
+
+To use it, first call ``notify2.init('app name')``, then create and show notifications::
+
+    n = notify2.Notification("Summary",
+                             "Some body text",
+                             "notification-message-im"   # Icon name
+                            )
+    n.show()
+
+To see more of what's possible, refer to docstrings of methods and objects.
+
+Based on the notifications spec at:
+http://developer.gnome.org/notification-spec/
+
+Porting applications from pynotify
+----------------------------------
+
+There are a few differences from pynotify you should be aware of:
+
+- If you need callbacks from notifications, notify2 must know about your event
+  loop. The simplest way is to pass 'glib' or 'qt' as the ``mainloop`` parameter
+  to ``init``.
+- The methods ``attach_to_widget`` and ``attach_to_status_icon`` are not
+  implemented. You can calculate the location you want the notification to
+  appear and call ``Notification``.
+- ``set_property`` and ``get_property`` are not implemented. The summary, body
+  and icon are accessible as attributes of a ``Notification`` instance.
+- Various methods that pynotify Notification instances got from gobject do not
+  exist, or only implement part of the functionality.
+
+Several pynotify functions, especially getters and setters, are only supported
+for compatibility. You are encouraged to use more direct, Pythonic alternatives.
+"""
+
+import dbus
+
+# Constants
+EXPIRES_DEFAULT = -1
+EXPIRES_NEVER = 0
+
+URGENCY_LOW = 0
+URGENCY_NORMAL = 1
+URGENCY_CRITICAL = 2
+urgency_levels = [URGENCY_LOW, URGENCY_NORMAL, URGENCY_CRITICAL]
+
+# Initialise the module (following pynotify's API) -----------------------------
+
+initted = False
+appname = ""
+_have_mainloop = False
+
+class UninittedError(RuntimeError):
+    pass
+
+class UninittedDbusObj(object):
+    def __getattr__(self, name):
+        raise UninittedError("You must call notify2.init() before using the "
+                             "notification features.")
+
+dbus_iface = UninittedDbusObj()
+
+def init(app_name, mainloop=None):
+    """Initialise the Dbus connection.
+    
+    To get callbacks from notifications, DBus must be integrated with a mainloop.
+    There are three ways to achieve this:
+    
+    - Set a default mainloop (dbus.set_default_main_loop) before calling init()
+    - Pass the mainloop parameter as a string 'glib' or 'qt' to integrate with
+      those mainloops. (N.B. passing 'qt' currently makes that the default dbus
+      mainloop, because that's the only way it seems to work.)
+    - Pass the mainloop parameter a DBus compatible mainloop instance, such as
+      dbus.mainloop.glib.DBusGMainLoop().
+    
+    If you only want to display notifications, without receiving information
+    back from them, you can safely omit mainloop.
+    """
+    global appname, initted, dbus_iface, _have_mainloop
+    
+    if mainloop == 'glib':
+        from dbus.mainloop.glib import DBusGMainLoop
+        mainloop = DBusGMainLoop()
+    elif mainloop == 'qt':
+        from dbus.mainloop.qt import DBusQtMainLoop
+        # For some reason, this only works if we make it the default mainloop
+        # for dbus. That might make life tricky for anyone trying to juggle two
+        # event loops, but I can't see any way round it.
+        mainloop = DBusQtMainLoop(set_as_default=True)
+    
+    bus = dbus.SessionBus(mainloop=mainloop)
+
+    dbus_obj = bus.get_object('org.freedesktop.Notifications',
+                              '/org/freedesktop/Notifications')
+    dbus_iface = dbus.Interface(dbus_obj,
+                                dbus_interface='org.freedesktop.Notifications')
+    appname = app_name
+    initted = True
+    
+    if mainloop or dbus.get_default_main_loop():
+        _have_mainloop = True
+        dbus_iface.connect_to_signal('ActionInvoked', _action_callback)
+        dbus_iface.connect_to_signal('NotificationClosed', _closed_callback)
+        
+    return True
+
+def is_initted():
+    """Has init() been called? Only exists for compatibility with pynotify.
+    """
+    return initted
+
+def get_app_name():
+    """Return appname. Only exists for compatibility with pynotify.
+    """
+    return appname
+
+def uninit():
+    """Undo what init() does."""
+    global initted, dbus_iface, _have_mainloop
+    initted = False
+    _have_mainloop = False
+    dbus_iface = UninittedDbusObj()
+
+# Retrieve basic server information --------------------------------------------
+
+def get_server_caps():
+    """Get a list of server capabilities.
+    """
+    return [str(x) for x in dbus_iface.GetCapabilities()]
+
+def get_server_info():
+    """Get basic information about the server.
+    """
+    res = dbus_iface.GetServerInformation()
+    return {'name': str(res[0]),
+             'vendor': str(res[1]),
+             'version': str(res[2]),
+             'spec-version': str(res[3]),
+            }
+
+# Action callbacks -------------------------------------------------------------
+
+notifications_registry = {}
+
+def _action_callback(nid, action):
+    nid, action = int(nid), str(action)
+    n = notifications_registry[nid]
+    n._action_callback(action)
+
+def _closed_callback(nid, reason):
+    nid, reason = int(nid), int(reason)
+    n = notifications_registry[nid]
+    n._closed_callback(n)
+    del notifications_registry[nid]
+
+def no_op(*args):
+    """No-op function for callbacks.
+    """
+    pass
+
+# Controlling notifications ----------------------------------------------------
+
+class Notification(object):
+    id = 0
+    timeout = -1    # -1 = server default settings
+    _closed_callback = no_op
+    
+    def __init__(self, summary, message='', icon=''):
+        self.summary = summary
+        self.message = message
+        self.icon = icon
+        self.hints = {}
+        self.actions = {}
+        self.data = {}     # Any data the user wants to attach
+    
+    def show(self):
+        """Ask the server to show the notification.
+        """
+        nid = dbus_iface.Notify(appname,       # app_name       (spec names)
+                              self.id,       # replaces_id
+                              self.icon,     # app_icon
+                              self.summary,  # summary
+                              self.message,  # body
+                              self._make_actions_array(),  # actions
+                              self.hints,    # hints
+                              self.timeout,  # expire_timeout
+                            )
+        
+        self.id = int(nid)
+        
+        if _have_mainloop:
+            notifications_registry[self.id] = self
+        return True
+    
+    def update(self, summary, message="", icon=None):
+        """Replace the summary and body of the notification, and optionally its
+        icon. You should call show() again after this to display the updated
+        notification.
+        """
+        self.summary = summary
+        self.message = message
+        if icon is not None:
+            self.icon = icon
+    
+    def close(self):
+        """Ask the server to close this notification.
+        """
+        if self.id != 0:
+            dbus_iface.CloseNotification(self.id)
+    
+    def set_hint(self, key, value):
+        """n.set_hint(key, value) <--> n.hints[key] = value
+        
+        Only exists for compatibility with pynotify.
+        """
+        self.hints[key] = value
+    
+    set_hint_string = set_hint_int32 = set_hint_double = set_hint
+    
+    def set_hint_byte(self, key, value):
+        """Set a hint with a dbus byte value. The input value can be an
+        integer or a bytes string of length 1.
+        """
+        self.hints[key] = dbus.Byte(value)
+    
+    def set_urgency(self, level):
+        """Set the urgency level to one of URGENCY_LOW, URGENCY_NORMAL or
+        URGENCY_CRITICAL.
+        """
+        if level not in urgency_levels:
+            raise ValueError("Unknown urgency level specified", level)
+        self.set_hint_byte("urgency", level)
+    
+    def set_category(self, category):
+        """Set the 'category' hint for this notification.
+        """
+        self.hints['category'] = category
+    
+    def set_timeout(self, timeout):
+        """Set the display duration in milliseconds, or one of the special
+        values EXPIRES_DEFAULT or EXPIRES_NEVER.
+        
+        Only exists for compatibility with pynotify; you can simply set::
+        
+          n.timeout = 5000
+        """
+        if not isinstance(timeout, int):
+            raise TypeError("timeout value was not int", timeout)
+        self.timeout = timeout
+    
+    def get_timeout(self):
+        """Return the timeout value for this notification.
+        
+        Only exists for compatibility with pynotify; you can inspect the
+        timeout attribute directly.
+        """
+        return self.timeout
+    
+    def add_action(self, action, label, callback, user_data=None):
+        """Add an action to the notification (if the server supports it).
+        
+        action : str
+          A brief key.
+        label : str
+          The text displayed on the action button
+        callback : callable
+          A function taking at 2-3 parameters: the Notification object, the
+          action key and (if specified) the user_data.
+        user_data :
+          An extra argument to pass to the callback.
+        """
+        self.actions[action] = (label, callback, user_data)
+    
+    def _make_actions_array(self):
+        """Make the actions array to send over DBus.
+        """
+        arr = []
+        for action, (label, callback, user_data) in self.actions.items():
+            arr.append(action)
+            arr.append(label)
+        return arr
+    
+    def _action_callback(self, action):
+        """Called when the user selects an action on the notification, to
+        dispatch it to the relevant user-specified callback.
+        """
+        try:
+            label, callback, user_data = self.actions[action]
+        except KeyError:
+            return
+        
+        if user_data is None:
+            callback(self, action)
+        else:
+            callback(self, action, user_data)
+    
+    def connect(self, event, callback):
+        """Set the callback for the notification closing; the only valid value
+        for event is 'closed'. The API is compatible with pynotify.
+        """
+        if event != 'closed':
+            raise ValueError("'closed' is the only valid value for event", event)
+        self._closed_callback = callback
+    
+    def set_data(self, key, value):
+        """n.set_data(key, value) <--> n.data[key] = value
+        
+        Only exists for compatibility with pynotify.
+        """
+        self.data[key] = value
+    
+    def get_data(self, key):
+        """n.get_data(key) <--> n.data[key]
+        
+        Only exists for compatibility with pynotify.
+        """
+        return self.data[key]
+
+    def set_icon_from_pixbuf(self, icon):
+        """Set a custom icon from a GdkPixbuf.
+        """
+        struct = (
+            icon.get_width(),
+            icon.get_height(),
+            icon.get_rowstride(),
+            icon.get_has_alpha(),
+            icon.get_bits_per_sample(),
+            icon.get_n_channels(),
+            dbus.ByteArray(icon.get_pixels())
+            )
+        self.hints['icon_data'] = struct
+    
+    def set_location(self, x, y):
+        """Set the notification location as (x, y), if the server supports it.
+        """
+        if (not isinstance(x, int)) or (not isinstance(y, int)):
+            raise TypeError("x and y must both be ints", (x,y))
+        self.hints['x'] = x
+        self.hints['y'] = y
+        
diff --git a/scudcloud-1.0/lib/notify2.pyc b/scudcloud-1.0/lib/notify2.pyc
deleted file mode 100644
index 923783d..0000000
--- a/scudcloud-1.0/lib/notify2.pyc
+++ /dev/null
diff --git a/scudcloud.py b/scudcloud-1.0/lib/scudcloud.py
index 8896cbe..537d947 100755..100644
--- a/scudcloud.py
+++ b/scudcloud-1.0/lib/scudcloud.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 INSTALL_DIR = "/opt/scudcloud/"
 import sys, os
-sys.path.append(INSTALL_DIR+'lib')
 import notify2
 from cookiejar import PersistentCookieJar
 from systray import Systray
diff --git a/systray.py b/scudcloud-1.0/lib/systray.py
index 81f5d81..81f5d81 100644
--- a/systray.py
+++ b/scudcloud-1.0/lib/systray.py
diff --git a/scudcloud-1.0/lib/systray.pyc b/scudcloud-1.0/lib/systray.pyc
deleted file mode 100644
index f601e39..0000000
--- a/scudcloud-1.0/lib/systray.pyc
+++ /dev/null
diff --git a/wrapper.py b/scudcloud-1.0/lib/wrapper.py
index ccf0b4e..ccf0b4e 100644
--- a/wrapper.py
+++ b/scudcloud-1.0/lib/wrapper.py
diff --git a/scudcloud-1.0/lib/wrapper.pyc b/scudcloud-1.0/lib/wrapper.pyc
deleted file mode 100644
index 3897c4c..0000000
--- a/scudcloud-1.0/lib/wrapper.pyc
+++ /dev/null
diff --git a/scudcloud-1.0/scudcloud b/scudcloud-1.0/scudcloud
index a45b7b6..3f3fc95 100755
--- a/scudcloud-1.0/scudcloud
+++ b/scudcloud-1.0/scudcloud
@@ -1,5 +1,7 @@
 #!/usr/bin/env python3
 import sys, argparse
+INSTALL_DIR = "/opt/scudcloud/"
+sys.path.append(INSTALL_DIR+'lib')
 from PyQt4 import QtGui
 from scudcloud import ScudCloud
 if __name__ == "__main__":
diff --git a/scudcloud-1.0/scudcloud.pyc b/scudcloud-1.0/scudcloud.pyc
deleted file mode 100644
index f2d7d72..0000000
--- a/scudcloud-1.0/scudcloud.pyc
+++ /dev/null