2021-12-06 Fred Gleason <fredg@paravelsystems.com>

* Added a 'RemoveCut()' method to the 'rivwebpyapi' API.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>

ChangeLog

@@ -22662,3 +22662,5 @@
 	system.
 2021-12-06 Fred Gleason <fredg@paravelsystems.com>
 	* Added an 'AddCut()' method to the 'rivwebpyapi' API.
+2021-12-06 Fred Gleason <fredg@paravelsystems.com>
+	* Added a 'RemoveCut()' method to the 'rivwebpyapi' API.

apis/rivwebpyapi/api/rivwebpyapi.py

@@ -211,7 +211,6 @@ class rivwebpyapi(object):
         self.__connection_username=username
         self.__connection_password=password
 
-##########################
     def AddCut(self,cart_number):
         """
           Add a new cut to an existing audio cart. Returns the metadata of
@@ -299,11 +298,6 @@ class rivwebpyapi(object):
 
         return handler.output()
 
-##########################
-
-
-
-
     def ListCart(self,cart_number,include_cuts=False):
         """
           Returns the metadata associated with a Rivendell cart
@@ -521,7 +515,6 @@ class rivwebpyapi(object):
 
           cut_number - The number of the desired cut, in the range
                         1 - 999 (integer)
-
         """
 
         if((cart_number<1)or(cart_number>999999)):
@@ -1085,3 +1078,48 @@ class rivwebpyapi(object):
         xml.sax.parseString(r.text,handler)
 
         return handler.output()
+
+    def RemoveCut(self,cart_number,cut_number):
+        """
+          Remove an existing cut from an audio cart.
+
+          Takes the following arguments:
+
+          cart_number - The number of the desired cart, in the range
+                        1 - 999999 (integer)
+
+          cut_number - The number of the cut to remove, in the range
+                        1 - 999 (integer)
+        """
+
+        if((cart_number<1)or(cart_number>999999)):
+            raise ValueError('invalid cart number')
+        if((cut_number<1)or(cut_number>999)):
+            raise ValueError('invalid cut number')
+
+        #
+        # Build the WebAPI arguments
+        #
+        postdata={
+            'COMMAND': '11',
+            'LOGIN_NAME': self.__connection_username,
+            'PASSWORD': self.__connection_password,
+            'CART_NUMBER': str(cart_number),
+            'CUT_NUMBER': str(cut_number)
+        }
+
+        #
+        # Fetch the XML
+        #
+        r=requests.post(self.__connection_url,data=postdata)
+        if(r.status_code!=requests.codes.ok):
+            r.raise_for_status()
+
+        #
+        # Generate the output dictionary
+        #
+        fields={
+            'ResponseCode': 'integer',
+            'ErrorString': 'string'
+        }
+        handler=RivWebPyApi_ListHandler(base_tag='RDWebResult',fields=fields)

apis/rivwebpyapi/tests/Makefile.am

@@ -32,7 +32,8 @@ EXTRA_DIST = add_cut.py\
              list_logs.py\
              list_scheduler_codes.py\
              list_services.py\
-             list_system_settings.py
+             list_system_settings.py\
+             remove_cut.py
 
 CLEANFILES = *~\
              *.idb\

apis/rivwebpyapi/tests/add_cut.py

@@ -31,7 +31,6 @@ username=''
 password=''
 cart_number=0
 cut_number=0
-include_cuts=False
 
 #
 # Get login parameters

apis/rivwebpyapi/tests/remove_cut.py

@@ -0,0 +1,63 @@
+#!%PYTHON_BANGPATH%
+
+# remove_cut.py
+#
+# RivWebPyApi test script for Rivendell
+#
+#  Test the RemoveCut Web API call
+#
+#   (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License version 2 as
+#   published by the Free Software Foundation.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free Software
+#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+
+import getpass
+import rivwebpyapi
+import sys
+
+url='';
+username=''
+password=''
+cart_number=0
+cut_number=0
+
+#
+# Get login parameters
+#
+usage='remove_cut --url=<rd-url> --username=<rd-username> --cart-number=<num> --cut-number=<num> [--password=<passwd>]'
+for arg in sys.argv:
+    f0=arg.split('=')
+    if(len(f0)==2):
+        if(f0[0]=='--url'):
+            url=f0[1]
+        if(f0[0]=='--username'):
+            username=f0[1]
+        if(f0[0]=='--password'):
+            password=f0[1]
+        if(f0[0]=='--cart-number'):
+            cart_number=int(f0[1])
+        if(f0[0]=='--cut-number'):
+            cut_number=int(f0[1])
+
+if(not password):
+    password=getpass.getpass()
+if((not url)or(not username)):
+    print(usage)
+    sys.exit(1)
+
+#
+# Execute
+#
+webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
+webapi.RemoveCut(cart_number=cart_number,cut_number=cut_number)