exception + misc. cleanup

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

diff --git a/source/mircoders/media/MediaHandlerRealVideo.java b/source/mircoders/media/MediaHandlerRealVideo.java
index c93d333..ec78572 100755 (executable)
--- a/source/mircoders/media/MediaHandlerRealVideo.java
+++ b/source/mircoders/media/MediaHandlerRealVideo.java
@@ -31,16 +31,18 @@
 
 package  mircoders.media;
 
-import java.util.*;
+import java.io.File;
 import java.io.StringReader;
 
-import freemarker.template.SimpleList;
+import mir.entity.Entity;
+import mir.log.LoggerWrapper;
+import mir.media.MirMedia;
+import mir.media.MediaExc;
+import mir.media.MediaFailure;
+import mir.misc.FileUtil;
+import mir.misc.StringUtil;
 import freemarker.template.SimpleHash;
-
-import mir.media.*;
-import mir.entity.*;
-import mir.misc.*;
-import mir.storage.*;
+import freemarker.template.SimpleList;
 
 
 
@@ -52,45 +54,49 @@ import mir.storage.*;
  * @see mir.media.MediaHandlerGeneric
  * @see mir.media.MirMedia
  * @author john <john@manifestor.org>, mh <mh@nadir.org>
- * @version $Id: MediaHandlerRealVideo.java,v 1.13 2002/11/28 07:28:24 mh Exp $
+ * @version $Id: MediaHandlerRealVideo.java,v 1.17 2003/03/09 03:53:11 zapata Exp $
  */
 
 
-public class MediaHandlerRealVideo extends MediaHandlerVideo implements
-  MirMedia
+public class MediaHandlerRealVideo extends MediaHandlerVideo implements MirMedia
 {
-  public void produce (Entity ent, Entity mediaTypeEnt )
-    throws MirMediaException {
+  protected LoggerWrapper logger;
+
+  public MediaHandlerRealVideo() {
+    logger = new LoggerWrapper("Media.Video.Real");
+  }
 
+  public void produce (Entity ent, Entity mediaTypeEnt) throws MediaExc, MediaFailure {
     // first see if the file exists
     super.produce(ent, mediaTypeEnt);
 
     String baseName = ent.getId();
     String date = ent.getValue("date");
     String datePath = StringUtil.webdbDate2path(date);
-    String rtspDir = MirConfig.getProp("Producer.RealMedia.Path");
-    String rtspMediaHost = MirConfig.getProp("Producer.RealMedia.Host");
+    String rtspDir = configuration.getString("Producer.RealMedia.Path");
+    String rtspMediaHost = configuration.getString("Producer.RealMedia.Host");
 
     String RealMediaPointer = rtspMediaHost+ent.getValue("publish_path");
     String RealMediaFile = datePath+ent.getId()+".ram";
     try {
       //write an rm (ram?. -mh) file
-      FileUtil.write(super.getStoragePath()+"/"+RealMediaFile,
+      FileUtil.write(super.getStoragePath()+File.separator+RealMediaFile,
                       new StringReader(RealMediaPointer), "US-ASCII");
-    } catch (Exception e) {
-      theLog.printError(e.toString());
-      throw new MirMediaException(e.toString());
+    }
+    catch (Throwable e) {
+      logger.error("MediaHandlerRealVideo.produce: " + e.toString());
+
+      throw new MediaFailure(e);
     }
   }
 
-  public SimpleList getURL(Entity ent, Entity mediaTypeEnt)
-  {
+  public SimpleList getURL(Entity ent, Entity mediaTypeEnt) {
     SimpleList theList = new SimpleList();
 
     //String stringSize = ent.getValue("size");
     //int size = Integer.parseInt(stringSize, 10)/1024;
     theList.add(ent);
-   
+
     String basePath=StringUtil.regexpReplace(ent.getValue("publish_path"),
                                             ".rm$","");
 
@@ -98,7 +104,7 @@ public class MediaHandlerRealVideo extends MediaHandlerVideo implements
     // somehow
     SimpleHash ramHash = new SimpleHash();
     ramHash.put("publish_path", basePath+".ram");
-    ramHash.put("publish_server", MirConfig.getProp("Producer.Media.Host"));
+    ramHash.put("publish_server", configuration.getString("Producer.Media.Host"));
     ramHash.put("title", "stream URL");
     theList.add(ramHash);
 
@@ -106,22 +112,19 @@ public class MediaHandlerRealVideo extends MediaHandlerVideo implements
 
   }
 
-  public String getStoragePath()
-  {
-    return MirConfig.getProp("Producer.RealMedia.Path");
+  public String getStoragePath() {
+    return configuration.getString("Producer.RealMedia.Path");
   }
 
-  public String getDescr(Entity mediaType)
-  {
+  public String getDescr(Entity mediaType) {
     return "RealMedia";
   }
 
-  public String getPublishHost()
-  {
-    return StringUtil.removeSlash(MirConfig.getProp("Producer.RealMedia.Host"));
+  public String getPublishHost() {
+    return StringUtil.removeSlash(configuration.getString("Producer.RealMedia.Host"));
   }
 
 }
-        
-        
+
+