From a42f75050a7a1753c263c04e124970dd777994ba Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Sun, 6 Nov 2016 01:17:58 +0800
Subject: [PATCH] # Suppress WindowsPreferences logging

---
 build.xml                               |  4 ++--
 installer/appx/filebot.l4j.ini          | 13 ++++++++-----
 installer/appx/filebot.launcher.l4j.ini | 13 ++++++++-----
 installer/appx/logging.properties       | 12 ++++++++++++
 installer/msi/filebot.l4j.ini           | 14 ++++++++++----
 installer/msi/filebot.launcher.l4j.ini  | 13 ++++++++-----
 installer/msi/filebot.wix               |  1 +
 installer/msi/logging.properties        | 12 ++++++++++++
 8 files changed, 61 insertions(+), 21 deletions(-)
 create mode 100644 installer/appx/logging.properties
 create mode 100644 installer/msi/logging.properties

diff --git a/build.xml b/build.xml
index 6fe401f2..b5edd4eb 100644
--- a/build.xml
+++ b/build.xml
@@ -574,7 +574,7 @@
 	<target name="appx" description="Build Windows 10 package" depends="revision">
 		<copy tofile="${dir.dist}/appx/FileBot.jar" file="${path.fatjar}" />
 		<copy todir="${dir.dist}/appx">
-			<fileset dir="${dir.installer}/appx" includes="*.exe, *.ini, *.png" />
+			<fileset dir="${dir.installer}/appx" includes="*.exe, *.ini, *.properties, *.png" />
 			<fileset dir="${dir.lib}/native/win32-x64" />
 		</copy>
 
@@ -631,7 +631,7 @@
 			<fileset dir="${dir.installer}/icons" includes="*.ico" />
 		</copy>
 		<copy-replace todir="${dir.staging}">
-			<fileset dir="${dir.installer}/msi" includes="*.wix, *.ini" />
+			<fileset dir="${dir.installer}/msi" includes="*.wix, *.ini, *.properties" />
 		</copy-replace>
 
 		<exec executable="candle" dir="${dir.staging}" failonerror="true">
diff --git a/installer/appx/filebot.l4j.ini b/installer/appx/filebot.l4j.ini
index faafe7f4..ae529a28 100644
--- a/installer/appx/filebot.l4j.ini
+++ b/installer/appx/filebot.l4j.ini
@@ -3,25 +3,28 @@
 -Dapplication.dir="%APPDATA%\FileBot"
 
 # put all temporary files here
--Djava.io.tmpdir="%APPDATA%\FileBot\temp"
+-Djava.io.tmpdir="%APPDATA%\FileBot\tmp"
 
 # network settings
 -Djava.net.useSystemProxies=true
 
-# use native shell for move/copy operations
+# use Java API move/copy operations
 -DuseNativeShell=false
 
 # use NTFS extended attributes for storing metadata
 -DuseExtendedFileAttributes=true
 -DuseCreationDate=false
 
-# look for native libs here
+# look for executables in the application folder
+-Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\fpcalc.exe"
+
+# look for native libraries in the application folder
 -Djna.library.path="%EXEDIR%"
 -Djna.boot.library.path="%EXEDIR%"
 -Djava.library.path="%EXEDIR%"
 
-# look for fpcalc here
--Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\fpcalc.exe"
+# reduce default logging
+-Djava.util.logging.config.file="%EXEDIR%\logging.properties"
 
 # force Application User Model ID for Windows Store
 -Dnet.filebot.AppUserModelID=PointPlanck.FileBot
diff --git a/installer/appx/filebot.launcher.l4j.ini b/installer/appx/filebot.launcher.l4j.ini
index 0fe66956..1da55ed1 100644
--- a/installer/appx/filebot.launcher.l4j.ini
+++ b/installer/appx/filebot.launcher.l4j.ini
@@ -3,25 +3,28 @@
 -Dapplication.dir="%APPDATA%\FileBot"
 
 # put all temporary files here
--Djava.io.tmpdir="%APPDATA%\FileBot\temp"
+-Djava.io.tmpdir="%APPDATA%\FileBot\tmp"
 
 # network settings
 -Djava.net.useSystemProxies=true
 
-# use native shell for move/copy operations
+# use Windows Shell for move/copy operations
 -DuseNativeShell=true
 
 # use NTFS extended attributes for storing metadata
 -DuseExtendedFileAttributes=true
 -DuseCreationDate=false
 
-# look for native libs here
+# look for executables in the application folder
+-Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\fpcalc.exe"
+
+# look for native libraries in the application folder
 -Djna.library.path="%EXEDIR%"
 -Djna.boot.library.path="%EXEDIR%"
 -Djava.library.path="%EXEDIR%"
 
-# look for fpcalc here
--Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\fpcalc.exe"
+# reduce default logging
+-Djava.util.logging.config.file="%EXEDIR%\logging.properties"
 
 # force Application User Model ID for Windows Store
 -Dnet.filebot.AppUserModelID=PointPlanck.FileBot
