diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java index abc013e..99a7681 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java @@ -58,15 +58,16 @@ public class AttributeUpdaterKernel { } private void process(File file, ProgressBar progressBar) { - statistic.total(); List attributes = processor.loadAttributes(file); FileInfoDto fileInfo = processor.filterAttributes(attributes); + statistic.total(); if (fileInfo.isChangeNecessary()) { statistic.shouldChange(); if (!Config.getInstance().isSafeMode()) { try { processor.update(file, fileInfo); statistic.success(); + log.info("Updated {}", file.getAbsolutePath()); } catch (IOException e) { statistic.failedChanging(); log.warn("File couldn't be updated: {}", file.getAbsoluteFile()); diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java index 78d2657..bfb63c5 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java @@ -2,6 +2,7 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl; import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.*; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.LogUtils; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.log4j.Log4j2; import org.apache.commons.lang3.StringUtils; @@ -60,6 +61,8 @@ public class MkvFileProcessor implements FileProcessor { LaneType.valueOf(((String) attribute.get("type")).toUpperCase(Locale.ENGLISH)))); } } + + LogUtils.ifDebug(log, fileAttributes); } catch (IOException e) { e.printStackTrace(); log.error("File could not be found or loaded!"); @@ -76,6 +79,7 @@ public class MkvFileProcessor implements FileProcessor { detectCurrentConfiguration(attributes, info, nonForcedTracks); detectDesiredConfiguration(info, nonForcedTracks); + LogUtils.ifDebug(log, info); return info; } @@ -117,7 +121,7 @@ public class MkvFileProcessor implements FileProcessor { @Override public void update(File file, FileInfoDto fileInfo) throws IOException { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(format("\"%s\" ", Config.getInstance().getPathFor(MkvToolNix.MKV_PROP_EDIT))); sb.append(format("\"%s\" ", file.getAbsolutePath())); if (fileInfo.isAudioDifferent()) { @@ -139,6 +143,6 @@ public class MkvFileProcessor implements FileProcessor { } InputStream inputstream = Runtime.getRuntime().exec(sb.toString()).getInputStream(); - log.debug(IOUtils.toString(new InputStreamReader(inputstream))); + LogUtils.ifDebug(log, IOUtils.toString(new InputStreamReader(inputstream))); } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileAttribute.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileAttribute.java index 4f2090d..1a5b449 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileAttribute.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileAttribute.java @@ -21,4 +21,17 @@ public class FileAttribute { this.forcedTrack = forcedTrack; this.type = type; } + + @Override + public String toString() { + final StringBuffer sb = new StringBuffer("["); + sb.append("id=").append(id); + sb.append(", language='").append(language).append('\''); + sb.append(", trackName='").append(trackName).append('\''); + sb.append(", defaultTrack=").append(defaultTrack); + sb.append(", forcedTrack=").append(forcedTrack); + sb.append(", type=").append(type); + sb.append(']'); + return sb.toString(); + } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java index ff50017..8fd9e0f 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java @@ -39,4 +39,16 @@ public class FileInfoDto { public boolean areForcedTracksDifferent() { return desiredForcedSubtitleLanes.size() > 0; } + + @Override + public String toString() { + final StringBuffer sb = new StringBuffer("["); + sb.append("defaultAudioLane=").append(defaultAudioLane); + sb.append(", defaultSubtitleLane=").append(defaultSubtitleLane); + sb.append(", desiredForcedSubtitleLanes=").append(desiredForcedSubtitleLanes); + sb.append(", desiredAudioLane=").append(desiredAudioLane); + sb.append(", desiredSubtitleLane=").append(desiredSubtitleLane); + sb.append(']'); + return sb.toString(); + } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/LogUtils.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/LogUtils.java new file mode 100644 index 0000000..2dec9c8 --- /dev/null +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/LogUtils.java @@ -0,0 +1,12 @@ +package at.pcgamingfreaks.mkvaudiosubtitlechanger.util; + +import org.apache.logging.log4j.Logger; + +public class LogUtils { + + public static void ifDebug(Logger log, T object) { + if (log.isDebugEnabled()) { + log.debug(object); + } + } +} diff --git a/src/main/resources/log4j2-dev.yml b/src/main/resources/log4j2-dev.yml new file mode 100644 index 0000000..bd94532 --- /dev/null +++ b/src/main/resources/log4j2-dev.yml @@ -0,0 +1,28 @@ +Configuration: + name: DefaultLogger + Appenders: + Console: + name: Console_Out + PatternLayout: + Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable" + ThresholdFilter: + level: debug + File: + name: FileAppender + fileName: default.log + PatternLayout: + Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable" + ThresholdFilter: + level: debug + Loggers: + Root: + level: debug + AppenderRef: + - ref: Console_Out + - ref: FileAppender + Logger: + name: "com.zaxxer.hikari.HikariConfig" + level: info + AppenderRef: + - ref: Console_Out + - ref: FileAppender \ No newline at end of file diff --git a/src/main/resources/log4j2.yaml b/src/main/resources/log4j2.yaml index 14026cc..371b601 100644 --- a/src/main/resources/log4j2.yaml +++ b/src/main/resources/log4j2.yaml @@ -10,7 +10,7 @@ Configuration: level: info Loggers: Root: - level: debug + level: info AppenderRef: - ref: FileAppender Logger: