Merge branch 'main' of ssh://code.freedombone.net:2222/bashrc/epicyon

happening.py

@@ -9,13 +9,12 @@ __status__ = "Production"
 import os
 from uuid import UUID
 from datetime import datetime
+from datetime import timedelta
 
 from utils import isPublicPost
 from utils import loadJson
 from utils import saveJson
 from utils import locatePost
-from utils import daysInMonth
-from utils import mergeDicts
 
 
 def _validUuid(testUuid: str, version=4):
@@ -259,13 +258,12 @@ def getTodaysEvents(baseDir: str, nickname: str, domain: str,
     return events
 
 
-def todaysEventsCheck(baseDir: str, nickname: str, domain: str) -> bool:
+def dayEventsCheck(baseDir: str, nickname: str, domain: str, currDate) -> bool:
-    """Are there calendar events today?
+    """Are there calendar events for the given date?
     """
-    now = datetime.now()
+    year = currDate.year
-    year = now.year
+    monthNumber = currDate.month
-    monthNumber = now.month
+    dayNumber = currDate.day
-    dayNumber = now.day
 
     calendarFilename = \
         baseDir + '/accounts/' + nickname + '@' + domain + \
@@ -297,57 +295,12 @@ def todaysEventsCheck(baseDir: str, nickname: str, domain: str) -> bool:
                 eventTime = \
                     datetime.strptime(tag['startTime'],
                                       "%Y-%m-%dT%H:%M:%S%z")
-                if int(eventTime.strftime("%Y")) == year and \
+                if int(eventTime.strftime("%d")) != dayNumber:
-                   int(eventTime.strftime("%m")) == monthNumber and \
-                   int(eventTime.strftime("%d")) == dayNumber:
-                    eventsExist = True
-                    break
-
-    return eventsExist
-
-
-def thisWeeksEventsCheck(baseDir: str, nickname: str, domain: str) -> bool:
-    """Are there calendar events this week?
-    """
-    now = datetime.now()
-    year = now.year
-    monthNumber = now.month
-    dayNumber = now.day
-
-    calendarFilename = \
-        baseDir + '/accounts/' + nickname + '@' + domain + \
-        '/calendar/' + str(year) + '/' + str(monthNumber) + '.txt'
-    if not os.path.isfile(calendarFilename):
-        return False
-
-    eventsExist = False
-    with open(calendarFilename, 'r') as eventsFile:
-        for postId in eventsFile:
-            postId = postId.replace('\n', '').replace('\r', '')
-            postFilename = locatePost(baseDir, nickname, domain, postId)
-            if not postFilename:
                     continue
-
+                if int(eventTime.strftime("%m")) != monthNumber:
-            postJsonObject = loadJson(postFilename)
-            if not _isHappeningPost(postJsonObject):
                     continue
-
+                if int(eventTime.strftime("%Y")) != year:
-            for tag in postJsonObject['object']['tag']:
-                if not _isHappeningEvent(tag):
                     continue
-                # this tag is an event or a place
-                if tag['type'] != 'Event':
-                    continue
-                # tag is an event
-                if not tag.get('startTime'):
-                    continue
-                eventTime = \
-                    datetime.strptime(tag['startTime'],
-                                      "%Y-%m-%dT%H:%M:%S%z")
-                if (int(eventTime.strftime("%Y")) == year and
-                    int(eventTime.strftime("%m")) == monthNumber and
-                    (int(eventTime.strftime("%d")) > dayNumber and
-                     int(eventTime.strftime("%d")) <= dayNumber + 6)):
                 eventsExist = True
                 break
 
@@ -361,9 +314,9 @@ def getThisWeeksEvents(baseDir: str, nickname: str, domain: str) -> {}:
     Note: currently not used but could be with a weekly calendar screen
     """
     now = datetime.now()
+    endOfWeek = now + timedelta(7)
     year = now.year
     monthNumber = now.month
-    dayNumber = now.day
 
     calendarFilename = \
         baseDir + '/accounts/' + nickname + '@' + domain + \
@@ -388,7 +341,6 @@ def getThisWeeksEvents(baseDir: str, nickname: str, domain: str) -> {}:
                 continue
 
             postEvent = []
-            dayOfMonth = None
             weekDayIndex = None
             for tag in postJsonObject['object']['tag']:
                 if not _isHappeningEvent(tag):
@@ -401,21 +353,17 @@ def getThisWeeksEvents(baseDir: str, nickname: str, domain: str) -> {}:
                     eventTime = \
                         datetime.strptime(tag['startTime'],
                                           "%Y-%m-%dT%H:%M:%S%z")
-                    if (int(eventTime.strftime("%Y")) == year and
+                    if eventTime >= now and eventTime <= endOfWeek:
-                        int(eventTime.strftime("%m")) == monthNumber and
+                        weekDayIndex = (eventTime - now).days()
-                        (int(eventTime.strftime("%d")) >= dayNumber and
-                         int(eventTime.strftime("%d")) <= dayNumber + 6)):
-                        dayOfMonth = str(int(eventTime.strftime("%d")))
-                        weekDayIndex = dayOfMonth - dayNumber
                         postEvent.append(tag)
                 else:
                     # tag is a place
                     postEvent.append(tag)
             if postEvent and weekDayIndex:
                 calendarPostIds.append(postId)
-                if not events.get(dayOfMonth):
+                if not events.get(weekDayIndex):
                     events[weekDayIndex] = []
-                events[dayOfMonth].append(postEvent)
+                events[weekDayIndex].append(postEvent)
 
     # if some posts have been deleted then regenerate the calendar file
     if recreateEventsFile:
@@ -424,23 +372,6 @@ def getThisWeeksEvents(baseDir: str, nickname: str, domain: str) -> {}:
             calendarFile.write(postId + '\n')
         calendarFile.close()
 
-    lastDayOfMonth = daysInMonth(year, monthNumber)
-    if dayNumber+6 > lastDayOfMonth:
-        monthNumber += 1
-        if monthNumber > 12:
-            monthNumber = 1
-            year += 1
-        for d in range(1, dayNumber + 6 - lastDayOfMonth):
-            dailyEvents = \
-                getTodaysEvents(baseDir, nickname, domain,
-                                year, monthNumber, d)
-            if dailyEvents:
-                if dailyEvents.get(d):
-                    newEvents = {}
-                    newEvents[d + (7 - (dayNumber + 6 - lastDayOfMonth))] = \
-                        dailyEvents[d]
-                    events = mergeDicts(events, newEvents)
-
     return events
 
 

translations/ar.json

@@ -213,6 +213,7 @@
     "Sensitive": "حساس",
     "Word Replacements": "استبدال الكلمات",
     "Happening Today": "اليوم",
+    "Happening Tomorrow": "غدا",
     "Happening This Week": "هكذا",
     "Blog": "مدونة",
     "Blogs": "المدونات",

translations/ca.json

@@ -213,6 +213,7 @@
     "Sensitive": "Sensible",
     "Word Replacements": "Substitucions de paraula",
     "Happening Today": "Avui",
+    "Happening Tomorrow": "Demà",
     "Happening This Week": "Aviat",
     "Blog": "Bloc",
     "Blogs": "Blocs",

translations/cy.json

@@ -213,6 +213,7 @@
     "Sensitive": "Sensitif",
     "Word Replacements": "Amnewidiadau Geiriau",
     "Happening Today": "Heddiw",
+    "Happening Tomorrow": "Yfory",
     "Happening This Week": "Yn fuan",
     "Blog": "Blog",
     "Blogs": "Blogs",

translations/de.json

@@ -213,6 +213,7 @@
     "Sensitive": "Empfindlich",
     "Word Replacements": "Wortersetzungen",
     "Happening Today": "Heute",
+    "Happening Tomorrow": "Morgen",
     "Happening This Week": "Demnächst",
     "Blog": "Blog",
     "Blogs": "Blogs",

translations/en.json

@@ -213,6 +213,7 @@
     "Sensitive": "Sensitive",
     "Word Replacements": "Word Replacements",
     "Happening Today": "Today",
+    "Happening Tomorrow": "Tomorrow",
     "Happening This Week": "Soon",
     "Blog": "Blog",
     "Blogs": "Blogs",

translations/es.json

@@ -213,6 +213,7 @@
     "Sensitive": "Sensible",
     "Word Replacements": "Reemplazos de palabras",
     "Happening Today": "Hoy",
+    "Happening Tomorrow": "Mañana",
     "Happening This Week": "Pronto",
     "Blog": "Blog",
     "Blogs": "Blogs",

translations/fr.json

@@ -213,6 +213,7 @@
     "Sensitive": "Sensible",
     "Word Replacements": "Remplacements de mots",
     "Happening Today": "Aujourd'hui",
+    "Happening Tomorrow": "Demain",
     "Happening This Week": "Bientôt",
     "Blog": "Blog",
     "Blogs": "Blogs",

translations/ga.json

@@ -213,6 +213,7 @@
     "Sensitive": "Íogair",
     "Word Replacements": "Athchur Focal",
     "Happening Today": "Inniu",
+    "Happening Tomorrow": "Amárach",
     "Happening This Week": "Go gairid",
     "Blog": "Blag",
     "Blogs": "Blaganna",

translations/hi.json

@@ -213,6 +213,7 @@
     "Sensitive": "संवेदनशील",
     "Word Replacements": "शब्द प्रतिस्थापन",
     "Happening Today": "आज",
+    "Happening Tomorrow": "आने वाला कल",
     "Happening This Week": "जल्द ही",
     "Blog": "ब्लॉग",
     "Blogs": "ब्लॉग",

translations/it.json

@@ -213,6 +213,7 @@
     "Sensitive": "Sensibile",
     "Word Replacements": "Sostituzioni di parole",
     "Happening Today": "Oggi",
+    "Happening Tomorrow": "Domani",
     "Happening This Week": "Presto",
     "Blog": "Blog",
     "Blogs": "Blog",

translations/ja.json

@@ -213,6 +213,7 @@
     "Sensitive": "敏感",
     "Word Replacements": "単語の置換",
     "Happening Today": "今日",
+    "Happening Tomorrow": "明日",
     "Happening This Week": "すぐに",
     "Blog": "ブログ",
     "Blogs": "ブログ",

translations/ku.json

@@ -213,6 +213,7 @@
     "Sensitive": "Pêketî",
     "Word Replacements": "Veguheztinên Peyvan",
     "Happening Today": "Îro",
+    "Happening Tomorrow": "Sibê",
     "Happening This Week": "Nêzda",
     "Blog": "Blog",
     "Blogs": "Blogs",

translations/oc.json

@@ -208,7 +208,8 @@
     "Remove Twitter posts": "Remove Twitter posts",
     "Sensitive": "Sensitive",
     "Word Replacements": "Word Replacements",
-    "Happening Today": "Happening Today",
+    "Happening Today": "Today",
+    "Happening Tomorrow": "Tomorrow",
     "Happening This Week": "Soon",
     "Blog": "Blog",
     "Blogs": "Blogs",

translations/pt.json

@@ -213,6 +213,7 @@
     "Sensitive": "Sensível",
     "Word Replacements": "Substituições do Word",
     "Happening Today": "Hoje",
+    "Happening Tomorrow": "Amanhã",
     "Happening This Week": "Em breve",
     "Blog": "Blog",
     "Blogs": "Blogs",

translations/ru.json

@@ -213,6 +213,7 @@
     "Sensitive": "чувствительный",
     "Word Replacements": "Замены слов",
     "Happening Today": "Cегодня",
+    "Happening Tomorrow": "Завтра",
     "Happening This Week": "Скоро",
     "Blog": "Блог",
     "Blogs": "Блоги",

translations/zh.json

@@ -213,6 +213,7 @@
     "Sensitive": "敏感",
     "Word Replacements": "单词替换",
     "Happening Today": "今天",
+    "Happening Tomorrow": "明天",
     "Happening This Week": "不久",
     "Blog": "博客",
     "Blogs": "网志",

webapp_headerbuttons.py

@@ -10,8 +10,8 @@ __status__ = "Production"
 import os
 import time
 from datetime import datetime
-from happening import todaysEventsCheck
+from datetime import timedelta
-from happening import thisWeeksEventsCheck
+from happening import dayEventsCheck
 from webapp_utils import htmlHighlightLabel
 
 
@@ -152,9 +152,10 @@ def headerButtonsTimeline(defaultTimeline: str,
     # show todays events buttons on the first inbox page
     happeningStr = ''
     if boxName == 'inbox' and pageNumber == 1:
-        if todaysEventsCheck(baseDir, nickname, domain):
         now = datetime.now()
-
+        tomorrow = datetime.now() + timedelta(1)
+        twodays = datetime.now() + timedelta(2)
+        if dayEventsCheck(baseDir, nickname, domain, now):
             # happening today button
             if not iconsAsButtons:
                 happeningStr += \
@@ -171,23 +172,23 @@ def headerButtonsTimeline(defaultTimeline: str,
                     '<button class="button">' + \
                     translate['Happening Today'] + '</button></a>'
 
-            # happening this week button
+        elif dayEventsCheck(baseDir, nickname, domain, tomorrow):
-            if thisWeeksEventsCheck(baseDir, nickname, domain):
+            # happening tomorrow button
             if not iconsAsButtons:
                 happeningStr += \
-                        '<a href="' + usersPath + \
+                    '<a href="' + usersPath + '/calendar?year=' + \
-                        '/calendar" tabindex="-1">' + \
+                    str(tomorrow.year) + '?month=' + str(tomorrow.month) + \
+                    '?day=' + str(tomorrow.day) + '" tabindex="-1">' + \
                     '<button class="buttonevent">' + \
-                        translate['Happening This Week'] + '</button></a>'
+                    translate['Happening Tomorrow'] + '</button></a>'
             else:
                 happeningStr += \
-                        '<a href="' + usersPath + \
+                    '<a href="' + usersPath + '/calendar?year=' + \
-                        '/calendar" tabindex="-1">' + \
+                    str(tomorrow.year) + '?month=' + str(tomorrow.month) + \
+                    '?day=' + str(tomorrow.day) + '" tabindex="-1">' + \
                     '<button class="button">' + \
-                        translate['Happening This Week'] + '</button></a>'
+                    translate['Happening Tomorrow'] + '</button></a>'
-        else:
+        elif dayEventsCheck(baseDir, nickname, domain, twodays):
-            # happening this week button
-            if thisWeeksEventsCheck(baseDir, nickname, domain):
             if not iconsAsButtons:
                 happeningStr += \
                     '<a href="' + usersPath + \