From: Adam Sutton <dev@adamsutton.me.uk>
Date: Mon, 30 Dec 2013 14:43:06 +0000 (+0000)
Subject: support: fix IPTV configuration migration for disabled/unmapped channels
X-Git-Tag: v4.1~2307
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2dbebfd81cf1e2a9fb197d68667bdafb49c97a47;p=thirdparty%2Ftvheadend.git

support: fix IPTV configuration migration for disabled/unmapped channels
---

diff --git a/support/conf_migrate.py b/support/conf_migrate.py
index edf2f70b0..fbfefa540 100755
--- a/support/conf_migrate.py
+++ b/support/conf_migrate.py
@@ -217,9 +217,13 @@ def iptv_network ( nets, opts ):
       m = muxes[url]
 
     # Create service entry
-    d['svcname']         = d['channelname']
+    if 'channelname' in d:
+      d['svcname']       = d['channelname']
+    else:
+      d['svcname']       = ''
     d['dvb_servicetype'] = d['stype']
     d['sid']             = 1 # Let's hope!
+    d['enabled']         = e
     m['svcs']            = { '1' : d }
 
     # Remove
@@ -227,7 +231,6 @@ def iptv_network ( nets, opts ):
       if f in d:
         del d[f]
 
-
   nets.append({ 'type'          : 'iptv',
                 'muxs'          : muxes,\
                 'skipinitscan'  : True,\