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

2019-08-26 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in the 'pypad_spottrap.py' PyPAD script that caused
	an infinite loop.
This commit is contained in:
Fred Gleason 2019-08-27 18:20:36 -04:00
parent d4503360f2
commit 3b95c723b7
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -19003,3 +19003,6 @@
2019-08-26 Fred Gleason <fredg@paravelsystems.com> 2019-08-26 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in the 'pypad_spinitron.py' PyPAD script that caused * Fixed a bug in the 'pypad_spinitron.py' PyPAD script that caused
an infinite loop. an infinite loop.
2019-08-26 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in the 'pypad_spottrap.py' PyPAD script that caused
an infinite loop.

29
apis/pypad/scripts/pypad_spottrap.py
View File

@ -4,7 +4,7 @@
# #
# Output Now & Next data on the basis of Group and Length. # Output Now & Next data on the basis of Group and Length.
# #
# (C) Copyright 2018 Fred Gleason <fredg@paravelsystems.com> # (C) Copyright 2018-2019 Fred Gleason <fredg@paravelsystems.com>
# #
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License version 2 as
@ -38,21 +38,20 @@ def ProcessPad(update):
last_updates[update.machine()]=None last_updates[update.machine()]=None
n=1 n=1
while(True): section='Rule'+str(n)
while(update.config().has_section(section)):
if update.shouldBeProcessed(section) and update.hasPadType(pypad.TYPE_NOW) and (last_updates[update.machine()] != update.startDateTimeString(pypad.TYPE_NOW)):
last_updates[update.machine()]=update.startDateTimeString(pypad.TYPE_NOW)
length=update.padField(pypad.TYPE_NOW,pypad.FIELD_LENGTH)
if update.padField(pypad.TYPE_NOW,pypad.FIELD_GROUP_NAME)==update.config().get(section,'GroupName') and length>=int(update.config().get(section,'MinimumLength')) and length<=int(update.config().get(section,'MaximumLength')):
msg=update.resolvePadFields(update.config().get(section,'FormatString'),pypad.ESCAPE_NONE)
else:
msg=update.resolvePadFields(update.config().get(section,'DefaultFormatString'),pypad.ESCAPE_NONE)
send_sock.sendto(msg.encode('utf-8'),
(update.config().get(section,'IpAddress'),int(update.config().get(section,'UdpPort'))))
n=n+1
section='Rule'+str(n) section='Rule'+str(n)
try:
if update.shouldBeProcessed(section) and update.hasPadType(pypad.TYPE_NOW) and (last_updates[update.machine()] != update.startDateTimeString(pypad.TYPE_NOW)):
last_updates[update.machine()]=update.startDateTimeString(pypad.TYPE_NOW)
length=update.padField(pypad.TYPE_NOW,pypad.FIELD_LENGTH)
if update.padField(pypad.TYPE_NOW,pypad.FIELD_GROUP_NAME)==update.config().get(section,'GroupName') and length>=int(update.config().get(section,'MinimumLength')) and length<=int(update.config().get(section,'MaximumLength')):
msg=update.resolvePadFields(update.config().get(section,'FormatString'),pypad.ESCAPE_NONE)
else:
msg=update.resolvePadFields(update.config().get(section,'DefaultFormatString'),pypad.ESCAPE_NONE)
send_sock.sendto(msg.encode('utf-8'),
(update.config().get(section,'IpAddress'),int(update.config().get(section,'UdpPort'))))
n=n+1
except configparser.NoSectionError:
return
# #
# 'Main' function # 'Main' function