Merge pull request #193 from frozar/preview

[PREVIEW] Fix the preview under Linux
This commit is contained in:
Grant Sanderson 2018-04-05 09:35:44 -07:00 committed by GitHub
commit f6afbf5408
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -129,6 +129,7 @@ def get_configuration():
return config return config
def handle_scene(scene, **config): def handle_scene(scene, **config):
import platform
if config["quiet"]: if config["quiet"]:
curr_stdout = sys.stdout curr_stdout = sys.stdout
sys.stdout = open(os.devnull, "w") sys.stdout = open(os.devnull, "w")
@ -142,6 +143,9 @@ def handle_scene(scene, **config):
]) ])
if open_file: if open_file:
commands = ["open"] commands = ["open"]
if (platform.system() == "Linux"):
commands = ["xdg-open"]
if config["show_file_in_finder"]: if config["show_file_in_finder"]:
commands.append("-R") commands.append("-R")
# #
@ -149,7 +153,9 @@ def handle_scene(scene, **config):
commands.append(scene.get_image_file_path()) commands.append(scene.get_image_file_path())
else: else:
commands.append(scene.get_movie_file_path()) commands.append(scene.get_movie_file_path())
sp.call(commands) FNULL = open(os.devnull, 'w')
sp.call(commands, stdout=FNULL, stderr=sp.STDOUT)
FNULL.close()
if config["quiet"]: if config["quiet"]:
sys.stdout.close() sys.stdout.close()