Exit with error when dir not found in expanded mode // fixes #525

w3c · Jan 3, 2017 · e42d189 · e42d189
1 parent e55039c
commit e42d189
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/main/java/com/adobe/epubcheck/tool/EpubChecker.java b/src/main/java/com/adobe/epubcheck/tool/EpubChecker.java
@@ -440,8 +440,15 @@ private int processFile(Report report)
  {
  if (expanded)
  {
- Archive epub;
+ // check existance of path (fix #525)
+ File f = new File(path);
+ if (!f.exists())
+ {
+ System.err.println(String.format(Messages.get("directory_not_found"), path));
+ return 1;
+ }
 
+ Archive epub;
  try
  {
  epub = new Archive(path, true);

diff --git a/src/main/resources/com/adobe/epubcheck/util/messages.properties b/src/main/resources/com/adobe/epubcheck/util/messages.properties
@@ -21,6 +21,7 @@ validating_version_message=Validating using EPUB version %1$s rules.
 output_type_conflict=Only one output format can be specified at a time.
 validating_against_epub_version=Validating against EPUB version %1$s - custom validation
 file_not_found=File not found: '%1$s'
+directory_not_found=Directory not found: '%1$s'
 epubcheck_completed=epubcheck completed
 error_creating_config_file=Error creating config file '%1$s'.
 expected_message_filename=Expected the Custom message file name, but found '%1$s'