another media handling merge.

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

diff --git a/source/mir/media/MediaHandlerGeneric.java b/source/mir/media/MediaHandlerGeneric.java
index ae9a9e3..df11bf0 100755 (executable)
--- a/source/mir/media/MediaHandlerGeneric.java
+++ b/source/mir/media/MediaHandlerGeneric.java
@@ -30,8 +30,18 @@ public class MediaHandlerGeneric implements MirMedia
         String dir = MirConfig.getProp("Producer.Media.Path");
         String mediaHost = MirConfig.getProp("Producer.Media.Host");
         String mediaFname = ent.getId()+"."+ext;
+        String date = ent.getValue("date");
+        String datePath = StringUtil.webdbDate2path(date);
+        //hack: make it a config option to use "dated" dirs
+        //we can't cause of stallman -mh
+        //if(FileUtil.write(dir+"/"+datePath+"/"+mediaFname, uploadedData)) {
         if(FileUtil.write(dir+"/"+mediaFname, uploadedData)) {
             try {
+                ent.setValueForProperty("is_produced", "1");
+                ent.setValueForProperty("icon_is_produced", "1");
+                //hack: make it a config option to use "dated" dirs
+                //we can't cause of stallman -mh
+                //ent.setValueForProperty("publish_path",datePath+"/"+mediaFname);
                 ent.setValueForProperty("publish_path", mediaFname);
                 ent.setValueForProperty("publish_server", mediaHost);
                 ent.update();
@@ -61,16 +71,28 @@ public class MediaHandlerGeneric implements MirMedia
     }
 
     public byte[] get (Entity ent, Entity mediaTypeEnt) {
-        String ext = mediaTypeEnt.getValue("extension");
-        String dir = MirConfig.getProp("Producer.Media.Path");
-        String fullFname = dir+"/"+ent.getId()+"."+ext;
-        return getFile(fullFname);
+        return null;
     }
 
     public byte[] getIcon (Entity ent) {
         String name = "/path/to/some/generic/icon";
         return getFile(name);
     }
+
+    public String getStoragePath()
+    {
+        return MirConfig.getProp("Producer.Media.Path");
+    }
+
+    public String getIconStoragePath()
+    {
+        return MirConfig.getProp("Producer.Image.IconPath");
+    }
+
+    public String getPublishHost()
+    {
+        return MirConfig.getProp("Producer.Media.Host");
+    }
 }