improve: latest log selector, use its own dir for logs, copy redacted logs to /sdcard/Download, use empty spaces for better readability

This commit makes DA select the most recent log file rather than number presence based;
makes it create its own dir in /data/local/tmp/DebugAssistant (change the dir if you have detector OCD);
copies the redacted logs to /sdcard/Download when you press the action button;
improves some messages from action.sh;
probably more I don't remember as I'm squashing this using fixup (:3)

if you're reading this and you are Pedro: ily <3

Signed-off-by: TheSillyOk <priv.ld@proton.me>

Author: TheSillyOk

action.sh

@@ -3,27 +3,30 @@
 # A tool to redact sensitive information from the extremely verbose debug logs of Meow's Debug Assistant.
 # LICENSE: BSD 3-Clause by ThePedroo
 
-echo "Selecting the latest debug log file..."
-
-if [ -f "/data/local/tmp/DebugAssistant-Boot3.log" ]; then
-  LATEST_DEBUG_LOG="/data/local/tmp/DebugAssistant-Boot3.log"
-elif [ -f "/data/local/tmp/DebugAssistant-Boot2.log" ]; then
-  LATEST_DEBUG_LOG="/data/local/tmp/DebugAssistant-Boot2.log"
-elif [ -f "/data/local/tmp/DebugAssistant.log" ]; then
-  LATEST_DEBUG_LOG="/data/local/tmp/DebugAssistant.log"
-else
-  echo "No debug log found."
+log() {
+  echo "$1"
+  echo ""
+}
+
+SAVE_FOLDER="/data/local/tmp/DebugAssistant"
+mkdir -p "$SAVE_FOLDER"
+
+log "Selecting the latest debug log file..."
+
+LATEST_SUFFIX=$(basename $(ls -t "$SAVE_FOLDER/"DebugAssistant* | grep -v "-Redacted" | head -n 1) | grep -oE "(-[0-9]+)?")
+LATEST="DebugAssistant$LATEST_SUFFIX.log"
+if [[ ! -f "$SAVE_FOLDER/$LATEST" ]]; then
+  log "[!] No debug logs found. Exiting..."
+  sleep 4
   exit 1
 fi
 
-echo "Latest debug log selected: $LATEST_DEBUG_LOG"
+NEW_LOG="$SAVE_FOLDER/DebugAssistant-Redacted.log"
+DMESG_LOG="$SAVE_FOLDER/DebugAssistant-DMESG$LATEST_SUFFIX.log"
 
-NEW_LOG="/data/local/tmp/DebugAssistant-Redacted.log"
-if [ -f "$NEW_LOG" ]; then
-  rm "$NEW_LOG"
-fi
+log "Latest debug log selected: $LATEST"
 
-echo "Redacting sensitive information..."
+log "Redacting sensitive information..."
 
 sed -E                                                                   \
   -e 's/([0-9]{1,3}\.){3}[0-9]{1,3}/XXX.XXX.XXX/g'                       \
@@ -58,6 +61,11 @@ sed -E                                                                   \
                                                                          \
                                                                          \
                                                                          \
-  "$LATEST_DEBUG_LOG" > "$NEW_LOG"
+  "$SAVE_FOLDER/$LATEST" > "$NEW_LOG"
+
+log "Redacted logs in $NEW_LOG"
 
-echo "Redacted logs in $NEW_LOG"
+cp "$NEW_LOG" /sdcard/Download
+cp "$DMESG_LOG" /sdcard/Download
+log "Copied redacted log and matching dmesg to /sdcard/Download..."
+sleep 3

post-fs-data.sh

@@ -3,42 +3,30 @@
 # A tool to collect extremely verbose debug log from the Android system.
 # LICENSE: BSD 3-Clause by ThePedroo
 
-SAVE_FOLDER=/data/local/tmp
+SAVE_FOLDER=/data/local/tmp/DebugAssistant
+
+mkdir -p "$SAVE_FOLDER"
 
 function prepare_file() {
-  local file_path="$SAVE_FOLDER/DebugAssistant$1.log"
+  local file_path="$1"
 
+  rm "$file_path"
   touch "$file_path"
   chown shell:shell "$file_path"
 }
 
 function watch_logcat() {
   local file_path="$SAVE_FOLDER/DebugAssistant$1.log"
+  prepare_file "$file_path"
 
-  logcat -f "$file_path" &
+  while [ ! ];do logcat;sleep 1;done > "$file_path" &
 }
 
-# Check if file exists
-if [ -f $SAVE_FOLDER/DebugAssistant.log ]; then
-  # Check if file -2 exists
-  if [ -f $SAVE_FOLDER/DebugAssistant-Boot2.log ]; then
-    # Check if file -3 exists
-    if [ -f $SAVE_FOLDER/DebugAssistant-Boot3.log ]; then
-      rm $SAVE_FOLDER/DebugAssistant-Boot3.log
-      rm $SAVE_FOLDER/DebugAssistant-Boot2.log
-      rm $SAVE_FOLDER/DebugAssistant.log
-
-      prepare_file ""
-      watch_logcat ""
-    else
-      prepare_file "-Boot3"
-      watch_logcat "-Boot3"
-    fi
-  else
-    prepare_file "-Boot2"
-    watch_logcat "-Boot2"
-  fi
+LATEST_SUFFIX=$(basename $(ls -t "$SAVE_FOLDER"/DebugAssistant*.log | grep -v "Redacted" | head -n 1) | grep -oE "([0-9]+)?")
+if [[ -z "$(ls $SAVE_FOLDER/DebugAssistant*.log)" || "${LATEST_SUFFIX:-1}" -ge 3 ]]; then
+  SUFFIX=""
 else
-  prepare_file ""
-  watch_logcat ""
+  SUFFIX="-$(( ${LATEST_SUFFIX:-1} + 1 ))"
 fi
+
+watch_logcat "$SUFFIX"