diff --git a/lib/__init__.py b/lib/__init__.py index bcb8c92..aa37724 100644 --- a/lib/__init__.py +++ b/lib/__init__.py @@ -61,14 +61,34 @@ class Usage(object): def isOffInterval(self): '''Is the timer usage expired''' + usage_expiry = self.intervalResetTimestamp() + if usage_expiry is None: + return False + return time.time() >= usage_expiry + + def usageStartTimestamp(self): + '''Start timestamp (ctime) for the current interval''' + if not os.path.exists(self.file): + return None + return os.path.getctime(self.file) + + def intervalResetTimestamp(self): + '''Epoch timestamp when the usage interval resets''' limit_interval = self.timer.limitInterval if (limit_interval < 0): - return False - if not os.path.exists(self.file): - return False - usage_started = os.path.getctime(self.file) + return None + usage_started = self.usageStartTimestamp() + if usage_started is None: + return None usage_expiry = usage_started + (limit_interval * 60 * 60) - return time.time() >= usage_expiry + return usage_expiry + + def timeUntilIntervalReset(self): + '''Seconds remaining until the interval resets''' + usage_expiry = self.intervalResetTimestamp() + if usage_expiry is None: + return None + return max(0, usage_expiry - time.time()) class Timer(object): diff --git a/timer.py b/timer.py index 26047bd..20859b0 100644 --- a/timer.py +++ b/timer.py @@ -1,7 +1,182 @@ +import html import os, time +import threading +from datetime import datetime +from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer from lib import Config +STATUS_SERVER_HOST = os.environ.get('APP_TIMER_STATUS_HOST', '127.0.0.1') +STATUS_SERVER_PORT = int(os.environ.get('APP_TIMER_STATUS_PORT', '8090')) + +STATUS_CONTEXT = {'config': None} + + +def _format_duration(seconds): + if seconds is None: + return '—' + seconds = int(seconds) + hours, remainder = divmod(seconds, 3600) + minutes, _ = divmod(remainder, 60) + parts = [] + if hours: + parts.append('%dh' % hours) + if minutes or not parts: + parts.append('%dm' % minutes) + return ' '.join(parts) + + +def _format_recharge(hours_value, reset_seconds): + if hours_value is None: + return '—' + if float(hours_value).is_integer(): + base = '%dh' % int(hours_value) + else: + base = '%.1fh' % float(hours_value) + if reset_seconds is None: + return 'Every %s' % base + return 'Every %s (ready in %s)' % (base, _format_duration(reset_seconds)) + + +def _format_usage(used, limit): + if limit is None: + return '%d min (no limit)' % used + used = max(0, used) + return '%d / %d min' % (used, limit) + + +def _format_time_left(time_left, limit): + if limit is None or time_left is None: + return '—' + return '%d min' % max(0, int(time_left)) + + +def _collect_timer_snapshot(timer): + usage_minutes = timer.usage.current + limit_minutes = timer.timeLimit + if limit_minutes < 0: + limit_minutes = None + time_left = None + if limit_minutes is not None: + time_left = max(limit_minutes - usage_minutes, 0) + interval_hours = timer.limitInterval + if interval_hours < 0: + interval_hours = None + reset_seconds = timer.usage.timeUntilIntervalReset() if interval_hours is not None else None + running = timer.isRunning() + blocked = bool(timer.usage.isOffLimit()) + return { + 'name': timer.name, + 'usage': usage_minutes, + 'limit': limit_minutes, + 'time_left': time_left, + 'interval_hours': interval_hours, + 'reset_in': reset_seconds, + 'running': running, + 'blocked': blocked, + 'apps': timer.apps, + } + + +def _render_timer_row(snapshot): + usage_text = _format_usage(snapshot['usage'], snapshot['limit']) + time_left_text = _format_time_left(snapshot['time_left'], snapshot['limit']) + interval_text = _format_recharge(snapshot['interval_hours'], snapshot['reset_in']) + active_text = 'Yes' if snapshot['running'] else 'No' + blocked_text = 'Yes' if snapshot['blocked'] else 'No' + apps = snapshot['apps'] or [] + apps_text = ', '.join(html.escape(app) for app in apps) if apps else '—' + return '{name}{usage}{time_left}{interval}{active}{blocked}{apps}'.format( + name=html.escape(snapshot['name']), + usage=usage_text, + time_left=time_left_text, + interval=interval_text, + active=active_text, + blocked=blocked_text, + apps=apps_text, + ) + + +def _render_status_page(config): + timestamp = datetime.now().strftime('%Y-%m-%d %H:%M:%S') + timers = config.timers if config else [] + rows = ''.join(_render_timer_row(_collect_timer_snapshot(timer)) for timer in timers) + if not rows: + rows = 'No timers configured' + html_doc = """ + + + + App Timer Status + + + +

App Timer Usage

+

Updated {timestamp}

+ + + + + + + + + + + + + + {rows} + +
CategoryUsageTime LeftRechargeActiveBlockedApps
+ +""".format(timestamp=timestamp, rows=rows) + return html_doc + + +class StatusRequestHandler(BaseHTTPRequestHandler): + def do_GET(self): + if self.path not in ('/', '/status'): + self.send_error(404, 'Not Found') + return + config = STATUS_CONTEXT.get('config') + try: + payload = _render_status_page(config).encode('utf-8') + except Exception as exc: + message = '

Error

%s

' % html.escape(str(exc)) + payload = message.encode('utf-8') + self.send_response(500) + else: + self.send_response(200) + self.send_header('Content-Type', 'text/html; charset=utf-8') + self.send_header('Content-Length', str(len(payload))) + self.end_headers() + self.wfile.write(payload) + + def log_message(self, format, *args): + # Keep HTTP logs concise + print("HTTP %s - %s" % (self.log_date_time_string(), format % args)) + + +def start_status_server(): + try: + httpd = ThreadingHTTPServer((STATUS_SERVER_HOST, STATUS_SERVER_PORT), StatusRequestHandler) + except OSError as exc: + print('Failed to start status server on %s:%s (%s)' % (STATUS_SERVER_HOST, STATUS_SERVER_PORT, exc)) + return None + thread = threading.Thread(target=httpd.serve_forever, daemon=True) + thread.start() + print('Status server running on http://%s:%s' % (STATUS_SERVER_HOST, STATUS_SERVER_PORT)) + return httpd + def check_timers(config): '''Will check every timer setup for it's usage and limits''' for timer in config.timers: @@ -20,8 +195,9 @@ def check_timers(config): # increment running apps timer timer.usage.increment(config.checkInterval) - config = Config() +STATUS_CONTEXT['config'] = config +status_server = start_status_server() while True: # check config changes if config.hasChanges():