From 15de3c2927006f6a22d8e5d58a6ab4dc7c60f2d9 Mon Sep 17 00:00:00 2001 From: Remy Date: Thu, 26 May 2011 16:42:41 -0700 Subject: [PATCH] Browser launcher works now - launches browser automatically on first startup --- headphones.py | 11 +++++++++++ webServer.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/headphones.py b/headphones.py index a1491d4a..be4aa322 100755 --- a/headphones.py +++ b/headphones.py @@ -4,6 +4,7 @@ from cherrypy.process.plugins import Daemonizer from optparse import OptionParser from configobj import ConfigObj from configcreate import configCreate +import webbrowser import webServer import time from threadtools import threadtool @@ -77,6 +78,16 @@ def serverstart(): #Start threads threadtool(cherrypy.engine).subscribe() cherrypy.engine.timeout_monitor.unsubscribe() + + + def browser(): + webbrowser.open('http://' + settings['http_host'] + ':' + settings['http_port']) + + + if settings['launch_browser'] == '1': + cherrypy.engine.subscribe('start', browser, priority=90) + + cherrypy.quickstart(webServer.Headphones(), config = conf) diff --git a/webServer.py b/webServer.py index 8bde25f0..d6f61cac 100644 --- a/webServer.py +++ b/webServer.py @@ -340,7 +340,7 @@ class Headphones: config.exposed = True - def configUpdate(self, http_host='127.0.0.1', http_username=None, http_port=8181, http_password=None, launch_browser=1, + def configUpdate(self, http_host='127.0.0.1', http_username=None, http_port=8181, http_password=None, launch_browser=0, sab_host=None, sab_username=None, sab_apikey=None, sab_password=None, sab_category=None, music_download_dir=None, usenet_retention=None, nzbmatrix=0, nzbmatrix_username=None, nzbmatrix_apikey=None, include_lossless=0, flac_to_mp3=0, move_to_itunes=0, path_to_itunes=None, rename_mp3s=0, cleanup=0, add_album_art=0):