From 811979cea7c0b58eaa4d414cc9c68386e3dc2d63 Mon Sep 17 00:00:00 2001 From: efrick Date: Wed, 16 Oct 2024 11:20:14 -0400 Subject: [PATCH] Move configparser code to seperate module This code is now in its own Class. This is to make it easier to do reporting and updating. --- get_artist_art.py | 16 +++++++++------- prog_conf.py | 16 ++++++++++++++++ 2 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 prog_conf.py diff --git a/get_artist_art.py b/get_artist_art.py index 518d520..629a612 100755 --- a/get_artist_art.py +++ b/get_artist_art.py @@ -1,11 +1,11 @@ #!/usr/bin/env python3 import argparse -import configparser import os from time import sleep import dir_activities import api_calls +from prog_conf import gaa_conf gaa_version = "2024.10.15.2" @@ -14,13 +14,15 @@ jls_extract_var = f'%(prog)s {gaa_version}' option_set.add_argument('--version', '-v', action='version', version=jls_extract_var) cmd_options = option_set.parse_args() -config = configparser.ConfigParser() -if (os.path.exists('config.ini')): - conf_path = 'config.ini' -else: - conf_path = os.path.join(os.path.expanduser("~"), ".local/share/get_artist_art/config.ini") +# config = configparser.ConfigParser() +# if (os.path.exists('config.ini')): +# conf_path = 'config.ini' +# else: +# conf_path = os.path.join(os.path.expanduser("~"), ".local/share/get_artist_art/config.ini") -config.read(conf_path) +# config.read(conf_path) +config = gaa_conf() +config = config.conf music_path = config['music']['dir'] ftv_api_key = config['fanart_tv']['api_key'] diff --git a/prog_conf.py b/prog_conf.py new file mode 100644 index 0000000..a6a650b --- /dev/null +++ b/prog_conf.py @@ -0,0 +1,16 @@ +import configparser +from os.path import exists,join,expanduser + + +class gaa_conf: + def __init__(self): + self.conf = configparser.ConfigParser() + if (exists('config.ini')): + self.conf_path = 'config.ini' + else: + self.conf_path = join(expanduser( + "~"), ".local/share/get_artist_art/config.ini") + self.conf.read(self.conf_path) + + def get(): + return gaa_conf