From 565555e0b36804ebbf8d141528dc66442cf755f5 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Fri, 21 Oct 2016 02:22:35 +0800 Subject: [PATCH] Avoid opening 0 byte test files as real archives --- source/net/filebot/cli/ScriptShellMethods.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/source/net/filebot/cli/ScriptShellMethods.java b/source/net/filebot/cli/ScriptShellMethods.java index 0c7c4999..dec4b2ab 100644 --- a/source/net/filebot/cli/ScriptShellMethods.java +++ b/source/net/filebot/cli/ScriptShellMethods.java @@ -104,14 +104,20 @@ public class ScriptShellMethods { return ARCHIVE_FILES.accept(self); } - public static boolean isDisk(File self) throws Exception { + public static boolean isDisk(File self) { // check disk folder - if (self.isDirectory() && MediaDetection.isDiskFolder(self)) + if (self.isDirectory() && MediaDetection.isDiskFolder(self)) { return true; + } // check disk image - if (self.isFile() && MediaTypes.getDefaultFilter("video/iso").accept(self) && MediaDetection.isVideoDiskFile(self)) - return true; + if (self.isFile() && MediaTypes.getDefaultFilter("video/iso").accept(self)) { + try { + return MediaDetection.isVideoDiskFile(self); + } catch (Exception e) { + debug.log(Level.WARNING, format("Failed to read disk image: %s: %s", self, e)); + } + } return false; }