Fixed display of negative times (happens with offsets).

This commit is contained in:
daniel-123 2013-06-09 23:12:53 +02:00
parent bcbdde7929
commit 6fc2cc410e

View File

@ -64,6 +64,11 @@ def parseTime(timeStr):
return datetime.timedelta(**time_params).total_seconds() return datetime.timedelta(**time_params).total_seconds()
def formatTime(timeInSeconds): def formatTime(timeInSeconds):
if(timeInSeconds < 0):
timeInSeconds = -timeInSeconds
sign = '-'
else:
sign = ''
timeInSeconds = round(timeInSeconds) timeInSeconds = round(timeInSeconds)
weeks = timeInSeconds // 604800 weeks = timeInSeconds // 604800
days = (timeInSeconds % 604800) // 86400 days = (timeInSeconds % 604800) // 86400
@ -71,13 +76,13 @@ def formatTime(timeInSeconds):
minutes = (timeInSeconds % 3600) // 60 minutes = (timeInSeconds % 3600) // 60
seconds = timeInSeconds % 60 seconds = timeInSeconds % 60
if(weeks > 0): if(weeks > 0):
return '{0:.0f}w, {1:.0f}d, {2:02.0f}:{3:02.0f}:{4:02.0f}'.format(weeks, days, hours, minutes, seconds) return '{0:}{1:.0f}w, {2:.0f}d, {3:02.0f}:{4:02.0f}:{5:02.0f}'.format(sign, weeks, days, hours, minutes, seconds)
elif(days > 0): elif(days > 0):
return '{0:.0f}d, {1:02.0f}:{2:02.0f}:{3:02.0f}'.format(days, hours, minutes, seconds) return '{0:}{1:.0f}d, {2:02.0f}:{3:02.0f}:{4:02.0f}'.format(sign, days, hours, minutes, seconds)
elif(hours > 0): elif(hours > 0):
return '{0:02.0f}:{1:02.0f}:{2:02.0f}'.format(hours, minutes, seconds) return '{0:}{1:02.0f}:{2:02.0f}:{3:02.0f}'.format(sign, hours, minutes, seconds)
else: else:
return '{0:02.0f}:{1:02.0f}'.format(minutes, seconds) return '{0:}{1:02.0f}:{2:02.0f}'.format(sign, minutes, seconds)
def findWorkingDir(): def findWorkingDir():
frozen = getattr(sys, 'frozen', '') frozen = getattr(sys, 'frozen', '')