clean up file structure, use bottle soup plugin

1 files changed, 0 insertions, 79 deletions

diff --git a/ebus/web/controller.py b/ebus/web/controller.py
deleted file mode 100644
index 99d7053..0000000
--- a/ebus/web/controller.py
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-import os, time
-import itty
-from werkzeug.contrib.cache import SimpleCache
-from simplejson import dumps as dump_json
-from sqlalchemy.orm import sessionmaker
-
-from ebus.web import model
-
-Session = sessionmaker()
-
-class CacheDecorator(object):
-    def __init__(self,key,timeout=20): 
-        self.cache = SimpleCache(default_timeout=timeout)
-        self.func = None
-        self.key = key
-
-    def cachedFunc(self, *args, **kwargs):
-        key = self.key(args, kwargs)
-        ret = self.cache.get(key)
-        if ret is None:
-            ret = self.func(*args, **kwargs)
-            self.cache.set(key, ret)
-        return ret
-
-    def __call__(self, func): 
-        self.func = func 
-        return self.cachedFunc
-
-
-## Web Requests
-@itty.get("/")
-def index(req):
-    filename=os.path.join(os.path.dirname(__file__), "static", "index.html")
-    return open(filename,"r").read()
-
-#@itty.get('/json/(?P<sensor>[^/]+)')
-#@itty.get('/json/(?P<sensor>[^/]+)/from_date/(?P<from_date>[^/]+)')
-#@itty.get('/json/(?P<sensor>[^/]+)/from_date/(?P<from_date>[^/]+)/till_date/(?P<till_date>[^/]+)')
-@CacheDecorator(key=lambda args,kwargs: tuple(kwargs.keys()) + tuple(kwargs.values()), 
-                timeout=20)
-def json(req,sensor=None,from_date=None,till_date=None):
-    print "sensor=%s from_date=%s till_date=%s" % (sensor,from_date,till_date)
-    """
-    values = Session().query(model.Value).join(model.Sensor)
-
-    if sensor:
-        values = values.filter(model.Sensor.name == sensor)\
-
-    if from_date:
-        values = values.filter(model.Value.timestamp >= from_date)
-
-    if till_date:
-        values = values.filter(model.Value.timestamp <= till_date)
-
-    response = {"sensor":sensor, "from_date":from_date, "till_date":till_date, "values":values.all()}
-    return itty.Response(dump_json(response),
-                         content_type="application/json")
-    """
-    return itty.Response("") 
-
-@itty.get('/json/list')
-def list(req):
-    sensors = Session().query(model.Sensor)
-    return str(sensors.all())
-
-@itty.get("/static/(?P<filename>.+)")
-def static(request,filename):
-    return ""
-    file = itty.static_file(filename, root=os.path.join(os.path.dirname(__file__), 'static'))
-    return itty.Response(file, content_type=itty.content_type(file))
-
-
-
-## Start method
-def run(db_engine,host="0.0.0.0",port=5000):
-    Session.configure(bind=db_engine)
-    return itty.run_itty(host=host,port=port)