take advantage of channel services api version 1.9

garybuhrmaster · Jan 17, 2020 · 95e5201 · 95e5201
1 parent 2026043
commit 95e5201
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/MythUtil-Channel-HDHR-visibilityCheck b/MythUtil-Channel-HDHR-visibilityCheck
@@ -254,8 +254,12 @@ if __name__ == '__main__':
         mvisible = bool(mythChannel['Visible'] == 'true')
         if mvisible != desiredvisible and sourceValid:
             print('Channel {} visibility should be: {}'.format(chanNum, desiredvisible))
-            # Copy existing values
-            data = mythChannel.copy()
+            if ChannelServiceVersion >= versionTuple("1.9"):
+                data = {}
+                data['ChanId'] = mythChannel['ChanId']
+            else:
+                # Copy existing values
+                data = mythChannel.copy()
             # Optional (and what we want to set)
             data['Visible']            = desiredvisible
             if args.update:

diff --git a/MythUtil-Channel-XMLTV-getLineup b/MythUtil-Channel-XMLTV-getLineup
@@ -314,7 +314,8 @@ if __name__ == '__main__':
         if not found:
             print('Channel {}, callsign: "{}", name: "{}" is not in the XMLTV channel list'.format(mythChannel['ChanNum'], mythChannel['CallSign'], mythChannel['ChannelName']))
             if args.delete:
-                data = mythChannel.copy()
+                data = {}
+                data['ChanId'] = mythChannel['ChanId']
                 if bool(s.Channel('RemoveDBChannel', transformAPIElementNames('Channel', data))['bool']):
                     print('  Channel deleted')
                 else:
@@ -329,8 +330,12 @@ if __name__ == '__main__':
                 break
         if found:
             update = False
-            # Copy existing values
-            data = mythChannel.copy()
+            if ChannelServiceVersion >= versionTuple("1.9"):
+                data = {}
+                data['ChanId'] = mythChannel['ChanId']
+            else:
+                # Copy existing values
+                data = mythChannel.copy()
             if (xmlChannel['icon'] is None) and (mythChannel['IconURL'] == ''):
                 pass           # Nothing to see here
             elif (xmlChannel['icon'] is not None) and (mythChannel['IconURL'] == ''):

diff --git a/MythUtil-Channel-videosource b/MythUtil-Channel-videosource
@@ -291,7 +291,8 @@ if __name__ == '__main__':
         if sourceId is None:
             print('Video source was not found to delete')
             sys.exit(1)
-        data = source.copy()
+        data = {}
+        data['Id'] = source['Id']
         if bool(s.Channel('RemoveVideoSource', transformAPIElementNames('VideoSource', data))['bool']):
             print('Video source deleted')
             try:

diff --git a/MythUtil-Channel-visibility b/MythUtil-Channel-visibility
@@ -198,8 +198,12 @@ if __name__ == '__main__':
             desiredvisible = False
         if mvisible != desiredvisible:
             print('Channel {} visibility should be: {}'.format(chanNum, desiredvisible))
-            # Copy existing values
-            data = mythChannel.copy()
+            if ChannelServiceVersion >= versionTuple("1.9"):
+                data = {}
+                data['ChanId'] = mythChannel['ChanId']
+            else:
+                # Copy existing values
+                data = mythChannel.copy()
             # Optional (and what we want to set)
             data['Visible']            = desiredvisible
             if args.update: