Skip to content

Commit 6c99f84

Browse files
committed
Handle new allow/block_origin map properties; update requirements to libmapper 2.6.1, mappersession 0.0.18
1 parent 4635e6f commit 6c99f84

2 files changed

Lines changed: 17 additions & 2 deletions

File tree

‎requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
netifaces==0.11.0
2-
libmapper==2.5.1
3-
mappersession==0.0.16
2+
libmapper==2.6.1
3+
mappersession==0.0.18

‎webmapper.py‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,21 @@ def map_props(map):
165165
# convert device list to names
166166
devnames = [d['name'] for d in props['scope']]
167167
props['scope'] = devnames
168+
if 'allow_origin' in props:
169+
if props['allow_origin'] == None:
170+
props['allow_origin'] = 'all'
171+
else:
172+
# convert device list to names
173+
devnames = [d['name'] for d in props['allow_origin']]
174+
props['allow_origin'] = devnames
175+
if 'block_origin' in props:
176+
if props['block_origin'] == None:
177+
props['block_origin'] = 'all'
178+
else:
179+
# convert device list to names
180+
devnames = [d['name'] for d in props['block_origin']]
181+
props['block_origin'] = devnames
182+
168183
# print("map_props", props)
169184
return props
170185

0 commit comments

Comments
 (0)