Changeset 7e639860f58c8c25ebe5ce1b714a54a6d668112a

Timestamp:

30.07.2013 02:50:28 (7 years ago)

Author:

Stanislaw Klekot <dozzie@…>

Branches:

b66903eafbcb1d49112014abc82c8bf683413db0

Children:

a87b728b31cead3ea82bed5a282b3b730df56491

Parents:

ea93e3cf09ad21475511b78b6daa2e16669788c2

git-author:

Stanislaw Klekot <dozzie@…> (30.07.2013 02:49:26)

git-committer:

Stanislaw Klekot <dozzie@…> (30.07.2013 02:50:28)

Message:

First stab at actually using remote objects cache.

Files:

• cache/.gitignore (added)
• dashwiki/macros/models.py (modified) (1 diff)
• dashwiki/plugins/FlatFile.py (modified) (1 diff)
• dashwiki/plugins/HTTP.py (modified) (1 diff)
• dashwiki/plugins/XMLRPC.py (modified) (1 diff)
• dashwiki/settings.py (modified) (1 diff)
• dashwiki/urls.py (modified) (2 diffs)

dashwiki/macros/models.py

@@ -33 +33 @@
     from dashwiki.plugins import load_plugin
     plugin_instance = load_plugin(self)
-    result = plugin_instance.call(args)
+
+    from django.conf import settings
+    from django.core.urlresolvers import reverse
+    from dashwiki.resource_cache import ResourceCache
+    cache = ResourceCache(
+      settings.DASHWIKI_CACHE_ROOT,
+      reverse('cached_files'),
+    )
+
+    result = plugin_instance.call(args, cache)
     return result
 

dashwiki/plugins/FlatFile.py

@@ -6 +6 @@
 
 class FlatFile(ProtocolPlugin):
-  def call(self, args):
+  def call(self, args, cache):
     # args: [...]
     self.set_args(args)

dashwiki/plugins/HTTP.py

@@ -5 +5 @@
 import os
 
+from dashwiki.logging import getLogger, message as log
+
+logger = getLogger(__name__)
+
 #-----------------------------------------------------------------------------
 
 class HTTP(ProtocolPlugin):
-  def call(self, args):
+  @staticmethod
+  def fetch(url, filename):
+    logger.info(log(
+      'fetching file',
+      url = url,
+      filename = filename,
+    ))
+    urlfetcher = urllib.URLopener()
+    urlfetcher.retrieve(url, filename)
+
+  def call(self, args, cache):
     # args: [...]
     self.set_args(args)
 
-    # TODO: remove when DashWiki serves images by itself (a cache)
-    if self.result_type == 'graph':
-      return self.make_image()
-
-    urlfetcher = urllib.URLopener()
-    (tempfilename, headers) = urlfetcher.retrieve(self.url)
-    data = open(tempfilename).read()
-    os.unlink(tempfilename)
+    # FIXME: how to choose filename?
+    filename = 'foo'
 
     if self.result_type == 'list':
+      data = cache.get(filename, lambda(g): HTTP.fetch(self.url, g.path()))
       return data.split('\n')
     elif self.result_type == 'graph':
-      return self.make_image()
+      url = cache.get_url(filename, lambda(g): HTTP.fetch(self.url, g.path()))
+      return {
+        'image': { 'image_target': url }
+      }
     else:
+      data = cache.get(filename, lambda(g): HTTP.fetch(self.url, g.path()))
       return data
 

dashwiki/plugins/XMLRPC.py

@@ -7 +7 @@
 
 class XMLRPC(ProtocolPlugin):
-  def call(self, args):
+  def call(self, args, cache):
     # args: [...]
     self.set_args(args)

dashwiki/settings.py

@@ -60 +60 @@
 # Example: "/home/media/media.lawrence.com/"
 MEDIA_ROOT = '%s/static' % (app_root_dir)
+
+# Absolute path to the directory that holds media.
+# Example: "/home/media/media.lawrence.com/"
+DASHWIKI_CACHE_ROOT = '%s/cache' % (app_root_dir)
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a

dashwiki/urls.py

@@ -31 +31 @@
     name = "static_files"
   ),
+  url(
+    r'^cache/(?P<path>.+)?$',
+    'django.views.static.serve', { 'document_root': settings.DASHWIKI_CACHE_ROOT },
+    name = "cached_files"
+  ),
 )
 
@@ -38 +43 @@
 
 #-----------------------------------------------------------------------------
-# vim:ft=python:foldmethod=marker
+# vim:ft=python:nowrap:foldmethod=marker