Do easy api url generation

This commit is contained in:
Ruud committed 2012-01-07 23:48:51 +01:00
1 parent ccd72fdc73
commit 088d1e6a45
1 file changed
+1 -6
+1 -6
View File
@@ -1,9 +1,7 @@
from couchpotato import app
from couchpotato.core.event import fireEvent, addEvent from couchpotato.core.event import fireEvent, addEvent
from couchpotato.core.logger import CPLog from couchpotato.core.logger import CPLog
from couchpotato.core.plugins.base import Plugin from couchpotato.core.plugins.base import Plugin
from couchpotato.environment import Env from couchpotato.environment import Env
from flask.helpers import url_for
from urllib import quote from urllib import quote
log = CPLog(__name__) log = CPLog(__name__)
@@ -20,11 +18,8 @@ class Desktop(Plugin):
def settingsToDesktop(self): def settingsToDesktop(self):
ctx = app.test_request_context()
ctx.push()
base_url = fireEvent('app.base_url', single = True) base_url = fireEvent('app.base_url', single = True)
base_url_api = '%s/%s' % (base_url, url_for('api.index')) base_url_api = '%s/%s' % (base_url, Env.setting('api_key'))
ctx.pop()
url_data = '{"host": "%s", "api": "%s"}' % (base_url, base_url_api) url_data = '{"host": "%s", "api": "%s"}' % (base_url, base_url_api)
self.urlopen('http://localhost:%s/%s' % (Env.get('binary_port'), quote(url_data))) self.urlopen('http://localhost:%s/%s' % (Env.get('binary_port'), quote(url_data)))