feat: added new themes and changed default theme to uni

new themes:
* uni
* hl-dark
* hl-light
* one-dark-24
* one-light-24
* ayu-dark-24
* ayu-light-24
* ayu-mirage

Author: pamburus

Cargo.lock

@@ -4,7 +4,7 @@ members = [".", "crate/encstr", "crate/heapopt"]
 [workspace.package]
 repository = "https://github.com/pamburus/hl"
 authors = ["Pavel Ivanov <mr.pavel.ivanov@gmail.com>"]
-version = "0.31.0-alpha.12"
+version = "0.31.0-alpha.13"
 edition = "2021"
 license = "MIT"
 

Cargo.toml

@@ -6,7 +6,7 @@ SHELL = /bin/bash
 
 # Local variables
 THEMES = $(notdir $(basename $(wildcard etc/defaults/themes/*.yaml)))
-SCREENSHOT_SAMPLE = prometheus.log
+SCREENSHOT_SAMPLE = cafe.log
 
 # Exported variables
 export RUST_BACKTRACE=1
@@ -91,11 +91,8 @@ clean: contrib-build
 screenshots: build $(THEMES:%=screenshot-%)
 
 screenshot-%: build contrib-screenshots
-	@defaults write org.alacritty NSRequiresAquaSystemAppearance -bool yes
 	@$(SHELL) contrib/bin/screenshot.sh light $(SCREENSHOT_SAMPLE) $*
-	@defaults write org.alacritty NSRequiresAquaSystemAppearance -bool no
 	@$(SHELL) contrib/bin/screenshot.sh dark $(SCREENSHOT_SAMPLE) $*
-	@defaults delete org.alacritty NSRequiresAquaSystemAppearance
 .PHONY: screenshot-%
 
 ## Collect coverage

Makefile

@@ -1,5 +1,7 @@
 # hl [![Build Status][ci-img]][ci] [![Coverage Status][cov-img]][cov] [![Release][release-img]][release]
 
+[![banner](doc/banner.svg)](#screenshot)
+
 High-performance log viewer and processor that transforms logs in JSON and logfmt formats into a human-readable output. Built with efficiency in mind, it enables quick parsing and analysis of large log files with minimal overhead.
 
 ## Features overview
@@ -179,10 +181,15 @@ High-performance log viewer and processor that transforms logs in JSON and logfm
 
 ### Screenshot
 
-![screenshot-light](https://github.com/pamburus/hl-extra/raw/90be58af2fb91d5b5e7ce3b74c3b567611379c40/screenshot/universal/light.png#gh-light-mode-only)
-![screenshot-dark](https://github.com/pamburus/hl-extra/raw/90be58af2fb91d5b5e7ce3b74c3b567611379c40/screenshot/universal/dark.png#gh-dark-mode-only)
+<p align="center">
+    <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/pamburus/hl-extra/bdc78073a46e62568c8fc4d9dbc0e908345d581c/screenshot/uni/dark.svg" />
+    <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/pamburus/hl-extra/bdc78073a46e62568c8fc4d9dbc0e908345d581c/screenshot/uni/light.svg" />
+    <img alt="screenshot" src="https://hl-uni.tiiny.site/dark.svg" />
+    </picture>
+</p>
 
-See other [screenshots](https://github.com/pamburus/hl-extra/tree/90be58af2fb91d5b5e7ce3b74c3b567611379c40/screenshot#readme)
+See other [screenshots](https://github.com/pamburus/hl-extra/tree/refs/heads/main/screenshot#readme)
 
 ## Features and usage
 

README.md

@@ -2,27 +2,27 @@
 
 set -e
 
-ALACRITTY=/Applications/Alacritty.app/Contents/MacOS/alacritty
 HL_SRC=$(cd $(dirname ${0:?})/../.. && pwd)
 MODE=${1:?}
 SAMPLE=${2:?}
 THEME=${3:?}
-TITLE="hl ${SAMPLE:?}"
+TITLE="hl sample/${SAMPLE:?}"
 
-"${ALACRITTY:?}" \
-    --config-file "${HL_SRC:?}"/contrib/etc/alacritty/${MODE:?}.toml \
-    -T "${TITLE:?}" \
-    --hold \
-    -e \
-        "${HL_SRC:?}"/target/debug/hl \
+mkdir -p "${HL_SRC:?}"/extra/screenshot/${THEME:?}
+
+"${HL_SRC:?}"/contrib/bin/termframe.sh \
+    --title "${TITLE:?}" \
+    --mode ${MODE:?} \
+    --embed-fonts true \
+    -W 120 \
+    -H 23 \
+    --font-family "JetBrains Mono, Fira Code, Cascadia Code, Source Code Pro, Consolas, Menlo, Monaco, DejaVu Sans Mono, monospace" \
+    --font-size 12 \
+    -o "${HL_SRC:?}"/extra/screenshot/${THEME:?}/${MODE:?}.svg \
+    -- \
+    "${HL_SRC:?}"/target/debug/hl \
         --config - \
         --theme ${THEME:?} \
+        --time-format '%T' \
         -P \
-        "${HL_SRC:?}"/sample/${SAMPLE:?} &
-
-sleep 0.5
-
-mkdir -p "${HL_SRC:?}"/extra/screenshot/${THEME:?}
-screencapture -l$(GetWindowID Alacritty "${TITLE:?}") "${HL_SRC:?}"/extra/screenshot/${THEME:?}/${MODE:?}.png
-
-kill $!
+        "${HL_SRC:?}"/sample/${SAMPLE:?}

contrib/bin/screenshot.sh

@@ -59,6 +59,13 @@ setup_get_window_id() {
     fi
 }
 
+setup_termframe() {
+    if [ ! -x "$(command -v termframe)" ]; then
+        brew tap pamburus/homebrew-tap
+        brew install termframe
+    fi
+}
+
 rust_is_required() {
     echo "Please install rust"
     echo "See https://doc.rust-lang.org/cargo/getting-started/installation.html"
@@ -125,8 +132,7 @@ setup_coverage_tools() {
 }
 
 setup_screenshot_tools() {
-    setup_get_window_id
-    setup_alacritty
+    setup_termframe
 }
 
 setup_taplo() {

contrib/bin/setup.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if command -v termframe &> /dev/null; then
+    TERMFRAME=$(command -v termframe)
+else
+    TERMFRAME=cargo run --lcoked --release --git github.com/pamburus/termframe --
+fi
+
+${TERMFRAME:?} "$@"