Support catchup-id attribute in programme element

Author: tiger-seo

spec/XmlTv/XmlTvSpec.php

@@ -35,6 +35,7 @@ function it_generates_an_xml_file()
         $channel->addUrl(new Tv\Elements\Url('http://foo.bar/'));
 
         $programme = new Tv\Programme('test', '1', '2');
+        $programme->catchupId = 'plugin://plugin.video.test/?catchup-id=foo';
         $programme->addTitle(new Tv\Elements\Title('title'));
         $programme->addSubTitle(new Tv\Elements\SubTitle('subtitle'));
         $programme->addDescription(new Tv\Elements\Desc('desc'));

spec/epg.xml

@@ -6,7 +6,7 @@
     <icon src="http://foo.bar/img.png" width="200" height="200"/>
     <url>http://foo.bar/</url>
   </channel>
-  <programme start="1" stop="2" channel="test">
+  <programme channel="test" start="1" stop="2" catchup-id="plugin://plugin.video.test/?catchup-id=foo">
     <title>title</title>
     <sub-title>subtitle</sub-title>
     <desc>desc</desc>

src/Tv/Programme.php

@@ -31,6 +31,11 @@
 
 class Programme implements XmlSerializable
 {
+    /**
+     * @var string
+     */
+    public $channel;
+
     /**
      * @var string
      */
@@ -62,14 +67,15 @@ class Programme implements XmlSerializable
     public $videoplus;
 
     /**
-     * @var string
+     * @var string Legal values are `0` or `1`.
      */
-    public $channel;
+    public $clumpidx;
 
     /**
-     * @var string Legal values are `0` or `1`.
+     * @var string A programme specific identifier for catchup URLs. Not part of the XMLTV specification.
+     * @see https://github.com/kodi-pvr/pvr.iptvsimple/tree/7.0.0-Matrix#supported-m3u-and-xmltv-elements
      */
-    public $clumpidx;
+    public $catchupId;
 
     /**
      * @var Title[]
@@ -202,6 +208,7 @@ class Programme implements XmlSerializable
      * @param string $showview
      * @param string $videoplus
      * @param string $clumpidx
+     * @param string $catchupId
      */
     public function __construct(
         string $channel,
@@ -505,14 +512,15 @@ public function getReview(): array
     public function xmlSerialize(): XmlElement
     {
         return (new XmlElement('programme'))
+            ->withAttribute('channel', $this->channel)
             ->withAttribute('start', $this->start)
             ->withAttribute('stop', $this->stop)
             ->withAttribute('pdc-start', $this->pdcStart)
             ->withAttribute('vps-start', $this->vpsStart)
             ->withAttribute('showview', $this->showview)
             ->withAttribute('videoplus', $this->videoplus)
-            ->withAttribute('channel', $this->channel)
             ->withAttribute('clumpidx', $this->clumpidx)
+            ->withAttribute('catchup-id', $this->catchupId)
             ->withChildren($this->getTitle())
             ->withChildren($this->getSubTitle())
             ->withChildren($this->getDescription())