From fbbb99a5b9693075ab47b3249e20254ee860d37f Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Mon, 25 May 2015 08:37:57 +0000 Subject: [PATCH] * avoid printStackTrace in favour of logging --- source/net/filebot/mediainfo/MediaInfo.java | 2 ++ .../net/filebot/subtitle/SubtitleMetrics.java | 18 +++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/source/net/filebot/mediainfo/MediaInfo.java b/source/net/filebot/mediainfo/MediaInfo.java index 7cb64a17..e93a933b 100644 --- a/source/net/filebot/mediainfo/MediaInfo.java +++ b/source/net/filebot/mediainfo/MediaInfo.java @@ -11,6 +11,7 @@ import java.util.EnumMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.logging.Level; import java.util.logging.Logger; import com.sun.jna.NativeLibrary; @@ -55,6 +56,7 @@ public class MediaInfo implements Closeable { try (RandomAccessFile raf = new RandomAccessFile(file, "r")) { return openViaBuffer(raf); } catch (IOException e) { + Logger.getLogger(MediaInfo.class.getName()).log(Level.WARNING, e.toString()); return false; } } diff --git a/source/net/filebot/subtitle/SubtitleMetrics.java b/source/net/filebot/subtitle/SubtitleMetrics.java index 009ab15b..87791b92 100644 --- a/source/net/filebot/subtitle/SubtitleMetrics.java +++ b/source/net/filebot/subtitle/SubtitleMetrics.java @@ -8,6 +8,8 @@ import java.io.File; import java.util.HashMap; import java.util.Map; import java.util.WeakHashMap; +import java.util.logging.Level; +import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -82,9 +84,8 @@ public enum SubtitleMetrics implements SimilarityMetric { }; private Map getSubtitleProperties(OpenSubtitlesSubtitleDescriptor subtitle) { - Map props = new HashMap(); - try { + Map props = new HashMap(); float fps = Math.round(subtitle.getMovieFPS()); // round because most FPS values in the database are bad anyway if (fps > 0) { props.put(FPS, fps); @@ -93,11 +94,11 @@ public enum SubtitleMetrics implements SimilarityMetric { if (seconds > 0) { props.put(SECONDS, seconds); } + return props; } catch (Exception e) { - e.printStackTrace(); + Logger.getLogger(SubtitleMetrics.class.getName()).log(Level.WARNING, e.toString()); } - - return props; + return emptyMap(); } private final Map> mediaInfoCache = new WeakHashMap>(64); @@ -107,7 +108,6 @@ public enum SubtitleMetrics implements SimilarityMetric { return mediaInfoCache.computeIfAbsent(file, (f) -> { try { Map props = new HashMap(); - MediaInfo mediaInfo = new MediaInfo(); if (mediaInfo.open(file)) { float fps = Math.round(Float.parseFloat(mediaInfo.get(StreamKind.Video, 0, "FrameRate"))); @@ -118,12 +118,12 @@ public enum SubtitleMetrics implements SimilarityMetric { if (seconds > 0) { props.put(SECONDS, seconds); } + return props; } - - return props; } catch (Exception e) { - return emptyMap(); + Logger.getLogger(SubtitleMetrics.class.getName()).log(Level.WARNING, e.toString()); } + return emptyMap(); }); } }