Improvements to health statistics #549
This commit is contained in:
parent
dd190d0543
commit
edb5b70b53
|
@ -122,7 +122,7 @@
|
||||||
"enabled": false,
|
"enabled": false,
|
||||||
"version": "0.0.2",
|
"version": "0.0.2",
|
||||||
"settings": {
|
"settings": {
|
||||||
"statistics_reset_interval": 24
|
"statistics_reset_cron": "0 0 * * *"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -19,22 +19,6 @@
|
||||||
import datetime
|
import datetime
|
||||||
from safeeyes import utility
|
from safeeyes import utility
|
||||||
|
|
||||||
def _get_next_reset_time(current_time, statistics_reset_cron):
|
|
||||||
import croniter
|
|
||||||
try:
|
|
||||||
cron = croniter.croniter(statistics_reset_cron, current_time)
|
|
||||||
return cron.get_next(datetime.datetime)
|
|
||||||
except:
|
|
||||||
# Error in getting the next reset time
|
|
||||||
return None
|
|
||||||
|
|
||||||
def validate(plugin_config, plugin_settings):
|
def validate(plugin_config, plugin_settings):
|
||||||
if not utility.module_exist("croniter"):
|
if not utility.module_exist("croniter"):
|
||||||
return _("Please install the Python module '%s'") % "croniter"
|
return _("Please install the Python module '%s'") % "croniter"
|
||||||
|
|
||||||
# Validate the cron expression
|
|
||||||
statistics_reset_cron = plugin_settings.get('statistics_reset_cron', '0 0 * * *')
|
|
||||||
if _get_next_reset_time(datetime.datetime.now(), statistics_reset_cron) is None:
|
|
||||||
return _("Invalid cron expression '%s'") % statistics_reset_cron
|
|
||||||
else:
|
|
||||||
return None
|
|
||||||
|
|
|
@ -25,188 +25,156 @@ import datetime
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
context = None
|
context = None
|
||||||
no_of_skipped_breaks = 0
|
|
||||||
no_of_breaks = 0
|
|
||||||
session = None
|
session = None
|
||||||
safe_eyes_start_time = datetime.datetime.now()
|
statistics_reset_cron = None
|
||||||
total_idle_time = 0
|
default_statistics_reset_cron = '0 0 * * *' # Every midnight
|
||||||
last_screen_time = -1
|
|
||||||
statistics_reset_cron = '0 0 * * *' # Every midnight
|
|
||||||
time_to_reset_break = datetime.datetime.now()
|
|
||||||
next_reset_time = None
|
next_reset_time = None
|
||||||
enabled = True
|
start_time = None
|
||||||
|
|
||||||
def init(ctx, safeeyes_config, plugin_config):
|
def init(ctx, safeeyes_config, plugin_config):
|
||||||
"""
|
"""
|
||||||
Initialize the plugin.
|
Initialize the plugin.
|
||||||
"""
|
"""
|
||||||
global enabled
|
|
||||||
global context
|
global context
|
||||||
global session
|
global session
|
||||||
global no_of_skipped_breaks
|
|
||||||
global no_of_breaks
|
|
||||||
global statistics_reset_cron
|
global statistics_reset_cron
|
||||||
global safe_eyes_start_time
|
|
||||||
global total_idle_time
|
|
||||||
global last_screen_time
|
|
||||||
global next_reset_time
|
|
||||||
|
|
||||||
logging.debug('Initialize Health Stats plugin')
|
logging.debug('Initialize Health Stats plugin')
|
||||||
context = ctx
|
context = ctx
|
||||||
statistics_reset_cron = plugin_config.get('statistics_reset_cron', '0 0 * * *')
|
statistics_reset_cron = plugin_config.get('statistics_reset_cron', default_statistics_reset_cron)
|
||||||
# Compute the next reset time
|
|
||||||
next_reset_time = _get_next_reset_time(datetime.datetime.now(), statistics_reset_cron)
|
|
||||||
enabled = next_reset_time is not None
|
|
||||||
|
|
||||||
if not enabled:
|
|
||||||
# There is an error in the cron expression
|
|
||||||
logging.error("Error in parsing the cron expression `" + statistics_reset_cron + "`. Health Stats plugin is disabled.")
|
|
||||||
return
|
|
||||||
|
|
||||||
if session is None:
|
if session is None:
|
||||||
# Read the session
|
# Read the session
|
||||||
session = context['session']['plugin'].get('healthstats', None)
|
defaults = {
|
||||||
if session is None:
|
'breaks': 0,
|
||||||
session = {'no_of_skipped_breaks': 0,
|
'skipped_breaks': 0,
|
||||||
'no_of_breaks': 0,
|
'screen_time': 0,
|
||||||
'safe_eyes_start_time': safe_eyes_start_time.strftime("%Y-%m-%d %H:%M:%S"),
|
'total_breaks': 0,
|
||||||
'total_idle_time': 0,
|
'total_skipped_breaks': 0,
|
||||||
'last_screen_time': -1,
|
'total_screen_time': 0,
|
||||||
'next_reset_time': next_reset_time.strftime("%Y-%m-%d %H:%M:%S")}
|
'total_resets': 0,
|
||||||
context['session']['plugin']['healthstats'] = session
|
}
|
||||||
no_of_skipped_breaks = session.get('no_of_skipped_breaks', 0)
|
|
||||||
no_of_breaks = session.get('no_of_breaks', 0)
|
session = context['session']['plugin'].get('healthstats', {}) | defaults
|
||||||
total_idle_time = session.get('total_idle_time', 0)
|
if 'no_of_breaks' in session:
|
||||||
last_screen_time = session.get('last_screen_time', -1)
|
# Ignore old format session.
|
||||||
str_time = session.get('safe_eyes_start_time', None)
|
session = defaults
|
||||||
str_next_reset_time = session.get('next_reset_time', None)
|
context['session']['plugin']['healthstats'] = session
|
||||||
if str_time:
|
|
||||||
safe_eyes_start_time = datetime.datetime.strptime(str_time, "%Y-%m-%d %H:%M:%S")
|
_get_next_reset_time()
|
||||||
if str_next_reset_time:
|
|
||||||
next_reset_time = datetime.datetime.strptime(str_time, "%Y-%m-%d %H:%M:%S")
|
|
||||||
|
|
||||||
_reset_stats()
|
|
||||||
|
|
||||||
|
|
||||||
def on_stop_break():
|
def on_stop_break():
|
||||||
"""
|
# Check if break was skipped.
|
||||||
After the break, check if it is skipped.
|
global session
|
||||||
"""
|
|
||||||
# Check if the plugin is enabled
|
|
||||||
if not enabled:
|
|
||||||
return
|
|
||||||
|
|
||||||
global no_of_skipped_breaks
|
|
||||||
if context['skipped']:
|
if context['skipped']:
|
||||||
no_of_skipped_breaks += 1
|
session['skipped_breaks'] += 1
|
||||||
session['no_of_skipped_breaks'] = no_of_skipped_breaks
|
|
||||||
|
# Screen time is starting again.
|
||||||
|
on_start()
|
||||||
|
|
||||||
|
|
||||||
|
def on_start_break(break_obj):
|
||||||
|
global session
|
||||||
|
session['breaks'] += 1
|
||||||
|
|
||||||
|
# Screen time has stoped.
|
||||||
|
on_stop()
|
||||||
|
|
||||||
|
|
||||||
|
def on_stop():
|
||||||
|
global start_time
|
||||||
|
_reset_stats()
|
||||||
|
if start_time:
|
||||||
|
screen_time = datetime.datetime.now() - start_time
|
||||||
|
session['screen_time'] += round(screen_time.total_seconds())
|
||||||
|
start_time = None
|
||||||
|
|
||||||
|
|
||||||
def get_widget_title(break_obj):
|
def get_widget_title(break_obj):
|
||||||
"""
|
"""
|
||||||
Return the widget title.
|
Return the widget title.
|
||||||
"""
|
"""
|
||||||
# Check if the plugin is enabled
|
|
||||||
if not enabled:
|
|
||||||
return ""
|
|
||||||
|
|
||||||
global no_of_breaks
|
|
||||||
no_of_breaks += 1
|
|
||||||
session['no_of_breaks'] = no_of_breaks
|
|
||||||
session['safe_eyes_start_time'] = safe_eyes_start_time.strftime("%Y-%m-%d %H:%M:%S")
|
|
||||||
session['total_idle_time'] = total_idle_time
|
|
||||||
session['last_screen_time'] = last_screen_time
|
|
||||||
return _('Health Statistics')
|
return _('Health Statistics')
|
||||||
|
|
||||||
|
|
||||||
def _reset_stats():
|
def _reset_stats():
|
||||||
global no_of_breaks
|
global session
|
||||||
global safe_eyes_start_time
|
|
||||||
global total_idle_time
|
|
||||||
global no_of_skipped_breaks
|
|
||||||
global last_screen_time
|
|
||||||
global next_reset_time
|
|
||||||
|
|
||||||
# Check if the reset time has passed
|
# Check if the reset time has passed
|
||||||
current_time = datetime.datetime.now()
|
if next_reset_time and datetime.datetime.now() >= next_reset_time:
|
||||||
total_duration_sec = (current_time - safe_eyes_start_time).total_seconds()
|
logging.info("Resetting the health statistics")
|
||||||
if current_time >= next_reset_time:
|
|
||||||
logging.debug("Resetting the health statistics")
|
|
||||||
# Reset statistics
|
|
||||||
if safe_eyes_start_time < next_reset_time:
|
|
||||||
# Safe Eyes is running even before the reset time
|
|
||||||
# Consider the reset time as the new start time
|
|
||||||
safe_eyes_start_time = next_reset_time
|
|
||||||
total_duration_sec = (current_time - safe_eyes_start_time).total_seconds()
|
|
||||||
|
|
||||||
# Update the next_reset_time
|
# Update the next_reset_time
|
||||||
next_reset_time = _get_next_reset_time(current_time, statistics_reset_cron)
|
_get_next_reset_time()
|
||||||
|
|
||||||
last_screen_time = round((total_duration_sec - total_idle_time) / 60)
|
# Reset statistics
|
||||||
total_idle_time = 0
|
session['total_breaks'] += session['breaks']
|
||||||
no_of_breaks = 0
|
session['total_skipped_breaks'] += session['skipped_breaks']
|
||||||
no_of_skipped_breaks = 0
|
session['total_screen_time'] += session['screen_time']
|
||||||
session['no_of_breaks'] = 0
|
session['total_resets'] += 1
|
||||||
session['no_of_skipped_breaks'] = 0
|
session['breaks'] = 0
|
||||||
session['safe_eyes_start_time'] = safe_eyes_start_time.strftime("%Y-%m-%d %H:%M:%S")
|
session['skipped_breaks'] = 0
|
||||||
session['total_idle_time'] = total_idle_time
|
session['screen_time'] = 0
|
||||||
session['last_screen_time'] = last_screen_time
|
|
||||||
session['next_reset_time'] = next_reset_time.strftime("%Y-%m-%d %H:%M:%S")
|
|
||||||
|
|
||||||
return total_duration_sec
|
|
||||||
|
|
||||||
|
|
||||||
def get_widget_content(break_obj):
|
def get_widget_content(break_obj):
|
||||||
"""
|
"""
|
||||||
Return the statistics.
|
Return the statistics.
|
||||||
"""
|
"""
|
||||||
# Check if the plugin is enabled
|
global next_reset_time
|
||||||
if not enabled:
|
resets = session['total_resets']
|
||||||
return ""
|
if session['screen_time'] > 21600 or (session['breaks'] and session['skipped_breaks'] / session['breaks']) >= 0.2:
|
||||||
|
|
||||||
total_duration_sec = _reset_stats()
|
|
||||||
screen_time = round((total_duration_sec - total_idle_time) / 60)
|
|
||||||
hours, minutes = divmod(screen_time, 60)
|
|
||||||
time_format = '{:02d}:{:02d}'.format(hours, minutes)
|
|
||||||
if hours > 6 or round((no_of_skipped_breaks / no_of_breaks), 1) >= 0.2:
|
|
||||||
# Unhealthy behavior -> Red broken heart
|
# Unhealthy behavior -> Red broken heart
|
||||||
heart = '💔️'
|
heart = '💔️'
|
||||||
else:
|
else:
|
||||||
# Healthy behavior -> Green heart
|
# Healthy behavior -> Green heart
|
||||||
heart = '💚'
|
heart = '💚'
|
||||||
if last_screen_time < 0:
|
|
||||||
screen_time_diff = ''
|
content = [
|
||||||
else:
|
heart,
|
||||||
hrs_diff, mins_diff = divmod(abs(screen_time - last_screen_time), 60)
|
f"BREAKS: {session['breaks']}",
|
||||||
symbol = ''
|
f"SKIPPED: {session['skipped_breaks']}",
|
||||||
if screen_time > last_screen_time:
|
f"SCREEN TIME: {_format_interval(session['screen_time'])}",
|
||||||
symbol = '+'
|
]
|
||||||
elif screen_time < last_screen_time:
|
|
||||||
symbol = '-'
|
if resets:
|
||||||
screen_time_diff = ' ( {}{:02d}:{:02d} )'.format(symbol, hrs_diff, mins_diff)
|
content[1] += f" [{round(session['total_breaks'] / resets, 1)}]"
|
||||||
return "{}\tBREAKS: {}\tSKIPPED: {}\tSCREEN TIME: {}{}".format(heart, no_of_breaks, no_of_skipped_breaks, time_format, screen_time_diff)
|
content[2] += f" [{round(session['total_skipped_breaks'] / resets, 1)}]"
|
||||||
|
content[3] += f" [{_format_interval(session['total_screen_time'] / resets)}]"
|
||||||
|
|
||||||
|
content = "\t".join(content)
|
||||||
|
if resets:
|
||||||
|
content += f"\n\t[] = average of {resets} reset(s)"
|
||||||
|
if next_reset_time is None:
|
||||||
|
content += f"\n\tSettings error in statistics reset interval: {statistics_reset_cron}"
|
||||||
|
return content
|
||||||
|
|
||||||
|
|
||||||
def on_start():
|
def on_start():
|
||||||
"""
|
"""
|
||||||
Add the idle period to the total idle time.
|
Track the start time.
|
||||||
"""
|
"""
|
||||||
# Check if the plugin is enabled
|
global start_time
|
||||||
if not enabled:
|
|
||||||
return ""
|
|
||||||
|
|
||||||
_reset_stats()
|
_reset_stats()
|
||||||
global total_idle_time
|
start_time = datetime.datetime.now()
|
||||||
# idle_period is provided by Smart Pause plugin
|
|
||||||
total_idle_time += context.get('idle_period', 0)
|
|
||||||
session['total_idle_time'] = total_idle_time
|
def _get_next_reset_time():
|
||||||
|
global next_reset_time
|
||||||
|
global session
|
||||||
|
|
||||||
def _get_next_reset_time(current_time, statistics_reset_cron):
|
|
||||||
try:
|
try:
|
||||||
cron = croniter.croniter(statistics_reset_cron, current_time)
|
cron = croniter.croniter(statistics_reset_cron, datetime.datetime.now())
|
||||||
next_time = cron.get_next(datetime.datetime)
|
next_reset_time = cron.get_next(datetime.datetime)
|
||||||
logging.debug("Health stats will be reset at " + next_time.strftime("%Y-%m-%d %H:%M:%S"))
|
session['next_reset_time'] = next_reset_time.strftime("%Y-%m-%d %H:%M:%S")
|
||||||
return next_time
|
logging.debug("Health stats will be reset at " + session['next_reset_time'])
|
||||||
except:
|
except:
|
||||||
# Error in getting the next reset time
|
logging.error("Error in statistics reset expression: " + statistics_reset_cron)
|
||||||
return None
|
next_reset_time = None
|
||||||
|
|
||||||
|
|
||||||
|
def _format_interval(seconds):
|
||||||
|
screen_time = round(seconds / 60)
|
||||||
|
hours, minutes = divmod(screen_time, 60)
|
||||||
|
return '{:02d}:{:02d}'.format(hours, minutes)
|
||||||
|
|
Loading…
Reference in New Issue