diff --git a/inc/yaml b/inc/yaml index 91e3d43..0832bf1 100644 --- a/inc/yaml +++ b/inc/yaml @@ -8,14 +8,31 @@ getYamlBlock(){ # If there is a yaml file, use it # if not, try and get the yaml header + getYamlFile || getYamlHeader +} + +getYamlFile(){ + vecho "getYamlFile $*" + cd "$dataDir" || return + local filename + filename="$(findFile "$1")" if [ -f "$filename.yaml" ]; then cat "$filename.yaml" + return 0 else - sed -n '1 { /^---/ { :a N; /\n---/! ba; p} }' "$filename" | - sed '1d;$d;s/\t/ /g' + return 1 fi } +getYamlHeader(){ + vecho "getYamlHeader $*" + cd "$dataDir" || return + local filename + filename="$(findFile "$1")" + sed -n '1 { /^---/ { :a N; /\n---/! ba; p} }' "$filename" | + sed '1d;$d;s/\t/ /g' +} + getYamlTitle(){ vecho "getYamlTitle $*" cd "$dataDir" || return