cleanup / abuse system fix / prepping for a release

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

diff --git a/source/mircoders/media/MediaHandlerMp3.java b/source/mircoders/media/MediaHandlerMp3.java
index 984de73..e01f79d 100755 (executable)
--- a/source/mircoders/media/MediaHandlerMp3.java
+++ b/source/mircoders/media/MediaHandlerMp3.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,30 +18,27 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with the com.oreilly.servlet library, any library
- * licensed under the Apache Software License, The Sun (tm) Java Advanced
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of
- * the above that use the same license as the above), and distribute linked
- * combinations including the two.  You must obey the GNU General Public
- * License in all respects for all of the code used other than the above
- * mentioned libraries.  If you modify this file, you may extend this exception
- * to your version of the file, but you are not obligated to do so.  If you do
- * not wish to do so, delete this exception statement from your version.
+ * the code of this program with  any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your version.
  */
-
 package  mircoders.media;
 
-import java.io.StringReader;
-
 import mir.entity.Entity;
 import mir.log.LoggerWrapper;
 import mir.media.MediaExc;
 import mir.media.MediaFailure;
-import mir.media.MirMedia;
-import mir.misc.FileUtil;
+import mir.media.MediaHandler;
 import mir.misc.StringUtil;
-import freemarker.template.SimpleHash;
-import freemarker.template.SimpleList;
+import mir.util.IORoutines;
+
+import java.io.File;
+import java.io.FileOutputStream;
 
 /**
  * Please note: this media handler produces
@@ -65,75 +62,43 @@ import freemarker.template.SimpleList;
  *
  * If the web server is not apache, then your on your own.
  *
- * @see mir.media.MirMedia
+ * @see mir.media.MediaHandler
  * @author mh <mh@nadir.org>
- * @version $Id: MediaHandlerMp3.java,v 1.14 2003/03/09 19:14:21 idfx Exp $
+ * @version $Id: MediaHandlerMp3.java,v 1.15.2.7 2005/08/21 17:09:23 zapata Exp $
  */
 
-public class MediaHandlerMp3 extends MediaHandlerAudio implements MirMedia
-{
-  protected LoggerWrapper logger;
-
+public class MediaHandlerMp3 extends MediaHandlerAudio implements MediaHandler {
   public MediaHandlerMp3() {
     logger = new LoggerWrapper("Media.Audio.Mp3");
   }
 
+  /**
+   * {@inheritDoc}
+   */
   public void produce(Entity ent, Entity mediaTypeEnt) throws MediaExc, MediaFailure {
-
-    // first check if the file exists
     super.produce(ent, mediaTypeEnt);
 
     String baseName = ent.getId();
-    String date = ent.getValue("date");
+    String date = ent.getFieldValue("date");
     String datePath = StringUtil.webdbDate2path(date);
-    String mp3Pointer = getPublishHost() + ent.getValue("publish_path");
+    String mp3Pointer = getPublishHost() + ent.getFieldValue("publish_path");
     String mpegURLFile = baseName + ".m3u";
     String playlistFile = baseName + ".pls";
 
     try {
-      //write the "meta" files
-      //first the .m3u since it only contains one line
-      FileUtil.write(getStoragePath() + "/" + datePath + "/" + mpegURLFile,
-                     new StringReader(mp3Pointer), "US-ASCII");
-      //now the .pls file
-      FileUtil.write(getStoragePath() + "/" + datePath + "/" + playlistFile,
-                     new StringReader(mp3Pointer), "US-ASCII");
+      IORoutines.writeStream(mp3Pointer, "us-ascii",
+          new FileOutputStream(new File(getBaseStoragePath() + "/" + datePath + "/" + mpegURLFile)));
+
+      IORoutines.writeStream(mp3Pointer, "us-ascii",
+          new FileOutputStream(new File(getBaseStoragePath() + "/" + datePath + "/" + playlistFile)));
     }
     catch (Throwable e) {
-      logger.error("MediaHandlerMp3.produce: " + e.toString());
+      logger.error("MediaHandlerMp3.execute: " + e.toString());
 
       throw new MediaFailure(e);
     }
   }
 
-  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"),
-                                               ".mp3$", "");
-
-    // @todo the texts ("title") below urgently need to be sanely localizaeble
-    // somehow
-    SimpleHash m3uHash = new SimpleHash();
-    m3uHash.put("publish_path", basePath + ".m3u");
-    m3uHash.put("publish_server", ent.getValue("publish_server"));
-    m3uHash.put("title", "stream URL");
-    theList.add(m3uHash);
-
-    SimpleHash plsHash = new SimpleHash();
-    plsHash.put("publish_path", basePath + ".pls");
-    plsHash.put("publish_server", ent.getValue("publish_server"));
-    plsHash.put("title", "playlist URL");
-    theList.add(plsHash);
-
-    return theList;
-
-  }
-
   public String getDescr(Entity mediaType) {
     return "mp3";
   }