Author: andre
Date: 2010-07-01 11:39:06 +0200 (Thu, 01 Jul 2010)
New Revision: 42767
Modified:
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/SegmenterTranscoder.java
Log:
deleting older stream segments MMB-1969
Modified:
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/SegmenterTranscoder.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/SegmenterTranscoder.java
2010-07-01 09:38:31 UTC (rev 42766)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/SegmenterTranscoder.java
2010-07-01 09:39:06 UTC (rev 42767)
@@ -44,6 +44,7 @@
* segmenter sample_low.ts 10 sample_low sample_low.m3u8
http://www.openimages.eu/
* The input file, output prefix and index prefix arguments are automatically
filled,
* specify segment duration (default 10 sec.) and httpPrefix (hostname) in
'createcaches.xml'.
+ * TODO: replace "/" with File.separator
*
* @author André van Toly
* @version $Id: SegmenterTranscoder.java 41564 2010-03-22 19:42:15Z andre $
@@ -82,14 +83,52 @@
}
/**
- * Saves mimetype (video/*) in destination node when not set.
+ * Saves mimetype (video/*) in destination node when not set and deletes
former segments when
+ * re-transcoding.
* @param dest destination node (streamsourcescaches)
*/
public void init(Node dest) {
String mt = dest.getStringValue("mimetype");
- if (mt == null || "".equals(mt)) {
+ if (mt == null || "".equals(mt)) {
dest.setStringValue("mimetype", "video/*");
}
+
+ // find and delete already existing segments
+ String filename = dest.getStringValue("url");
+ if (filename.length() < 1) {
+ log.error("Still empty fileName: '" + filename + "' of #" +
dest.getNumber());
+ } else {
+
+ String fileprefix = filename.substring(0,
filename.lastIndexOf("."));
+ if (fileprefix.indexOf("/") > -1) {
+ fileprefix = fileprefix.substring(fileprefix.lastIndexOf("/")
+ 1, fileprefix.length());
+ }
+
+ File file = new File(FileServlet.getDirectory(), filename);
+ String dir = file.toString();
+ dir = dir.substring(0, dir.lastIndexOf("/"));
+
+ if (log.isDebugEnabled()) {
+ log.debug(" filename: " + filename);
+ log.debug("fileprefix: " + fileprefix);
+ log.debug(" dir: " + dir);
+ }
+
+ FilenameFilter filter = new FilterPrefix(fileprefix);
+ String[] dirlist = new File(dir).list(filter);
+ if (dirlist != null) {
+ for (int i = 0; i < dirlist.length; i++) {
+ File f = new File(dir, dirlist[i]);
+ if (f.delete()) {
+ log.service("Deleted old version of '" + dirlist[i] +
"'");
+ } else {
+ log.error("Could not delete old version of file '" +
dirlist[i] + "'");
+ }
+ }
+ }
+ }
+
+
}
@Override
@@ -128,7 +167,7 @@
return args.toArray(new String[args.size()]);
}
-
+
private static final Pattern PROGRESS = Pattern.compile(".*time
remaining.*");
@Override
@@ -152,3 +191,19 @@
}
}
+
+
+class FilterPrefix implements FilenameFilter {
+
+ protected static String str;
+ public FilterPrefix(String s) {
+ str = s;
+ }
+
+ public boolean accept(File dir, String name) {
+ if (name.startsWith(str)) {
+ return true;
+ }
+ return false;
+ }
+}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
