shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2025-03-31 22:50:32 +03:00
Code Issues Releases Wiki Activity

bitarray library previously returned True or False, now return 0 and 1, and we where checking against "is True"

Browse Source
This commit is contained in:
Adolfo Gómez García 2021-05-27 10:52:36 +02:00
parent 02c3ffbe75
commit 7edf3094ed
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/uds/core/util/calendar/__init__.py
View File

@ -129,7 +129,7 @@ class CalendarChecker:
return next_event
def check(self, dtime=None):
def check(self, dtime=None) -> bool:
"""
Checks if the given time is a valid event on calendar
@param dtime: Datetime object to check
@ -157,7 +157,7 @@ class CalendarChecker:
CalendarChecker.cache.put(cacheKey, data.tobytes(), 3600 * 24)
memCache.set(cacheKey, data.tobytes(), 3600*24)
return data[dtime.hour * 60 + dtime.minute]
return bool(data[dtime.hour * 60 + dtime.minute])
def nextEvent(self, checkFrom=None, startEvent=True, offset=None):
"""

2
server/src/uds/models/meta_pool.py
View File

@ -124,7 +124,7 @@ class MetaPool(UUIDModel, TaggingMixin): # type: ignore
access = self.fallbackAccess
# Let's see if we can access by current datetime
for ac in sorted(self.calendarAccess.all(), key=lambda x: x.priority):
if CalendarChecker(ac.calendar).check(chkDateTime) is True:
if CalendarChecker(ac.calendar).check(chkDateTime):
access = ac.access
break # Stops on first rule match found