From 00d8e03d908397edb9bb0cdadd68d4663b40fb90 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Mon, 16 Oct 2017 17:45:41 +0530 Subject: [PATCH] ttrss: Minor refactoring Signed-off-by: Sunil Mohan Adapa --- actions/ttrss | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/actions/ttrss b/actions/ttrss index c424f97a7..0e8593b1d 100755 --- a/actions/ttrss +++ b/actions/ttrss @@ -77,18 +77,23 @@ def enable_api_access(): import psycopg2 # Only available post installation aug = load_augeas() - dbuser = aug.get('/files' + DATABASE_FILE + '/$dbuser').strip("'") - dbpass = aug.get('/files' + DATABASE_FILE + '/$dbpass').strip("'") - dbname = aug.get('/files' + DATABASE_FILE + '/$dbname').strip("'") - dbserver = aug.get('/files' + DATABASE_FILE + '/$dbserver').strip("'") + + def get_value(variable_name): + """Return the value of a variable from database configuration file.""" + return aug.get('/files' + DATABASE_FILE + '/$' + variable_name) \ + .strip("'\"") + + user = get_value('dbuser') + password = get_value('dbpass') + database = get_value('dbname') + host = get_value('dbserver') connection = psycopg2.connect( - database=dbname, user=dbuser, password=dbpass, host=dbserver) + database=database, user=user, password=password, host=host) cursor = connection.cursor() - cursor.execute( - "update ttrss_prefs set def_value=true \ - where pref_name='ENABLE_API_ACCESS';") + cursor.execute("UPDATE ttrss_prefs SET def_value=true " + "WHERE pref_name='ENABLE_API_ACCESS';") connection.commit() connection.close()