prenex/magcms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[fix]convert bytes to string

Browse Source
This commit is contained in:
Adrien Beudin 2019-09-25 19:36:21 +02:00
parent 86be23bc82
commit b572e90ef7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
prosopopee/prosopopee.py
View File

@ -148,7 +148,7 @@ class Video(object):
binary = "avprobe" binary = "avprobe"
command = binary + " -v error -select_streams v:0 -show_entries stream=width,height -of csv=p=0 " + self.base_dir.joinpath(self.name) command = binary + " -v error -select_streams v:0 -show_entries stream=width,height -of csv=p=0 " + self.base_dir.joinpath(self.name)
out = subprocess.check_output(command.split()) out = subprocess.check_output(command.split())
width,height = out.split(',') width,height = out.decode("utf-8").split(',')
return float(width) / int(height) return float(width) / int(height)
def __repr__(self): def __repr__(self):
@ -282,7 +282,7 @@ class Image(object):
def ratio(self): def ratio(self):
command = "gm identify -format %w,%h " + self.base_dir.joinpath(self.name) command = "gm identify -format %w,%h " + self.base_dir.joinpath(self.name)
out = subprocess.check_output(command.split()) out = subprocess.check_output(command.split())
width,height = out.split(',') width,height = out.decode("utf-8").split(',')
return float(width) / int(height) return float(width) / int(height)
def __repr__(self): def __repr__(self):
@ -540,7 +540,7 @@ def build_gallery(settings, gallery_settings, gallery_path, template):
if gallery_settings.get("password") or settings.get("password"): if gallery_settings.get("password") or settings.get("password"):
from_template = light_templates.get_template("form.html") from_template = light_templates.get_template("form.html")
html = encrypt(password, light_templates, gallery_light_path, settings, gallery_settings) html = encrypt(password, light_templates, gallery_light_path, settings, gallery_settings)
open(Path("build").joinpath(gallery_light_path, "index.html"), "wb").write(html) open(Path("build").joinpath(gallery_light_path, "index.html"), "wb").write(html)