0x2620
/
openmedialibrary
1
0
Fork 0
Code Issues 131 Pull Requests Releases Wiki Activity

use gio open if available

This commit is contained in:
j 2017-10-08 12:55:53 +02:00
parent 216b880151
commit ee586ee194
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ctl
View File

@ -147,7 +147,11 @@ if [ "$1" == "open" ]; then
if [ $SYSTEM == "Linux" ]; then if [ $SYSTEM == "Linux" ]; then
if [ -e "$PID" ]; then if [ -e "$PID" ]; then
if ps -p `cat "$PID"` > /dev/null; 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 else
$PYTHON "${NAME}/oml/gtkstatus.py" $@ $PYTHON "${NAME}/oml/gtkstatus.py" $@
exit $? exit $?

10
oml/utils.py
View File

@ -264,7 +264,10 @@ def open_file(path=None):
if sys.platform == 'darwin': if sys.platform == 'darwin':
cmd += ['open', path] cmd += ['open', path]
elif sys.platform.startswith('linux'): 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': elif sys.platform == 'win32':
path = '\\'.join(path.split('/')) path = '\\'.join(path.split('/'))
os.startfile(path) os.startfile(path)
@ -285,7 +288,10 @@ def open_folder(folder=None, path=None):
path = folder path = folder
cmd += ['open', '-R', path] cmd += ['open', '-R', path]
elif sys.platform.startswith('linux'): 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': elif sys.platform == 'win32':
path = '\\'.join(path.split('/')) path = '\\'.join(path.split('/'))
cmd = 'explorer.exe /select,"%s"' % path cmd = 'explorer.exe /select,"%s"' % path