diff --git a/installer/appx/logging.properties b/installer/appx/logging.properties
new file mode 100644
index 00000000..f9199f53
--- /dev/null
+++ b/installer/appx/logging.properties
@@ -0,0 +1,12 @@
+# Default global handler
+handlers= java.util.logging.ConsoleHandler
+
+# Default global logging level
+.level= WARNING
+
+# Limit messages that printed on the console to WARNING and above
+java.util.logging.ConsoleHandler.level = WARNING
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+
+# Suppress WindowsPreferences logging
+java.util.prefs.WindowsPreferences = SEVERE
diff --git a/installer/msi/filebot.l4j.ini b/installer/msi/filebot.l4j.ini
index d5dde233..8a51ad18 100644
--- a/installer/msi/filebot.l4j.ini
+++ b/installer/msi/filebot.l4j.ini
@@ -3,19 +3,25 @@
 -Dapplication.dir="%APPDATA%\FileBot"
 
 # put all temporary files here
--Djava.io.tmpdir="%APPDATA%\FileBot\temp"
+-Djava.io.tmpdir="%APPDATA%\FileBot\tmp"
 
 # network settings
 -Djava.net.useSystemProxies=true
 
+# use Java API move/copy operations
+-DuseNativeShell=false
+
 # use NTFS extended attributes for storing metadata
 -DuseExtendedFileAttributes=true
 -DuseCreationDate=false
 
-# look for native libs here
+# look for executables in the application folder
+-Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\fpcalc.exe"
+
+# look for native libraries in the application folder
 -Djna.library.path="%EXEDIR%"
 -Djna.boot.library.path="%EXEDIR%"
 -Djava.library.path="%EXEDIR%"
 
-# look for fpcalc here
--Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\fpcalc.exe"
+# reduce default logging
+-Djava.util.logging.config.file="%EXEDIR%\logging.properties"
diff --git a/installer/msi/filebot.launcher.l4j.ini b/installer/msi/filebot.launcher.l4j.ini
index 7d79c3d0..97cfb41a 100644
--- a/installer/msi/filebot.launcher.l4j.ini
+++ b/installer/msi/filebot.launcher.l4j.ini
@@ -3,22 +3,25 @@
 -Dapplication.dir="%APPDATA%\FileBot"
 
 # put all temporary files here
--Djava.io.tmpdir="%APPDATA%\FileBot\temp"
+-Djava.io.tmpdir="%APPDATA%\FileBot\tmp"
 
 # network settings
 -Djava.net.useSystemProxies=true
 
-# use native shell for move/copy operations
+# use Windows Shell for move/copy operations
 -DuseNativeShell=true
 
 # use NTFS extended attributes for storing metadata
 -DuseExtendedFileAttributes=true
 -DuseCreationDate=false
 
-# look for native libs here
+# look for executables in the application folder
+-Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\fpcalc.exe"
+
+# look for native libraries in the application folder
 -Djna.library.path="%EXEDIR%"
 -Djna.boot.library.path="%EXEDIR%"
 -Djava.library.path="%EXEDIR%"
 
-# look for fpcalc here
--Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\fpcalc.exe"
+# reduce default logging
+-Djava.util.logging.config.file="%EXEDIR%\logging.properties"
diff --git a/installer/msi/filebot.wix b/installer/msi/filebot.wix
index b1a6cf4f..83bf551d 100644
--- a/installer/msi/filebot.wix
+++ b/installer/msi/filebot.wix
@@ -58,6 +58,7 @@
 
 					<Component Id='ApplicationBase' Guid='9E365344-A00C-45DE-A2A4-266412C3D06E' Win64="$(var.Win64)">
 						<File Id='FileBot.jar' Name='FileBot.jar' Source='@{path.fatjar}' KeyPath='yes' />
+						<File Id='logging.properties' Name='logging.properties' Source='logging.properties' KeyPath='yes' />
 						<File Id='jnidispatch.dll' Name='jnidispatch.dll' Source='jnidispatch.dll' />
 						<File Id='MediaInfo.dll' Name='MediaInfo.dll' Source='MediaInfo.dll' />
 						<File Id='lib7_Zip_JBinding.dll' Name='7-Zip-JBinding.dll' Source='7-Zip-JBinding.dll' />
diff --git a/installer/msi/logging.properties b/installer/msi/logging.properties
new file mode 100644
index 00000000..f9199f53
--- /dev/null
+++ b/installer/msi/logging.properties
@@ -0,0 +1,12 @@
+# Default global handler
+handlers= java.util.logging.ConsoleHandler
+
+# Default global logging level
+.level= WARNING
+
+# Limit messages that printed on the console to WARNING and above
+java.util.logging.ConsoleHandler.level = WARNING
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+
+# Suppress WindowsPreferences logging
+java.util.prefs.WindowsPreferences = SEVERE