Major update of the webapp.

[people/shoehn/ipfire.org.git] / webapp / backend / misc.py

diff --git a/webapp/backend/misc.py b/webapp/backend/misc.py
index 22dce10b9b3ff3c25f988c09e2336f625cf2856d..3cc129f7b1896c058154b90683b95c15b45f0570 100644 (file)
--- a/webapp/backend/misc.py
+++ b/webapp/backend/misc.py
@@ -4,6 +4,14 @@ class Object(object):
        def __init__(self, backend):
                self.backend = backend
 
+               self.init()
+
+       def init(self):
+               """
+                       Function for custom initialization.
+               """
+               pass
+
        @property
        def db(self):
                return self.backend.db
@@ -12,22 +20,26 @@ class Object(object):
        def accounts(self):
                return self.backend.accounts
 
+       @property
+       def downloads(self):
+               return self.backend.downloads
+
+       @property
+       def geoip(self):
+               return self.backend.geoip
+
+       @property
+       def iuse(self):
+               return self.backend.iuse
+
+       @property
+       def memcache(self):
+               return self.backend.memcache
+
        @property
        def planet(self):
                return self.backend.planet
 
-
-class Singleton(type):
-       """
-               A class for using the singleton pattern
-       """
-
-       def __init__(cls, name, bases, dict):
-               super(Singleton, cls).__init__(name, bases, dict)
-               cls.instance = None
- 
-       def __call__(cls, *args, **kw):
-               if cls.instance is None:
-                       cls.instance = super(Singleton, cls).__call__(*args, **kw)
- 
-               return cls.instance
+       @property
+       def settings(self):
+               return self.backend.settings