Repositories / gitweb2.git
gitweb2.git
Clone (read-only): git clone http://git.guha-anderson.com/git/gitweb2.git
@@ -1,5 +1,6 @@ .build/ build/ +.gradle/ *.kexe *.klib .kotlin/
@@ -1,58 +0,0 @@ -KOTLIN_HOME ?= /home/arjun/.local/opt/kotlin -KONANC := $(KOTLIN_HOME)/bin/konanc -CINTEROP := $(KOTLIN_HOME)/bin/cinterop -PKG_CONFIG ?= pkg-config -TARGET ?= linux_x64 - -KOTLIN_GIT_DIR ?= /home/arjun/repos/homebox/kotlin-git -KOTLIN_GIT_KLIB := $(KOTLIN_GIT_DIR)/.build/klib/kotlin-git.klib -LIBGIT2_KLIB := $(KOTLIN_GIT_DIR)/.build/klib/libgit2.klib - -BUILD_DIR := .build -LIBEVENT_KLIB := $(BUILD_DIR)/klib/libevent.klib -APP_BIN := $(BUILD_DIR)/bin/gitweb2.kexe - -LIBGIT2_LIB_DIR := $(shell $(PKG_CONFIG) --variable=libdir libgit2 2>/dev/null) -LIBGIT2_LIBS := $(shell $(PKG_CONFIG) --libs libgit2 2>/dev/null) -LIBEVENT_INCLUDE_DIR := $(shell $(PKG_CONFIG) --variable=includedir libevent 2>/dev/null) -LIBEVENT_LIB_DIR := $(shell $(PKG_CONFIG) --variable=libdir libevent 2>/dev/null) -LIBEVENT_CFLAGS := $(shell $(PKG_CONFIG) --cflags libevent 2>/dev/null) -LIBEVENT_LIBS := $(shell $(PKG_CONFIG) --libs libevent 2>/dev/null) - -SOURCES := $(shell find src/main/kotlin -name '*.kt' | sort) - -.PHONY: all check-system-libevent check-system-libgit2 kotlin-git run clean - -all: $(APP_BIN) - -check-system-libgit2: - $(PKG_CONFIG) --exists libgit2 - -check-system-libevent: - $(PKG_CONFIG) --exists libevent - -kotlin-git: | check-system-libgit2 - $(MAKE) -C $(KOTLIN_GIT_DIR) - -$(LIBEVENT_KLIB): src/nativeInterop/cinterop/libevent.def | check-system-libevent - mkdir -p $(dir $@) - $(CINTEROP) -target $(TARGET) -def $< -o $(BUILD_DIR)/klib/libevent \ - -libraryPath $(LIBEVENT_LIB_DIR) \ - -compiler-option -I$(LIBEVENT_INCLUDE_DIR) \ - $(foreach flag,$(LIBEVENT_CFLAGS),-compiler-option $(flag)) - -$(APP_BIN): $(SOURCES) $(LIBEVENT_KLIB) kotlin-git - mkdir -p $(dir $@) - $(KONANC) -target $(TARGET) -o $(BUILD_DIR)/bin/gitweb2 \ - -library $(LIBGIT2_KLIB) -library $(KOTLIN_GIT_KLIB) -library $(LIBEVENT_KLIB) $(SOURCES) \ - -linker-option -L$(LIBGIT2_LIB_DIR) \ - -linker-option -L$(LIBEVENT_LIB_DIR) \ - -linker-option --allow-shlib-undefined \ - $(foreach flag,$(LIBGIT2_LIBS),-linker-option $(flag)) \ - $(foreach flag,$(LIBEVENT_LIBS),-linker-option $(flag)) - -run: $(APP_BIN) - $(APP_BIN) ~/repos - -clean: - rm -rf $(BUILD_DIR)
@@ -2,34 +2,37 @@ A Kotlin/Native, read-only web viewer for local Git repositories. -The app links against the `kotlin-git` library in -`/home/arjun/repos/homebox/kotlin-git` and uses libevent's native HTTP server -through cinterop. It does not use the JVM. +The app uses Ktor Native with the CIO engine for HTTP and the local +`/home/arjun/repos/homebox/kotlin-git` library for repository reads. ## Requirements -- Kotlin/Native installed at `/home/arjun/.local/opt/kotlin` -- system `libgit2` and `libevent` visible through `pkg-config` -- `make` +- Kotlin/Native through the Gradle wrapper +- system `libgit2` visible through `pkg-config` +- the local `kotlin-git` klibs built at + `/home/arjun/repos/homebox/kotlin-git/.build/klib` +- the included Gradle wrapper ## Build ```sh -make +./gradlew build ``` ## Run ```sh -.build/bin/gitweb2.kexe ~/repos +./build/bin/native/releaseExecutable/gitweb2.kexe ~/repos ``` Options: ```sh -.build/bin/gitweb2.kexe ~/repos --host 127.0.0.1 --port 8080 +./build/bin/native/releaseExecutable/gitweb2.kexe ~/repos --host 127.0.0.1 --port 8080 ``` +Press `Ctrl+C` to stop the server. + The server scans nested directories for Git repositories and renders repository, branch, file, directory, and commit history pages. Nested repository paths and branch names that contain slashes are percent-encoded in URLs:
@@ -0,0 +1,61 @@ +plugins { + kotlin("multiplatform") version "2.3.20" +} + +group = "gitweb" +version = "0.1.0" + +val ktorVersion = "3.4.2" +val kotlinGitDir = providers.gradleProperty("kotlinGitDir") + .orElse("/home/arjun/repos/homebox/kotlin-git") +val kotlinGitKlib = kotlinGitDir.map { file("$it/.build/klib/kotlin-git.klib") } +val libgit2Klib = kotlinGitDir.map { file("$it/.build/klib/libgit2.klib") } + +fun pkgConfig(vararg args: String): List<String> = + providers.exec { + commandLine("pkg-config", *args) + }.standardOutput.asText.get().trim().split(Regex("\\s+")).filter { it.isNotBlank() } + +fun pkgConfigValue(vararg args: String): String = + providers.exec { + commandLine("pkg-config", *args) + }.standardOutput.asText.get().trim() + +kotlin { + val hostOs = System.getProperty("os.name") + val arch = System.getProperty("os.arch") + val nativeTarget = when { + hostOs == "Linux" && (arch == "x86_64" || arch == "amd64") -> linuxX64("native") + hostOs == "Linux" && arch == "aarch64" -> linuxArm64("native") + else -> throw GradleException("Unsupported Kotlin/Native host: $hostOs $arch") + } + + nativeTarget.apply { + binaries { + executable { + baseName = "gitweb2" + entryPoint = "main" + linkerOpts("-L${pkgConfigValue("--variable=libdir", "libgit2")}") + linkerOpts(pkgConfig("--libs", "libgit2")) + } + } + } + + sourceSets { + val nativeMain by getting { + kotlin.srcDir("src/main/kotlin") + dependencies { + implementation("io.ktor:ktor-server-core:$ktorVersion") + implementation("io.ktor:ktor-server-cio:$ktorVersion") + implementation(files(kotlinGitKlib)) + implementation(files(libgit2Klib)) + } + } + val nativeTest by getting { + dependencies { + implementation(kotlin("test")) + implementation("io.ktor:ktor-server-test-host:$ktorVersion") + } + } + } +}
@@ -0,0 +1,3 @@ +org.gradle.parallel=true +kotlin.code.style=official +kotlin.mpp.applyDefaultHierarchyTemplate=false
@@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists
@@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 the original 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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# 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 ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + + + +# 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@"
@@ -0,0 +1,93 @@ +@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 +@rem SPDX-License-Identifier: Apache-2.0 +@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=. +@rem This is normally unused +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% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega
@@ -0,0 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + mavenCentral() + } +} + +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + mavenCentral() + } +} + +rootProject.name = "gitweb2"
@@ -2,31 +2,22 @@ package gitweb -import gitweb.internal.event.evbuffer_add -import gitweb.internal.event.evbuffer_free -import gitweb.internal.event.evbuffer_new -import gitweb.internal.event.event_base_dispatch -import gitweb.internal.event.event_base_free -import gitweb.internal.event.event_base_new -import gitweb.internal.event.evhttp_add_header -import gitweb.internal.event.evhttp_bind_socket -import gitweb.internal.event.evhttp_free -import gitweb.internal.event.evhttp_new -import gitweb.internal.event.evhttp_request_get_output_headers -import gitweb.internal.event.evhttp_request_get_uri -import gitweb.internal.event.evhttp_send_reply -import gitweb.internal.event.evhttp_set_gencb -import kotlinx.cinterop.COpaquePointer -import kotlinx.cinterop.CPointer +import io.ktor.http.ContentType +import io.ktor.http.HttpStatusCode +import io.ktor.http.withCharset +import io.ktor.server.application.call +import io.ktor.server.cio.CIO +import io.ktor.server.engine.embeddedServer +import io.ktor.server.request.path +import io.ktor.server.response.header +import io.ktor.server.response.respondText +import io.ktor.server.routing.get +import io.ktor.server.routing.routing +import io.ktor.utils.io.charsets.Charsets import kotlinx.cinterop.ExperimentalForeignApi -import kotlinx.cinterop.StableRef -import kotlinx.cinterop.addressOf -import kotlinx.cinterop.asStableRef -import kotlinx.cinterop.convert import kotlinx.cinterop.pointed import kotlinx.cinterop.staticCFunction import kotlinx.cinterop.toKString -import kotlinx.cinterop.usePinned import kotlinx.git.Blob import kotlinx.git.Branch import kotlinx.git.BranchType @@ -35,13 +26,16 @@ import kotlinx.git.GitException import kotlinx.git.Repository import kotlinx.git.TreeEntryKind import platform.posix.F_OK +import platform.posix.SIGINT +import platform.posix.SIGTERM import platform.posix.access import platform.posix.closedir -import platform.posix.errno import platform.posix.getenv import platform.posix.opendir +import platform.posix.pause import platform.posix.readdir -import platform.posix.strerror +import platform.posix.signal +import platform.posix._exit import kotlin.system.exitProcess private const val DefaultHost = "127.0.0.1" @@ -68,26 +62,31 @@ private class GitWebServer( private val reposByKey: Map<String, RepoInfo> = repos.associateBy { it.key } fun start() { - val base = event_base_new() ?: error("event_base_new failed") - val http = evhttp_new(base) ?: error("evhttp_new failed") - val self = StableRef.create(this) - try { - evhttp_set_gencb(http, staticCFunction(::handleRequest), self.asCPointer()) - if (evhttp_bind_socket(http, host, port.toUShort()) != 0) { - error("failed to bind http server to $host:$port: ${posixError()}") + println("gitweb2 serving ${repos.size} repositories from $root at http://$host:$port/") + val server = embeddedServer(CIO, host = host, port = port) { + routing { + get("{...}") { + val response = route(call.request.path()) + call.response.header("Cache-Control", "no-store") + call.respondText( + text = response.body, + contentType = ContentType.Text.Html.withCharset(Charsets.UTF_8), + status = HttpStatusCode.fromValue(response.status), + ) + } } - println("gitweb2 serving ${repos.size} repositories from $root at http://$host:$port/") - event_base_dispatch(base) + } + try { + server.start(wait = false) + installSignalHandlers() + while (true) pause() } finally { - self.dispose() - evhttp_free(http) - event_base_free(base) + server.stop() Git.shutdown() } } - fun route(rawUri: String): Response { - val rawPath = rawUri.substringBefore('?') + fun route(rawPath: String): Response { val parts = rawPath.split('/').filter { it.isNotEmpty() } return try { when { @@ -114,7 +113,7 @@ private class GitWebServer( val summary = repoSummary(repo) append("<li><a href=\"${repoUrl(repo, summary.branch)}\"><strong>${html(repo.name)}</strong>") append("<span>${html(summary.branch)}") - if (summary.shortId.isNotEmpty()) append(" · ${html(summary.shortId)}") + if (summary.shortId.isNotEmpty()) append(" · ${html(summary.shortId)}") append("</span><small>${html(summary.summary)}</small></a></li>") } append("</ol>") @@ -198,7 +197,7 @@ private class GitWebServer( ): String = buildString { append(repoHeader(repo, branch, path, branches, "code")) append("<div class=\"panel file\">") - append("<div class=\"file-meta\">${blob.bytes.size} bytes · ${html(blob.id.value.take(12))}</div>") + append("<div class=\"file-meta\">${blob.bytes.size} bytes · ${html(blob.id.value.take(12))}</div>") if (blob.isBinary) { append("<p class=\"notice\">Binary file</p>") } else { @@ -213,7 +212,7 @@ private class GitWebServer( append("<ol class=\"commits\">") for (commit in git.commits(branch, 100)) { append("<li><strong>${html(commit.summary)}</strong>") - append("<span>${html(commit.id.value.take(12))} · ${html(commit.author.name)}</span>") + append("<span>${html(commit.id.value.take(12))} · ${html(commit.author.name)}</span>") append("</li>") } append("</ol>") @@ -254,27 +253,13 @@ private class GitWebServer( private data class RepoSummary(val branch: String, val summary: String, val shortId: String) } -private fun handleRequest(request: CPointer<cnames.structs.evhttp_request>?, context: COpaquePointer?) { - if (request == null || context == null) return - val server = context.asStableRef<GitWebServer>().get() - val uri = evhttp_request_get_uri(request)?.toKString() ?: "/" - send(request, server.route(uri)) +private fun installSignalHandlers() { + signal(SIGINT, staticCFunction(::exitFromSignal)) + signal(SIGTERM, staticCFunction(::exitFromSignal)) } -private fun send(request: CPointer<cnames.structs.evhttp_request>, response: Response) { - val bytes = response.body.encodeToByteArray() - val buffer = evbuffer_new() ?: return - try { - bytes.usePinned { pinned -> - evbuffer_add(buffer, pinned.addressOf(0), bytes.size.convert()) - } - val headers = evhttp_request_get_output_headers(request) - evhttp_add_header(headers, "Content-Type", "text/html; charset=utf-8") - evhttp_add_header(headers, "Cache-Control", "no-store") - evhttp_send_reply(request, response.status, statusText(response.status), buffer) - } finally { - evbuffer_free(buffer) - } +private fun exitFromSignal(signalNumber: Int) { + _exit(128 + signalNumber) } private fun page(title: String, body: String): String = """ @@ -283,7 +268,7 @@ private fun page(title: String, body: String): String = """ <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> -<title>${html(title)} · gitweb2</title> +<title>${html(title)} · gitweb2</title> <style> :root { color-scheme: light; --ink: #1f2428; --muted: #586069; --line: #d0d7de; --wash: #f6f8fa; --link: #0969da; --accent: #1a7f37; } * { box-sizing: border-box; } @@ -349,7 +334,7 @@ private fun discoverRepos(root: String): List<RepoInfo> { closedir(dir) } } - scan(expandHome(root).trimEnd('/'), "", 0) + scan(normalizeRoot(root), "", 0) return found.sortedBy { it.name } } @@ -434,17 +419,14 @@ private fun expandHome(path: String): String { return path } -private fun statusText(status: Int): String = when (status) { - 200 -> "OK" - 404 -> "Not Found" - 500 -> "Server Error" - else -> "OK" -} - -private fun posixError(): String { - val code = errno - val message = strerror(code)?.toKString() - return if (message.isNullOrBlank()) "errno $code" else "$message (errno $code)" +private fun normalizeRoot(path: String): String { + val expanded = expandHome(path) + val cwd = getenv("PWD")?.toKString() + return when { + expanded == "." && cwd != null -> cwd + expanded.startsWith("./") && cwd != null -> joinPath(cwd, expanded.drop(2)) + else -> expanded + }.trimEnd('/') } private fun parseArgs(args: Array<String>): Config? {
@@ -1,3 +0,0 @@ -package = gitweb.internal.event -headers = event2/event.h event2/http.h event2/buffer.h event2/keyvalq_struct.h -linkerOpts.linux = -levent