Skip to content

Commit

Permalink
fix autofollow vs continuemode bug
Browse files Browse the repository at this point in the history 
update continuemode and add follow to test doc
  • Loading branch information
@fross123
fross123 committed Apr 22, 2024
1 parent 40b427e commit 08827a8
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 62 deletions.
8 changes: 6 additions & 2 deletions app/csv_parser.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,12 @@ def send_csv(ip, document, qlab_version, passcode):
bundle.add_content(cue_notes(cue["notes"]).build())

# Continue Mode/Follow
if cue.get("follow") or cue.get("continueMode"):
continue_mode = cue.get("continueMode")
if cue.get("continuemode"):
continue_mode = cue.get("continuemode")
bundle.add_content(cue_continueMode(continue_mode).build())

if cue.get("follow"):
continue_mode = cue.get("follow")
bundle.add_content(cue_continueMode(continue_mode).build())

# Target
Expand Down
120 changes: 60 additions & 60 deletions app/static/example_file/csv_test_doc.csv
View file
Original file line number Diff line number Diff line change
@@ -1,60 +1,60 @@
Type,Number,Name,Notes,continueMode,Target,File Target,Color,MIDI Message Type,Midi Command Format,Midi Command,Midi Device ID,Midi Control Number,Midi Control Value,Midi Patch Name,Midi Patch Number,Midi Q List,Midi Q Number,Network Patch Number,Custom String,Stop Target When Done,Stage Number,Fade Opacity,Midi Raw String
audio,audio-1,Test 1,,1,,,red,,,,,,,,,,,,,,,,
mic,mic-5,Test 2,,2,,,orange,,,,,,,,,,,,,,,,
video,vid-9,Test 3,,3,,app/static/example_file/broken_heart.png,green,,,,,,,,,,,,,,1,,
camera,cam-13,Test 4,,1,,,blue,,,,,,,,,,,,,,,,
text,txt-17,Test 5,,2,,,purple,,,,,,,,,,,,,,,,
light,lx-21,Test 6,,3,,,red,,,,,,,,,,,,,,,,
fade,fade-1,stop target when done is checked.,,2,,,orange,,,,,,,,,,,,,true,,,
fade,fade-2,test-fade-false-stop-target-when-done,stop target when done should not be selected,,,,,,,,,,,,,,,,,false,,,
network,nw-29,Test 8,,3,,,green,,,,,,,,,,,,,,,,
midi,midi-33,Test 9,,1,,,blue,,,,,,,,,,,,,,,,
midi file,midi-f-37,Test 10,,2,,,purple,,,,,,,,,,,,,,,,
timecode,tc-41,Test 11,,3,,,red,,,,,,,,,,,,,,,,
group,grp-45,Test 12,,2,,,orange,,,,,,,,,,,,,,,,
start,start-49,Test 13,,3,5,,green,,,,,,,,,,,,,,,,
stop,stop-53,Test 14,,1,5,,blue,,,,,,,,,,,,,,,,
pause,pause-57,Test 15,,2,5,,purple,,,,,,,,,,,,,,,,
load,load-61,Test 16,,3,5,,red,,,,,,,,,,,,,,,,
reset,reset-65,Test 17,,2,5,,orange,,,,,,,,,,,,,,,,
devamp,devamp-69,Test 18,,3,9,,green,,,,,,,,,,,,,,,,
goto,goto-73,Test 19,,1,5,,blue,,,,,,,,,,,,,,,,
target,target-77,Test 20,,2,57,,purple,,,,,,,,,,,,,,,,
arm,arm-81,Test 21,,3,5,,red,,,,,,,,,,,,,,,,
disarm,disarm-85,Test 22,,2,5,,orange,,,,,,,,,,,,,,,,
wait,wait-89,Test 23,,3,,,green,,,,,,,,,,,,,,,,
memo,memo-93,Test 24,,0,,,blue,,,,,,,,,,,,,,,,
script,script-97,Test 25,,0,,,purple,,,,,,,,,,,,,,,,
list,list-101,Test 26,,,,,red,,,,,,,,,,,,,,,,
cuelist,cuelist-105,Test 27,,,,,orange,,,,,,,,,,,,,,,,
cue list,cue_list-109,Test 28,,,,,green,,,,,,,,,,,,,,,,
cart,cart-113,Test 29,,,,,blue,,,,,,,,,,,,,,,,
cue cart,cue-cart-117,Test 30,,,,,purple,,,,,,,,,,,,,,,,
cue cart,cue-cart-121,Test 31,,,,,red,,,,,,,,,,,,,,,,
midi,midi-MT 1,Midi Test 1,Midi Test 1,,,,orange,2,1,1,12,,,,,50,50,,,,,,
midi,MT 2,Midi Test 2,Midi Test 2,,,,green,2,16,2,10,10,10,,,25,20,,,,,,
network,NW 1,Network Test 1,,,,,purple,,,,,,,,,,,1,/go,,,,
network,NW 2,Network Test 2,,,,,purple,,,,,,,,,,,1,/go,,,,
memo,color-1,color-1,,,,,berry,,,,,,,,,,,,,,,,
memo,color-2,color-2,,,,,blue,,,,,,,,,,,,,,,,
memo,color-3,color-3,,,,,crimson,,,,,,,,,,,,,,,,
memo,color-4,color-4,,,,,cyan,,,,,,,,,,,,,,,,
memo,color-5,color-5,,,,,forest,,,,,,,,,,,,,,,,
memo,color-6,color-6,,,,,gray,,,,,,,,,,,,,,,,
memo,color-7,color-7,,,,,green,,,,,,,,,,,,,,,,
memo,color-8,color-8,,,,,hot pink,,,,,,,,,,,,,,,,
memo,color-9,color-9,,,,,indigo,,,,,,,,,,,,,,,,
memo,color-10,color-10,,,,,lavender,,,,,,,,,,,,,,,,
memo,color-11,color-11,,,,,magenta,,,,,,,,,,,,,,,,
memo,color-12,color-12,,,,,midnight,,,,,,,,,,,,,,,,
memo,color-13,color-13,,,,,olive,,,,,,,,,,,,,,,,
memo,color-14,color-14,,,,,orange,,,,,,,,,,,,,,,,
memo,color-15,color-15,,,,,peach,,,,,,,,,,,,,,,,
memo,color-16,color-16,,,,,plum,,,,,,,,,,,,,,,,
memo,color-17,color-17,,,,,purple,,,,,,,,,,,,,,,,
memo,color-18,color-18,,,,,red,,,,,,,,,,,,,,,,
memo,color-19,color-19,,,,,sky blue,,,,,,,,,,,,,,,,
memo,color-20,color-20,,,,,yellow,,,,,,,,,,,,,,,,
video,vid-test-fade,Video Test Fade,,,,,,,,,,,,,,,,,,,1,,
fade,video-fade-out,Video Fade Opacity Zero,,,vid-test-fade,,,,,,,,,,,,,,,,,0,
midi,midi-sysex-test-1,Midi SysEx Test 1,,,,,,3,,,,,,,,,,,,,,,testing-raw-string
Type,Number,Name,Notes,Continue Mode,follow,Target,File Target,Color,MIDI Message Type,Midi Command Format,Midi Command,Midi Device ID,Midi Control Number,Midi Control Value,Midi Patch Name,Midi Patch Number,Midi Q List,Midi Q Number,Network Patch Number,Custom String,Stop Target When Done,Stage Number,Fade Opacity,Midi Raw String
audio,audio-1,Test 1,,1,,,,red,,,,,,,,,,,,,,,,
mic,mic-5,Test 2,,,2,,,orange,,,,,,,,,,,,,,,,
video,vid-9,Test 3,,3,,,app/static/example_file/broken_heart.png,green,,,,,,,,,,,,,,1,,
camera,cam-13,Test 4,,1,,,,blue,,,,,,,,,,,,,,,,
text,txt-17,Test 5,,2,,,,purple,,,,,,,,,,,,,,,,
light,lx-21,Test 6,,3,,,,red,,,,,,,,,,,,,,,,
fade,fade-1,stop target when done is checked.,,2,,,,orange,,,,,,,,,,,,,true,,,
fade,fade-2,test-fade-false-stop-target-when-done,stop target when done should not be selected,,,,,,,,,,,,,,,,,,false,,,
network,nw-29,Test 8,,3,,,,green,,,,,,,,,,,,,,,,
midi,midi-33,Test 9,,1,,,,blue,,,,,,,,,,,,,,,,
midi file,midi-f-37,Test 10,,2,,,,purple,,,,,,,,,,,,,,,,
timecode,tc-41,Test 11,,3,,,,red,,,,,,,,,,,,,,,,
group,grp-45,Test 12,,2,,,,orange,,,,,,,,,,,,,,,,
start,start-49,Test 13,,3,,5,,green,,,,,,,,,,,,,,,,
stop,stop-53,Test 14,,1,,5,,blue,,,,,,,,,,,,,,,,
pause,pause-57,Test 15,,2,,5,,purple,,,,,,,,,,,,,,,,
load,load-61,Test 16,,3,,5,,red,,,,,,,,,,,,,,,,
reset,reset-65,Test 17,,2,,5,,orange,,,,,,,,,,,,,,,,
devamp,devamp-69,Test 18,,3,,9,,green,,,,,,,,,,,,,,,,
goto,goto-73,Test 19,,1,,5,,blue,,,,,,,,,,,,,,,,
target,target-77,Test 20,,2,,57,,purple,,,,,,,,,,,,,,,,
arm,arm-81,Test 21,,3,,5,,red,,,,,,,,,,,,,,,,
disarm,disarm-85,Test 22,,2,,5,,orange,,,,,,,,,,,,,,,,
wait,wait-89,Test 23,,3,,,,green,,,,,,,,,,,,,,,,
memo,memo-93,Test 24,,0,,,,blue,,,,,,,,,,,,,,,,
script,script-97,Test 25,,0,,,,purple,,,,,,,,,,,,,,,,
list,list-101,Test 26,,,,,,red,,,,,,,,,,,,,,,,
cuelist,cuelist-105,Test 27,,,,,,orange,,,,,,,,,,,,,,,,
cue list,cue_list-109,Test 28,,,,,,green,,,,,,,,,,,,,,,,
cart,cart-113,Test 29,,,,,,blue,,,,,,,,,,,,,,,,
cue cart,cue-cart-117,Test 30,,,,,,purple,,,,,,,,,,,,,,,,
cue cart,cue-cart-121,Test 31,,,,,,red,,,,,,,,,,,,,,,,
midi,midi-MT 1,Midi Test 1,Midi Test 1,,,,,orange,2,1,1,12,,,,,50,50,,,,,,
midi,MT 2,Midi Test 2,Midi Test 2,,,,,green,2,16,2,10,10,10,,,25,20,,,,,,
network,NW 1,Network Test 1,,,,,,purple,,,,,,,,,,,1,/go,,,,
network,NW 2,Network Test 2,,,,,,purple,,,,,,,,,,,1,/go,,,,
memo,color-1,color-1,,,,,,berry,,,,,,,,,,,,,,,,
memo,color-2,color-2,,,,,,blue,,,,,,,,,,,,,,,,
memo,color-3,color-3,,,,,,crimson,,,,,,,,,,,,,,,,
memo,color-4,color-4,,,,,,cyan,,,,,,,,,,,,,,,,
memo,color-5,color-5,,,,,,forest,,,,,,,,,,,,,,,,
memo,color-6,color-6,,,,,,gray,,,,,,,,,,,,,,,,
memo,color-7,color-7,,,,,,green,,,,,,,,,,,,,,,,
memo,color-8,color-8,,,,,,hot pink,,,,,,,,,,,,,,,,
memo,color-9,color-9,,,,,,indigo,,,,,,,,,,,,,,,,
memo,color-10,color-10,,,,,,lavender,,,,,,,,,,,,,,,,
memo,color-11,color-11,,,,,,magenta,,,,,,,,,,,,,,,,
memo,color-12,color-12,,,,,,midnight,,,,,,,,,,,,,,,,
memo,color-13,color-13,,,,,,olive,,,,,,,,,,,,,,,,
memo,color-14,color-14,,,,,,orange,,,,,,,,,,,,,,,,
memo,color-15,color-15,,,,,,peach,,,,,,,,,,,,,,,,
memo,color-16,color-16,,,,,,plum,,,,,,,,,,,,,,,,
memo,color-17,color-17,,,,,,purple,,,,,,,,,,,,,,,,
memo,color-18,color-18,,,,,,red,,,,,,,,,,,,,,,,
memo,color-19,color-19,,,,,,sky blue,,,,,,,,,,,,,,,,
memo,color-20,color-20,,,,,,yellow,,,,,,,,,,,,,,,,
video,vid-test-fade,Video Test Fade,,,,,,,,,,,,,,,,,,,,1,,
fade,video-fade-out,Video Fade Opacity Zero,,,,vid-test-fade,,,,,,,,,,,,,,,,,0,
midi,midi-sysex-test-1,Midi SysEx Test 1,,,,,,,3,,,,,,,,,,,,,,,testing-raw-string

0 comments on commit 08827a8

Please sign in to comment.