Changeset 201:574d0d75ee24

Timestamp:

09/26/09 15:20:49 (6 months ago)

Author:

rgrp

Branch:

default

convert_revision:

svn:0ead1229-0713-0410-96cd-f668dbfad531/trunk@289

Message:

[shksprdata][l]: add in moby metadata and associated material.

• refactor loading of text info into db and load moby metadata.
• script creation of moby html and pdf in cache and link to these using Resource on relevant Material
  • support new locator_type cache on Resource

Location:

shakespeare

Files:

• cache.py (modified) (1 diff)
• model/__init__.py (modified) (2 diffs)
• model/dm.py (modified) (1 diff)
• tests/test_model.py (modified) (1 diff)

shakespeare/cache.py

@@ -35 +35 @@
     def path_from_offset(self, offset):
         "Get full path of file in cache given by offset."
+        if offset.startswith('/'):
+            offset = offset[1:]
         return os.path.join(self.cache_path, offset)
+
+    def save(self, path, data):
+        fp = self.path_from_offset(path)
+        fo = open(fp, 'w')
+        fo.write(data)
+        fo.close()
 
     def download_url(self, url, overwrite=False):

shakespeare/model/__init__.py

@@ -62 +62 @@
     Session.flush()
 
-def load_texts(fileobj, locator, norm_work_name=None):
+def load_material(fileobj, norm_work_name=None):
     if not norm_work_name:
         norm_work_name = lambda x: x
     cfgp = SafeConfigParser()
     cfgp.readfp(fileobj)
+    results = []
     for section in cfgp.sections():
         work_name = unicode(norm_work_name(section))
         work = Work.by_name(work_name)
-        if work is None:
-            work = Work(name=work_name)
+        assert work is not None, work_name
 
         item = Material.by_name(unicode(section))
@@ -81 +81 @@
             setattr(item, key, val)
         item.work = work
-        if not item.resources:
-            res = Resource(
-                locator_type=u'package',
-                locator=locator(section),
-                # TODO: use format correctly
-                format=u'txt',
-                material=item,
-                )
+        results.append(item)
         Session.flush()
+    return results
+

shakespeare/model/dm.py

@@ -100 +100 @@
             from StringIO import StringIO
             return StringIO(self.locator)
+        elif self.locator_type == u'cache':
+            import shakespeare.cache
+            cache = shakespeare.cache.default
+            fp = cache.path_from_offset(self.locator)
+            return open(fp)
         else:
             raise NotImplementedError

shakespeare/tests/test_model.py

@@ -63 +63 @@
         assert out.read() == sometext
 
+    def test_get_stream_cache(self):
+        import shakespeare.cache
+        cache = shakespeare.cache.default
+        sometext = u'baa baa'
+        path = 'testcache.txt'
+        cache.save(path, sometext)
+        res = model.Resource(locator=path, locator_type=u'cache')
+        out = res.get_stream()
+        assert out.read() == sometext
+
 
 class TestStatistic: