diff --git a/ChangeLog b/ChangeLog index b8510c37..a926cdf8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22729,3 +22729,5 @@ * Added a 'PostImage()' method to the 'rivwebpyapi' API. 2021-12-09 Fred Gleason * Added a 'RemoveImage()' method to the 'rivwebpyapi' API. +2021-12-09 Fred Gleason + * Added a 'RemoveRss()' method to the 'rivwebpyapi' API. diff --git a/apis/rivwebpyapi/api/rivwebpyapi.py b/apis/rivwebpyapi/api/rivwebpyapi.py index 58d49df4..eb6c766b 100755 --- a/apis/rivwebpyapi/api/rivwebpyapi.py +++ b/apis/rivwebpyapi/api/rivwebpyapi.py @@ -1891,6 +1891,35 @@ class rivwebpyapi(object): if(r.status_code!=requests.codes.ok): self.__throwError(response=r) + def RemoveImage(self,image_id): + """ + Upload a podcast image to the remote archive. + + Takes the following argument: + + image_id - ID of the image (integer). + """ + + if(image_id<0): + raise ValueError('invalid image ID') + + # + # Build the WebAPI arguments + # + postdata={ + 'COMMAND': '45', + 'LOGIN_NAME': self.__connection_username, + 'PASSWORD': self.__connection_password, + 'ID': str(image_id) + } + + # + # Fetch the audio data + # + r=requests.post(self.__connection_url,data=postdata) + if(r.status_code!=requests.codes.ok): + self.__throwError(response=r) + def RemovePodcast(self,cast_id): """ Delete podcast audio from the remote archive. @@ -1920,26 +1949,26 @@ class rivwebpyapi(object): if(r.status_code!=requests.codes.ok): self.__throwError(response=r) - def RemoveImage(self,image_id): + def RemoveRss(self,feed_id): """ - Upload a podcast image to the remote archive. + Delete podcast RSS XML from the remote archive. Takes the following argument: - image_id - ID of the image (integer). + feed_id - ID of the owning podcast feed (integer). """ - if(image_id<0): - raise ValueError('invalid image ID') + if(feed_id<0): + raise ValueError('invalid feed ID') # # Build the WebAPI arguments # postdata={ - 'COMMAND': '45', + 'COMMAND': '43', 'LOGIN_NAME': self.__connection_username, 'PASSWORD': self.__connection_password, - 'ID': str(image_id) + 'ID': str(feed_id) } # diff --git a/apis/rivwebpyapi/tests/Makefile.am b/apis/rivwebpyapi/tests/Makefile.am index 218fb3ba..14b9c816 100644 --- a/apis/rivwebpyapi/tests/Makefile.am +++ b/apis/rivwebpyapi/tests/Makefile.am @@ -52,6 +52,7 @@ EXTRA_DIST = add_cart.py\ remove_cut.py\ remove_image.py\ remove_podcast.py\ + remove_rss.py\ save_podcast.py\ trim_audio.py\ unassign_sched_code.py diff --git a/apis/rivwebpyapi/tests/remove_rss.py b/apis/rivwebpyapi/tests/remove_rss.py new file mode 100755 index 00000000..e7a380d9 --- /dev/null +++ b/apis/rivwebpyapi/tests/remove_rss.py @@ -0,0 +1,73 @@ +#!%PYTHON_BANGPATH% + +# remove_rss.py +# +# RivWebPyApi test script for Rivendell +# +# Test the RemoveRss Web API call +# +# (C) Copyright 2021 Fred Gleason +# +# 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 +def eprint(*args,**kwargs): + print(*args,file=sys.stderr,**kwargs) + +url=''; +username='' +password='' +feed_id=-1 + +# +# Get login parameters +# +usage='remove_rss --url= --username= --feed-id=' +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]=='--feed-id'): + feed_id=int(f0[1]) + +if(not password): + password=getpass.getpass() +if((not url)or(not username)): + print(usage) + sys.exit(1) +if(feed_id<0): + eprint('you must supply "--feed-id"') + sys.exit(1) + +# +# Execute +# +webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +try: + webapi.RemoveRss(feed_id=feed_id) +except rivwebpyapi.RivWebPyError as err: + eprint('*** ERROR ***') + eprint('Response Code: '+str(err.responseCode)) + eprint('ErrorString: '+str(err.errorString)) + eprint('*************') + eprint('') + sys.exit(1)