luxick/estus-shots-py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finalize migration to SQLAlchemy.

Browse Source
This commit is contained in:
luxick
2019-10-16 22:37:22 +02:00
parent fccd75d6c5
commit eafcfffc1f
7 changed files with 158 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
estusshots/util.py
View File

@@ -37,17 +37,19 @@ def timedelta_to_str(data: timedelta) -> str:
)
def timedelta(start: time, end: time) -> float:
startDateTime = datetime.combine(date.today(), start)
def compute_timedelta(start: time, end: time) -> float:
if not start or not end:
return 0
s = datetime.combine(date.today(), start)
# Check if the the end is still on the same day
if start.hour > end.hour:
base = date.today() + timedelta(days=1)
else:
base = date.today()
endDateTime = datetime.combine(base, end)
difference = startDateTime - endDateTime
e = datetime.combine(base, end)
difference = s - e
difference_hours = difference.total_seconds() / 3600
return difference_hours
return abs(difference_hours)
def combine_datetime(date: datetime.date, time: datetime.time):