From ed94b360978726e3f10720ac350b4fe57a6957e1 Mon Sep 17 00:00:00 2001 From: ArabCoders Date: Mon, 27 Nov 2023 23:06:59 +0300 Subject: [PATCH] Encode unicode file paths. --- app/src/M3u8.py | 3 ++- app/src/Segments.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/M3u8.py b/app/src/M3u8.py index 909a26dd..2c1ec9a8 100644 --- a/app/src/M3u8.py +++ b/app/src/M3u8.py @@ -2,6 +2,7 @@ import json import logging import math import os +from urllib.parse import quote from src.Utils import calcDownloadPath from ffprobe import FFProbe from src.Config import Config @@ -68,7 +69,7 @@ class M3u8: else: m3u8 += f"#EXTINF:{segmentSize}, nodesc\n" - m3u8 += f"{self.config.url_prefix}segments/{i}/{file}" + m3u8 += f"{self.config.url_prefix}segments/{i}/{quote(file)}" if len(segmentParams) > 0: m3u8 += '?'+'&'.join([f"{key}={value}" for key, value in segmentParams.items()]) diff --git a/app/src/Segments.py b/app/src/Segments.py index b9f42321..8202d3cc 100644 --- a/app/src/Segments.py +++ b/app/src/Segments.py @@ -109,7 +109,8 @@ class Segments: ffmpegCmd.append('mpegts') ffmpegCmd.append('pipe:1') - logging.info(f'{self.aconvert}, {self.vconvert} '+' '.join(ffmpegCmd)) + logging.debug( + f'Streaming {realFile} segment {self.segment_index}.' + ' '.join(ffmpegCmd)) proc = subprocess.run(ffmpegCmd, stdout=subprocess.PIPE) return proc.stdout