Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonzalo Odiard <godiard@gmail.com>2013-03-14 20:10:39 (GMT)
committer Gonzalo Odiard <godiard@gmail.com>2013-03-14 20:10:39 (GMT)
commit451071686f2f3bdf6edaf492949cdf0e40e3ebf8 (patch)
treea9ac3049cf06255cc5506e74ff8071c7bdcc1dc2
parent660840c80610c6355c96478e8534e74d52ff7469 (diff)
Display the preview
Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
-rw-r--r--server.py12
-rw-r--r--web/index.html7
2 files changed, 17 insertions, 2 deletions
diff --git a/server.py b/server.py
index 45917bf..544fbff 100644
--- a/server.py
+++ b/server.py
@@ -71,6 +71,11 @@ class JournalHTTPRequestHandler(network.ChunkedGlibHTTPRequestHandler):
mime_type, title, content = jm.get_object_by_id(object_id)
self.send_header_response(mime_type, title)
self.wfile.write(content)
+ if self.path.startswith('/datastore/preview/id='):
+ object_id = self.path[self.path.find('=') + 1:]
+ preview = jm.get_preview_by_id(object_id)
+ self.send_header_response('image/png')
+ self.wfile.write(preview)
def send_header_response(self, mime_type, file_name=None):
self.send_response(200)
@@ -115,6 +120,13 @@ class JournalManager():
f.close()
return mime_type, title, content
+ def get_preview_by_id(self, object_id):
+ dsobj = datastore.get(object_id)
+ preiew = None
+ if 'preview' in dsobj.metadata:
+ preview = dsobj.metadata['preview']
+ return preview
+
def get_starred(self):
self.dsobjects, self._nobjects = datastore.find({'keep': '1'})
results = []
diff --git a/web/index.html b/web/index.html
index 1d04b5a..44d8abc 100644
--- a/web/index.html
+++ b/web/index.html
@@ -10,8 +10,11 @@
for (var i = 0; i < starred.length; i++)
{
$('#journaltable').append("<tr>" +
- "<td class='title'>" + starred[i].title + "</td>"+
- "<td>" + starred[i].desc + "</td>"+
+ "<td><img src=/datastore/preview/id=" + starred[i].id + "/></td>"+
+ "<td>"+
+ "<table><tr><td class='title'>" + starred[i].title + "</td></tr>"+
+ "<tr><td>" + starred[i].desc + "</td></tr></table>"+
+ "</td>" +
"<td><a href=/datastore/id=" + starred[i].id + ">Download</a></td>"+
"</tr>");
}