X-Git-Url: https://zdv2.bktei.com/gitweb/BK-2020-03.git/blobdiff_plain/8d7a8e1491609126256b0e79efca377424dd80b8..refs/heads/develop:/unitproc/find_erotica.sh

diff --git a/unitproc/find_erotica.sh b/unitproc/find_erotica.sh
index 3c03e52..1502098 100755
--- a/unitproc/find_erotica.sh
+++ b/unitproc/find_erotica.sh
@@ -2,7 +2,7 @@
 # Desc: Searches for erotic phrases in text files in specified working directory
 # Usage: find_erotica.sh [dir]
 # Depends: GNU Find utils, GNU Parallel 20210822, GNU Grep, GNU Coreutils 8.32, bc
-# Version: 0.2.0
+# Version: 0.3.0
 
 
 FIN_MAX=400;
@@ -39,9 +39,9 @@ search_thread() {
             grep -v -- '-$'; # ADJUST ME
     );
 
-    if [[ "${#output[@]}" -gt 0 ]]; then
+    if [[ "${#output[@]}" -gt 1 ]]; then
         printf "%s\n" "$(basename "${fin}" )";
-        printf "Result: %d lines.\n" "${#output[@]}"
+        printf "Result: %d lines.\n" "${#output[@]}";
         printf "%s\n" "${output[@]}";
         printf "\n";
     fi;
@@ -69,6 +69,7 @@ find_nouns() {
     cmd+=('-e' 'nipple');
     cmd+=('-e' 'areola');
     cmd+=('-e' 'breast');
+    cmd+=('-e' 'vulva');
     cmd+=('-e' 'womanhood');
     cmd+=('-e' 'manhood');
     cmd+=('-e' 'his member');
@@ -90,15 +91,15 @@ find_nouns() {
     cmd+=('-e' 'lips');
     cmd+=('-e' 'lovers');
     cmd+=('-e' 'hard-on');
-    cmd+=('-e' 'whore');
     cmd+=('-e' 'sex');
     cmd+=('-e' 'throat');
     cmd+=('-e' 'cleavage');
+    cmd+=('-e' 'kiss');
     cmd+=('--');
     cmd+=("$fin");
     local output; mapfile -t output < <( "${cmd[@]}"; );
     printf "%s\n" "${output[@]}";
-
+    #printf "Found %d matching lines for nouns.\n" "${#output[@]}" 1>&2; # debug
     # yell "STATUS:Finished find_nouns() on $fin"  # debug;
 }; # find nouns
 find_adjectives() {
@@ -141,11 +142,13 @@ find_adjectives() {
     cmd+=('-e' 'tender');
     cmd+=('-e' 'pleasurabl');
     cmd+=('-e' 'buxom|busty|curvy');
+    cmd+=('-e' 'naked|nude');
     cmd+=('--');
     cmd+=('-');
 
     local output; mapfile -t output < <( "${cmd[@]}"; );
     printf "%s\n" "${output[@]}";
+    #printf "Found %d matching lines for adjectives.\n" "${#output[@]}" 1>&2; # debug
 }; # find adjectives
 find_verbs() {
     # Desc: Find verbs
@@ -178,6 +181,7 @@ find_verbs() {
     cmd+=('-');
     local output; mapfile -t output < <( "${cmd[@]}"; );
     printf "%s\n" "${output[@]}";
+    #printf "Found %d matching lines for verbs.\n" "${#output[@]}" 1>&2; # debug
 }; # find verbs
 find_mix_1() {
     # Desc: Filter mix 1
@@ -270,10 +274,12 @@ find_phrase () {
     cmd+=('-e' '( his| her| my) [^\.|;]{,24}nipple.{,24}harden');
     cmd+=('-e' '(suck|lick)[^\.|;]{,12} (nipple|cock( |\.|,)|dick)');
     cmd+=('-e' '(slap)[^\.|;]{,12}( ass)');
-    cmd+=('-e' '( his| her| my) [^\.|;]{,12} (cunt|pussy( |\.|,)|cock( |\.|,)|dick|shaft( |\.|,|;))');
+    cmd+=('-e' '( his| her| my) [^\.|;]{,12}(cunt|pussy( |\.|,)|cock( |\.|,)|dick|shaft( |\.|,|;))');
     cmd+=('--');
     cmd+=('-');
-    "${cmd[@]}"; # execute command
+    local output; mapfile -t output < <( "${cmd[@]}"; );
+    printf "%s\n" "${output[@]}";
+    #printf "Found %d matching lines for phrases in %s.\n" "${#output[@]}" "$fin" 1>&2; # debug
 }; # find phrase
 main () {
     din="$1";