X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=income_progress_bars.py;h=5d9a887323feb2cc7da85f1e81dae7bc696d83f2;hb=HEAD;hp=3edb48dc75068267e00900759587d79542d59076;hpb=2c81e34cd696fd5da8b4a5d0338b2fe388fa8178;p=misc diff --git a/income_progress_bars.py b/income_progress_bars.py index 3edb48d..5d9a887 100644 --- a/income_progress_bars.py +++ b/income_progress_bars.py @@ -1,13 +1,12 @@ -from http.server import BaseHTTPRequestHandler, HTTPServer import os import json import jinja2 +from plomlib import PlomDB, PlomException, run_server, PlomHandler -hostName = "localhost" -serverPort = 8081 +server_port = 8083 +db_path = '/home/plom/org/income.json' -tmpl = jinja2.Template(""" - +tmpl = """ - -{% for p in progress_bars %} - + +{% for p in progress_bars %} - - -{% endfor %} -
earnedprogresssurplus
{{p.title}}
earnedprogresssurplus
{{p.title}} {{p.earned|round(2)}}{% if p.time_progress >= 0 %}
{% endif %}
{{p.diff_goal}}
-
+{% if p.time_progress >= 0 %}
{% endif %}
+
{{p.diff_goal}}
+{% endfor %} + + +
hourly rateworked today
€ minutes
€ minutes
€ minutes
@@ -103,45 +102,35 @@ table { -""") +""" -class Database: - timestamp_year = 0, - timestamp_month = 0, - timestamp_week = 0, - year_income = 0, - month_income = 0, - week_income = 0, - workday_hourly_rate_1 = 10, - workday_hourly_rate_2 = 25, - workday_hourly_rate_3 = 50, - workday_minutes_worked_1 = 0, - workday_minutes_worked_2 = 0, - workday_minutes_worked_3 = 0, - year_goal = 20000, - workdays_per_month = 16 - def __init__(self): - db_name = "_income" - self.db_file = db_name + ".json" - self.lock_file = db_name+ ".lock" - if os.path.exists(self.db_file): - with open(self.db_file, "r") as f: - d = json.load(f) - for k, v in d.items(): - if not hasattr(self, k): - raise Exception("bad key in db: " + k) - setattr(self, k, v) +class IncomeDB(PlomDB): - def lock(self): - if os.path.exists(self.lock_file): - raise Exception('Sorry, lock file!') - f = open(self.lock_file, 'w+') - f.close() + def __init__(self): + # defaults + self.timestamp_year = 0, + self.timestamp_month = 0, + self.timestamp_week = 0, + self.year_income = 0, + self.month_income = 0, + self.week_income = 0, + self.workday_hourly_rate_1 = 10, + self.workday_hourly_rate_2 = 25, + self.workday_hourly_rate_3 = 50, + self.workday_minutes_worked_1 = 0, + self.workday_minutes_worked_2 = 0, + self.workday_minutes_worked_3 = 0, + self.year_goal = 20000, + self.workdays_per_month = 16 + super().__init__(db_path) - def unlock(self): - os.remove(self.lock_file) + def read_db_file(self, f): + d = json.load(f) + for k, v in d.items(): + if not hasattr(self, k): + raise PlomException("bad key in db: " + k) + setattr(self, k, v) def to_dict(self): keys = [k for k in dir(self) if (not k.startswith('_')) and (not callable(getattr(self, k)))] @@ -153,57 +142,6 @@ class Database: def write_db(self): self.write_text_to_db(json.dumps(self.to_dict())) - def backup(self): - import shutil - from datetime import datetime, timedelta - # collect modification times of numbered .bak files - bak_prefix = f'{self.db_file}.bak.' - backup_dates = [] - i = 0 - bak_as = f'{bak_prefix}{i}' - while os.path.exists(bak_as): - mod_time = os.path.getmtime(bak_as) - backup_dates += [str(datetime.fromtimestamp(mod_time))] - i += 1 - bak_as = f'{bak_prefix}{i}' - - # collect what numbered .bak files to save: the older, the fewer; for each - # timedelta, keep the newest file that's older - ages_to_keep = [timedelta(minutes=4**i) for i in range(0, 8)] - now = datetime.now() - to_save = [] - for age in ages_to_keep: - limit = now - age - for i, date in enumerate(reversed(backup_dates)): - if datetime.strptime(date, '%Y-%m-%d %H:%M:%S.%f') < limit: - unreversed_i = len(backup_dates) - i - 1 - if unreversed_i not in to_save: - to_save += [unreversed_i] - break - - # remove redundant backup files - j = 0 - for i in to_save: - if i != j: - source = f'{bak_prefix}{i}' - target = f'{bak_prefix}{j}' - shutil.move(source, target) - j += 1 - for i in range(j, len(backup_dates)): - try: - os.remove(f'{bak_prefix}{i}') - except FileNotFoundError: - pass - - # put copy of current state at end of bak list - shutil.copy(self.db_file, f'{bak_prefix}{j}') - - def write_text_to_db(self, text): - self.lock() - self.backup() - with open(self.db_file, 'w') as f: - f.write(text); - self.unlock() class ProgressBar: def __init__(self, title, earned, goal, time_progress=-1): @@ -222,13 +160,23 @@ class ProgressBar: if time_progress > 0: self.success = success_income / time_progress -class MyServer(BaseHTTPRequestHandler): + +class IncomeProgressHandler(PlomHandler): + + def app_init(self, handler): + default_path = '/income_progress' + handler.add_route('GET', default_path, self.display_income_progress) + handler.add_route('POST', default_path, self.post_income_update) + return 'income_progress', default_path def do_POST(self): + self.try_do(self.post_income_update) + + def post_income_update(self): from urllib.parse import parse_qs length = int(self.headers['content-length']) postvars = parse_qs(self.rfile.read(length).decode(), keep_blank_values=1) - db = Database() + db = IncomeDB() db.workday_minutes_worked_1 = int(postvars['workday_minutes_worked_1'][0]) db.workday_minutes_worked_2 = int(postvars['workday_minutes_worked_2'][0]) db.workday_minutes_worked_3 = int(postvars['workday_minutes_worked_3'][0]) @@ -248,14 +196,16 @@ class MyServer(BaseHTTPRequestHandler): db.workday_minutes_worked_2 = 0 db.workday_minutes_worked_3 = 0 db.write_db() - self.send_response(302) - self.send_header('Location', '/') - self.end_headers() + homepage = self.apps['income_progress'] if hasattr(self, 'apps') else self.homepage + self.redirect(homepage) def do_GET(self): + self.try_do(self.display_income_progress) + + def display_income_progress(self): import datetime import calendar - db = Database() #load_db() + db = IncomeDB() today = datetime.datetime.now() update_db = False if today.year != db.timestamp_year: @@ -294,7 +244,9 @@ class MyServer(BaseHTTPRequestHandler): ProgressBar("month", month_plus, month_goal, progress_time_month), ProgressBar("week", week_plus, week_goal, progress_time_week), ProgressBar("workday", day_income, workday_goal)] - page = tmpl.render( + homepage = self.apps['income_progress'] if hasattr(self, 'apps') else self.homepage + page = jinja2.Template(tmpl).render( + homepage = homepage, progress_bars = progress_bars, workday_hourly_rate_1 = db.workday_hourly_rate_1, workday_minutes_worked_1 = db.workday_minutes_worked_1, @@ -309,25 +261,8 @@ class MyServer(BaseHTTPRequestHandler): workday_goal = workday_goal, workdays_per_week = workdays_per_week, ) - self.send_response(200) - self.send_header("Content-type", "text/html") - self.end_headers() - self.wfile.write(bytes(page, "utf-8")) + self.send_HTML(page) - def fail_on_lockfile(self): - if os.path.exists(lock_file): - self.send_response(400) - self.end_headers() - self.wfile.write(bytes("Sorry, lock file!", "utf-8")) - return True - return False if __name__ == "__main__": - webServer = HTTPServer((hostName, serverPort), MyServer) - print(f"Server started http://{hostName}:{serverPort}") - try: - webServer.serve_forever() - except KeyboardInterrupt: - pass - webServer.server_close() - print("Server stopped.") + run_server(server_port, IncomeProgressHandler)
yearly income goal€
monthly income goal{{month_goal|round(2)}}€