External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 01:17:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

slight cleanup and refactor of Schedule.timezone property

Browse Source
This commit is contained in:
Ryan Petrello
2018-05-08 08:21:42 -04:00
parent 876431c529
commit 00ae91dace
2 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/api/views.py
View File

@@ -745,7 +745,11 @@ class ScheduleZoneInfo(APIView):
swagger_topic = 'System Configuration' swagger_topic = 'System Configuration'
def get(self, request): def get(self, request):
return Response(Schedule.get_zoneinfo()) zones = [
{'name': zone}
for zone in Schedule.get_zoneinfo()
]
return Response(zones)
class LaunchConfigCredentialsBase(SubListAttachDetachAPIView): class LaunchConfigCredentialsBase(SubListAttachDetachAPIView):

35
awx/main/models/schedules.py
View File

@@ -6,9 +6,9 @@ import logging
import re import re
import dateutil.rrule import dateutil.rrule
from operator import itemgetter
import dateutil.parser import dateutil.parser
from dateutil.tz import datetime_exists, tzutc from dateutil.tz import datetime_exists, tzutc
from dateutil.zoneinfo import get_zonefile_instance
# Django # Django
from django.db import models from django.db import models
@@ -100,28 +100,22 @@ class Schedule(CommonModel, LaunchTimeConfig):
@classmethod @classmethod
def get_zoneinfo(self): def get_zoneinfo(self):
from dateutil.zoneinfo import get_zonefile_instance return sorted(get_zonefile_instance().zones)
return [
{'name': zone}
for zone in sorted(get_zonefile_instance().zones)
]
@property @property
def timezone(self): def timezone(self):
utc = tzutc() utc = tzutc()
_rrule = dateutil.rrule.rrulestr( all_zones = Schedule.get_zoneinfo()
self.rrule,
tzinfos={x: utc for x in dateutil.parser.parserinfo().UTCZONE}
)
tzinfo = _rrule._dtstart.tzinfo
if tzinfo == utc:
return 'UTC'
fname = tzinfo._filename
all_zones = map(itemgetter('name'), Schedule.get_zoneinfo())
all_zones.sort(key = lambda x: -len(x)) all_zones.sort(key = lambda x: -len(x))
for zone in all_zones: for r in Schedule.rrulestr(self.rrule)._rrule:
if fname.endswith(zone): if r._dtstart:
return zone tzinfo = r._dtstart.tzinfo
if tzinfo is utc:
return 'UTC'
fname = tzinfo._filename
for zone in all_zones:
if fname.endswith(zone):
return zone
logger.warn('Could not detect valid zoneinfo for {}'.format(self.rrule)) logger.warn('Could not detect valid zoneinfo for {}'.format(self.rrule))
return '' return ''
@@ -130,6 +124,7 @@ class Schedule(CommonModel, LaunchTimeConfig):
""" """
Apply our own custom rrule parsing requirements Apply our own custom rrule parsing requirements
""" """
tzinfos = {x: tzutc() for x in dateutil.parser.parserinfo().UTCZONE}
kwargs['forceset'] = True kwargs['forceset'] = True
# #
@@ -163,7 +158,7 @@ class Schedule(CommonModel, LaunchTimeConfig):
# local_tz = tzfile('/usr/share/zoneinfo/America/New_York') # local_tz = tzfile('/usr/share/zoneinfo/America/New_York')
local_tz = dateutil.rrule.rrulestr( local_tz = dateutil.rrule.rrulestr(
rrule.replace(naive_until, naive_until + 'Z'), rrule.replace(naive_until, naive_until + 'Z'),
tzinfos={x: tzutc() for x in dateutil.parser.parserinfo().UTCZONE} tzinfos=tzinfos
)._dtstart.tzinfo )._dtstart.tzinfo
# Make a datetime object with tzinfo=<the DTSTART timezone> # Make a datetime object with tzinfo=<the DTSTART timezone>
@@ -181,7 +176,7 @@ class Schedule(CommonModel, LaunchTimeConfig):
# rrule is now: DTSTART;TZID=America/New_York:20200601T120000 RRULE:...;UNTIL=20200601T220000Z # rrule is now: DTSTART;TZID=America/New_York:20200601T120000 RRULE:...;UNTIL=20200601T220000Z
rrule = rrule.replace(naive_until, utc_until) rrule = rrule.replace(naive_until, utc_until)
x = dateutil.rrule.rrulestr(rrule, **kwargs) x = dateutil.rrule.rrulestr(rrule, tzinfos=tzinfos, **kwargs)
for r in x._rrule: for r in x._rrule:
if r._dtstart and r._dtstart.tzinfo is None: if r._dtstart and r._dtstart.tzinfo is None: