From 088d1e6a456887c4a0f179f1cb1d195be0764e6b Mon Sep 17 00:00:00 2001 From: Ruud Date: Sat, 7 Jan 2012 23:48:51 +0100 Subject: [PATCH] Do easy api url generation --- couchpotato/core/_base/desktop/main.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/couchpotato/core/_base/desktop/main.py b/couchpotato/core/_base/desktop/main.py index fe064a3b..69588f5d 100644 --- a/couchpotato/core/_base/desktop/main.py +++ b/couchpotato/core/_base/desktop/main.py @@ -1,9 +1,7 @@ -from couchpotato import app from couchpotato.core.event import fireEvent, addEvent from couchpotato.core.logger import CPLog from couchpotato.core.plugins.base import Plugin from couchpotato.environment import Env -from flask.helpers import url_for from urllib import quote log = CPLog(__name__) @@ -20,11 +18,8 @@ class Desktop(Plugin): def settingsToDesktop(self): - ctx = app.test_request_context() - ctx.push() base_url = fireEvent('app.base_url', single = True) - base_url_api = '%s/%s' % (base_url, url_for('api.index')) - ctx.pop() + base_url_api = '%s/%s' % (base_url, Env.setting('api_key')) url_data = '{"host": "%s", "api": "%s"}' % (base_url, base_url_api) self.urlopen('http://localhost:%s/%s' % (Env.get('binary_port'), quote(url_data)))