fix minor errors

This commit is contained in:
bkfox
2015-11-23 15:05:37 +01:00
parent 201353367d
commit 4291eea67e
4 changed files with 30 additions and 14 deletions

View File

@ -113,6 +113,7 @@ class DiffusionAdmin (admin.ModelAdmin):
return qs.exclude(type = Diffusion.Type['unconfirmed'])
admin.site.register(Log)
admin.site.register(Track)
admin.site.register(Schedule)

View File

@ -8,6 +8,7 @@ from django.utils.html import strip_tags
from taggit.managers import TaggableManager
import aircox_programs.utils as utils
import aircox_programs.settings as settings
@ -541,7 +542,7 @@ class Diffusion (models.Model):
r = [ sound.duration
for sound in self.sounds.filter(type = Sound.Type['archive'])
if sound.duration ]
return sum(r) or self.duration
return utils.time_sum(r) if r else self.duration
def get_archives (self):
"""

View File

@ -11,7 +11,6 @@ def to_timedelta (time):
seconds = time.second
)
def seconds_to_time (seconds):
"""
Seconds to datetime.time
@ -20,4 +19,12 @@ def seconds_to_time (seconds):
hours, minutes = divmod(minutes, 60)
return datetime.time(hour = hours, minute = minutes, second = seconds)
def time_sum (times):
"""
Sum up a list of time elements
"""
seconds = sum([ time.hour * 3600 + time.minute * 60 + time.second
for time in times ])
return seconds_to_time(seconds)