diff --git a/ctl b/ctl index 7d6349a..d06340c 100755 --- a/ctl +++ b/ctl @@ -9,6 +9,7 @@ if [ -e oml ]; then fi BASE=`pwd` SYSTEM=`uname -s` +SYSTEM_=`uname -s` PLATFORM=`uname -m` if [ $SYSTEM == "Linux" ]; then @@ -16,7 +17,7 @@ if [ $SYSTEM == "Linux" ]; then fi export PLATFORM_ENV="$BASE/platform/$SYSTEM" if [ $SYSTEM == "Darwin" ]; then - export DYLD_FALLBACK_LIBRARY_PATH="$PLATFORM_ENV/lib" + export DYLD_FALLBACK_LIBRARY_PATH="$PLATFORM_ENV/lib" fi PATH="$PLATFORM_ENV/bin:$PATH" @@ -48,7 +49,7 @@ if [ "$1" == "start" ]; then rm "$launchd_plist" fi fi - if [ $SYSTEM == "Linux" ]; then + if [ $SYSTEM_ == "Linux" ]; then if [ -e "$HOME/.config/autostart/openmedialibrary.desktop" ]; then rm "$HOME/.config/autostart/openmedialibrary.desktop" fi @@ -96,18 +97,19 @@ if [ "$1" == "restart" ]; then fi fi if [ "$1" == "open" ]; then - "$0" start & #time to switch to python and use webbrowser.open_tab? + echo $SYSTEM if [ $SYSTEM == "Darwin" ]; then - open "$BASE/$NAME/static/html/load.html" - else - xdg-open "$BASE/$NAME/static/html/load.html" + open "/Applications/Open Media Library.app" + fi + if [ $SYSTEM_ == "Linux" ]; then + exec python3 "$NAME/oml/gtkwebkit.py" $@ fi exit 0 fi if [ "$1" == "ui" ]; then shift - exec python3 $NAME/oml/ui.py $@ + exec python3 "$NAME/oml/ui.py" $@ fi if [ "$1" == "update" ]; then cd "$BASE/$NAME" diff --git a/oml/gtkwebkit.py b/oml/gtkwebkit.py new file mode 100755 index 0000000..417b958 --- /dev/null +++ b/oml/gtkwebkit.py @@ -0,0 +1,32 @@ +#!/usr/bin/python3 +import gi +gi.require_version('WebKit2', '4.0') +from gi.repository import WebKit2, Gtk +import os +import subprocess + +icon = os.path.join(os.path.dirname(os.path.abspath(__file__)), '../static/png/oml.png') +title = "Open Media Library" +base = os.path.expanduser('~/.local/share/openmedialibrary') + + +wnd = Gtk.Window() +wnd.set_icon_from_file(icon) + +ctx = WebKit2.WebContext.get_default() +web = WebKit2.WebView.new_with_context(ctx) + +wnd.connect("destroy", Gtk.main_quit) +wnd.add(web) +wnd.set_wmclass(title, title) +wnd.set_title(title) +wnd.set_default_size(1366, 768) +wnd.show_all() + +url = 'file://' + base + '/openmedialibrary/static/html/load.html' +web.load_uri(url) + +ctl = base + '/ctl' +p = subprocess.Popen([ctl, 'start']) +Gtk.main() +p = subprocess.Popen([ctl, 'stop'])