MP1.36.Pre: DWHD Trakt Update and XML Validation

.github/workflows/workflow_xml_validate.yml

@@ -18,6 +18,7 @@ jobs:
       - name: ⤵️ Check out configuration from GitHub
         uses: actions/checkout@v4
       - name: 🚀 Run XML Validate
-        uses: action-pack/valid-xml@v1
+        uses: kehoecj/validate-configs-action@v4
         with:
-          file-endings: ".xml"
+          exclude-dirs: "MediaPortal.Tests"
+          exclude-file-types: "yaml,yml"

Common-MP-TVE3/External/Gentle.NET/Documentation/Help/Register.bat

@@ -4,4 +4,4 @@ REM *** EDIT THE PATHS BELOW IF NEEDED
 REM
 REM Registers Gentle.Framework in HTML 2 Help
 REM
-"C:\Program Files\Helpware\H2Reg\H2Reg.exe" -r cmdfile="C:\Code\Gentle.NET\Documentation\Help\H2Reg.ini"
+"C:\Program Files\Helpware\H2Reg\H2Reg.exe" -r cmdfile="C:\Code\Gentle.NET\Documentation\Help\H2Reg.help"

Common-MP-TVE3/External/Gentle.NET/Documentation/Help/Unregister.bat

@@ -1,3 +1,3 @@
 @echo off
 REM Unregisters Gentle.Framework in HTML 2 Help
-"C:\Program Files\H2Reg\H2Reg.exe" -u cmdfile="C:\Code\Gentle.NET\Documentation\Help\H2Reg.ini"
+"C:\Program Files\H2Reg\H2Reg.exe" -u cmdfile="C:\Code\Gentle.NET\Documentation\Help\H2Reg.help"

Tools/InstallationScripts/XML-plugin/Example/test.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!-- world -->
+<root>
 <a>
     <a>AAA
         <a>
@@ -17,3 +18,4 @@
 <a>
     <d attr1="value1" attr2="value2" attr3="value3" attr4="value4">HHH</d>
 </a>
+</root>

TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Croatia.D3 - sjeverna hrvatska.xml

@@ -4,6 +4,7 @@
 		<Frequency>658000</Frequency>
 		<BandWidth>8</BandWidth>
 		<Offset>0</Offset>
+	</DVBTTuning>
 	<DVBTTuning>
 		<Frequency>690000</Frequency>
 		<BandWidth>8</BandWidth>

TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Ireland.Donegal - Holywell Hill.xml

@@ -5,6 +5,7 @@
     <BandWidth>8</BandWidth>
     <Offset>167</Offset>
   </DVBTTuning>
+  <DVBTTuning>
     <Frequency>506000</Frequency>
     <BandWidth>8</BandWidth>
     <Offset>167</Offset>

TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Beacon Hill.xml

@@ -36,4 +36,4 @@
     <BandWidth>8</BandWidth>
     <Offset>167</Offset>
   </DVBTTuning>
-</ArrayOfDVBTTuning>3
+</ArrayOfDVBTTuning>

TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Bluebell Hill.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ArrayOfDVBTTuning xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <!-- PSB1 -->
+  <DVBTTuning>
     <Frequency>562000</Frequency><!-- C32 -->
     <BandWidth>8</BandWidth>
     <Offset>167</Offset>
@@ -47,4 +48,4 @@
     <BandWidth>8</BandWidth>
     <Offset>167</Offset>
   </DVBTTuning>
-</ArrayOfDVBTTuning>
+</ArrayOfDVBTTuning>

TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Rosneath.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ArrayOfDVBTTuning xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <!-- PSB1 -->
+  <DVBTTuning>
     <Frequency>618000</Frequency><!-- C39 -->
     <BandWidth>8</BandWidth>
     <Offset>167</Offset>
@@ -35,4 +36,4 @@
     <BandWidth>8</BandWidth>
     <Offset>167</Offset>
   </DVBTTuning>
-</ArrayOfDVBTTuning>
+</ArrayOfDVBTTuning>

TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Tunbridge Wells.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ArrayOfDVBTTuning xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <!-- PSB1 -->
+  <DVBTTuning>
     <Frequency>634000</Frequency><!-- C41 -->
     <BandWidth>8</BandWidth>
     <Offset>167</Offset>
@@ -41,4 +42,4 @@
     <BandWidth>8</BandWidth>
     <Offset>167</Offset>
   </DVBTTuning>
-</ArrayOfDVBTTuning>
+</ArrayOfDVBTTuning>

TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/FR/linternaute_com.xml

@@ -7,8 +7,8 @@
     <Channel id="Arte" siteId="3" />
     <Channel id="BFM TV" siteId="4" />
     <Channel id="Canal+" siteId="5" />
-    <Channel id="Canal+ cinéma" siteId="6" />
-    <Channel id="Canal+ Décalé" siteId="7" />
+    <Channel id="Canal+ cinéma" siteId="6" />
+    <Channel id="Canal+ Décalé" siteId="7" />
     <Channel id="Canal J" siteId="9" />
     <Channel id="Canal+ sport" siteId="8" />
     <Channel id="Cinecinema Aut..." siteId="10" />
@@ -18,13 +18,13 @@
     <Channel id="Cinecinema Fri..." siteId="14" />
     <Channel id="Cinecinema Pre..." siteId="15" />
     <Channel id="Cinecinema Star" siteId="81" />
-    <Channel id="Ciné FX" siteId="16" />
-    <Channel id="Comédie" siteId="17" />
+    <Channel id="Ciné FX" siteId="16" />
+    <Channel id="Comédie" siteId="17" />
     <Channel id="Cuisine.Tv" siteId="18" />
     <Channel id="Direct 8" siteId="19" />
     <Channel id="Equidia" siteId="20" />
     <Channel id="Escales" siteId="21" />
-    <Channel id="Eurêka" siteId="22" />
+    <Channel id="Eurêka" siteId="22" />
     <Channel id="Euronews" siteId="23" />
     <Channel id="Europe 2 TV" siteId="24" />
     <Channel id="Eurosport" siteId="25" />
@@ -34,49 +34,49 @@
     <Channel id="France 3" siteId="29" />
     <Channel id="France 4" siteId="30" />
     <Channel id="France 5" siteId="31" />
-    <Channel id="France Ô" siteId="32" />
+    <Channel id="France Ô" siteId="32" />
     <Channel id="Fun TV" siteId="33" />
     <Channel id="Gulli" siteId="34" />
     <Channel id="Histoire (TPS)" siteId="35" />
     <Channel id="Info sport" siteId="36" />
     <Channel id="i Tele" siteId="37" />
     <Channel id="Jimmy" siteId="38" />
     <Channel id="KTO" siteId="39" />
-    <Channel id="La Chaîne Météo" siteId="40" />
-    <Channel id="La Chaîne parl..." siteId="41" />
-    <Channel id="LCI - La Chaîn..." siteId="42" />
+    <Channel id="La Chaîne Météo" siteId="40" />
+    <Channel id="La Chaîne parl..." siteId="41" />
+    <Channel id="LCI - La Chaîn..." siteId="42" />
     <Channel id="L'Equipe TV (b..." siteId="43" />
     <Channel id="M6" siteId="44" />
-    <Channel id="Ma Planète" siteId="45" />
+    <Channel id="Ma Planète" siteId="45" />
     <Channel id="MCM" siteId="46" />
     <Channel id="Mezzo" siteId="47" />
     <Channel id="Moteurs" siteId="48" />
     <Channel id="MTV" siteId="49" />
     <Channel id="Musique Classi..." siteId="50" />
     <Channel id="National Geogr..." siteId="51" />
-    <Channel id="Nickelodéon" siteId="52" />
+    <Channel id="Nickelodéon" siteId="52" />
     <Channel id="NRJ 12" siteId="53" />
     <Channel id="NT 1" siteId="54" />
