From ee586ee194ecf01c855d57db984fe7442e8f1880 Mon Sep 17 00:00:00 2001 From: j Date: Sun, 8 Oct 2017 12:55:53 +0200 Subject: [PATCH] use gio open if available --- ctl | 6 +++++- oml/utils.py | 10 ++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ctl b/ctl index a7e8b6f..f02ceeb 100755 --- a/ctl +++ b/ctl @@ -147,7 +147,11 @@ if [ "$1" == "open" ]; then if [ $SYSTEM == "Linux" ]; then if [ -e "$PID" ]; then if ps -p `cat "$PID"` > /dev/null; then - xdg-open "file://${BASE}/openmedialibrary/static/html/load.html" + if [ -e /usr/bin/gio ]; then + gio open "file://${BASE}/openmedialibrary/static/html/load.html" + else + xdg-open "file://${BASE}/openmedialibrary/static/html/load.html" + fi else $PYTHON "${NAME}/oml/gtkstatus.py" $@ exit $? diff --git a/oml/utils.py b/oml/utils.py index a3463f4..50e2e9e 100644 --- a/oml/utils.py +++ b/oml/utils.py @@ -264,7 +264,10 @@ def open_file(path=None): if sys.platform == 'darwin': cmd += ['open', path] elif sys.platform.startswith('linux'): - cmd += ['xdg-open', path] + if os.path.exists('/usr/bin/gio'): + cmd += ['gio', 'open', path] + else: + cmd += ['xdg-open', path] elif sys.platform == 'win32': path = '\\'.join(path.split('/')) os.startfile(path) @@ -285,7 +288,10 @@ def open_folder(folder=None, path=None): path = folder cmd += ['open', '-R', path] elif sys.platform.startswith('linux'): - cmd += ['xdg-open', folder] + if os.path.exists('/usr/bin/gio'): + cmd += ['gio', 'open', folder] + else: + cmd += ['xdg-open', folder] elif sys.platform == 'win32': path = '\\'.join(path.split('/')) cmd = 'explorer.exe /select,"%s"' % path