mirror/maloja
1
0
Fork 0
mirror of https://github.com/krateng/maloja.git synced 2023-08-10 21:12:55 +03:00
Code Issues Projects Releases Wiki Activity

Fixed time issues

Browse Source
This commit is contained in:
Krateng 2021-01-15 18:39:52 +01:00
parent c4a9c6dc0f
commit bcd62c16fa
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
maloja/malojatime.py
View File

@ -207,23 +207,15 @@ class MTimeWeek(MRangeDescriptor):
self.year = year self.year = year
self.week = week self.week = week
# assume the first day of the first week of this year is 1/1 thisisoyear_firstday = datetime.date.fromisocalendar(year,1,1) - datetime.timedelta(days=1)
firstday = datetime.date(year,1,1) self.firstday = thisisoyear_firstday + datetime.timedelta(days=7*(week-1))
y,w,d = firstday.chrcalendar()
if y == self.year: self.lastday = self.firstday + datetime.timedelta(days=6)
firstday -= datetime.timedelta(days=(d-1))
else:
firstday += datetime.timedelta(days=8-d)
# now we know the real first day, add the weeks we need
firstday = firstday + datetime.timedelta(days=7*(week-1))
lastday = firstday + datetime.timedelta(days=6)
# turn them into local overwritten date objects
self.firstday = datetime.date(firstday.year,firstday.month,firstday.day)
self.lastday = datetime.date(lastday.year,lastday.month,lastday.day)
# now check if we're still in the same year # now check if we're still in the same year
y,w,_ = self.firstday.chrcalendar() y,w,_ = self.firstday.chrcalendar()
self.year,self.week = y,w self.year,self.week = y,w
# firstday and lastday are already correct
def __str__(self): def __str__(self):
@ -596,16 +588,16 @@ def delimit_desc(step="month",stepn=1,trail=1):
def day_from_timestamp(stamp): def day_from_timestamp(stamp):
dt = datetime.datetime.utcfromtimestamp(stamp) dt = datetime.datetime.fromtimestamp(stamp,tz=TIMEZONE)
return MTime(dt.year,dt.month,dt.day) return MTime(dt.year,dt.month,dt.day)
def month_from_timestamp(stamp): def month_from_timestamp(stamp):
dt = datetime.datetime.utcfromtimestamp(stamp) dt = datetime.datetime.fromtimestamp(stamp,tz=TIMEZONE)
return MTime(dt.year,dt.month) return MTime(dt.year,dt.month)
def year_from_timestamp(stamp): def year_from_timestamp(stamp):
dt = datetime.datetime.utcfromtimestamp(stamp) dt = datetime.datetime.fromtimestamp(stamp,tz=TIMEZONE)
return MTime(dt.year) return MTime(dt.year)
def week_from_timestamp(stamp): def week_from_timestamp(stamp):
dt = datetime.datetime.utcfromtimestamp(stamp) dt = datetime.datetime.fromtimestamp(stamp,tz=TIMEZONE)
d = datetime.date(dt.year,dt.month,dt.day) d = datetime.date(dt.year,dt.month,dt.day)
y,w,_ = d.chrcalendar() y,w,_ = d.chrcalendar()
return MTimeWeek(y,w) return MTimeWeek(y,w)

2
maloja/monkey.py
View File

@ -45,7 +45,7 @@ class expandeddate(date):
def chrcalendar(self): def chrcalendar(self):
tomorrow = self + timedelta(days=1) tomorrow = self + timedelta(days=1)
cal = tomorrow.isocalendar() cal = tomorrow.isocalendar()
return (cal[0],cal[1],cal[2] % 7) return (cal[0],cal[1],cal[2])
datetime.date = expandeddate datetime.date = expandeddate