X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=plomlib.py;h=d1b4c4c9a4713cecb84d6c497e7e4f5505e9add0;hb=e58262d6913522cf57d5317fbf0398e2d56b29a0;hp=92bfb8535d7604bc1e47f0595cc68fd28e433283;hpb=436e0f40b45319ef4452ce6ced1a3c3df813119b;p=misc diff --git a/plomlib.py b/plomlib.py index 92bfb85..d1b4c4c 100644 --- a/plomlib.py +++ b/plomlib.py @@ -27,47 +27,56 @@ class PlomDB: def backup(self): import shutil from datetime import datetime, timedelta + if not os.path.exists(self.db_file): + return + # collect modification times of numbered .bak files + print('DEBUG BACKUP') 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}' + # backup_dates = [] + mtimes_to_paths = {} + for path in [path for path in os.listdir(os.path.dirname(bak_prefix)) + if path.startswith(os.path.basename(bak_prefix))]: + mod_time = os.path.getmtime(path) + print(f'DEBUG pre-exists: {path} {mod_time}') + mtimes_to_paths[str(datetime.fromtimestamp(mod_time))] = path + # backup_dates += [str(datetime.fromtimestamp(mod_time))] + + for mtime in sorted(mtimes_to_paths.keys()): + print(f'DEBUG mtimes_to_paths: {mtime}:{mtimes_to_paths[mtime]}') # 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)] + print(f'DEBUG ages_to_keep: {ages_to_keep}') now = datetime.now() - to_save = [] + 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] + for mtime in reversed(sorted(mtimes_to_paths.keys())): + print(f'DEBUG checking if {mtime} < {limit} ({now} - {age})') + if datetime.strptime(mtime, '%Y-%m-%d %H:%M:%S.%f') < limit: + print('DEBUG it is, adding!') + to_save[mtime] = mtimes_to_paths[mtime] 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}' + for path in [path for path in mtimes_to_paths.values() + if path not in to_save.values()]: + print(f'DEBUG removing {path} cause not in to_save') + os.remove(path) + + i = 0 + for mtime in sorted(to_save.keys()): + source = to_save[mtime] + target = f'{bak_prefix}{i}' + print(f'DEBUG to_save {source} -> {target}') + if source != target: shutil.move(source, target) - j += 1 - for i in range(j, len(backup_dates)): - try: - os.remove(f'{bak_prefix}{i}') - except FileNotFoundError: - pass + i += 1 # put copy of current state at end of bak list - shutil.copy(self.db_file, f'{bak_prefix}{j}') + print(f'DEBUG saving current state to {bak_prefix}{i}') + shutil.copy(self.db_file, f'{bak_prefix}{i}') def write_text_to_db(self, text, mode='w'): self.lock() @@ -77,25 +86,17 @@ class PlomDB: self.unlock() -class PlomServer(BaseHTTPRequestHandler): +class PlomHandler(BaseHTTPRequestHandler): + homepage = '/' + html_head = '\n\n' + html_foot = '\n' - def __init__(self, *args, **kwargs): - self.html_head = ['\n\n'] - self.html_foot = ['\n'] - self.pre_init() - super().__init__(*args, **kwargs) - - def pre_init(self): - pass - def fail_400(self, e): self.send_HTML(f'ERROR: {e}', 400) def send_HTML(self, html, code=200): self.send_code_and_headers(code, [('Content-type', 'text/html')]) - header = '\n'.join(self.html_head) - footer = '\n'.join(self.html_foot) - self.wfile.write(bytes(f'{header}\n{html}\n{footer}', 'utf-8')) + self.wfile.write(bytes(f'{self.html_head}\n{html}\n{self.html_foot}', 'utf-8')) def send_code_and_headers(self, code, headers=[]): self.send_response(code) @@ -106,11 +107,17 @@ class PlomServer(BaseHTTPRequestHandler): def redirect(self, url='/'): self.send_code_and_headers(302, [('Location', url)]) + def try_do(self, do_method): + try: + do_method() + except PlomException as e: + self.fail_400(e) + -def run_server(port, server_class): +def run_server(port, handler_class): from http.server import HTTPServer - webServer = HTTPServer(('localhost', port), server_class) + webServer = HTTPServer(('localhost', port), handler_class) print(f"Server started http://localhost:{port}") try: webServer.serve_forever()