diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..85e7c1d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/.idea/ diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..62c1466 --- /dev/null +++ b/build.gradle @@ -0,0 +1,39 @@ +plugins { + id 'org.jetbrains.kotlin.jvm' version '1.3.50' + id "com.jfrog.bintray" version "1.8.4" +} + +group 'net.volcanomobile' +version '0.1' + +repositories { + mavenCentral() +} + +dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" +} + +compileKotlin { + kotlinOptions.jvmTarget = "1.8" +} +compileTestKotlin { + kotlinOptions.jvmTarget = "1.8" +} + +def Properties properties = new Properties() +properties.load(project.rootProject.file("local.properties").newDataInputStream()) + +bintray { + user = properties.getProperty('bintrayUser') + key = properties.getProperty('bintrayApiKey') + configurations = ['archives'] + pkg { + repo = 'public' + name = 'weservsdk' + userOrg = 'volcanomobile' + licenses = ['Apache-2.0'] + vcsUrl = 'https://github.com/VolcanoMobile/weserv-sdk.git' + githubRepo = 'VolcanoMobile/weserv-sdk' + } +} \ 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..87b738c 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..e615bb0 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu Sep 05 15:48:12 CEST 2019 +distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..af6708f --- /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='"-Xmx64m"' + +# 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..6d57edc --- /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="-Xmx64m" + +@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..c9cc186 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'weservsdk' + diff --git a/src/main/kotlin/net/volcanomobile/weservsdk/Fit.kt b/src/main/kotlin/net/volcanomobile/weservsdk/Fit.kt new file mode 100644 index 0000000..8d503b9 --- /dev/null +++ b/src/main/kotlin/net/volcanomobile/weservsdk/Fit.kt @@ -0,0 +1,12 @@ +package net.volcanomobile.weservsdk + +enum class Fit(internal val value: String) +{ + Inside("inside"), + Outside("outside"), + Cover("cover"), + Fill("fill"), + Contain("contain") +} + +internal fun Fit.toQueryString() = "&fit=$value" \ No newline at end of file diff --git a/src/main/kotlin/net/volcanomobile/weservsdk/Size.kt b/src/main/kotlin/net/volcanomobile/weservsdk/Size.kt new file mode 100644 index 0000000..86bf773 --- /dev/null +++ b/src/main/kotlin/net/volcanomobile/weservsdk/Size.kt @@ -0,0 +1,16 @@ +package net.volcanomobile.weservsdk + +import java.lang.StringBuilder + +data class Size internal constructor( + val width: Int?, + val height: Int? +) + +internal fun Size.toQueryString() = + StringBuilder().apply { + if (width != null) + append("&w=$width") + if (height != null) + append("&h=$height") + }.toString() \ No newline at end of file diff --git a/src/main/kotlin/net/volcanomobile/weservsdk/Weserv.kt b/src/main/kotlin/net/volcanomobile/weservsdk/Weserv.kt new file mode 100644 index 0000000..b59112f --- /dev/null +++ b/src/main/kotlin/net/volcanomobile/weservsdk/Weserv.kt @@ -0,0 +1,35 @@ +package net.volcanomobile.weservsdk + +import net.volcanomobile.weservsdk.builder.WeservBuilder +import java.net.URLEncoder + +private const val BASE_URL = "https://images.weserv.nl/?url=" + +data class Weserv internal constructor( + val url: String, + val useSsl: Boolean, + val size: Size?, + val fit: Fit?, + val withoutEnlargement: Boolean +) + +fun weserv(lambda: WeservBuilder.() -> Unit) = + WeservBuilder().apply(lambda).build() + +fun Weserv.buildUrl() = + StringBuilder(BASE_URL).apply { + if (useSsl) + append("ssl:") + + append(URLEncoder.encode(url, "UTF-8")) + + if (size != null) + append(size.toQueryString()) + + if (fit != null) + append(fit.toQueryString()) + + if (withoutEnlargement) + append("&we") + + }.toString() \ No newline at end of file diff --git a/src/main/kotlin/net/volcanomobile/weservsdk/WeservDsl.kt b/src/main/kotlin/net/volcanomobile/weservsdk/WeservDsl.kt new file mode 100644 index 0000000..ab6c815 --- /dev/null +++ b/src/main/kotlin/net/volcanomobile/weservsdk/WeservDsl.kt @@ -0,0 +1,3 @@ +package net.volcanomobile.weservsdk + +@DslMarker internal annotation class WeservDsl \ No newline at end of file diff --git a/src/main/kotlin/net/volcanomobile/weservsdk/builder/SizeBuilder.kt b/src/main/kotlin/net/volcanomobile/weservsdk/builder/SizeBuilder.kt new file mode 100644 index 0000000..e537062 --- /dev/null +++ b/src/main/kotlin/net/volcanomobile/weservsdk/builder/SizeBuilder.kt @@ -0,0 +1,15 @@ +package net.volcanomobile.weservsdk.builder + +import net.volcanomobile.weservsdk.Size +import net.volcanomobile.weservsdk.WeservDsl + +@WeservDsl +class SizeBuilder internal constructor() { + private var width: Int? = null + private var height: Int? = null + + fun width(lambda: () -> Int) { this.width = lambda() } + fun height(lambda: () -> Int) { this.height = lambda() } + + fun build() = Size(width, height) +} \ No newline at end of file diff --git a/src/main/kotlin/net/volcanomobile/weservsdk/builder/WeservBuilder.kt b/src/main/kotlin/net/volcanomobile/weservsdk/builder/WeservBuilder.kt new file mode 100644 index 0000000..b909004 --- /dev/null +++ b/src/main/kotlin/net/volcanomobile/weservsdk/builder/WeservBuilder.kt @@ -0,0 +1,45 @@ +package net.volcanomobile.weservsdk.builder + +import net.volcanomobile.weservsdk.Fit +import net.volcanomobile.weservsdk.Size +import net.volcanomobile.weservsdk.Weserv +import net.volcanomobile.weservsdk.WeservDsl +import java.net.URI + +@WeservDsl +class WeservBuilder internal constructor() { + private var url: URI? = null + private var size: Size? = null + private var fit: Fit? = null + private var withoutEnlargement = false + + fun url(labmda: () -> String) { url = URI(labmda()) } + + fun size(lambda: SizeBuilder.() -> Unit) { size = SizeBuilder().apply(lambda).build() } + + fun fit(lambda: () -> Fit) { fit = lambda() } + fun withoutEnlargement(lambda: () -> Boolean) { withoutEnlargement = lambda() } + + fun build(): Weserv = + url?.let { url -> + require(url.port == -1) { "Port not allowed" } + + val urlBuilder = StringBuilder("${url.host}${url.path}").apply { + if (!url.query.isNullOrBlank()) { + append("?${url.query}" ) + } + if (!url.fragment.isNullOrBlank()) { + append("#${url.fragment}") + } + } + + return Weserv( + urlBuilder.toString(), + url.scheme == "https", + size, + fit, + withoutEnlargement + ) + + } ?: throw IllegalArgumentException("url is null") +} \ No newline at end of file