r46712 - in mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams: createcaches download transcoders

[andre]

Author: andre
Date: 2014-09-22 22:16:04 +0200 (Mon, 22 Sep 2014)
New Revision: 46712

Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Job.java
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/download/Downloader.java
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/AnalyzerUtils.java
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpeg2TheoraAnalyzer.java
Log:
porting differences from 1.9

Modified: mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Job.java
===================================================================
--- mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Job.java 2014-09-22 20:04:08 UTC (rev 46711)
+++ mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Job.java 2014-09-22 20:16:04 UTC (rev 46712)
@@ -251,8 +251,22 @@
assert outFileName != null;
assert outFileName.length() > 0;
dest.setStringValue("url", outFileName);
+
+ int pos = outFileName.lastIndexOf("/");
+ if (pos > 0) { // check if directory exists
+ String dirName = outFileName.substring(0, pos);
+ File dir = new File(processor.getDirectory(), dirName);
+ if (!dir.exists()) {
+ LOG.warn("The directory '" + dir.toString() + "' does NOT exist, will try to create it.");
+ try {
+ dir.mkdir();
+ } catch (SecurityException se) {
+ LOG.error("SecurityException while trying creating directory '" + dir.toString() + "' : " + se);
+ }
+ }
+ }
+
jd.transcoder.init(dest);
-
dest.commit();



Modified: mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/download/Downloader.java
===================================================================
--- mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/download/Downloader.java 2014-09-22 20:04:08 UTC (rev 46711)
+++ mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/download/Downloader.java 2014-09-22 20:16:04 UTC (rev 46712)
@@ -92,7 +92,19 @@
fileNameTransformer.setReplacer("_");
fileNameTransformer.setMoreDisallowed("[\\s!?:/,]");
}
-
+
+ private static String removeDupUnderscores(String str) {
+ StringBuilder res = new StringBuilder();
+ for (int i = 0; i < str.length(); i++) {
+ if (i + 1 < str.length() && str.charAt(i) == '_' && str.charAt(i + 1) == '_') {
+ // do nothing
+ } else {
+ res.append(str.charAt(i));
+ }
+ }
+ return res.toString();
+ }
+
public String download() throws MalformedURLException, SocketException, IOException, IllegalArgumentException {

HttpURLConnection huc = getURLConnection(url);
@@ -117,7 +129,8 @@
}
}

- File f = getFile(node, field, fileNameTransformer.transform(name));
+ String fileName = removeDupUnderscores( fileNameTransformer.transform(name) );
+ File f = getFile(node, field, fileName);
Map<String, String> meta = FileServlet.getInstance().getMetaHeaders(f);
meta.put("Content-Disposition", "attachment; " + FileServlet.getMetaValue("filename", name));
FileServlet.getInstance().setMetaHeaders(f, meta);

Modified: mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/AnalyzerUtils.java
===================================================================
--- mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/AnalyzerUtils.java 2014-09-22 20:04:08 UTC (rev 46711)
+++ mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/AnalyzerUtils.java 2014-09-22 20:16:04 UTC (rev 46712)
@@ -529,8 +529,12 @@
if (str.equals("libmp3lame")) str = "mp3";
if (str.equals("mpeg1video")) str = "mpeg";
if (str.equals("mpeg2video")) str = "mpeg2";
- if (str.startsWith("lib")) str = str.substring(3, str.length());
-
+ if (str.startsWith("lib")) {
+ int pos = str.indexOf(" ");
+ str = str.substring(3, pos);
+ } else if (str.indexOf(" ") > -1) {
+ str = str.substring(0, str.indexOf(" "));
+ }
return Codec.get(str);
}


Modified: mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpeg2TheoraAnalyzer.java
===================================================================
--- mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpeg2TheoraAnalyzer.java 2014-09-22 20:04:08 UTC (rev 46711)
+++ mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpeg2TheoraAnalyzer.java 2014-09-22 20:16:04 UTC (rev 46712)
@@ -21,9 +21,7 @@

package org.mmbase.streams.transcoders;

-import java.util.regex.*;
-import java.util.*;
-
+import org.mmbase.applications.media.Codec;
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
import org.mmbase.bridge.NodeList;
@@ -34,8 +32,14 @@
import org.mmbase.storage.search.StepField;
import org.mmbase.streams.UpdateSourcesFunction;
import org.mmbase.util.functions.Parameters;
+import org.mmbase.util.logging.ChainedLogger;
+import org.mmbase.util.logging.Logger;
+import org.mmbase.util.logging.Logging;

-import org.mmbase.util.logging.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;


/**