voussoir/voussoirkit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hms updates.

Browse source
This commit is contained in:
voussoir 2025-03-24 22:17:43 -07:00
parent bc97ae182f
commit 8179022785
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
voussoirkit/hms.py
View file

@ -25,6 +25,12 @@ def _render_letters(hours, minutes, seconds):
return ''.join(parts) return ''.join(parts)
def hms_to_seconds(hms) -> float: def hms_to_seconds(hms) -> float:
if any(x in hms for x in 'hms'):
return hms_letters_to_seconds(hms)
else:
return hms_colons_to_seconds(hms)
def hms_colons_to_seconds(hms) -> float:
''' '''
Convert hh:mm:ss string to an integer or float of seconds. Convert hh:mm:ss string to an integer or float of seconds.
''' '''
@ -43,15 +49,15 @@ def hms_to_seconds(hms) -> float:
return seconds return seconds
def hms_letters_to_seconds(hms) -> float: def hms_letters_to_seconds(hms) -> float:
match = re.match(r'(?:(\d+)h)?(?:(\d+)m)?(\d+)s?', hms.strip()) match = re.match(r'(?:([\d\.]+)h)?(?:([\d\.]+)m)?(?:([\d\.]+)s)?', hms.strip())
if not match: if not match:
raise ValueError(f'{hms} does not match 00h00m00s pattern') raise ValueError(f'{hms} does not match 00h00m00s pattern')
(hours, minutes, seconds) = match.groups() (hours, minutes, seconds) = match.groups()
seconds = int(seconds) seconds = float(seconds or 0)
if hours: if hours:
seconds += int(hours) * 3600 seconds += float(hours or 0) * 3600
if minutes: if minutes:
seconds += int(minutes) * 60 seconds += float(minutes or 0) * 60
return seconds return seconds
def rounds(seconds): def rounds(seconds):