Add new options and simplify the script (#7)

* Add ignore-external-files option

* Fix typo

* Use correct bash syntax

* Simplify script and add ignore-header-deps option

* Disable additional logging

* Use correct way to check what file already checked

Author: MinyazevR

action.yml

@@ -39,7 +39,7 @@ inputs:
       In this case, the version field is ignored.
     required: false
     default: false
-  ignore-headers:
+  ignore-external-files:
     description: |
       Ignore thirdparty headers.
     required: false
@@ -61,6 +61,10 @@ inputs:
       Won't emit warnings for non-Qt files, or in other words, if -DQT_CORE_LIB is missing.
     required: false
     default: false
+  ignore-header-deps:
+    description: |
+    required: false
+    default: false
   qt4-compat:
     description: |
       Turns off checks not compatible with Qt 4
@@ -84,6 +88,10 @@ inputs:
     description: |-
       Is used to check only modified and appended files.
     default: ""
+  root-dir:
+    description: |-
+      If the ignore-external-files option is set, the final output on GH will show files that are located below this directory
+    default: ""
 outputs:
   warnings-count:
     description: 'Total warnings count'
@@ -155,8 +163,10 @@ runs:
         SUPPORTED_CHECKS_JSON: ${{ inputs.supported-checks-json }}
         VISIT_IMPLICIT_CODE: ${{ inputs.visit-implicit-code }}
         CLAZY_CHECKS_AS_ERRORS: ${{ inputs.warnings_as_errors }}
-        IGNORE_HEADERS : ${{ inputs.ignore-headers }}
+        IGNORE_EXTERNAL_FILES : ${{ inputs.ignore-external-files }}
         ONLY_DIFF: ${{ inputs.only-diff }}
+        ROOT_DIR: ${{ inputs.root-dir }}
+        IGNORE_HEADER_DEPS: ${{ inputs.ignore-header-deps }}
       run: |
         PATH=~/.local/clazy/bin:$PATH "$GITHUB_ACTION_PATH/clazy.sh"
 

clazy.sh

@@ -30,11 +30,6 @@ if [ "$VISIT_IMPLICIT_CODE" == "true" ]; then
     options+=( "--visit-implicit-code" )
 fi
 
-if [ "$IGNORE_HEADERS" == "true" ] && [ -n "$DATABASE" ]; then
-    cp $DATABASE/compile_commands.json $DATABASE/compile_commands_backup.json
-    sed -i 's/-I\([^ ]*\)/-isystem\1/g' $DATABASE/compile_commands.json
-fi
-
 pattern='^(.*?):([0-9]+):([0-9]+): (.+): (.+) \[(.*)\]$'
 
 if [[ -n "$ONLY_DIFF" ]]; then
@@ -68,93 +63,54 @@ echo 0 > "$warnings_file"
 echo 0 > "$errors_file"
 
 declare -A warnings_seen
-
+root_path=$(realpath -s "$ROOT_DIR")
+	
 echo "$output" | grep -E "$pattern" | while IFS= read -r line; do
     if [[ $line =~ $pattern ]]; then
-        relative_path="${BASH_REMATCH[1]}"
+        absolute_path="${BASH_REMATCH[1]}"
         line_number="${BASH_REMATCH[2]}"
         column_number="${BASH_REMATCH[3]}"
         warning_type="${BASH_REMATCH[4]}"
         warning_message="${BASH_REMATCH[5]}"
         warning_code="${BASH_REMATCH[6]}"
 
-        counter=0
-        if [[ "$relative_path" == /* ]]; then
-            absolute_path=$relative_path
-        else
-          for full_path in "${files[@]}"; do
-            if [[ "$(basename "$full_path")" == "$relative_path" ]]; then
-              absolute_path="$full_path"
-              ((counter++))
-            fi
-          done
-        fi
-
-        # This is incredibly bad, but I don't know how to properly handle the clazy output yet
-        if [ "$counter" -ne 1 ]; then
-          continue
-        fi
-
         warning_key="${absolute_path}:${line_number}:${column_number}:${warning_code}"
+        hash=$(echo -n "$warning_key" | md5sum | cut -d' ' -f1)
 
-        if [[ -n "${warnings_seen[$warning_key]}" ]]; then
+        if [[ -n "${warnings_seen[$hash]:-}" ]]; then
             continue
         fi
 
         warnings_seen["$warning_key"]=1
 
-        if [ "$IGNORE_HEADERS" != "true" ]; then
-            if [[ "$warning_type" == "warning" ]]; then
-                echo "warning file=$absolute_path,line=$line_number,col=$column_number,$warning_message [$warning_code]"
-                current_warnings=$(<"$warnings_file")
-                ((current_warnings++))
-                echo "$current_warnings" > "$warnings_file"
-            fi
-
-            if [[ "$warning_type" == "error" ]]; then
-                echo "error file=$absolute_path,line=$line_number,col=$column_number,$warning_message [$warning_code]"
-                current_errors=$(<"$errors_file")
-                ((current_errors++))
-                echo "$current_errors" > "$errors_file"
-            fi
-
-        elif [[ "${files[@]}" =~ "$absolute_path" ]]; then
-
-            if [[ "$warning_type" == "warning" ]]; then
-                echo "warning file=$absolute_path,line=$line_number,col=$column_number,$warning_message [$warning_code]"
-                current_warnings=$(<"$warnings_file")
-                ((current_warnings++))
-                echo "$current_warnings" > "$warnings_file"
-            fi
-
-            if [[ "$warning_type" == "error" ]]; then
-                echo "error file=$absolute_path,line=$line_number,col=$column_number,$warning_message [$warning_code]"
-                current_errors=$(<"$errors_file")
-                ((current_errors++))
-                echo "$current_errors" > "$errors_file"
-            fi
-        fi
-
-        if [[ "${files[@]}" =~ "$absolute_path" ]]; then
-            if [[ "$warning_type" == "warning" ]]; then
-                echo "::warning file=$absolute_path,line=$line_number,col=$column_number::$warning_message [$warning_code]"
-            fi
+	if [[ "$IGNORE_EXTERNAL_FILES" == "true" && "$absolute_path" != "$root_path"* ]]; then
+	    continue
+	fi
 
-            if [[ "$warning_type" == "error" ]]; then
-                echo "::error file=$absolute_path,line=$line_number,col=$column_number::$warning_message [$warning_code]"
-            fi
+	if [[ "$IGNORE_HEADER_DEPS" == "true" ]] && [[ ! "${files[@]}" =~ "$absolute_path" ]]; then
+            continue
+	fi
+	
+        if [[ "$warning_type" == "warning" ]]; then
+            echo "::warning file=$absolute_path,line=$line_number,col=$column_number::$warning_message [$warning_code]"
+            current_warnings=$(<"$warnings_file")
+            ((current_warnings++))
+            echo "$current_warnings" > "$warnings_file"
         fi
+
+        if [[ "$warning_type" == "error" ]]; then
+            echo "::error file=$absolute_path,line=$line_number,col=$column_number::$warning_message [$warning_code]"
+            current_errors=$(<"$errors_file")
+            ((current_errors++))
+            echo "$current_errors" > "$errors_file"
+        fi        
     fi
 done
 
 warnings_count=$(<"$warnings_file")
 errors_count=$(<"$errors_file")
 
 echo "::set-output name=errors-count::$errors_count"
-echo "::set-output name=warnings-count::$warnings_count"
-
-if [ "$IGNORE_HEADERS" == "true" ] && [ -n "$DATABASE" ]; then
-    mv $DATABASE/compile_commands_backup.json $DATABASE/compile_commands.json
-fi
+echo "::set-output name=warnings-count::$warnings_count"	
 
 rm -f "$warnings_file" "$errors_file"