diff --git a/config/application.yaml b/config/application.yaml index c067695..d206439 100644 --- a/config/application.yaml +++ b/config/application.yaml @@ -12,7 +12,7 @@ choices: - group: Логи в CP1251 # encoding: CP-1251 paths: - - log-samples/bankplus.log as "$g - $f" + - log-samples/bankplus.log as "$g - $f" (selected) - group: Логи UPC-2 paths: @@ -22,4 +22,4 @@ choices: - group: JavaScript scanDir: C:\lang\analog\src\main\resources\static\js paths: - - C:\lang\analog\src\main\resources\static\js\main-controller.js as "Main.JS" (selected) \ No newline at end of file + - C:\lang\analog\src\main\resources\static\js\main-controller.js as "Main.JS" \ No newline at end of file diff --git a/src/main/java/ru/ftc/upc/testing/analog/service/EncodingDetector.java b/src/main/java/ru/ftc/upc/testing/analog/service/EncodingDetector.java index c423835..8c11ad9 100644 --- a/src/main/java/ru/ftc/upc/testing/analog/service/EncodingDetector.java +++ b/src/main/java/ru/ftc/upc/testing/analog/service/EncodingDetector.java @@ -11,6 +11,7 @@ import ru.ftc.upc.testing.analog.util.Util; import java.io.File; +import java.io.FileNotFoundException; import java.io.IOException; import java.util.concurrent.ConcurrentHashMap; @@ -65,6 +66,9 @@ private void processPath(String path) { "(took {} ms).", path, DEFAULT_ENCODING, (System.currentTimeMillis() - fileProcessingStart)); } + } catch (FileNotFoundException e) { + log.warn("Couldn't detect encoding of log '{}' because it wasn't found.", path); + } catch (IOException e) { detectedEncodings.put(path, DEFAULT_ENCODING); log.warn(format("Couldn't detect encoding of log '%s' because of error. %s has been selected as default", diff --git a/src/main/java/ru/ftc/upc/testing/analog/service/MainController.java b/src/main/java/ru/ftc/upc/testing/analog/service/MainController.java index b785edd..5df44d5 100644 --- a/src/main/java/ru/ftc/upc/testing/analog/service/MainController.java +++ b/src/main/java/ru/ftc/upc/testing/analog/service/MainController.java @@ -13,6 +13,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.nio.file.Files; +import java.nio.file.NoSuchFileException; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; @@ -144,6 +145,9 @@ private Stream flattenGroup(ChoiceGroup group) { Util.expandTitle(logPath.toString(), DEFAULT_TITLE_FORMAT, groupName), false)) .collect(toSet())); + } catch (NoSuchFileException e) { + log.warn("Path '{}' is not found and thus won't be scanned.", scanDirPath); + } catch (IOException e) { log.error(format("Failed to scan directory '%s'; will be ignored.", group.getScanDir()), e); }