Fix #10: use the "severity" field in matchers

This removes the ugly "sed" hack needed to make flake8 work.

Author: TrueBrain

entrypoint.sh

@@ -1,35 +1,36 @@
 #!/bin/sh
 
-# Copy the matcher to the host system; otherwise "add-matcher" can't find it.
-cp /code/flake8-matcher.json /github/workflow/flake8-matcher.json
-echo "::add-matcher::${RUNNER_TEMP}/_github_workflow/flake8-matcher.json"
+# Copy the matcher to a shared volume with the host; otherwise "add-matcher"
+# can't find it.
+cp /code/flake8-matcher.json ${HOME}/
+echo "::add-matcher::${HOME}/flake8-matcher.json"
 
-# Run flake8. We add 'error/warning' as GitHub Actions ProblemMatcher needs
-# the text 'error/warning' to know how to classify it.
-# The weird piping is needed because we want to get the exitcode from flake8,
-# but there is no other good universal way of doing so.
-# e.g. PIPESTATUS and pipestatus only work in bash/zsh respectively.
-echo "Running flake8 on '${INPUT_PATH}' with the following options..."
+# Create the flake8 arguments
+echo "Running flake8 on '${INPUT_PATH}' with the following options:"
 command_args=""
-echo "Ignoring '${INPUT_IGNORE}'"
-if [ "x${INPUT_IGNORE}" != "x" ]; then 
+echo " - ignoring: '${INPUT_IGNORE}'"
+if [ "x${INPUT_IGNORE}" != "x" ]; then
     command_args="${command_args} --ignore ${INPUT_IGNORE}"
 fi
-echo "Max line length '${INPUT_MAX_LINE_LENGTH}'"
-if [ "x${INPUT_MAX_LINE_LENGTH}" != "x" ]; then 
+echo " - nax line length: '${INPUT_MAX_LINE_LENGTH}'"
+if [ "x${INPUT_MAX_LINE_LENGTH}" != "x" ]; then
     command_args="${command_args} --max-line-length ${INPUT_MAX_LINE_LENGTH}"
 fi
-echo "Resulting CLI options ${command_args}"
-exec 5>&1
-res=`{ { flake8 ${command_args} ${INPUT_PATH}; echo $? 1>&4; } | sed -r 's/: ([^W][0-9][0-9][0-9])/: error: \1/;s/: (W[0-9][0-9][0-9])/: warning: \1/' 1>&5; } 4>&1`
-if [ "$res" = "0" ]; then
+echo " - path: '${INPUT_PATH}'"
+command_args="${command_args} ${INPUT_PATH}"
+echo "Resulting command: flake8 ${command_args}"
+
+# Run flake8
+flake8 ${command_args}
+if [ "$?" = "0" ]; then
     echo "Flake8 found no problems"
 else
     echo "Flake8 found one or more problems"
 fi
 
 # Remove the matcher, so no other jobs hit it.
-echo "::remove-matcher owner=flake8::"
+echo "::remove-matcher owner=flake8-error::"
+echo "::remove-matcher owner=flake8-warning::"
 
 # If we are in warn-only mode, return always as if we pass
 if [ -n "${INPUT_ONLY_WARN}" ]; then

flake8-matcher.json

@@ -1,15 +1,30 @@
 {
     "problemMatcher": [
         {
-            "owner": "flake8",
+            "owner": "flake8-error",
+            "severity": "error",
             "pattern": [
                 {
-                    "regexp": "^([^:]*):(\\d+):(\\d+): (error|warning): (\\w\\d\\d\\d) (.*)$",
+                    "regexp": "^([^:]*):(\\d+):(\\d+): ([EF]\\d\\d\\d) (.*)$",
                     "file": 1,
                     "line": 2,
                     "column": 3,
-                    "severity": 4,
-                    "message": 6
+                    "code": 4,
+                    "message": 5
+                }
+            ]
+        },
+        {
+            "owner": "flake8-warning",
+            "severity": "warning",
+            "pattern": [
+                {
+                    "regexp": "^([^:]*):(\\d+):(\\d+): ([W]\\d\\d\\d) (.*)$",
+                    "file": 1,
+                    "line": 2,
+                    "column": 3,
+                    "code": 4,
+                    "message": 5
                 }
             ]
         }