- Umstellung auf Andrea

geändert:       src/Makefiles/Makefile.ftpUpload
	geändert:       src/Makefiles/Makefile.vidstabTest
- kleinere Korrekturen
	geändert:       src/galleryHelper/getVideoDurationJson.py
	geändert:       src/galleryHelper/vidGalInsert.py
This commit is contained in:
marko
2018-12-03 17:36:51 +01:00
parent 10f98eac61
commit ce978f05fd
4 changed files with 32 additions and 17 deletions

View File

@@ -21,7 +21,7 @@ def probe(vid_file_path):
@vid_file_path : The absolute (full) path of the video file, string.
'''
if type(vid_file_path) != str:
raise Exception('Gvie ffprobe a full file path of the video')
raise Exception('Give ffprobe a full file path of the video')
return
command = ["ffprobe",
@@ -34,7 +34,7 @@ def probe(vid_file_path):
pipe = sp.Popen(command, stdout=sp.PIPE, stderr=sp.STDOUT)
out, err = pipe.communicate()
return json.loads(out)
return json.loads(out.decode('utf-8'))
def duration(vid_file_path):