diff --git a/etc/report_generator.py b/etc/report_generator.py index 9ef76b7..5d44148 100644 --- a/etc/report_generator.py +++ b/etc/report_generator.py @@ -350,7 +350,8 @@ def get_database_info(): os.path.join(base_dir, 'mmind_hs.pkl'), os.path.join(base_dir, 'golfsim_hs.pkl'), os.path.join(base_dir, 'bbsdb.pkl'), - os.path.join(base_dir, 'bbsdm.pkl')] + os.path.join(base_dir, 'bbsdm.pkl'), + os.path.join(base_dir, 'qrz.db')] for file in databaseFiles: try: @@ -371,6 +372,16 @@ def get_database_info(): bbsdb = pickle.load(f) elif 'bbsdm' in file: bbsdm = pickle.load(f) + elif 'qrz.db' in file: + # open the qrz.db sqllite file + import sqlite3 + conn = sqlite3.connect(file) + cursor = conn.cursor() + cursor.execute("SELECT * FROM qrz") + qrz_db = cursor.fetchall() + # convert to a list of strings + qrz_db = [f"{row[0]}: {row[1]} {row[2]}" for row in qrz_db] + conn.close() except Exception as e: print(f"Warning issue reading database file: {str(e)}") if 'lemonstand' in file: @@ -425,7 +436,8 @@ def get_database_info(): 'golfsim_score': golfsim_score, 'banList': banList, 'adminList': adminList, - 'sentryIgnoreList': sentryIgnoreList + 'sentryIgnoreList': sentryIgnoreList, + 'qrz_db': qrz_db if 'qrz_db' in locals() else "no data" } def generate_main_html(log_data, system_info): @@ -913,6 +925,11 @@ def generate_database_html(database_info): Mastermind${mmind_score} Golf Simulator${golfsim_score} +

QRZ Database

+

QRZ Database holds heard nodeID and Shortname

+ + +
${qrz_db}
""" diff --git a/etc/report_generator5.py b/etc/report_generator5.py index 18b0848..93a64b1 100644 --- a/etc/report_generator5.py +++ b/etc/report_generator5.py @@ -359,7 +359,8 @@ def get_database_info(): os.path.join(base_dir, 'mmind_hs.pkl'), os.path.join(base_dir, 'golfsim_hs.pkl'), os.path.join(base_dir, 'bbsdb.pkl'), - os.path.join(base_dir, 'bbsdm.pkl')] + os.path.join(base_dir, 'bbsdm.pkl'), + os.path.join(base_dir, 'qrz.db')] for file in databaseFiles: try: @@ -380,6 +381,16 @@ def get_database_info(): bbsdb = pickle.load(f) elif 'bbsdm' in file: bbsdm = pickle.load(f) + elif 'qrz.db' in file: + #open the qrz.db sqllite file + import sqlite3 + conn = sqlite3.connect(file) + cursor = conn.cursor() + cursor.execute("SELECT * FROM qrz") + qrz_db = cursor.fetchall() + # convert to a list of strings + qrz_db = [f"{row[0]}: {row[1]} {row[2]}" for row in qrz_db] + conn.close() except Exception as e: print(f"Warning issue reading database file: {str(e)}") if 'lemonstand' in file: @@ -434,7 +445,8 @@ def get_database_info(): 'golfsim_score': golfsim_score, 'banList': banList, 'adminList': adminList, - 'sentryIgnoreList': sentryIgnoreList + 'sentryIgnoreList': sentryIgnoreList, + 'qrz_db': qrz_db if 'qrz_db' in locals() else "no data" } def generate_main_html(log_data, system_info): @@ -1207,6 +1219,11 @@ def generate_database_html(database_info): Mastermind${mmind_score} Golf Simulator${golfsim_score} +

QRZ Database

+

QRZ Database holds heard nodeID and Shortname

+ + +
${qrz_db}
"""