-    <Channel id="Odyssée" siteId="55" />
-    <Channel id="Paris Première" siteId="56" />
+    <Channel id="Odyssée" siteId="55" />
+    <Channel id="Paris Première" siteId="56" />
     <Channel id="Pink TV" siteId="57" />
     <Channel id="Piwi" siteId="58" />
-    <Channel id="Planète" siteId="59" />
-    <Channel id="Planète Choc" siteId="60" />
-    <Channel id="Planète Thalas..." siteId="61" />
+    <Channel id="Planète" siteId="59" />
+    <Channel id="Planète Choc" siteId="60" />
+    <Channel id="Planète Thalas..." siteId="61" />
     <Channel id="SCI-FI" siteId="62" />
-    <Channel id="Série club" siteId="63" />
+    <Channel id="Série club" siteId="63" />
     <Channel id="Sport+" siteId="64" />
     <Channel id="TCM" siteId="65" />
-    <Channel id="Téva" siteId="66" />
+    <Channel id="Téva" siteId="66" />
     <Channel id="TF 1" siteId="67" />
     <Channel id="TF 6" siteId="68" />
     <Channel id="TFou" siteId="69" />
     <Channel id="TIJI" siteId="70" />
     <Channel id="TMC" siteId="71" />
     <Channel id="Toute l'histoi..." siteId="72" />
     <Channel id="TPS Foot" siteId="73" />
-    <Channel id="TPS Homecinéma" siteId="74" />
+    <Channel id="TPS Homecinéma" siteId="74" />
     <Channel id="TPS Star" siteId="75" />
     <Channel id="TV5MONDE" siteId="76" />
     <Channel id="Ushuaia TV" siteId="77" />
@@ -87,7 +87,7 @@
   <Listing type="Html">
     <Site url="http://www.linternaute.com/television/programme-tv/cgi/recherche/recherche.php?f_date=[DD]-[MM]-[YYYY]&amp;f_id_tranche_horaire=0&amp;f_id_format=&amp;f_id_chaine=[ID]&amp;submit.x=6&amp;submit.y=11" external="false" encoding="" />
     <Html>
-      <Template name="default" start="Derniers avis" end="&nbsp;&nbsp;&nbsp;CHERCHER UN">
+      <Template name="default" start="Derniers avis" end="nbsp;CHERCHER UN">
         <SectionTemplate tags="TSA">
           <TemplateText>
 &lt;tr&gt;
@@ -119,4 +119,3 @@
     <Modify channel="*" field="#DESCRIPTION" search="Toutes les chaines" action="Replace">---</Modify>
   </Actions>
 </Grabber>
-

TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/GR/www_in_gr.xml

@@ -65,7 +65,7 @@
           </TemplateText>
         </SectionTemplate>
       </Template>
-      <Template name="Details" start="&lt;div vlass=&quote;text-content&quote;&gt;" end="&lt;hr&gt;">
+      <Template name="Details" start="&lt;div vlass=&quot;text-content&quot;&gt;" end="&lt;hr&gt;">
         <SectionTemplate tags="DP">
           <TemplateText>
             &lt;div&gt;&lt;div&gt;&lt;/div&gt;&lt;p&gt;&lt;#DESCRIPTION&gt;&lt;/p&gt;

mediaportal/MediaPortal.Base/MediaPortalDirs.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- 
    This file stores information about the various Directories used in MediaPortal.
    You may change only the information between the <Path> and </Path> elements.

mediaportal/MediaPortal.Base/skin/DefaultWideHD/Trakt.Settings.Account.xml

@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--version="1.0" encoding="utf-8" standalone="yes"-->
-<!--version="1.0" encoding="utf-8" standalone="yes"-->
-<window>
-  <id>87272</id>
-  <defaultcontrol>2</defaultcontrol>
-  <allowoverlay>no</allowoverlay>
-  <define>#currentmodule:#Trakt.Translation.AccountSetup.Label</define>
-  <define>#selecteditem:#highlightedbutton</define>
-  <define>#defaultcontrol:2</define>
-  <define>#defaultcontrol.onleft:9997</define>
-  <controls>
-    <control>
-      <description>BG</description>
-      <type>image</type>
-      <id>1</id>
-      <texture>BH Trakt.jpg</texture>
-      <width>1920</width>
-      <height>1080</height>
-      <colordiffuse>90ffffff</colordiffuse>
-    </control>
-    <import>Trakt.Common.Fanart.xml</import>
-    <import>common.window.xml</import>
-    <import>common.time.xml</import>
-    <import>Trakt.Common.xml</import>
-    <control>
-      <type>group</type>
-      <description>group element</description>
-      <posX>525</posX>
-      <posY>241</posY>
-      <width>559</width>
-      <height>568</height>
-      <layout>StackLayout(Vertical)</layout>
-      <visible>!string.equals(#Trakt.Settings.Account.Dialog.Visible,true)</visible>
-      <control>
-        <type>button</type>
-        <description>Create New Account</description>
-        <id>2</id>
-        <width>600</width>
-        <label>#Trakt.Translation.CreateNewAccount.Label</label>
-        <onup>17</onup>
-        <width>799</width>
-        <onleft>#defaultcontrol.onleft</onleft>
-      </control>
-      <control>
-        <description>Login to Existing Account</description>
-        <type>button</type>
-        <id>3</id>
-        <width>799</width>
-        <label>#Trakt.Translation.LoginExistingAccount.Label</label>
-        <onleft>#defaultcontrol.onleft</onleft>
-      </control>
-      <control>
-        <description>Disconnect Current Account</description>
-        <type>button</type>
-        <id>4</id>
-        <width>799</width>
-        <label />
-        <onleft>#defaultcontrol.onleft</onleft>
-        <ondown>2</ondown>
-      </control>
-    </control>
-    <import>Trakt.AccountDialog.xml</import>
-  </controls>
-</window>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--version="1.0" encoding="utf-8" standalone="yes"-->
+<!--version="1.0" encoding="utf-8" standalone="yes"-->
+<window>
+  <id>87279</id>
+  <defaultcontrol>2</defaultcontrol>
+  <allowoverlay>no</allowoverlay>
+  <define>#currentmodule:#Trakt.Translation.AccountSetup.Label</define>
+  <define>#selecteditem:#highlightedbutton</define>
+  <define>#defaultcontrol:2</define>
+  <define>#defaultcontrol.onleft:9997</define>
+  <controls>
+    <control>
+      <description>BG</description>
+      <type>image</type>
+      <id>1</id>
+      <texture>BH Trakt.jpg</texture>
+      <width>1920</width>
+      <height>1080</height>
+      <colordiffuse>90ffffff</colordiffuse>
+    </control>
+    <import>Trakt.Common.Fanart.xml</import>
+    <import>common.window.xml</import>
+    <import>common.time.xml</import>
+    <import>Trakt.Common.xml</import>
+    <control>
+      <type>group</type>
+      <description>group element</description>
+      <posX>525</posX>
+      <posY>241</posY>
+      <width>559</width>
+      <height>568</height>
+      <layout>StackLayout(Vertical)</layout>
+      <visible>!string.equals(#Trakt.Settings.Account.Dialog.Visible,true)</visible>
+      <control>
+        <type>button</type>
+        <description>Create New Account</description>
+        <id>2</id>
+        <width>600</width>
+        <label>#Trakt.Translation.CreateNewAccount.Label</label>
+        <onup>17</onup>
+        <width>799</width>
+        <onleft>#defaultcontrol.onleft</onleft>
+      </control>
+      <control>
+        <description>Login to Existing Account</description>
+        <type>button</type>
+        <id>3</id>
+        <width>799</width>
+        <label>#Trakt.Translation.LoginExistingAccount.Label</label>
+        <onleft>#defaultcontrol.onleft</onleft>
+      </control>
+      <control>
+        <description>Disconnect Current Account</description>
+        <type>button</type>
+        <id>4</id>
+        <width>799</width>
+        <label />
+        <onleft>#defaultcontrol.onleft</onleft>
+        <ondown>2</ondown>
+      </control>
+    </control>
+    <import>Trakt.AccountDialog.xml</import>
+  </controls>
+</window>