SimpleDisplay: Hide non-relevants errors for 'or' policies

Signed-off-by: Maxime Gervais <[email protected]>

Author: g-maxime

.github/workflows/MediaConch_Checks.yml

@@ -13,7 +13,7 @@ jobs:
       PYTHONPATH: /usr/local/lib/python2.7:/usr/local/lib/python2.7/dist-packages:/usr/local/lib/python2.7/site-packages
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - name: Dependencies
@@ -26,17 +26,17 @@ jobs:
             pip --disable-pip-version-check install git+https://github.com/vi/mkvparse.git
           fi
           if [ "$RUNNER_OS" == "macOS" ]; then
-            brew install libtool automake libxslt sqlite jansson libevent qt@5 sfk xmlstarlet ffmpeg
+            brew install libtool automake libxslt jansson qt@5 sfk xmlstarlet ffmpeg
             sudo pip --disable-pip-version-check install --prefix /usr/local git+https://github.com/vi/mkvparse.git
           fi
       - name: Get ZenLib info
         id: zenlib-info
         run: |
-          echo "::set-output name=hash::$(git ls-remote https://github.com/MediaArea/ZenLib.git HEAD | cut -f1)"
-          echo "::set-output name=path::$(dirname $PWD)/ZenLib"
+          echo "hash=$(git ls-remote https://github.com/MediaArea/ZenLib.git HEAD | cut -f1)" >> $GITHUB_OUTPUT
+          echo "path=$(dirname $PWD)/ZenLib" >> $GITHUB_OUTPUT
       - name: ZenLib cache
         id: zenlib-cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.zenlib-info.outputs.path }}
           key: ${{ runner.os }}-ZenLib-${{ steps.zenlib-info.outputs.hash }}
@@ -52,11 +52,11 @@ jobs:
       - name: Get MediaInfoLib info
         id: mediainfolib-info
         run: |
-          echo "::set-output name=hash::$(git ls-remote https://github.com/MediaArea/MediaInfoLib.git HEAD | cut -f1)"
-          echo "::set-output name=path::$(dirname $PWD)/MediaInfoLib"
+          echo "hash=$(git ls-remote https://github.com/MediaArea/MediaInfoLib.git HEAD | cut -f1)" >> $GITHUB_OUTPUT
+          echo "path=$(dirname $PWD)/MediaInfoLib" >> $GITHUB_OUTPUT
       - name: MediaInfoLib cache
         id: mediainfolib-cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.mediainfolib-info.outputs.path }}
           key: ${{ runner.os }}-MediaInfoLib-${{ steps.mediainfolib-info.outputs.hash }}

Source/Common/generated/ImplementationReportDisplaySimpleXsl.h

