Merge branch 'master' into HEAD

This commit is contained in:
Jakobus Schürz 2022-01-27 18:23:48 +01:00
commit 9e6b21fb5b
12 changed files with 14 additions and 13 deletions

View file

@ -16,6 +16,8 @@ alias sexit='ssh -O exit $(history -p \!ssh:$:t)'
alias remountshared='sudo systemctl restart media-remote-sharefs-userdata.mount'
alias umountshared='sudo systemctl stop media-remote-sharefs-userdata.mount'
alias musictag='python3 -m music_tag'
alias nestedwayland='dbus-run-session -- gnome-shell --nested --wayland'
alias xo='xdg-open .'

View file

@ -23,7 +23,6 @@
[ -z "${subdestpic+x}" ] && subdestpic="${subdestdefault}"
[ -z "${subdestvid+x}" ] && subdestvid="${subdestdefault}"
help () {
cat << EOF
Usage: $(basename $0) [move=[true|copy]] [setdate=[true|false]] [forcedate=[true|false]] [setoriginalfilename=[false|true|force]] [<file>]
@ -98,14 +97,14 @@ parsedatetime() {
# 2020.04.02_15-32-20+02:00.jpg
# 2020.04.13_10-59-14+02:00.jpg
# WhatsApp Image 2019-07-29 at 12.45.02.jpeg
loginfo "fn: $filename"
echo fn: $filename >&2
if [[ $filename =~ ^.*([0-9]{4})(\.|-)([0-9]{2})(\.|-)([0-9]{2})( |_|-|" at ")([0-9]{2})(\.|-|:)([0-9]{2})(\.|-|:)([0-9]{2})(\.|-|\+|\(| ).*$ ]]; then
result="$(printf "%04d:%02d:%02d %02d:%02d:%02d" "${BASH_REMATCH[1]#0}" "${BASH_REMATCH[3]#0}" "${BASH_REMATCH[5]#0}" "${BASH_REMATCH[7]#0}" "${BASH_REMATCH[9]#0}" "${BASH_REMATCH[11]#0}")"
fi
if [ -z "${result}" ]; then
# signal-2020-08-09-171936.jpg
if [[ $filename =~ ^.*([0-9]{4})(\.|-)([0-9]{2})(\.|-)([0-9]{2})( |_|-|" at ")([0-9]{2})([0-9]{2})([0-9]{2})(\.|-|\+|\(| ).*$ ]]; then
if [[ $filename =~ ^.*([0-9]{4})(\.|-)([0-9]{2})(\.|-)([0-9]{2})( |_|-|" at ")([0-9]{2})([0-9]{2})([0-9]{2})(\.|-|\+|_|\(| ).*$ ]]; then
result="$(printf "%04d:%02d:%02d %02d:%02d:%02d" "${BASH_REMATCH[1]#0}" "${BASH_REMATCH[3]#0}" "${BASH_REMATCH[5]#0}" "${BASH_REMATCH[7]#0}" "${BASH_REMATCH[8]#0}" "${BASH_REMATCH[9]#0}")"
fi
fi

@ -1 +1 @@
Subproject commit 693e5a2a0f6acfd2666882655d5dfd32e8c6c50b
Subproject commit 2afeff1529ec85d0c5ced5ece3714c2220b646a5

@ -1 +1 @@
Subproject commit 4138333f5cfb6e21b0f8d63a43add4c70c25cdaf
Subproject commit e086f0b3fe1cb56df1335037cfd3d612defce082

@ -1 +1 @@
Subproject commit 0452b71830b1a219b8cdc68141ee58ec288ea711
Subproject commit e34f6c129d39b90db44df1107c8b7dfacfd18946

@ -1 +1 @@
Subproject commit 9310f91476a94ee9c2f3a587171893743a343e26
Subproject commit 81f3eaba295b3fceb2d032db57e5eae99ae480f8

@ -1 +1 @@
Subproject commit e1fe727127a813095854a5b063c15e955a77eafb
Subproject commit 4524fb465b11881409482636ae716b4965011550

@ -1 +1 @@
Subproject commit 97bf9ec720662af51ae403b6dfe720d4a24bfcbc
Subproject commit 176f364f1b4acf894cdc248944f2d5506a37cc80

@ -1 +1 @@
Subproject commit 26f922753a288df639b8d05d13ed62b9b04a26bc
Subproject commit a8b3c254d0e5c43be24298ce16cd01f740fe8d42

@ -1 +1 @@
Subproject commit 97cf3e6e638f936187d5f6e9b5eb1bdf0a4df256
Subproject commit 531bcc9e5a4cb1b1fb4dec8face230bf3d205ac7

@ -1 +1 @@
Subproject commit 4d29c1d6a0def18923b4762c8f85ca3ee5ae6c83
Subproject commit f7f1413ed9b69eb80c8af07d38ebcc889ed64d96

@ -1 +1 @@
Subproject commit 256702dd1432894b3607d3de6cd660863b331818
Subproject commit 2571c8f52077ada85bf4b0bdefc724e6a5d4c4a8