diff --git a/ChangeLog b/ChangeLog index 12bfc204..a0726ca5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22684,3 +22684,5 @@ * Added an 'DeleteAudio()' method to the 'rivwebpyapi' API. 2021-12-07 Fred Gleason * Added an 'Export()' method to the 'rivwebpyapi' API. +2021-12-07 Fred Gleason + * Added an 'ExportPeaks()' method to the 'rivwebpyapi' API. diff --git a/apis/rivwebpyapi/api/rivwebpyapi.py b/apis/rivwebpyapi/api/rivwebpyapi.py index 97a019b6..24b9f4d0 100755 --- a/apis/rivwebpyapi/api/rivwebpyapi.py +++ b/apis/rivwebpyapi/api/rivwebpyapi.py @@ -707,6 +707,46 @@ class rivwebpyapi(object): for block in r.iter_content(1024): handle.write(block) + def ExportPeaks(self,cart_number,cut_number): + """ + Export audio peak data from the audio store (bytes). + + Takes the following arguments: + + cart_number - The number of the desired cart, in the range + 1 - 999999 (integer) + + cut_number - The number of the desired cut, 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': '16', + 'LOGIN_NAME': self.__connection_username, + 'PASSWORD': self.__connection_password, + 'CART_NUMBER': str(cart_number), + 'CUT_NUMBER': str(cut_number) + } + + # + # Fetch the peak data + # + r=requests.post(self.__connection_url,data=postdata,stream=True) + if(r.status_code!=requests.codes.ok): + r.raise_for_status() + ret=bytes() + for block in r.iter_content(chunk_size=1024): + ret=ret+block + return ret + def ListCart(self,cart_number,include_cuts=False): """ Returns the metadata associated with a Rivendell cart diff --git a/apis/rivwebpyapi/tests/Makefile.am b/apis/rivwebpyapi/tests/Makefile.am index 7028c62d..4784e9a8 100644 --- a/apis/rivwebpyapi/tests/Makefile.am +++ b/apis/rivwebpyapi/tests/Makefile.am @@ -29,6 +29,7 @@ EXTRA_DIST = add_cart.py\ delete_audio.py\ delete_log.py\ export.py\ + export_peaks.py\ list_cart.py\ list_cart_sched_codes.py\ list_carts.py\ diff --git a/apis/rivwebpyapi/tests/export_peaks.py b/apis/rivwebpyapi/tests/export_peaks.py new file mode 100755 index 00000000..c8557129 --- /dev/null +++ b/apis/rivwebpyapi/tests/export_peaks.py @@ -0,0 +1,68 @@ +#!%PYTHON_BANGPATH% + +# export_peaks.py +# +# RivWebPyApi test script for Rivendell +# +# Test the ExportPeaks 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 + +url=''; +username='' +password='' +cart_number=0 +cut_number=0 + +# +# Get login parameters +# +usage='export_peaks --url= --username= --cart-number= --cut-number= [--password=]' +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) + +# +# Get the peak data +# +webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +peak_data=webapi.ExportPeaks(cart_number=cart_number,cut_number=cut_number) + +# +# Write to stdout +# +sys.stdout.buffer.write(peak_data)