mirror of https://gitlab.com/bashrc2/epicyon
Tidying
parent
f0f818197e
commit
36e7516257
29
happening.py
29
happening.py
|
@ -34,10 +34,14 @@ def getTodaysEvents(baseDir: str,nickname: str,domain: str, \
|
||||||
dayNumber=now.day
|
dayNumber=now.day
|
||||||
else:
|
else:
|
||||||
dayNumber=currDayOfMonth
|
dayNumber=currDayOfMonth
|
||||||
calendarFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/calendar/'+str(year)+'/'+str(monthNumber)+'.txt'
|
|
||||||
|
calendarFilename= \
|
||||||
|
baseDir+'/accounts/'+nickname+'@'+domain+ \
|
||||||
|
'/calendar/'+str(year)+'/'+str(monthNumber)+'.txt'
|
||||||
events={}
|
events={}
|
||||||
if not os.path.isfile(calendarFilename):
|
if not os.path.isfile(calendarFilename):
|
||||||
return events
|
return events
|
||||||
|
|
||||||
calendarPostIds=[]
|
calendarPostIds=[]
|
||||||
recreateEventsFile=False
|
recreateEventsFile=False
|
||||||
with open(calendarFilename,'r') as eventsFile:
|
with open(calendarFilename,'r') as eventsFile:
|
||||||
|
@ -102,9 +106,12 @@ def todaysEventsCheck(baseDir: str,nickname: str,domain: str) -> bool:
|
||||||
monthNumber=now.month
|
monthNumber=now.month
|
||||||
dayNumber=now.day
|
dayNumber=now.day
|
||||||
|
|
||||||
calendarFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/calendar/'+str(year)+'/'+str(monthNumber)+'.txt'
|
calendarFilename= \
|
||||||
|
baseDir+'/accounts/'+nickname+'@'+domain+ \
|
||||||
|
'/calendar/'+str(year)+'/'+str(monthNumber)+'.txt'
|
||||||
if not os.path.isfile(calendarFilename):
|
if not os.path.isfile(calendarFilename):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
eventsExist=False
|
eventsExist=False
|
||||||
with open(calendarFilename,'r') as eventsFile:
|
with open(calendarFilename,'r') as eventsFile:
|
||||||
for postId in eventsFile:
|
for postId in eventsFile:
|
||||||
|
@ -149,9 +156,12 @@ def thisWeeksEventsCheck(baseDir: str,nickname: str,domain: str) -> bool:
|
||||||
monthNumber=now.month
|
monthNumber=now.month
|
||||||
dayNumber=now.day
|
dayNumber=now.day
|
||||||
|
|
||||||
calendarFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/calendar/'+str(year)+'/'+str(monthNumber)+'.txt'
|
calendarFilename= \
|
||||||
|
baseDir+'/accounts/'+nickname+'@'+domain+ \
|
||||||
|
'/calendar/'+str(year)+'/'+str(monthNumber)+'.txt'
|
||||||
if not os.path.isfile(calendarFilename):
|
if not os.path.isfile(calendarFilename):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
eventsExist=False
|
eventsExist=False
|
||||||
with open(calendarFilename,'r') as eventsFile:
|
with open(calendarFilename,'r') as eventsFile:
|
||||||
for postId in eventsFile:
|
for postId in eventsFile:
|
||||||
|
@ -198,10 +208,15 @@ def getThisWeeksEvents(baseDir: str,nickname: str,domain: str) -> {}:
|
||||||
year=now.year
|
year=now.year
|
||||||
monthNumber=now.month
|
monthNumber=now.month
|
||||||
dayNumber=now.day
|
dayNumber=now.day
|
||||||
calendarFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/calendar/'+str(year)+'/'+str(monthNumber)+'.txt'
|
|
||||||
|
calendarFilename= \
|
||||||
|
baseDir+'/accounts/'+nickname+'@'+domain+ \
|
||||||
|
'/calendar/'+str(year)+'/'+str(monthNumber)+'.txt'
|
||||||
|
|
||||||
events={}
|
events={}
|
||||||
if not os.path.isfile(calendarFilename):
|
if not os.path.isfile(calendarFilename):
|
||||||
return events
|
return events
|
||||||
|
|
||||||
calendarPostIds=[]
|
calendarPostIds=[]
|
||||||
recreateEventsFile=False
|
recreateEventsFile=False
|
||||||
with open(calendarFilename,'r') as eventsFile:
|
with open(calendarFilename,'r') as eventsFile:
|
||||||
|
@ -281,10 +296,14 @@ def getCalendarEvents(baseDir: str,nickname: str,domain: str, \
|
||||||
"""Retrieves calendar events
|
"""Retrieves calendar events
|
||||||
Returns a dictionary indexed by day number of lists containing Event and Place activities
|
Returns a dictionary indexed by day number of lists containing Event and Place activities
|
||||||
"""
|
"""
|
||||||
calendarFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/calendar/'+str(year)+'/'+str(monthNumber)+'.txt'
|
calendarFilename= \
|
||||||
|
baseDir+'/accounts/'+nickname+'@'+domain+ \
|
||||||
|
'/calendar/'+str(year)+'/'+str(monthNumber)+'.txt'
|
||||||
|
|
||||||
events={}
|
events={}
|
||||||
if not os.path.isfile(calendarFilename):
|
if not os.path.isfile(calendarFilename):
|
||||||
return events
|
return events
|
||||||
|
|
||||||
calendarPostIds=[]
|
calendarPostIds=[]
|
||||||
recreateEventsFile=False
|
recreateEventsFile=False
|
||||||
with open(calendarFilename,'r') as eventsFile:
|
with open(calendarFilename,'r') as eventsFile:
|
||||||
|
|
Loading…
Reference in New Issue