X-Git-Url: https://zdv2.bktei.com/gitweb/BK-2020-03.git/blobdiff_plain/c560a7fe17aedf2393b7d3313e60e795702bbc14..4278ff51911269c34a9029b7de5979c364cc68be:/user/bkots?ds=sidebyside diff --git a/user/bkots b/user/bkots index f829ce6..baffb08 100755 --- a/user/bkots +++ b/user/bkots @@ -5,12 +5,13 @@ declare -Ag appRollCall # Associative array for storing app status declare -Ag fileRollCall # Associative array for storing file status declare -Ag dirRollCall # Associative array for storing dir status declare -ag arrayPosArgs # Associative array for processArgs() function -declare -g ots_delay; ots_delay=1 # minimum time in seconds between ots operations declare -ag calendars; calendars+=("https://finney.calendar.eternitywall.com"); calendars+=("https://btc.calendar.catallaxy.com"); calendars+=("https://alice.btc.calendar.opentimestamps.org"); calendars+=("https://bob.btc.calendar.opentimestamps.org"); +declare -a commands # array for storing assembled commands +age_threshold="60"; # min age to add file; seconds; # Declare functions yell() { echo "$0: $*" >&2; } # print script path and all args to stderr @@ -199,7 +200,7 @@ showVersion() { vbm "DEBUG:showVersion function called." cat <<'EOF' -bkots 0.0.8 +bkots 1.0.3 Copyright (C) 2022 Steven Baltakatei Sandoval License GPLv3: GNU GPL version 3 This is free software; you are free to change and redistribute it. @@ -260,6 +261,8 @@ showUsage() { themselves are also ignored by default (e.g. '/home/user/.gitconfig'). + Files modified less than 1 minute ago are ignored. + EXAMPLES: bkots -v foo.txt bkots foo.txt bar.pdf /home/username/Pictures/ @@ -351,18 +354,30 @@ get_parent_dirnames() { echo "$name_base"; done; }; # Output parent dirnames to stdout +cmdwrap() { + # print command to stderr + echo "$@" 1>&2; + + # execute command + "$@"; +}; # print and execute string together +export -f cmdwrap; # export cmdwrap for use in other functions main() { # Desc: Creates `.ots` file: # - for each file specified in arrayPosArgs array # - for each file in each dir specified in arrayPosArgs array # Output file created alongside each file or in output directory specified by pathDirIn1 # Usage: main "$@"; - # Input: arrayPosArgs array with positional arguments - # pathDirOut1 path for output `.ots` files (if pathDirOut1 is specified and is a path) + # Input: arrayPosArgs array with positional arguments + # pathDirOut1 path for output `.ots` files (if pathDirOut1 is specified and is a path) + # age_threshold var: mininum age in seconds to timestamp file + # Output: file(s) creates `.ots` file alongside specified files - # Depends: find (GNU findutils) 4.8.0, GNU Coreutils 8.32 (sort) + # Depends: find (GNU findutils) 4.8.0, GNU Coreutils 8.32 (sort), GNU Parallel 20210822 # Ref/Attrib: [1] How to create an array of unique elements from a string/array in bash https://unix.stackexchange.com/a/167194 # [2] How to find files containing newlines in their names https://stackoverflow.com/a/21727028 + # [3] Get mtime of specific file using Bash? https://stackoverflow.com/a/4774377 + # [4] Search/Replace with string substitution instead of sed. https://www.shellcheck.net/wiki/SC2001 local -a file_list file_list_pruned; local -a files_to_verify files_to_upgrade files_to_stamp local -a files_to_verify_pruned files_to_upgrade_pruned files_to_stamp_pruned @@ -371,22 +386,18 @@ main() { processArgs "$@"; # Check dependencies - if ! checkapp ots find; then + if ! checkapp ots find parallel; then displayMissing; die "FATAL:Missing dependencies."; fi; - # Check arguments - ## Mark if output dir option specified - if [[ -v pathDirOut1 ]]; then - vbm "DEBUG:output directory specified:pathDirOut1:$pathDirOut1"; - if [[ -d $pathDirOut1 ]]; then - vbm "DEBUG:pathDirOut1:$pathDirOut1"; - config_output_dir="true"; - else - die "ERROR:Not a dir:$pathDirOut1"; + # Check arguments + for arg in "${arrayPosArgs[@]}"; do + arg="$(readlink -f "$arg")"; + if ! { [[ -d $arg ]] || [[ -f $arg ]]; }; then + die "FATAL:Not a file or dir:arg:$arg"; fi; - fi; + done; # Display ots details vbm "$(type ots)"; # show how 'ots' is defined @@ -425,7 +436,7 @@ main() { done < <(find "$item" -maxdepth 1 -type f); fi; else - die "ERROR:Not a file or dir:item:$item"; + die "FATAL:Not a file or dir:item:$item"; fi; done; if [[ $opVerbose == "true" ]]; then @@ -435,50 +446,65 @@ main() { # Prune file_list for item in "${file_list[@]}"; do - if ! [[ $option_include_dotfiles == "true" ]]; then - ## Ignore files located beneath a dotfile directory (e.g. '/home/my_repo/.git/config') - unset flag_contains_dotfile_parent; - while read -r line; do - ### Check line from output of get_parent_dirnames - pattern="^\."; - if [[ $line =~ $pattern ]]; then - #### line starts with '.' - vbm "DEBUG:Dotfile parent detected. Not including in file_list_pruned:$item"; - vbm "DEBUG:Dotfile in path:item:$item"; - vbm "DEBUG:Dotfile parent:line:$line"; - flag_contains_dotfile_parent="true"; - break - fi; - done < <(get_parent_dirnames "$item"); - if [[ $flag_contains_dotfile_parent == "true" ]]; then - unset flag_contains_dotfile_parent; - continue; # skip to next item (i.e. don't add to file_list_pruned) - fi; + ## Ignore files that end in '.ots.bak'. + if [[ $item =~ '.ots.bak'$ ]]; then + vbm "DEBUG:Skipping file ending in '.ots.bak':item:$item"; + continue; # skip to next item + fi; - ## Ignore dotfiles themselves - item_basename="$(basename "$item")"; - pattern="^\."; - if [[ $item_basename =~ $pattern ]]; then - vbm "INFO :Skipping dotfile:item:$item"; - continue; # skip to next item + ## Ignore dotfiles + if ! [[ $option_include_dotfiles == "true" ]]; then + ### Ignore files if '/.' contained within canonical path + pattern="/\."; # a dot after a forward slash + if [[ $item =~ $pattern ]]; then + continue; fi; + + # ### Ignore files located beneath a dotfile directory (e.g. '/home/my_repo/.git/config') + # unset flag_contains_dotfile_parent; + # while read -r line; do + # #### Check line from output of get_parent_dirnames + # pattern="^\."; + # if [[ $line =~ $pattern ]]; then + # ##### line starts with '.' + # vbm "DEBUG:Dotfile parent detected. Not including in file_list_pruned:$item"; + # vbm "DEBUG:Dotfile in path:item:$item"; + # vbm "DEBUG:Dotfile parent:line:$line"; + # flag_contains_dotfile_parent="true"; + # break + # fi; + # done < <(get_parent_dirnames "$item"); + # if [[ $flag_contains_dotfile_parent == "true" ]]; then + # unset flag_contains_dotfile_parent; + # continue; # skip to next item (i.e. don't add to file_list_pruned) + # fi; + + # ### Ignore dotfiles themselves + # item_basename="$(basename "$item")"; + # pattern="^\."; + # if [[ $item_basename =~ $pattern ]]; then + # vbm "INFO :Skipping dotfile:item:$item"; + # continue; # skip to next item + # fi; fi; - + ## Ignore files with newlines present in filename. See [2]. if [[ $item =~ $'\n' ]]; then - yell "INFO :Skipping file name with newline:$item"; + vbm "DEBUG:Skipping file name with newline:$item"; continue; # skip to next item fi; ## Ignore files that end in '~'. if [[ $item =~ ~$ ]]; then - yell "INFO :Skipping file ending in tilde:$item"; + vbm "DEBUG:Skipping file ending in tilde:$item"; continue; # skip to next item fi; - ## Ignore files that end in '.ots.bak'. - if [[ $item =~ '.ots.bak'$ ]]; then - yell "INFO :Skipping file ending in '.ots.bak':item:$item"; + ## Ignore files modified less than age_threshold. See [3]. + time_now="$(date +%s)"; # epoch seconds + item_age="$(stat -c %Y "$item")"; # age in seconds + if [[ $(( time_now - item_age )) -lt "$age_threshold" ]]; then + yell "INFO :Skipping file modified less than $age_threshold seconds ago:item:$item"; continue; # skip to next item fi; @@ -614,9 +640,10 @@ main() { fi; # Act on files - ## Upgrade files + ## Assemble upgrade file commands for item in "${files_to_upgrade_pruned[@]}"; do path_prf="$(cut -d $'\n' -f1 < <(echo "$item"))"; + path_prf_sesc="${path_prf//\"/\\\"}"; # escape path double quotes. See [4]. if [[ -z "$path_prf" ]]; then yell "ERROR:blank upgrade item encountered. Skipping:item:$item"; continue; @@ -626,18 +653,24 @@ main() { ### Try upgrade with known calendars in random order while read -r url; do vbm "DEBUG:Upgrading with calendar:url:$url"; - ots -l "$url" --no-default-whitelist upgrade "$path_prf" && break; + if [[ "$opVerbose" = "true" ]]; then + commands+=("cmdwrap ots -v -l $url --no-default-whitelist upgrade \"$path_prf_sesc\"") && break; + else + commands+=("cmdwrap ots -l $url --no-default-whitelist upgrade \"$path_prf_sesc\"") && break; + fi; + #ots -l "$url" --no-default-whitelist upgrade "$path_prf" && break; done < <(printf "%s\n" "${calendars[@]}" | shuf); else yell "DEBUG:DRY RUN:Not running:\"ots upgrade $path_prf\""; fi; - #sleep "$ots_delay"; done; - ## Verify files + ## Assemble verify file commands for item in "${files_to_verify_pruned[@]}"; do path_src="$(cut -d $'\n' -f1 < <(echo "$item"))"; path_prf="$(cut -d $'\n' -f2 < <(echo "$item"))"; + path_src_sesc="${path_src//\"/\\\"}"; # escape path double quotes. See [4]. + path_prf_sesc="${path_prf//\"/\\\"}"; # escape path double quotes. See [4]. if [[ -z "$path_src" ]] || [[ -z "$path_prf" ]]; then yell "ERROR:blank verify item encountered. Skipping:item:$item"; continue; @@ -648,31 +681,45 @@ main() { ### Try verify with known calendars in random order while read -r url; do vbm "DEBUG:Verifying with calendar:url:$url"; - ots -l "$url" --no-default-whitelist verify -f "$path_src" "$path_prf" && break; + if [[ "$opVerbose" = "true" ]]; then + commands+=("cmdwrap ots -v -l $url --no-default-whitelist verify -f \"$path_src_sesc\" \"$path_prf_sesc\"") && break; + else + commands+=("cmdwrap ots -l $url --no-default-whitelist verify -f \"$path_src_sesc\" \"$path_prf_sesc\"") && break; + fi; + #ots -l "$url" --no-default-whitelist verify -f "$path_src" "$path_prf" && break; done < <(printf "%s\n" "${calendars[@]}" | shuf); else yell "DEBUG:DRY RUN:Not running:\"ots verify -f $path_src $path_prf\""; fi; - #sleep "$ots_delay"; done; - ## Stamp files + ## Assemble stamp file commands for item in "${files_to_stamp_pruned[@]}"; do path_src="$(cut -d $'\n' -f1 < <(echo "$item"))"; + path_src_sesc="${path_src//\"/\\\"}"; # escape path double quotes. See [4]. if [[ -z "$path_src" ]]; then yell "ERROR:blank stamp item encountered. Skipping:item:$item"; continue; fi; vbm "DEBUG:Attempting to stamp source file:path_src:$path_src"; if [[ ! $option_dry_run == "true" ]]; then - ots stamp "$path_src"; + if [[ "$opVerbose" = "true" ]]; then + commands+=("cmdwrap ots -v stamp \"$path_src_sesc\""); + else + commands+=("cmdwrap ots stamp \"$path_src_sesc\""); + fi; + #ots stamp "$path_src"; else yell "DEBUG:DRY RUN:Not running:\"ots stamp $path_src\""; fi; - sleep "$ots_delay"; done; + ## Run commands + #yell "DEBUG:commands:$(printf "%s\n" "${commands[@]}")"; + printf "%s\n" "${commands[@]}" | parallel --group --jobs 25%; + }; # main program # Run program main "$@"; +exit 0;