@@ -13,70 +13,17 @@ import random

 import json

 import text_server

+import datastore

-class DonutResource(twisted.web.resource.Resource):

-

-	def __init__(self):

-		twisted.web.resource.Resource.__init__(self)

-		self.data_store = []

-

-	isLeaf = True

-

-	def render_POST(self, request):

-		print self.data_store

-		data_store = self.data_store

-		data_store.append(json.loads(request.content.read()))

-		_id = len(data_store)-1

-		data_store[-1]['id'] = _id

-		return json.dumps(dict(id=len(data_store)-1))

-

-	def render_PUT(self, request):

-		data_store = self.data_store

-		new = json.load(request.content)

-		print new

-		if new['id'] < len(data_store):

-			data_store[new['id']] = new

-		return ''

-

-	def render_GET(self, request):

-		if not request.postpath:

-			return json.dumps(self.data_store)

-

-		idx = request.postpath[0]

-		idx = int(idx)

-		return json.dumps(self.data_store[idx])

-

-class DonutShopListResource(twisted.web.resource.Resource):

-	donut_shops = dict(

-		a = DonutResource(),

-		b = DonutResource(),

-		c = DonutResource(),

-	)

-

-	isLeaf = False

-

-	def getChild(self, path, request):

-		print path

-

-		if path in self.donut_shops:

-			result = self.donut_shops.get(path)

-			return result

-

-		return twisted.web.resource.Resource.getChild(self, path, request)

-

-

-

-class TestResource(twisted.web.resource.Resource):

+class TextResource(twisted.web.resource.Resource):

 	lqueue = collections.deque()

 	nqueue = collections.deque()

 	isLeaf = False

 	def __init__(self):

-		from pymongo import MongoClient

-		mc = MongoClient()

-		db = mc.text_server

-		collection = db.texts

+		import redis

+		collection = datastore.RedisDataStore(redis.Redis())

 		twisted.web.resource.Resource.__init__(self)

 		self.putChild('html', static.File('html'))

new file mode 100644

@@ -0,0 +1,18 @@

+import json

+class RedisDataStore(object):

+	key = 0

+	def __init__(self, connection):

+		self.db = connection

+

+	rkey = '%05d__BOOK%%s'

+	def insert(self, dct):

+		self.key += 1

+		rkey = self.rkey % self.key

+		self.db.set(rkey % '', 1)

+		self.db.set(rkey % '__TITLE', dct['title'])

+		self.db.set(rkey % '__CONTENT', json.dumps(dct['content']))

+

+	def find(self, key):

+		rkey = self.rkey % self.key 

+		if self.db.get(rkey % '') is not None:

+			return self.db.get(rkey % '__TITLE'), self.db.get(rkey % '__CONTENT')

@@ -22,6 +22,7 @@ def load_data(fil):

 		a,b = chunk.split('--')

 		a = filter(None, [x.strip() for x in a.split('\n\n')])

 		b = filter(None, [x.strip() for x in b.split('\n\n')])

+		print b[0], type(b[0])

 		name = ''

 		if a[0].startswith('#'):

@@ -45,8 +46,10 @@ class ChunkResource(twisted.web.resource.Resource):

 	def render_GET(self, request):

 		idx = request.postpath[0]

-		data = self.data_store.find(_id=idx)[0]

-		title, cont = data['title'], data['content']

-		result = u'var text_title = "%s", objs = %s' % (title, json.dumps(cont))

+		data = self.data_store.find(idx)

+		title, cont = data

+		title = title.decode('utf-8')

+		cont = cont.decode('utf-8')

+		result = u'var text_title = "%s", objs = %s' % (title, cont)

 		return bytes(result.encode('utf-8'))