@@ -138,7 +138,7 @@ const char implementation_report_display_simple_xsl[] = {
 ,'\x0a'
 ,'\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x74','\x65','\x6d','\x70','\x6c','\x61','\x74','\x65','\x20','\x6d','\x61','\x74','\x63','\x68','\x3d','\x22','\x6d','\x63','\x3a','\x70','\x6f','\x6c','\x69','\x63','\x79','\x7c','\x6d','\x63','\x3a','\x72','\x75','\x6c','\x65','\x22','\x3e','\x0d'
 ,'\x0a'
-,'\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x69','\x66','\x20','\x74','\x65','\x73','\x74','\x3d','\x22','\x40','\x6f','\x75','\x74','\x63','\x6f','\x6d','\x65','\x21','\x3d','\x27','\x70','\x61','\x73','\x73','\x27','\x20','\x6f','\x72','\x20','\x64','\x65','\x73','\x63','\x65','\x6e','\x64','\x61','\x6e','\x74','\x3a','\x3a','\x2a','\x5b','\x40','\x6f','\x75','\x74','\x63','\x6f','\x6d','\x65','\x21','\x3d','\x27','\x70','\x61','\x73','\x73','\x27','\x5d','\x22','\x3e','\x0d'
+,'\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x69','\x66','\x20','\x74','\x65','\x73','\x74','\x3d','\x22','\x28','\x6e','\x61','\x6d','\x65','\x28','\x2e','\x2e','\x29','\x21','\x3d','\x27','\x70','\x6f','\x6c','\x69','\x63','\x79','\x27','\x20','\x61','\x6e','\x64','\x20','\x40','\x6f','\x75','\x74','\x63','\x6f','\x6d','\x65','\x21','\x3d','\x27','\x70','\x61','\x73','\x73','\x27','\x29','\x20','\x6f','\x72','\x20','\x28','\x6e','\x61','\x6d','\x65','\x28','\x2e','\x2e','\x29','\x3d','\x27','\x70','\x6f','\x6c','\x69','\x63','\x79','\x27','\x20','\x61','\x6e','\x64','\x20','\x2e','\x2e','\x2f','\x40','\x74','\x79','\x70','\x65','\x3d','\x27','\x6f','\x72','\x27','\x20','\x61','\x6e','\x64','\x20','\x2e','\x2e','\x2f','\x40','\x6f','\x75','\x74','\x63','\x6f','\x6d','\x65','\x21','\x3d','\x27','\x70','\x61','\x73','\x73','\x27','\x20','\x61','\x6e','\x64','\x20','\x40','\x6f','\x75','\x74','\x63','\x6f','\x6d','\x65','\x3d','\x2e','\x2e','\x2f','\x40','\x6f','\x75','\x74','\x63','\x6f','\x6d','\x65','\x29','\x20','\x6f','\x72','\x20','\x28','\x6e','\x61','\x6d','\x65','\x28','\x2e','\x2e','\x29','\x3d','\x27','\x70','\x6f','\x6c','\x69','\x63','\x79','\x27','\x20','\x61','\x6e','\x64','\x20','\x2e','\x2e','\x2f','\x40','\x74','\x79','\x70','\x65','\x21','\x3d','\x27','\x6f','\x72','\x27','\x20','\x61','\x6e','\x64','\x20','\x40','\x6f','\x75','\x74','\x63','\x6f','\x6d','\x65','\x21','\x3d','\x27','\x70','\x61','\x73','\x73','\x27','\x29','\x22','\x3e','\x0d'
 ,'\x0a'
 ,'\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x74','\x65','\x78','\x74','\x3e','\x26','\x23','\x78','\x61','\x3b','\x3c','\x2f','\x78','\x73','\x6c','\x3a','\x74','\x65','\x78','\x74','\x3e','\x0d'
 ,'\x0a'
@@ -158,7 +158,7 @@ const char implementation_report_display_simple_xsl[] = {
 ,'\x0a'
 ,'\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x74','\x65','\x78','\x74','\x3e','\x5d','\x3c','\x2f','\x78','\x73','\x6c','\x3a','\x74','\x65','\x78','\x74','\x3e','\x0d'
 ,'\x0a'
-,'\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x61','\x70','\x70','\x6c','\x79','\x2d','\x74','\x65','\x6d','\x70','\x6c','\x61','\x74','\x65','\x73','\x20','\x73','\x65','\x6c','\x65','\x63','\x74','\x3d','\x22','\x6d','\x63','\x3a','\x72','\x75','\x6c','\x65','\x5b','\x40','\x6f','\x75','\x74','\x63','\x6f','\x6d','\x65','\x21','\x3d','\x27','\x70','\x61','\x73','\x73','\x27','\x5d','\x7c','\x6d','\x63','\x3a','\x70','\x6f','\x6c','\x69','\x63','\x79','\x5b','\x40','\x6f','\x75','\x74','\x63','\x6f','\x6d','\x65','\x21','\x3d','\x27','\x70','\x61','\x73','\x73','\x27','\x5d','\x7c','\x64','\x65','\x73','\x63','\x65','\x6e','\x64','\x61','\x6e','\x74','\x3a','\x3a','\x2a','\x5b','\x40','\x6f','\x75','\x74','\x63','\x6f','\x6d','\x65','\x21','\x3d','\x27','\x70','\x61','\x73','\x73','\x27','\x5d','\x22','\x2f','\x3e','\x0d'
+,'\x20','\x20','\x20','\x20','\x20','\x20','\x3c','\x78','\x73','\x6c','\x3a','\x61','\x70','\x70','\x6c','\x79','\x2d','\x74','\x65','\x6d','\x70','\x6c','\x61','\x74','\x65','\x73','\x20','\x73','\x65','\x6c','\x65','\x63','\x74','\x3d','\x22','\x6d','\x63','\x3a','\x70','\x6f','\x6c','\x69','\x63','\x79','\x7c','\x6d','\x63','\x3a','\x72','\x75','\x6c','\x65','\x22','\x2f','\x3e','\x0d'
 ,'\x0a'
 ,'\x20','\x20','\x20','\x20','\x3c','\x2f','\x78','\x73','\x6c','\x3a','\x69','\x66','\x3e','\x0d'
 ,'\x0a'

Source/Resource/displays/MediaConchSimple.xsl

@@ -62,7 +62,7 @@
     </xsl:for-each>
   </xsl:template>
   <xsl:template match="mc:policy|mc:rule">
-    <xsl:if test="@outcome!='pass' or descendant::*[@outcome!='pass']">
+    <xsl:if test="(name(..)!='policy' and @outcome!='pass') or (name(..)='policy' and ../@type='or' and ../@outcome!='pass' and @outcome=../@outcome) or (name(..)='policy' and ../@type!='or' and @outcome!='pass')">
       <xsl:text>&#xa;</xsl:text>
       <xsl:text> </xsl:text>
       <xsl:text>  --</xsl:text>
@@ -72,7 +72,7 @@
       <xsl:text>:</xsl:text>
       <xsl:value-of select="@name"/>
       <xsl:text>]</xsl:text>
-      <xsl:apply-templates select="mc:rule[@outcome!='pass']|mc:policy[@outcome!='pass']|descendant::*[@outcome!='pass']"/>
+      <xsl:apply-templates select="mc:policy|mc:rule"/>
     </xsl:if>
   </xsl:template>
 </xsl:stylesheet>