Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-29 15:12:34 +02:00
Code Issues Projects Releases Wiki Activity

Fixed conflict in 'ChangeLog'

Browse Source
This commit is contained in:
Fred Gleason 2019-09-02 11:56:16 -04:00
commit 9f7eb36b9d
2 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -19084,3 +19084,5 @@
* Modified the 'pypad' module so as not to throw a
'UnicodeDecodeError' exception when processing a PAD update
containing an invalid UTF-8 character.
2019-09-02 Patrick Linstruth <patrick@deltecent.com>
* Refactored 'pypad_tunein.py' ProcessPad while loop.

57
apis/pypad/scripts/pypad_tunein.py
View File

@ -31,31 +31,38 @@ import configparser
def ProcessPad(update):
if update.hasPadType(pypad.TYPE_NOW):
section='Station'+str(n)
n=1
while(update.config().has_section(section)):
values={}
values['id']=update.config().get(section,'StationID')
values['partnerId']=update.config().get(section,'PartnerID')
values['partnerKey']=update.config().get(section,'PartnerKey')
values['title']=update.resolvePadFields(update.config().get(section,'TitleString'),pypad.ESCAPE_NONE)
values['artist']=update.resolvePadFields(update.config().get(section,'ArtistString'),pypad.ESCAPE_NONE)
values['album']=update.resolvePadFields(update.config().get(section,'AlbumString'),pypad.ESCAPE_NONE)
update.syslog(syslog.LOG_INFO,'Updating TuneIn: artist='+values['artist']+' title='+values['title']+' album='+values['album'])
try:
response=requests.get('http://air.radiotime.com/Playing.ashx',params=values)
response.raise_for_status()
except requests.exceptions.RequestException as e:
update.syslog(syslog.LOG_WARNING,str(e))
else:
xml=ET.fromstring(response.text)
status=xml.find('./head/status')
if(status.text!='200'):
update.syslog(syslog.LOG_WARNING,'Update Failed: '+xml.find('./head/fault').text)
n=n+1
section='Station'+str(n)
if(n==1):
update.syslog(syslog.LOG_WARNING,'No station config found')
n=1
while(True):
section='Station'+str(n)
try:
values={}
values['id']=update.config().get(section,'StationID')
values['partnerId']=update.config().get(section,'PartnerID')
values['partnerKey']=update.config().get(section,'PartnerKey')
values['title']=update.resolvePadFields(update.config().get(section,'TitleString'),pypad.ESCAPE_NONE)
values['artist']=update.resolvePadFields(update.config().get(section,'ArtistString'),pypad.ESCAPE_NONE)
values['album']=update.resolvePadFields(update.config().get(section,'AlbumString'),pypad.ESCAPE_NONE)
except configparser.NoSectionError:
if(n==1):
update.syslog(syslog.LOG_WARNING,'No station config found')
return
#
# Now, send the update
#
if update.shouldBeProcessed(section):
update.syslog(syslog.LOG_INFO,'Updating TuneIn: artist='+values['artist']+' title='+values['title']+' album='+values['album'])
try:
response=requests.get('http://air.radiotime.com/Playing.ashx',params=values)
response.raise_for_status()
except requests.exceptions.RequestException as e:
update.syslog(syslog.LOG_WARNING,str(e))
else:
xml=ET.fromstring(response.text)
status=xml.find('./head/status')
if(status.text!='200'):
update.syslog(syslog.LOG_WARNING,'Update Failed: '+xml.find('./head/fault').text)
n=n+1
#
# Program Name