1.0.0+kodimov.2: programme guide for every channel, TeleVigo on 15

- The amazon.tv guide that upstream 1.0.0 switched to is a flat list of
  programmes; group it by channel (the guide export crashed with KeyError)
- Add TVG2/TeleVigo listings from the EPG_dobleM guide to epg.xml
- Export channels + programme guide every 6 hours, by default, without
  on-screen notifications
- TeleVigo moves to 15, near the generalist channels

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

resources/lib/kodimov.py

@@ -33,14 +33,17 @@ WATERMARKED_BUT_PLAYABLE = {
 # Free channels that Movistar+ doesn't carry. 'chno' must not clash with a
 # Movistar dial number.
 EXTRA_CHANNELS = [
-  {'id': 'TVG2', 'name': 'TVG2', 'chno': 10, 'group': 'Galicia',
+  {'id': 'TVG2', 'name': 'TVG2', 'chno': 10, 'group': 'Galicia', 'epg_id': 'TVG2',
    'logo': 'https://i.imgur.com/yFy6gxg.png',
    'url': 'https://crtvg-tvg2.flumotion.cloud/playlist.m3u8'},
-  {'id': 'TeleVigo', 'name': 'TeleVigo', 'chno': 155, 'group': 'Galicia',
+  {'id': 'TeleVigo', 'name': 'TeleVigo', 'chno': 15, 'group': 'Galicia', 'epg_id': 'TELEVIGO',
    'logo': 'https://i.imgur.com/4iVmlFa.png',
    'url': 'https://stream-us-east-1.getpublica.com/playlist.m3u8?network_id=12687'},
 ]
 
+# Programme listings for the extra channels (Movistar's guide covers the rest).
+EXTRA_EPG_URL = 'https://raw.githubusercontent.com/davidmuma/EPG_dobleM/master/guiafanart_color.xml.gz'
+
 AUTOLOGIN_URL = 'https://soter-pf.svp.video.telefonicaservices.com/service/login/autologin?deviceId={device}&deviceType=webplayer&_={ts}'
 SOTER_INITDATA_URL = 'https://soter-pf.sve.video.telefonicaservices.com/service/login/initData?legacy=true'
 
@@ -167,3 +170,33 @@ def write_if_changed(filename, content):
     f.write(content)
   os.replace(tmp, filename) if hasattr(os, 'replace') else shutil.move(tmp, filename)
   return True
+
+
+def extra_channels_xmltv(session):
+  """Returns the <channel> and <programme> elements for the extra channels,
+  taken from a public XMLTV guide and renamed to their tvg-id."""
+  import gzip
+  import xml.etree.ElementTree as ET
+  wanted = dict((c['epg_id'], c) for c in EXTRA_CHANNELS if c.get('epg_id'))
+  out = []
+  for c in EXTRA_CHANNELS:
+    out.append('<channel id="{id}">\n  <display-name>{name}</display-name>\n  <icon src="{logo}"/>\n</channel>\n'.format(**c))
+  try:
+    r = session.get(EXTRA_EPG_URL, timeout=(10, 120))
+    r.raise_for_status()
+    found = 0
+    for _, el in ET.iterparse(gzip.GzipFile(fileobj=io.BytesIO(r.content))):
+      if el.tag == 'programme':
+        c = wanted.get(el.get('channel'))
+        if c:
+          el.set('channel', c['id'])
+          for icon in el.findall('icon'): el.remove(icon)  # large fan art
+          out.append(ET.tostring(el, encoding='unicode') + '\n')
+          found += 1
+        el.clear()
+      elif el.tag == 'channel':
+        el.clear()
+    LOG('extra_channels_xmltv: {} programmes'.format(found))
+  except Exception as e:
+    LOG('extra_channels_xmltv: failed: {}'.format(e))
+  return out