filmroellchen/intro-outro-generator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make-ffmpeg: Properly escape special characters

Browse source
This commit is contained in:
Jannik Beyerstedt 2024-10-06 21:49:08 +02:00
parent 0bb26d6b25
commit 9210d36248
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
make-ffmpeg.py
View file

@ -66,8 +66,8 @@ class TextConfig:
else: else:
filter_str += ":font='{}'".format(self.fontfamily) filter_str += ":font='{}'".format(self.fontfamily)
filter_str += ":fontsize={0}:fontcolor={1}:x={2}:y={3}:text='{4}'".format( filter_str += ":fontsize={0}:fontcolor={1}:x={2}:y={3}:text={4}".format(
self.fontsize, self.fontcolor, self.x, self.y, text) self.fontsize, self.fontcolor, self.x, self.y, ffmpeg_escape_str(text))
return filter_str return filter_str
@ -167,7 +167,12 @@ def fit_text(string: str, frame_width):
def ffmpeg_escape_str(text: str) -> str: def ffmpeg_escape_str(text: str) -> str:
text = text.replace(':', "\:") # the ffmpeg command needs colons to be escaped # Escape according to https://ffmpeg.org/ffmpeg-filters.html#Notes-on-filtergraph-escaping
# and don't put the string in quotes afterwards!
text = text.replace(",", r"\,")
text = text.replace(':', r"\\:")
text = text.replace("'", r"\\\'")
return text return text
@ -186,13 +191,9 @@ def enqueue_job(conf: Config, event):
event_title = str(event['title']) event_title = str(event['title'])
event_personnames = str(event['personnames']) event_personnames = str(event['personnames'])
event_title = event_title.replace('"', '\\"')
event_title = event_title.replace('\'', '')
event_personnames = event_personnames.replace('"', '\\"')
title = ffmpeg_escape_str(conf.title.fit_text(event_title)) title = conf.title.fit_text(event_title)
speakers = ffmpeg_escape_str(conf.speaker.fit_text(event_personnames)) speakers = conf.speaker.fit_text(event_personnames)
text = ffmpeg_escape_str(conf.text_text)
if args.debug: if args.debug:
print('Title: ', title) print('Title: ', title)
@ -205,7 +206,7 @@ def enqueue_job(conf: Config, event):
videofilter = conf.title.get_ffmpeg_filter(conf.inout_type, title) + "," videofilter = conf.title.get_ffmpeg_filter(conf.inout_type, title) + ","
videofilter += conf.speaker.get_ffmpeg_filter(conf.inout_type, speakers) + "," videofilter += conf.speaker.get_ffmpeg_filter(conf.inout_type, speakers) + ","
videofilter += conf.text.get_ffmpeg_filter(conf.inout_type, text) videofilter += conf.text.get_ffmpeg_filter(conf.inout_type, conf.text_text)
cmd = [ffmpeg_path, '-y', '-i', conf.template_file, '-vf', videofilter] cmd = [ffmpeg_path, '-y', '-i', conf.template_file, '-vf', videofilter]