commit 25ef69a6d68b3813534681f68d880e6c4bf9554c Author: Julius de Jeu Date: Thu Jan 17 17:27:03 2019 +0100 Initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3558e67 --- /dev/null +++ b/.gitignore @@ -0,0 +1,134 @@ + +# Created by https://www.gitignore.io/api/gradle,kotlin,intellij+all +# Edit at https://www.gitignore.io/?templates=gradle,kotlin,intellij+all + +### Intellij+all ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/modules.xml +# .idea/*.iml +# .idea/modules + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### Intellij+all Patch ### +# Ignores the whole .idea folder and all .iml files +# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360 + +.idea/ + +# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023 + +*.iml +modules.xml +.idea/misc.xml +*.ipr + +### Kotlin ### +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +### Gradle ### +.gradle +/build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Cache of project +.gradletasknamecache + +# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 +# gradle/wrapper/gradle-wrapper.properties + +### Gradle Patch ### +**/build/ + +# End of https://www.gitignore.io/api/gradle,kotlin,intellij+all + +input/ +output/ +watermerk.png \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..fbc77b7 --- /dev/null +++ b/build.gradle @@ -0,0 +1,36 @@ +plugins { + id 'java' + id 'org.jetbrains.kotlin.jvm' version '1.3.11' + id 'com.github.johnrengelman.shadow' version '4.0.3' + +} + +group 'nl.aegeedelft.watermarker' +version '1.0' + +sourceCompatibility = 1.8 + +repositories { + mavenCentral() +} + +dependencies { + compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8" + testCompile group: 'junit', name: 'junit', version: '4.12' +} + +compileKotlin { + kotlinOptions.jvmTarget = "1.8" +} +compileTestKotlin { + kotlinOptions.jvmTarget = "1.8" +} + +shadowJar { + baseName = 'WaterMarker' + classifier = null + version = null + manifest { + attributes 'Main-Class': 'nl.aegeedelft.watermarker.MainKt' + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..29e08e8 --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +kotlin.code.style=official \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..28861d2 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..115e6ac --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..cccdd3d --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..c5ceffd --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'WaterMarker' + diff --git a/src/main/kotlin/nl/aegeedelft/watermarker/Main.kt b/src/main/kotlin/nl/aegeedelft/watermarker/Main.kt new file mode 100644 index 0000000..ffabe4d --- /dev/null +++ b/src/main/kotlin/nl/aegeedelft/watermarker/Main.kt @@ -0,0 +1,196 @@ +package nl.aegeedelft.watermarker + +import org.intellij.lang.annotations.Language +import java.awt.* +import java.awt.image.BufferedImage +import java.awt.image.RenderedImage +import java.io.BufferedInputStream +import java.io.ByteArrayInputStream +import java.io.File +import java.util.* +import javax.imageio.IIOImage +import javax.imageio.ImageIO +import javax.imageio.ImageWriteParam +import javax.imageio.stream.MemoryCacheImageOutputStream +import javax.swing.* +import javax.swing.filechooser.FileFilter +import kotlin.concurrent.timerTask + + +@Language("RegExp") +val filenameRegex = ".*\\.(png|jpe?g|bmp)".toRegex() + +val jf = JFrame("WaterMarker") + +object obs : Observable() { + fun observe() { + setChanged() + } +} + +fun main(args: Array) { + var watermark: File? = null + var outdir: File? = null + var basedir: File? = null + + val basepicker = JFileChooser() + val bds = JLabel("Pick an input folder") + val outpicker = JFileChooser() + val ods = JLabel("Pick an output folder") + val wmpicker = JFileChooser() + val wms = JLabel("Pick a Watermark file") + + val box = Box.createVerticalBox() + + + + basepicker.currentDirectory = File(".") + basepicker.fileSelectionMode = JFileChooser.DIRECTORIES_ONLY + basepicker.isAcceptAllFileFilterUsed = false + + outpicker.currentDirectory = File(".") + outpicker.fileSelectionMode = JFileChooser.DIRECTORIES_ONLY + outpicker.isAcceptAllFileFilterUsed = false + + wmpicker.currentDirectory = File(".") + wmpicker.fileSelectionMode = JFileChooser.FILES_ONLY + wmpicker.fileFilter = object : FileFilter() { + override fun accept(f: File): Boolean = filenameRegex.matches(f.name) or f.isDirectory + + override fun getDescription(): String = "Image Files" + } + wmpicker.isAcceptAllFileFilterUsed = false + + box.add( + JButton("Select Input").apply { + addActionListener { + val c = basepicker.showOpenDialog(jf) + if (c == JFileChooser.APPROVE_OPTION) { + basedir = basepicker.selectedFile + bds.text = basepicker.selectedFile.path + } + } + }.forceToCenter() + ) + box.add(bds.forceToCenter()) + + box.add( + JButton("Select Output").apply { + addActionListener { + val c = outpicker.showOpenDialog(jf) + if (c == JFileChooser.APPROVE_OPTION) { + outdir = outpicker.selectedFile + ods.text = outpicker.selectedFile.path + } + } + }.forceToCenter() + ) + box.add(ods.forceToCenter()) + + box.add( + JButton("Select Watermark").apply { + addActionListener { + val c = wmpicker.showOpenDialog(jf) + if (c == JFileChooser.APPROVE_OPTION) { + watermark = wmpicker.selectedFile + wms.text = wmpicker.selectedFile.path + } + } + }.forceToCenter() + ) + box.add(wms.forceToCenter()) + + box.add(JButton("Run!").apply { + addActionListener { + if (watermark != null && outdir != null && basedir != null) { + doTheThing(basedir!!, outdir!!, watermark!!) + } else { + JOptionPane.showMessageDialog( + jf, + "You have left one of the files empty!", + "Error!", + JOptionPane.ERROR_MESSAGE + ) + } + } + }.forceToCenter()) + + jf.add(box, BorderLayout.CENTER) + + jf.setLocationRelativeTo(null) + jf.defaultCloseOperation = JFrame.EXIT_ON_CLOSE + jf.preferredSize = Dimension(300, 300) + jf.size = jf.preferredSize + jf.isVisible = true +} + +fun doTheThing(basedir: File, outdir: File, watermarkpath: File) { + val watermark = ImageIO.read(watermarkpath) + //JOptionPane.showMessageDialog(jf, "", "Inserting watermark!", JOptionPane.INFORMATION_MESSAGE, ImageIcon(watermark)) + FrmPopUpInfo("Inserting Watermark", watermark) + for (f in basedir.listFiles()) { + if (filenameRegex.matches(f.name.toString()) && !"jpe?g".toRegex().matches(f.extension)) { + val image = ImageIO.read(f) + + val combined = addWM(watermark, image) as RenderedImage + + ImageIO.write(combined, "JPG", File(outdir, f.nameWithoutExtension + ".jpg")) + } else { + val `is` = BufferedInputStream(ByteArrayInputStream(f.readBytes())) + val it = ImageIO.getImageReadersByMIMEType("image/jpeg") + val reader = it.next() + val iis = ImageIO.createImageInputStream(`is`) + reader.setInput(iis, false, false) + val image = reader.read(0) + val imageMetadata = reader.getImageMetadata(0) + + val combined = addWM(watermark, image) as RenderedImage + + val iter = ImageIO.getImageWritersByMIMEType("image/jpeg") + val writer = iter.next() + val iwp = writer.defaultWriteParam + iwp.compressionMode = ImageWriteParam.MODE_EXPLICIT + iwp.compressionQuality = 0.9f + val imgOut = MemoryCacheImageOutputStream(File(outdir, f.nameWithoutExtension + ".jpg").outputStream()) + writer.output = imgOut + val ending = IIOImage(combined, null, imageMetadata) + writer.write(null, ending, iwp) + writer.dispose() + } + } + obs.observe() + obs.notifyObservers() +} + +fun Component.forceToCenter(): Component = JPanel().apply { this.add(this@forceToCenter) } + +fun addWM(watermark: BufferedImage, image: BufferedImage): Image { + val combined = BufferedImage(image.width, image.height, BufferedImage.TYPE_INT_RGB) + val g = combined.graphics + g.drawImage(image, 0, 0, null) + val x = image.width - watermark.width - 5 + val y = image.height - watermark.height - 5 + g.drawImage(watermark, x, y, null) + return combined +} + +class FrmPopUpInfo(message: String, image: Image) : JFrame() { + init { + this.title = message + this.add(JLabel(ImageIcon(image))) + this.background = Color.WHITE + this.pack() + + this.setLocationRelativeTo(null) + obs.addObserver { o, arg -> + java.util.Timer().schedule(timerTask { + + }, 5 * 1000) + this@FrmPopUpInfo.isVisible = false + + this@FrmPopUpInfo.dispose() + } + + this.isVisible = true + } +} \ No newline at end of file