m/shell-scripting-templates
1
0
Fork 0
mirror of https://github.com/natelandau/shell-scripting-templates.git synced 2025-11-10 14:13:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

cleanup regex

Browse Source
This commit is contained in:
Nathaniel Landau
2021-08-19 17:12:47 -04:00
parent 58cac3ea3b
commit 24dfe4b97f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
utilities/dates.bash
View File

@@ -1,3 +1,4 @@
_monthToNumber_() { _monthToNumber_() {
# DESC: Convert a month name to a number # DESC: Convert a month name to a number
# ARGS: None # ARGS: None
@@ -74,6 +75,8 @@ _parseDate_() {
# * DD MM YY * MM DD YY # * DD MM YY * MM DD YY
# TODO: Impelemt the following date formats # TODO: Impelemt the following date formats
# * MMDDYY * YYMMDD * mon-DD-YY # * MMDDYY * YYMMDD * mon-DD-YY
# TODO: Simplify and reduce the number of regex checks
[[ $# -eq 0 ]] && { [[ $# -eq 0 ]] && {
error 'Missing required argument to _parseDate_()!' error 'Missing required argument to _parseDate_()!'
@@ -89,7 +92,7 @@ _parseDate_() {
debug "_parseDate_() input ${tan}$date${purple}" debug "_parseDate_() input ${tan}$date${purple}"
# YYYY MM DD or YYYY-MM-DD # YYYY MM DD or YYYY-MM-DD
pat="(.*[^0-9]|^)((20[0-2][0-9])[-\.\/_ ]+([ 0-9]{1,2})[-\.\/_ ]+([ 0-9]{1,2}))([^0-9].*|$)" pat="(.*[^0-9]|^)((20[0-2][0-9])[-\.\/_ ]+([0-9]{1,2})[-\.\/_ ]+([0-9]{1,2}))([^0-9].*|$)"
if [[ ${date} =~ $pat ]]; then if [[ ${date} =~ $pat ]]; then
_parseDate_found="${BASH_REMATCH[2]}" _parseDate_found="${BASH_REMATCH[2]}"
_parseDate_year=$((10#${BASH_REMATCH[3]})) _parseDate_year=$((10#${BASH_REMATCH[3]}))
@@ -126,7 +129,7 @@ _parseDate_() {
debug "regex match: ${tan}DD Month, YYYY${purple}" debug "regex match: ${tan}DD Month, YYYY${purple}"
# MM-DD-YYYY or DD-MM-YYYY # MM-DD-YYYY or DD-MM-YYYY
elif [[ ${date} =~ (.*[^0-9]|^)(([ 0-9]{1,2})[-\.\/_ ]+([ 0-9]{1,2})[-\.\/_ ]+(20[0-2][0-9]))([^0-9].*|$) ]]; then elif [[ ${date} =~ (.*[^0-9]|^)(([0-9]{1,2})[-\.\/_ ]+([0-9]{1,2})[-\.\/_ ]+(20[0-2][0-9]))([^0-9].*|$) ]]; then
if [[ $((10#${BASH_REMATCH[3]})) -lt 13 && if [[ $((10#${BASH_REMATCH[3]})) -lt 13 &&
$((10#${BASH_REMATCH[4]})) -gt 12 && $((10#${BASH_REMATCH[4]})) -gt 12 &&