diff --git a/app/routes.py b/app/routes.py index 13c3554..0248843 100644 --- a/app/routes.py +++ b/app/routes.py @@ -238,40 +238,41 @@ def search(): @app.route('/config', methods=['GET', 'POST', 'PUT']) @auth_required def config(): - if os.getenv('WHOOGLE_CONFIG_DISABLE_CHANGE', '') != '': - if request.method == 'GET': - return json.dumps(g.user_config.__dict__) - elif request.method == 'PUT': - if 'name' in request.args: - config_pkl = os.path.join( - app.config['CONFIG_PATH'], - request.args.get('name')) - session['config'] = (pickle.load(open(config_pkl, 'rb')) - if os.path.exists(config_pkl) - else session['config']) - return json.dumps(session['config']) - else: - return json.dumps({}) + if request.method == 'GET': + return json.dumps(g.user_config.__dict__) + elif request.method == 'PUT' and os.getenv('WHOOGLE_CONFIG_DISABLE_CHANGE', '') == '': + if 'name' in request.args: + config_pkl = os.path.join( + app.config['CONFIG_PATH'], + request.args.get('name')) + session['config'] = (pickle.load(open(config_pkl, 'rb')) + if os.path.exists(config_pkl) + else session['config']) + return json.dumps(session['config']) else: - config_data = request.form.to_dict() - if 'url' not in config_data or not config_data['url']: - config_data['url'] = g.user_config.url + return json.dumps({}) + elif os.getenv('WHOOGLE_CONFIG_DISABLE_CHANGE', '') == '': + config_data = request.form.to_dict() + if 'url' not in config_data or not config_data['url']: + config_data['url'] = g.user_config.url - # Save config by name to allow a user to easily load later - if 'name' in request.args: - pickle.dump( - config_data, - open(os.path.join( - app.config['CONFIG_PATH'], - request.args.get('name')), 'wb')) + # Save config by name to allow a user to easily load later + if 'name' in request.args: + pickle.dump( + config_data, + open(os.path.join( + app.config['CONFIG_PATH'], + request.args.get('name')), 'wb')) - # Overwrite default config if user has cookies disabled - if g.cookies_disabled: - open(app.config['DEFAULT_CONFIG'], 'w').write( - json.dumps(config_data, indent=4)) + # Overwrite default config if user has cookies disabled + if g.cookies_disabled: + open(app.config['DEFAULT_CONFIG'], 'w').write( + json.dumps(config_data, indent=4)) - session['config'] = config_data - return redirect(config_data['url']) + session['config'] = config_data + return redirect(config_data['url']) + else: + return json.dumps({}) @app.route('/url', methods=['GET'])