hendrik/pollmaster-docker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

issue #1

Browse Source
This commit is contained in:
matnad 2019-02-12 15:00:21 +01:00
parent 1cff89cf71
commit 44b8d3328a
1 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
cogs/poll.py
View File

@ -67,12 +67,12 @@ class Poll:
self.open = True self.open = True
self.active = True self.active = True
self.activation = 0 self.activation = 0
self.activation_tz = 'UTC' self.activation_tz = 0.0
self.votes = {} self.votes = {}
async def is_open(self, update_db=True): async def is_open(self, update_db=True):
if open and self.duration != 0 \ if open and self.duration != 0 \
and datetime.datetime.utcnow().replace(tzinfo=pytz.utc) > self.duration.replace(tzinfo=pytz.utc): and datetime.datetime.utcnow().replace(tzinfo=pytz.utc) > self.get_duration_with_tz():
self.open = False self.open = False
if update_db: if update_db:
await self.save_to_db() await self.save_to_db()
@ -80,7 +80,7 @@ class Poll:
async def is_active(self, update_db=True): async def is_active(self, update_db=True):
if not self.active and self.activation != 0 \ if not self.active and self.activation != 0 \
and datetime.datetime.utcnow().replace(tzinfo=pytz.utc) > self.activation.replace(tzinfo=pytz.utc): and datetime.datetime.utcnow().replace(tzinfo=pytz.utc) > self.get_activation_with_tz():
self.active = True self.active = True
if update_db: if update_db:
await self.save_to_db() await self.save_to_db()
@ -249,7 +249,7 @@ class Poll:
dt = await get_valid(force) dt = await get_valid(force)
self.activation = dt self.activation = dt
if self.activation != 0: if self.activation != 0:
self.activation_tz = dt.tzinfo.tzname(dt) self.activation_tz = dt.utcoffset().total_seconds() / 3600
self.active = False self.active = False
return return
except InputError: except InputError:
@ -269,7 +269,7 @@ class Poll:
if self.activation == 0: if self.activation == 0:
await self.add_vaild(message, 'manually activated') await self.add_vaild(message, 'manually activated')
else: else:
self.activation_tz = dt.tzinfo.tzname(dt) self.activation_tz = dt.utcoffset().total_seconds() / 3600
await self.add_vaild(message, self.activation.strftime('%d-%b-%Y %H:%M %Z')) await self.add_vaild(message, self.activation.strftime('%d-%b-%Y %H:%M %Z'))
self.active = False self.active = False
break break
@ -1000,16 +1000,13 @@ class Poll:
# else: # else:
# return self.options_traditional # return self.options_traditional
async def get_deadline(self, string=False): def get_duration_with_tz(self):
if self.duration == 0: if self.duration == 0:
if string:
return 'No deadline'
else:
return 0 return 0
else: elif isinstance(self.duration, datetime.datetime):
deadline = self.duration dt = self.duration
if deadline.tzinfo is None or deadline.tzinfo.utcoffset(deadline) is None: if dt.tzinfo is None or dt.tzinfo.utcoffset(dt) is None:
deadline = pytz.utc.localize(deadline) dt = pytz.utc.localize(dt)
if isinstance(self.duration_tz, float): if isinstance(self.duration_tz, float):
tz = possible_timezones(self.duration_tz, common_only=True) tz = possible_timezones(self.duration_tz, common_only=True)
if not tz: if not tz:
@ -1020,7 +1017,35 @@ class Poll:
else: else:
tz = pytz.timezone(self.duration_tz) tz = pytz.timezone(self.duration_tz)
deadline = deadline.astimezone(tz) return dt.astimezone(tz)
def get_activation_with_tz(self):
if self.activation == 0:
return 0
elif isinstance(self.activation, datetime.datetime):
dt = self.activation
if dt.tzinfo is None or dt.tzinfo.utcoffset(dt) is None:
dt = pytz.utc.localize(dt)
if isinstance(self.activation_tz, float):
tz = possible_timezones(self.activation_tz, common_only=True)
if not tz:
tz = pytz.timezone('UTC')
else:
# choose one valid timezone with the offset
tz = pytz.timezone(tz[0])
else:
tz = pytz.timezone(self.activation_tz)
return dt.astimezone(tz)
async def get_deadline(self, string=False):
if self.duration == 0:
if string:
return 'No deadline'
else:
return 0
else:
deadline = self.get_duration_with_tz()
if string: if string:
return deadline.strftime('%d-%b-%Y %H:%M %Z') return deadline.strftime('%d-%b-%Y %H:%M %Z')
else: else:
@ -1033,11 +1058,7 @@ class Poll:
else: else:
return 0 return 0
else: else:
activation_date = self.activation activation_date = self.get_activation_with_tz()
if activation_date.tzinfo is None or activation_date.tzinfo.utcoffset(activation_date) is None:
activation_date = pytz.utc.localize(activation_date)
tz = pytz.timezone(self.activation_tz)
activation_date = activation_date.astimezone(tz)
if string: if string:
return activation_date.strftime('%d-%b-%Y %H:%M %Z') return activation_date.strftime('%d-%b-%Y %H:%M %Z')
else: else: