From 3bdad3d3404718eb59514328c1967878e1c0f60c Mon Sep 17 00:00:00 2001 From: "matthias@arch" Date: Thu, 24 Nov 2022 00:24:23 +0100 Subject: [PATCH] minor fixes --- regina/regina.py | 6 ++++++ regina/visualize.py | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/regina/regina.py b/regina/regina.py index e49530a..8179357 100644 --- a/regina/regina.py +++ b/regina/regina.py @@ -68,12 +68,16 @@ def main(): config_file = "" collect = False visualize_ = False + log_file = "" # parse args i = 1 while i in range(1, len(argv)): if argv[i] == "--config": if len(argv) > i + 1: config_file = argv[i+1] else: missing_arg_val(argv[i]) + if argv[i] == "--log-file": + if len(argv) > i + 1: log_file = argv[i+1] + else: missing_arg_val(argv[i]) elif argv[i] == "--help": help() exit(0) @@ -93,6 +97,8 @@ def main(): error(f"Not a file: '{config_file}'") read_settings_file(config_file, settings) settings["version"] = version + if log_file: settings["access-log"] = log_file + print(f"regina version {version} with server-name '{settings['server-name']}' and database '{settings['db']}'") if not settings["server-name"]: missing_arg("server-name") diff --git a/regina/visualize.py b/regina/visualize.py index 4818f38..08586b3 100644 --- a/regina/visualize.py +++ b/regina/visualize.py @@ -1,11 +1,10 @@ import sqlite3 as sql -from sys import argv, exit -from re import fullmatch, findall +from sys import exit +from re import fullmatch import matplotlib.pyplot as plt -import matplotlib as mpl from os.path import isdir from datetime import datetime as dt -from .database import t_request, t_user, t_file, t_filegroup, database_tables +from .database import t_request, t_user, t_file, t_filegroup from .sql_util import sanitize, sql_select, sql_exists, sql_insert, sql_tablesize, sql_get_count_where """ visualize information from the databse @@ -372,6 +371,7 @@ def visualize(loaded_settings: dict): img_dir = settings["img_dir"] img_filetype = settings["img_filetype"] + img_location = settings["img_location"] names = { # paths "img_file_ranking_last_x_days": f"ranking_all_time_files_last_x_days.{img_filetype}", @@ -388,13 +388,13 @@ def visualize(loaded_settings: dict): # values "mobile_user_percentage_total": 0.0, "mobile_user_percentage_last_x_days": 0.0, - "user_count_x_days": 0, + "user_count_last_x_days": 0, "user_count_total": 0, - "request_count_x_days": 0, + "request_count_last_x_days": 0, "request_count_total": 0, - "human_user_percentage_x_days": 0, - "human_request_percentage_x_days": 0, + "human_user_percentage_last_x_days": 0, "human_user_percentage_total": 0, + "human_request_percentage_last_x_days": 0, "human_request_percentage_total": 0, # general "regina_version": settings["version"], @@ -491,14 +491,14 @@ def visualize(loaded_settings: dict): if gen_img: fig_daily, ax1, ax2, plots = plot2y(date_names, [len(user_ids) for user_ids in unique_user_ids_dates], [len(request_ids) for request_ids in unique_request_ids_dates], xlabel="Date", ylabel1="User count", label1="Unique users", ylabel2="Request count", label2="Unique requests", color1=palette["red"], color2=palette["blue"]) if get_humans: - fig_daily, ax1, ax2, plots = plot2y(date_names, [len(user_ids) for user_ids in unique_user_ids_human_dates], [len(request_ids) for request_ids in unique_request_ids_human_dates], label1="Unique users (human)", ylabel2="Einzigartige Anfragen", label2="Unique requests (human)", color1=palette["orange"], color2=palette["green"], fig=fig_daily, ax1=ax1, ax2=ax2, plots=plots) - fig_daily.savefig(f"{img_dir}{names[f'img_users_and_requests{suffix}']}") + fig_daily, ax1, ax2, plots = plot2y(date_names, [len(user_ids) for user_ids in unique_user_ids_human_dates], [len(request_ids) for request_ids in unique_request_ids_human_dates], label1="Unique users (human)", label2="Unique requests (human)", color1=palette["orange"], color2=palette["green"], fig=fig_daily, ax1=ax1, ax2=ax2, plots=plots) + fig_daily.savefig(f"{img_dir}/{names[f'img_users_and_requests{suffix}']}") # os & browser os_ranking, browser_ranking, names[f"mobile_user_percentage{suffix}"] = get_os_browser_mobile_rankings(cur, unique_user_ids_human) if gen_img: fig_os_rating = plot_ranking(os_ranking, xlabel="Platform", ylabel="Share [%]", color_settings=color_settings_operating_systems) - fig_os_rating.savefig(f"{img_dir}{names[f'img_operating_system_ranking{suffix}']}") + fig_os_rating.savefig(f"{img_dir}/{names[f'img_operating_system_ranking{suffix}']}") fig_browser_rating = plot_ranking(browser_ranking, xlabel="Browsers", ylabel="Share [%]", color_settings=color_settings_browsers) fig_browser_rating.savefig(f"{img_dir}/{names[f'img_browser_ranking{suffix}']}")