From f89e7191c67794f8584093ffcd2945be051dc38f Mon Sep 17 00:00:00 2001
From: helmutm <helmutm@fd906abe-77d9-0310-91a1-e0d9ade77398>
Date: Tue, 21 Oct 2008 15:35:00 +0000
Subject: [PATCH] provide a media asset view showing a medium-sized variant as
 default

git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@2929 fd906abe-77d9-0310-91a1-e0d9ade77398
---
 media/asset.py               |  4 ++--
 media/browser/admin.py       |  5 ++---
 media/browser/asset.pt       | 20 ++++++++++----------
 media/browser/configure.zcml |  5 +++++
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/media/asset.py b/media/asset.py
index 11ebc20..e576113 100644
--- a/media/asset.py
+++ b/media/asset.py
@@ -65,12 +65,12 @@ class MediaAsset(MediaAssetFile, ExternalFileAdapter):
 
     def setData(self, data):
         ExternalFileAdapter.setData(self, data)
-        if data:
+        if data and self.getMimeType().startswith('image/'):
             self.transform(self.rules)
     data = property(ExternalFileAdapter.getData, setData)
 
     def getMimeType(self):
-        return self.context.contentType
+        return self.context.contentType or ''
 
     def getDataPath(self):
         storage = component.getUtility(IExternalStorage, name=self.storageName)
diff --git a/media/browser/admin.py b/media/browser/admin.py
index 968946a..ce13d83 100644
--- a/media/browser/admin.py
+++ b/media/browser/admin.py
@@ -40,15 +40,14 @@ class RegenerationView(object):
         tMediaAsset = self.context.getLoopsRoot().getConceptManager()[conceptType]
         # Remove old transformed versions
         #storageDir = assetManager.options.get("storage_parameters")
-        #print storageDir
         # Regenerate all media asset transforations
         resources = tMediaAsset.getResources()
         logger = getLogger('Asset Manager')
         errors = 0
         for res in resources:
-            logger.info('*** regenerating: ' + res.__name__)
             asset = component.queryAdapter(res, IMediaAsset)
-            if asset != None:
+            if asset != None and res.contentType.startswith('image/'):
+                logger.info('*** regenerating: ' + res.__name__)
                 try:
                     asset.transform()
                 except:
diff --git a/media/browser/asset.pt b/media/browser/asset.pt
index c003c62..90c4f5a 100644
--- a/media/browser/asset.pt
+++ b/media/browser/asset.pt
@@ -1,16 +1,16 @@
 <!-- ZPT macros for demo view -->
 
 <metal:block define-macro="asset">
-  <h1 tal:content="item/adapted/title">Title</h1>
+    <h1 tal:content="item/adapted/title">Title</h1>
+    <div tal:define="descr item/adapted/description" tal:condition="descr">
+      <h2>Description</h2>
+      <p tal:content="item/adapted/description">Description</p>
+    </div>
 
-  <h2>Content type</h2>
-  <p tal:content="item/adapted/getContentType">image/jpeg</p>
-
-  <div tal:define="descr item/adapted/description" tal:condition="descr">
-    <h2>Description</h2>
-    <p tal:content="item/adapted/description">Description</p>
-  </div>
-
-  <p><img tal:attributes="src string:${item/url}/@@mediaasset.html" /></p>
+    <p tal:define="url python: view.getUrlForTarget(item)">
+      <a href="#"
+         tal:attributes="href string:${url}/view"><img
+            tal:attributes="src string:${url}/@@mediaasset.html?v=medium" /></a>
+    </p>
 </metal:block>
 
diff --git a/media/browser/configure.zcml b/media/browser/configure.zcml
index 6f60056..56eb95e 100644
--- a/media/browser/configure.zcml
+++ b/media/browser/configure.zcml
@@ -5,6 +5,11 @@
    xmlns="http://namespaces.zope.org/browser"
    i18n_domain="zope">
 
+  <page for="loops.interfaces.IResource"
+        name="image_medium.html"
+        class="loops.media.browser.asset.MediaAssetView"
+        permission="zope.View" />
+
   <page for="loops.interfaces.IResource"
         name="mediaasset.html"
         class="loops.media.browser.asset.MediaAssetView"