fixed / clean ups

[mir.git] / source / mircoders / media / MediaHandlerGeneric.java

diff --git a/source/mircoders/media/MediaHandlerGeneric.java b/source/mircoders/media/MediaHandlerGeneric.java
index 3d531ab..69fa6b7 100755 (executable)
--- a/source/mircoders/media/MediaHandlerGeneric.java
+++ b/source/mircoders/media/MediaHandlerGeneric.java
@@ -29,20 +29,22 @@
  */
 package  mircoders.media;
 
-import java.io.File;\r
-import java.io.FileInputStream;\r
-import java.io.InputStream;\r
-import java.util.List;\r
-import java.util.Vector;\r
-import javax.servlet.ServletContext;\r
-\r
-import mir.config.MirPropertiesConfiguration;\r
-import mir.entity.Entity;\r
-import mir.log.LoggerWrapper;\r
-import mir.media.MediaExc;\r
-import mir.media.MediaFailure;\r
-import mir.media.MirMedia;\r
-import mir.misc.FileUtil;\r
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Vector;
+
+import javax.servlet.ServletContext;
+
+import mir.config.MirPropertiesConfiguration;
+import mir.entity.Entity;
+import mir.log.LoggerWrapper;
+import mir.media.MediaExc;
+import mir.media.MediaFailure;
+import mir.media.MediaHandler;
+import mir.misc.FileUtil;
 import mir.misc.StringUtil;
 
 
@@ -59,14 +61,14 @@ import mir.misc.StringUtil;
  * we don't have entered in the media_type table, (like RTF documents,
  * PS, PDF, etc..)
  * <p>
- * Of course it implements the MirMedia interface.
+ * Of course it implements the MirMediaHandler interface.
  *
- * @see mir.media.MirMedia
+ * @see mir.media.MirMediaHandler
  * @author mh <mh@nadir.org>
- * @version $Id: MediaHandlerGeneric.java,v 1.20.2.2 2003/09/03 17:49:39 zapata Exp $
+ * @version $Id: MediaHandlerGeneric.java,v 1.20.2.6 2004/01/18 17:30:58 zapata Exp $
  */
 
-public class MediaHandlerGeneric implements MirMedia
+public class MediaHandlerGeneric implements MediaHandler
 {
     protected static MirPropertiesConfiguration configuration;
     protected static String imageHost;
@@ -88,16 +90,16 @@ public class MediaHandlerGeneric implements MirMedia
       logger = new LoggerWrapper("Media.Generic");
     }
 
-    public void set (InputStream in, Entity ent, Entity mediaTypeEnt ) throws MediaExc, MediaFailure {
-      String ext = mediaTypeEnt.getValue("name");
+    public void store (InputStream in, Entity ent, Entity mediaTypeEnt ) throws MediaExc, MediaFailure {
+      String ext = mediaTypeEnt.getFieldValue("name");
       String mediaFname = ent.getId() + "." + ext;
-      String date = ent.getValue("date");
+      String date = ent.getFieldValue("date");
       String datePath = StringUtil.webdbDate2path(date);
       try {
         long size = FileUtil.write(getStoragePath() + File.separator + datePath +
                                    File.separator + mediaFname, in);
-        ent.setValueForProperty("publish_path", datePath + mediaFname);
-        ent.setValueForProperty("size", new Long(size).toString());
+        ent.setFieldValue("publish_path", datePath + mediaFname);
+        ent.setFieldValue("size", new Long(size).toString());
         ent.update();
       }
       catch (Throwable e) {
@@ -110,24 +112,24 @@ public class MediaHandlerGeneric implements MirMedia
       //check first if the media file exist since produced
       //location is also the storage location
 
-      String date = ent.getValue("date");
+      String date = ent.getFieldValue("date");
       String datePath = StringUtil.webdbDate2path(date);
-      String relPath = datePath+ent.getId()+"."+mediaTypeEnt.getValue("name");
+      String relPath = datePath+ent.getId()+"."+mediaTypeEnt.getFieldValue("name");
       String fname = getStoragePath()+relPath;
       if(! new File(fname).exists())
-        throw new MediaExc("error in MirMedia.produce(): " + relPath + " does not exist!");
+        throw new MediaExc("error in MirMediaHandler.produce(): " + relPath + " does not exist!");
     }
 
     public InputStream getMedia (Entity ent, Entity mediaTypeEnt) throws MediaExc, MediaFailure {
-      String publishPath = ent.getValue("publish_path");
+      String publishPath = ent.getFieldValue("publish_path");
       String fname = getStoragePath()+publishPath;
       File f = new File(fname);
       if(! f.exists())
-        throw new MediaExc("error in MirMedia.getMedia(): " + fname + " does not exist!");
+        throw new MediaExc("error in MirMediaHandler.getMedia(): " + fname + " does not exist!");
 
-      FileInputStream inputStream;
+      BufferedInputStream inputStream;
       try {
-        inputStream = new FileInputStream(f);
+        inputStream = new BufferedInputStream(new FileInputStream(f));
       }
       catch (Throwable e) {
         throw new MediaFailure("MediaHandlerGeneric.getMedia(): " + e.toString(), e);
@@ -136,13 +138,13 @@ public class MediaHandlerGeneric implements MirMedia
       return inputStream;
     }
 
-    public InputStream getIcon (Entity ent) throws MediaExc, MediaFailure {
+    public InputStream getThumbnail (Entity ent) throws MediaExc, MediaFailure {
       return null;
     }
 
-    public String getIconMimeType (Entity aMediaEntity, Entity aMediaType) throws MediaExc, MediaFailure {
+    public String getThumbnailMimeType (Entity aMediaEntity, Entity aMediaType) throws MediaExc, MediaFailure {
       ServletContext servletContext = MirPropertiesConfiguration.getContext();
-      String fileName = aMediaEntity.getId()+"."+aMediaType.getValue("name");
+      String fileName = aMediaEntity.getId()+"."+aMediaType.getFieldValue("name");
 
       return servletContext.getMimeType(fileName);
     };
@@ -184,24 +186,9 @@ public class MediaHandlerGeneric implements MirMedia
       return theList;
     }
 
-    public boolean isVideo()
-    {
-      return false;
-    }
-
-    public boolean isAudio()
-    {
-      return false;
-    }
-
-    public boolean isImage()
-    {
-      return false;
-    }
-
     public String getDescr( Entity mediaType)
     {
-      return mediaType.getValue("mime_type");
+      return mediaType.getFieldValue("mime_type");
     }
 
 }