diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/action.source.sh | 14 | ||||
| -rw-r--r-- | src/lib/album.source.sh | 12 | ||||
| -rw-r--r-- | src/lib/bootstrap.source.sh | 14 | ||||
| -rw-r--r-- | src/lib/config.source.sh | 40 | ||||
| -rw-r--r-- | src/lib/template.source.sh | 10 |
5 files changed, 45 insertions, 45 deletions
diff --git a/src/lib/action.source.sh b/src/lib/action.source.sh index 01dc245..193aa4b 100644 --- a/src/lib/action.source.sh +++ b/src/lib/action.source.sh @@ -2,16 +2,16 @@ run_simple_action() { case "$action" in --version) if [[ -n "$config_file" || "$has_config_overrides" = 'yes' \ - || "$PHOTOALBUM_FORCE_GENERATE" = yes ]]; then + || "$SHURIKEN_FORCE_GENERATE" = yes ]]; then usage exit 1 fi - printf 'This is Photoalbum Version %s\n' "$VERSION" + printf 'This is Shuriken Version %s\n' "$VERSION" ;; --init) if [[ -n "$config_file" || "$has_config_overrides" = 'yes' \ - || "$PHOTOALBUM_FORCE_GENERATE" = yes ]]; then + || "$SHURIKEN_FORCE_GENERATE" = yes ]]; then usage exit 1 fi @@ -33,8 +33,8 @@ load_configured_action() { apply_config_defaults apply_template_dir_default apply_cli_overrides - PHOTOALBUM_CONFIG_SOURCE="$rc_file" - export PHOTOALBUM_CONFIG_SOURCE + SHURIKEN_CONFIG_SOURCE="$rc_file" + export SHURIKEN_CONFIG_SOURCE } log_configured_action() { @@ -54,13 +54,13 @@ log_configured_action() { log_verbose "Effective splash page setting: ${SPLASH_PAGE:-yes}" log_verbose "Effective tarball setting: ${TARBALL_INCLUDE:-no}" log_verbose "Effective sync delete setting: ${SYNC_DELETE:-yes}" - log_verbose "Effective force generation setting: $PHOTOALBUM_FORCE_GENERATE" + log_verbose "Effective force generation setting: $SHURIKEN_FORCE_GENERATE" } run_configured_action() { local rc_file - if [[ "$PHOTOALBUM_FORCE_GENERATE" = yes && "$action" != --generate ]]; then + if [[ "$SHURIKEN_FORCE_GENERATE" = yes && "$action" != --generate ]]; then usage exit 1 fi diff --git a/src/lib/album.source.sh b/src/lib/album.source.sh index 704db34..29eff6b 100644 --- a/src/lib/album.source.sh +++ b/src/lib/album.source.sh @@ -145,7 +145,7 @@ cached_photo_identify_output() { local cached_signature='' local current_signature - cache_dir="$DIST_DIR/.photoalbum-cache/exif" + cache_dir="$DIST_DIR/.shuriken-cache/exif" cache_file="$cache_dir/$photo.txt" current_signature=$(photo_cache_signature "$photo" "$photo_path") @@ -834,7 +834,7 @@ count_tree_files() { write_generation_metadata() { local -r tarball_file="$1"; shift local -r generated_at=$(current_timestamp_iso) - local -r config_source="${PHOTOALBUM_CONFIG_SOURCE:-}" + local -r config_source="${SHURIKEN_CONFIG_SOURCE:-}" local -r template_name=$(basename "$TEMPLATE_DIR") local -r source_image_count=$(count_incoming_images) local -r generated_photo_count=$(count_files "$DIST_DIR/photos") @@ -844,7 +844,7 @@ write_generation_metadata() { { printf '{\n' printf ' "generator": {\n' - printf ' "name": "photoalbum",\n' + printf ' "name": "shuriken",\n' printf ' "version": %s\n' "$(_json_string "$VERSION")" printf ' },\n' printf ' "generated_at": %s,\n' "$(_json_string "$generated_at")" @@ -879,7 +879,7 @@ write_generation_metadata() { "$(_json_string "${ORIGINAL_BASEPATH:-}")" printf ' }\n' printf '}\n' - } > "$DIST_DIR/photoalbum.json" + } > "$DIST_DIR/shuriken.json" } prepare_generation_photo_assets() { @@ -976,7 +976,7 @@ dry_run() { fi printf 'Dry run: no files will be written.\n' - printf 'Config source: %s\n' "${PHOTOALBUM_CONFIG_SOURCE:-}" + printf 'Config source: %s\n' "${SHURIKEN_CONFIG_SOURCE:-}" printf 'Incoming directory: %s\n' "$INCOMING_DIR" printf 'Output directory: %s\n' "$DIST_DIR" printf 'Template directory: %s\n' "$TEMPLATE_DIR" @@ -1011,7 +1011,7 @@ dry_run() { "$DIST_DIR" "$html_index_count" fi printf ' %s/favicon.ico\n' "$DIST_DIR" - printf ' %s/photoalbum.json\n' "$DIST_DIR" + printf ' %s/shuriken.json\n' "$DIST_DIR" printf ' %s/photos/* (%s image files)\n' "$DIST_DIR" "$image_count" printf ' %s/thumbs/* (%s image files)\n' "$DIST_DIR" "$image_count" printf ' %s/blurs/* (%s image files)\n' "$DIST_DIR" "$image_count" diff --git a/src/lib/bootstrap.source.sh b/src/lib/bootstrap.source.sh index 3e514fc..244cd55 100644 --- a/src/lib/bootstrap.source.sh +++ b/src/lib/bootstrap.source.sh @@ -37,11 +37,11 @@ USAGE } output_is_quiet() { - [ "$PHOTOALBUM_OUTPUT_MODE" = quiet ] + [ "$SHURIKEN_OUTPUT_MODE" = quiet ] } output_is_verbose() { - [ "$PHOTOALBUM_OUTPUT_MODE" = verbose ] + [ "$SHURIKEN_OUTPUT_MODE" = verbose ] } log_info() { @@ -71,7 +71,7 @@ resolve_default_rc_file() { source_root=$(resolve_source_root) if [ -n "$source_root" ]; then - printf '%s\n' "$source_root/src/photoalbum.default.conf" + printf '%s\n' "$source_root/src/shuriken.default.conf" return fi @@ -82,10 +82,10 @@ resolve_source_root() { local script_dir local source_root - script_dir="$PHOTOALBUM_SOURCE_DIR" + script_dir="$SHURIKEN_SOURCE_DIR" source_root=$(cd "$script_dir/.." && pwd) - if [[ -f "$source_root/src/photoalbum.default.conf" \ + if [[ -f "$source_root/src/shuriken.default.conf" \ && -d "$source_root/share/templates/default" ]]; then printf '%s\n' "$source_root" fi @@ -149,7 +149,7 @@ apply_template_dir_default() { } init_config() { - local -r rc_file=photoalbum.conf + local -r rc_file=shuriken.conf local default_rc_file local rewritten_rc_file local source_root @@ -171,7 +171,7 @@ init_config() { source_root=$(resolve_source_root) if [[ -n "$source_root" \ - && "$default_rc_file" = "$source_root/src/photoalbum.default.conf" ]]; then + && "$default_rc_file" = "$source_root/src/shuriken.default.conf" ]]; then source_template_dir="$source_root/share/templates/default" rewritten_rc_file=$(mktemp "${rc_file}.XXXXXX") if ! awk -v template_dir="$source_template_dir" \ diff --git a/src/lib/config.source.sh b/src/lib/config.source.sh index 200bac5..35624b7 100644 --- a/src/lib/config.source.sh +++ b/src/lib/config.source.sh @@ -23,7 +23,7 @@ print_config() { resolve_tar_opts tar_opts resolve_sync_destinations sync_destinations - print_shell_assignment CONFIG_SOURCE "${PHOTOALBUM_CONFIG_SOURCE:-}" + print_shell_assignment CONFIG_SOURCE "${SHURIKEN_CONFIG_SOURCE:-}" print_shell_assignment INCOMING_DIR "$INCOMING_DIR" print_shell_assignment DIST_DIR "$DIST_DIR" print_shell_assignment TEMPLATE_DIR "$TEMPLATE_DIR" @@ -83,7 +83,7 @@ generation_staging_dir() { final_base=$(basename "$final_dist") staging_parent=$(existing_parent_dir "$final_dist") - mktemp -d "$staging_parent/.photoalbum.$final_base.staging.XXXXXX" + mktemp -d "$staging_parent/.shuriken.$final_base.staging.XXXXXX" } prepare_generation_staging_dir() { @@ -91,12 +91,12 @@ prepare_generation_staging_dir() { local -r staging_dir="$1"; shift local cache_dir - if [ "$PHOTOALBUM_FORCE_GENERATE" = yes ]; then + if [ "$SHURIKEN_FORCE_GENERATE" = yes ]; then log_verbose 'Force generation enabled; not reusing existing output cache' return fi - for cache_dir in photos thumbs blurs .photoalbum-cache; do + for cache_dir in photos thumbs blurs .shuriken-cache; do if [ -d "$final_dist/$cache_dir" ]; then if ! mkdir -p "$staging_dir/$cache_dir"; then return 1 @@ -109,9 +109,9 @@ prepare_generation_staging_dir() { } cleanup_generation_staging_dir() { - if [ -n "${PHOTOALBUM_ACTIVE_STAGING_DIR:-}" ]; then - rm -rf "$PHOTOALBUM_ACTIVE_STAGING_DIR" - PHOTOALBUM_ACTIVE_STAGING_DIR='' + if [ -n "${SHURIKEN_ACTIVE_STAGING_DIR:-}" ]; then + rm -rf "$SHURIKEN_ACTIVE_STAGING_DIR" + SHURIKEN_ACTIVE_STAGING_DIR='' fi } @@ -147,7 +147,7 @@ wait_for_process_exit() { } terminate_active_generation() { - local -r pid="${PHOTOALBUM_ACTIVE_GENERATION_PID:-}" + local -r pid="${SHURIKEN_ACTIVE_GENERATION_PID:-}" if [ -z "$pid" ]; then return @@ -158,7 +158,7 @@ terminate_active_generation() { terminate_process_tree KILL "$pid" fi wait "$pid" 2>/dev/null || true - PHOTOALBUM_ACTIVE_GENERATION_PID='' + SHURIKEN_ACTIVE_GENERATION_PID='' } handle_generation_staging_signal() { @@ -198,7 +198,7 @@ replace_dist_with_staging() { if [ -e "$final_dist" ]; then if ! backup_parent=$( - mktemp -d "$staging_parent/.photoalbum.$final_base.backup.XXXXXX" + mktemp -d "$staging_parent/.shuriken.$final_base.backup.XXXXXX" ); then return 1 fi @@ -244,7 +244,7 @@ generate_staged() { staging_dir=$(generation_staging_dir "$final_dist") log_verbose "Effective output directory: $final_dist" log_verbose "Generation staging directory: $staging_dir" - PHOTOALBUM_ACTIVE_STAGING_DIR="$staging_dir" + SHURIKEN_ACTIVE_STAGING_DIR="$staging_dir" trap cleanup_generation_staging_dir EXIT trap 'handle_generation_staging_signal 130' INT trap 'handle_generation_staging_signal 143' TERM @@ -260,14 +260,14 @@ generate_staged() { set +e ( set -e - PHOTOALBUM_FINAL_DIST_DIR="$final_dist" - export PHOTOALBUM_FINAL_DIST_DIR + SHURIKEN_FINAL_DIST_DIR="$final_dist" + export SHURIKEN_FINAL_DIST_DIR DIST_DIR="$staging_dir" generate ) & - PHOTOALBUM_ACTIVE_GENERATION_PID=$! - wait "$PHOTOALBUM_ACTIVE_GENERATION_PID" + SHURIKEN_ACTIVE_GENERATION_PID=$! + wait "$SHURIKEN_ACTIVE_GENERATION_PID" status=$? - PHOTOALBUM_ACTIVE_GENERATION_PID='' + SHURIKEN_ACTIVE_GENERATION_PID='' set -e if (( status != 0 )); then @@ -288,7 +288,7 @@ generate_staged() { return "$status" fi - PHOTOALBUM_ACTIVE_STAGING_DIR='' + SHURIKEN_ACTIVE_STAGING_DIR='' clear_generation_staging_traps } @@ -298,7 +298,7 @@ resolve_config_file() { if [ -n "$config_file" ]; then printf '%s\n' "$config_file" else - printf '%s\n' ./photoalbum.conf + printf '%s\n' ./shuriken.conf fi } @@ -306,7 +306,7 @@ missing_config() { local -r config_file="$1"; shift printf 'Error: Can not find config file %s\n' "$config_file" >&2 - printf 'Run photoalbum --init to create ./photoalbum.conf.\n' >&2 + printf 'Run shuriken --init to create ./shuriken.conf.\n' >&2 exit 1 } @@ -374,7 +374,7 @@ require_config_var() { local -r name="$1"; shift if [ -z "${!name+x}" ] || [ -z "${!name}" ]; then - config_error "$name must be set in photoalbum configuration" + config_error "$name must be set in shuriken configuration" fi } diff --git a/src/lib/template.source.sh b/src/lib/template.source.sh index 87f73b1..1824a3d 100644 --- a/src/lib/template.source.sh +++ b/src/lib/template.source.sh @@ -119,7 +119,7 @@ _json_bool() { _display_path() { local -r path="$1"; shift - local -r final_dist="${PHOTOALBUM_FINAL_DIST_DIR:-}" + local -r final_dist="${SHURIKEN_FINAL_DIST_DIR:-}" if [[ -n "$final_dist" && "$path" == "$DIST_DIR"* ]]; then printf '%s%s\n' "$final_dist" "${path#"$DIST_DIR"}" @@ -139,15 +139,15 @@ current_date_text() { current_date_text_to() { local -n output_ref="$1"; shift - if [ -z "$PHOTOALBUM_CURRENT_DATE_TEXT" ]; then + if [ -z "$SHURIKEN_CURRENT_DATE_TEXT" ]; then if random_seed_is_set; then - PHOTOALBUM_CURRENT_DATE_TEXT='Thu Jan 1 00:00:00 UTC 1970' + SHURIKEN_CURRENT_DATE_TEXT='Thu Jan 1 00:00:00 UTC 1970' else - PHOTOALBUM_CURRENT_DATE_TEXT=$(command date) + SHURIKEN_CURRENT_DATE_TEXT=$(command date) fi fi - output_ref="$PHOTOALBUM_CURRENT_DATE_TEXT" + output_ref="$SHURIKEN_CURRENT_DATE_TEXT" } current_timestamp_slug() { |