diff --git a/.gitignore b/.gitignore index a1c2a23..4b2333b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,106 @@ +# Created by https://www.toptal.com/developers/gitignore/api/intellij,kotlin,macos,linux,windows,gradle +# Edit at https://www.toptal.com/developers/gitignore?templates=intellij,kotlin,macos,linux,windows,gradle + +### Intellij ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +.idea +*.hprof + +# 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/artifacts +.idea/compiler.xml +.idea/jarRepositories.xml +.idea/modules.xml +.idea/*.iml +.idea/modules +*.iml +*.ipr + +# 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 Patch ### +# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 + +# *.iml +# modules.xml +# .idea/misc.xml +# *.ipr + +# Sonarlint plugin +.idea/**/sonarlint/ + +# SonarQube Plugin +.idea/**/sonarIssues.xml + +# Markdown Navigator plugin +.idea/**/markdown-navigator.xml +.idea/**/markdown-navigator-enh.xml +.idea/**/markdown-navigator/ + +# Cache file creation bug +# See https://youtrack.jetbrains.com/issue/JBR-2257 +.idea/$CACHE_FILE$ + +### Kotlin ### # Compiled class file *.class @@ -21,3 +124,95 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* + +### Linux ### +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +### macOS ### +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### Windows ### +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +### 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.toptal.com/developers/gitignore/api/intellij,kotlin,macos,linux,windows,gradle + +/local.properties diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..7da5f93 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,119 @@ +import org.gradle.api.internal.artifacts.dependencies.DefaultExternalModuleDependency + +plugins { + kotlin("multiplatform") version "1.3.72" + id("com.android.library") + id("maven-publish") +} + +group = "com.pablocasia.kotorra" +version = "1.0.0" + +repositories { + gradlePluginPortal() + google() + jcenter() + mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-eap") + } +} + +kotlin { + android() + ios { + binaries { + framework { + baseName = "kotorra" + } + } + } + js { + browser() + } + jvm() + + val commonMain by sourceSets.getting { + dependencies { + implementation(kotlin("stdlib-common")) + } + } + val commonTest by sourceSets.getting { + dependencies { + implementation(kotlin("test-common")) + implementation(kotlin("test-annotations-common")) + } + } + val androidMain by sourceSets.getting { + dependencies { + implementation(kotlin("stdlib-jdk7")) + } + } + val androidTest by sourceSets.getting + val iosMain by sourceSets.getting + val iosTest by sourceSets.getting + val jsMain by sourceSets.getting { + dependencies { + implementation(kotlin("stdlib-js")) + } + } + val jsTest by sourceSets.getting { + dependencies { + implementation(kotlin("test-js")) + } + } + val jvmMain by sourceSets.getting { + dependencies { + implementation(kotlin("stdlib-jdk7")) + } + } + val jvmTest by sourceSets.getting +} + +android { + compileSdkVersion(29) + defaultConfig { + minSdkVersion(15) + } + buildTypes { + getByName("release") { + isMinifyEnabled = false + } + } +} + +project.afterEvaluate { + publishing { + publications { + create("maven") { + groupId = "com.pablocasia.kotorra" + artifactId = "kotorra-android" + version = "1.0.0" + artifact("${project.buildDir}/outputs/aar/${project.name}-release.aar") + + pom { + withXml { + val dependenciesNode = asNode().appendNode("dependencies") + + listOf( + Pair("compile", "compile"), + Pair("api", "api"), + Pair("implementation", "runtime") + ).forEach { scope -> + configurations.findByName(scope.first)?.dependencies + ?.filterIsInstance() + ?.forEach { dependency -> + dependenciesNode.appendNode("dependency").apply { + appendNode("groupId", dependency.group) + appendNode("artifactId", dependency.name) + appendNode("version", dependency.version) + appendNode("scope", scope.second) + } + } + } + } + } + } + } + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..7fc6f1f --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +kotlin.code.style=official diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..490fda8 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..a4b4429 --- /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-6.3-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..2fe81a7 --- /dev/null +++ b/gradlew @@ -0,0 +1,183 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## 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" "-Xms64m"' + +# 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 or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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=`expr $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" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9109989 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,103 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@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 Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@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" "-Xms64m" + +@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.kts b/settings.gradle.kts new file mode 100644 index 0000000..57ecbd4 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,21 @@ +pluginManagement { + repositories { + mavenCentral() + gradlePluginPortal() + google() + jcenter() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-eap") + } + } + resolutionStrategy { + eachPlugin { + if (requested.id.namespace == "com.android" || requested.id.name == "kotlin-android-extensions") { + useModule("com.android.tools.build:gradle:3.5.2") + } + } + } +} +rootProject.name = "kotorra" + +enableFeaturePreview("GRADLE_METADATA") diff --git a/src/androidMain/AndroidManifest.xml b/src/androidMain/AndroidManifest.xml new file mode 100644 index 0000000..514ae71 --- /dev/null +++ b/src/androidMain/AndroidManifest.xml @@ -0,0 +1,2 @@ + + diff --git a/src/androidMain/kotlin/com/pablocasia/kotorra/Extensions.kt b/src/androidMain/kotlin/com/pablocasia/kotorra/Extensions.kt new file mode 100644 index 0000000..48616cc --- /dev/null +++ b/src/androidMain/kotlin/com/pablocasia/kotorra/Extensions.kt @@ -0,0 +1,30 @@ +package com.pablocasia.kotorra + +fun Kotorra.v(block: Gabble.() -> Unit) { + Kotorra.logGabble(block, Kotorra.Level.VERBOSE) +} + +fun Kotorra.d(block: Gabble.() -> Unit) { + Kotorra.logGabble(block, Kotorra.Level.DEBUG) +} + +fun Kotorra.i(block: Gabble.() -> Unit) { + Kotorra.logGabble(block, Kotorra.Level.INFO) +} + +fun Kotorra.w(block: Gabble.() -> Unit) { + Kotorra.logGabble(block, Kotorra.Level.WARNING) +} + +fun Kotorra.e(block: Gabble.() -> Unit) { + Kotorra.logGabble(block, Kotorra.Level.ERROR) +} + +private fun Kotorra.logGabble(block: Gabble.() -> Unit, priority: Kotorra.Level) { + with(Gabble().apply(block)) { + val isThreadNameVisibleInitialValue = Kotorra.isThreadNameVisible + Kotorra.isThreadNameVisible = isThreadNameVisible + rawLog(priority, tag, throwable, message) + Kotorra.isThreadNameVisible = isThreadNameVisibleInitialValue + } +} diff --git a/src/androidMain/kotlin/com/pablocasia/kotorra/Gabble.kt b/src/androidMain/kotlin/com/pablocasia/kotorra/Gabble.kt new file mode 100644 index 0000000..32c6eea --- /dev/null +++ b/src/androidMain/kotlin/com/pablocasia/kotorra/Gabble.kt @@ -0,0 +1,8 @@ +package com.pablocasia.kotorra + +data class Gabble( + var message: String = "", + var tag: String? = null, + var throwable: Throwable? = null, + var isThreadNameVisible: Boolean = false +) diff --git a/src/androidMain/kotlin/com/pablocasia/kotorra/PlatformBranch.kt b/src/androidMain/kotlin/com/pablocasia/kotorra/PlatformBranch.kt new file mode 100644 index 0000000..3da774b --- /dev/null +++ b/src/androidMain/kotlin/com/pablocasia/kotorra/PlatformBranch.kt @@ -0,0 +1,89 @@ +package com.pablocasia.kotorra + +import android.os.Build +import android.util.Log +import java.io.PrintWriter +import java.io.StringWriter + +actual class PlatformBranch : Branch() { + private val loggerTitle: String = "Kotorra_Android" + + actual override fun performLog(priority: Kotorra.Level, tag: String?, throwable: Throwable?, message: String?) { + require(isEnable(priority, tag)) { return } + + val stackTrace = Thread.currentThread().stackTrace + requireNotNull(stackTrace) { return } + + val elementIndex: Int = getElementIndex(stackTrace) + require(elementIndex > 0) { return } + + val element = stackTrace[elementIndex] + val result = StringBuilder() + + if (Kotorra.isThreadNameVisible) addThreadName(result) + addClassName(element, result) + addMethodName(element, result) + message?.let { addMessage(message, result) } + throwable?.let { addException(it, result) } + + Log.println(priority.toValue(), getGeneratedTag(tag), result.toString()) + } + + private fun getElementIndex(stackTrace: Array?): Int { + requireNotNull(stackTrace) { return 0 } + for (i in 2..stackTrace.size) { + val className = stackTrace[i].className ?: "" + if (className.contains("com.pablocasia.kotorra")) continue + return i + } + return 0 + } + + private fun addThreadName(result: StringBuilder) { + result.append("[Thread: ").append(Thread.currentThread().name).append("] ") + } + + private fun addClassName(element: StackTraceElement, result: StringBuilder) { + val fullClassName = element.className + val classNameFormatted = fullClassName.substring(fullClassName.lastIndexOf('.') + 1) + result.append(classNameFormatted).append(".") + } + + private fun addMethodName(element: StackTraceElement, result: StringBuilder) { + result.append("${element.methodName}(${element.fileName}:${element.lineNumber})") + } + + private fun addMessage(msg: String, result: StringBuilder) { + require(msg.isNotEmpty()) { return } + result.append(" -> ").append(msg) + } + + private fun addException(throwable: Throwable, result: StringBuilder) { + val stringWriter = StringWriter() + val printWriter = PrintWriter(stringWriter) + throwable.printStackTrace(printWriter) + printWriter.flush() + result.append("\n Throwable: ").append(stringWriter.toString()) + } + + private fun getGeneratedTag(tag: String?): String { + val generatedTag = if (tag == null) loggerTitle else "${loggerTitle}_$tag" + return if (generatedTag.length <= MAX_TAG_LENGTH || Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + generatedTag + } else { + generatedTag.substring(0, MAX_TAG_LENGTH) + } + } + + private fun Kotorra.Level.toValue() = when (this) { + Kotorra.Level.VERBOSE -> Log.VERBOSE + Kotorra.Level.DEBUG -> Log.DEBUG + Kotorra.Level.INFO -> Log.INFO + Kotorra.Level.WARNING -> Log.WARN + Kotorra.Level.ERROR -> Log.ERROR + } + + companion object { + private const val MAX_TAG_LENGTH = 23 + } +} diff --git a/src/commonMain/kotlin/com/pablocasia/kotorra/Branch.kt b/src/commonMain/kotlin/com/pablocasia/kotorra/Branch.kt new file mode 100644 index 0000000..88fb2d0 --- /dev/null +++ b/src/commonMain/kotlin/com/pablocasia/kotorra/Branch.kt @@ -0,0 +1,11 @@ +package com.pablocasia.kotorra + +abstract class Branch { + open fun isEnable(priority: Kotorra.Level, tag: String?) = true + + internal fun rawLog(priority: Kotorra.Level, tag: String?, throwable: Throwable?, message: String?) { + performLog(priority, tag, throwable, message) + } + + protected abstract fun performLog(priority: Kotorra.Level, tag: String?, throwable: Throwable?, message: String?) +} diff --git a/src/commonMain/kotlin/com/pablocasia/kotorra/Kotorra.kt b/src/commonMain/kotlin/com/pablocasia/kotorra/Kotorra.kt new file mode 100644 index 0000000..89a5f25 --- /dev/null +++ b/src/commonMain/kotlin/com/pablocasia/kotorra/Kotorra.kt @@ -0,0 +1,88 @@ +package com.pablocasia.kotorra + +import kotlin.jvm.JvmOverloads +import kotlin.native.concurrent.ThreadLocal + +@ThreadLocal +object Kotorra { + private val tree = mutableListOf() + var isThreadNameVisible = false + + @JvmOverloads + fun initialize(branches: List = listOf(PlatformBranch())) { + branches.forEach { tree.add(it) } + } + + fun removeBranch(branch: Branch) { + tree.remove(branch) + } + + fun clearBranches() { + tree.clear() + } + + @PublishedApi + internal fun rawLog(priority: Level, tag: String?, throwable: Throwable?, message: String?) { + if (isEnable(priority, tag)) tree.forEach { it.rawLog(priority, tag, throwable, message) } + } + + @JvmOverloads + fun v(message: String = "", tag: String? = null, throwable: Throwable? = null) { + rawLog(Level.VERBOSE, tag, throwable, message) + } + + @JvmOverloads + fun v(message: () -> String, tag: String? = null, throwable: Throwable? = null) { + rawLog(Level.VERBOSE, tag, throwable, message()) + } + + @JvmOverloads + fun d(message: String = "", tag: String? = null, throwable: Throwable? = null) { + rawLog(Level.DEBUG, tag, throwable, message) + } + + @JvmOverloads + fun d(message: () -> String, tag: String? = null, throwable: Throwable? = null) { + rawLog(Level.DEBUG, tag, throwable, message()) + } + + @JvmOverloads + fun i(message: String = "", tag: String? = null, throwable: Throwable? = null) { + rawLog(Level.INFO, tag, throwable, message) + } + + @JvmOverloads + fun i(message: () -> String, tag: String? = null, throwable: Throwable? = null) { + rawLog(Level.INFO, tag, throwable, message()) + } + + @JvmOverloads + fun w(message: String = "", tag: String? = null, throwable: Throwable? = null) { + rawLog(Level.WARNING, tag, throwable, message) + } + + @JvmOverloads + fun w(message: () -> String, tag: String? = null, throwable: Throwable? = null) { + rawLog(Level.WARNING, tag, throwable, message()) + } + + @JvmOverloads + fun e(message: String = "", tag: String? = null, throwable: Throwable? = null) { + rawLog(Level.ERROR, tag, throwable, message) + } + + @JvmOverloads + fun e(message: () -> String, tag: String? = null, throwable: Throwable? = null) { + rawLog(Level.ERROR, tag, throwable, message()) + } + + private fun isEnable(priority: Level, tag: String?) = tree.any { it.isEnable(priority, tag) } + + enum class Level { + VERBOSE, + DEBUG, + INFO, + WARNING, + ERROR + } +} diff --git a/src/commonMain/kotlin/com/pablocasia/kotorra/PlatformBranch.kt b/src/commonMain/kotlin/com/pablocasia/kotorra/PlatformBranch.kt new file mode 100644 index 0000000..c862abb --- /dev/null +++ b/src/commonMain/kotlin/com/pablocasia/kotorra/PlatformBranch.kt @@ -0,0 +1,5 @@ +package com.pablocasia.kotorra + +expect class PlatformBranch() : Branch { + override fun performLog(priority: Kotorra.Level, tag: String?, throwable: Throwable?, message: String?) +} \ No newline at end of file diff --git a/src/iosMain/kotlin/com/pablocasia/kotorra/PlatformBranch.kt b/src/iosMain/kotlin/com/pablocasia/kotorra/PlatformBranch.kt new file mode 100644 index 0000000..b3c4198 --- /dev/null +++ b/src/iosMain/kotlin/com/pablocasia/kotorra/PlatformBranch.kt @@ -0,0 +1,60 @@ +package com.pablocasia.kotorra + +import platform.Foundation.NSDate +import platform.Foundation.NSDateFormatter +import platform.Foundation.NSThread + +actual class PlatformBranch actual constructor() : Branch() { + private val loggerTitle: String = "Kotorra_iOS" + + private val dateFormatter = NSDateFormatter().apply { + dateFormat = "yyyy-MM-dd HH:mm:ss.SSS" + } + + actual override fun performLog(priority: Kotorra.Level, tag: String?, throwable: Throwable?, message: String?) { + require(isEnable(priority, tag)) { return } + val stackTrace = NSThread.callStackSymbols + val result = StringBuilder() + addCurrentTime(result) + addPriority(priority, result) + addTag(tag, result) + addClassAndMethodName(stackTrace[0] as String, result) + message?.let { addMessage(message, result) } + throwable?.let { addException(it, result) } + + println("$result") + } + + private fun addCurrentTime(result: StringBuilder) { + result.append(dateFormatter.stringFromDate(NSDate())) + } + + private fun addPriority(priority: Kotorra.Level, result: StringBuilder) { + result.append(" ${priority.toValue()}/") + } + + private fun addTag(tag: String?, result: StringBuilder) { + result.append(if (tag == null) loggerTitle else "${loggerTitle}_$tag").append(": ") + } + + private fun addClassAndMethodName(element: String, result: StringBuilder) { + // TODO + } + + private fun addMessage(msg: String, result: StringBuilder) { + require(msg.isNotEmpty()) { return } + result.append(" -> ").append(msg) + } + + private fun addException(throwable: Throwable, result: StringBuilder) { + result.append("\n Throwable: ").append(throwable.message) + } + + private fun Kotorra.Level.toValue() = when (this) { + Kotorra.Level.VERBOSE -> "VERBOSE" + Kotorra.Level.DEBUG -> "DEBUG" + Kotorra.Level.INFO -> "INFO" + Kotorra.Level.WARNING -> "WARN" + Kotorra.Level.ERROR -> "ERROR" + } +} diff --git a/src/jsMain/kotlin/com/pablocasia/kotorra/PlatformBranch.kt b/src/jsMain/kotlin/com/pablocasia/kotorra/PlatformBranch.kt new file mode 100644 index 0000000..d72c601 --- /dev/null +++ b/src/jsMain/kotlin/com/pablocasia/kotorra/PlatformBranch.kt @@ -0,0 +1,42 @@ +package com.pablocasia.kotorra + +actual class PlatformBranch : Branch() { + private val loggerTitle: String = "Kotorra_Javascript" + + actual override fun performLog(priority: Kotorra.Level, tag: String?, throwable: Throwable?, message: String?) { + require(isEnable(priority, tag)) { return } + val result = StringBuilder() + addPriority(priority, result) + addTag(tag, result) + message?.let { addMessage(message, result) } + throwable?.let { addException(it, result) } + + console.log("$result") + } + + private fun addPriority(priority: Kotorra.Level, result: StringBuilder) { + result.append("${priority.toValue()}/") + } + + private fun addTag(tag: String?, result: StringBuilder) { + requireNotNull(tag) { result.append(loggerTitle) } + result.append("${loggerTitle}_$tag") + } + + private fun addMessage(msg: String, result: StringBuilder) { + require(msg.isNotEmpty()) { return } + result.append(" -> ").append(msg) + } + + private fun addException(throwable: Throwable, result: StringBuilder) { + result.append("\n Throwable: ").append(throwable.message) + } + + private fun Kotorra.Level.toValue() = when (this) { + Kotorra.Level.VERBOSE -> "VERBOSE" + Kotorra.Level.DEBUG -> "DEBUG" + Kotorra.Level.INFO -> "INFO" + Kotorra.Level.WARNING -> "WARNING" + Kotorra.Level.ERROR -> "ERROR" + } +} diff --git a/src/jvmMain/kotlin/com/pablocasia/kotorra/PlatformBranch.kt b/src/jvmMain/kotlin/com/pablocasia/kotorra/PlatformBranch.kt new file mode 100644 index 0000000..e4061ab --- /dev/null +++ b/src/jvmMain/kotlin/com/pablocasia/kotorra/PlatformBranch.kt @@ -0,0 +1,7 @@ +package com.pablocasia.kotorra + +actual class PlatformBranch : Branch() { + actual override fun performLog(priority: Kotorra.Level, tag: String?, throwable: Throwable?, message: String?) { + TODO("Not yet implemented") + } +} diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml new file mode 100644 index 0000000..f0ec934 --- /dev/null +++ b/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file