LICENSE

@@ -1,15 +0,0 @@
-    decal - a GNU cal-like program with CalDAV synchronization 
-    Copyright (C) 2022 Yessiest
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

README.md

@@ -7,14 +7,14 @@ This is a calendar app which tries to bring something new to the functionality o
 This project is currently very WIP, the todo list is:
 
 - [x] Basic decal functionality (receiving events and showing a tagged calendar)
-- [x] Event details
+- [ ] Event details
 - [ ] Creating events
 - [ ] Modifying events
 - [ ] Task lists
 - [ ] Task lists as calendar tags (maybe?)
 - [ ] Creating, modifying, removing, completing tasks
-- [x] Offline caching (partial)
-- [x] JSON export
+- [ ] Offline caching
+- [ ] JSON export
 
 # Dependencies
 ```

decal

@@ -1,8 +1,6 @@
 #!/usr/bin/python
-# if you're reading the source code for this (oof), feel free to suggest improvements for this, or, well, anything above or below this comment (as long as it's not just "rewrite this entire thing in C++ for me because i think python bad", "idk how but optimize stuff kthx". just don't be a dick, ok? thanks).
 import configparser
 import datetime
-from datetime import date, timedelta
 import calendar
 import caldav
 import argparse
@@ -13,7 +11,7 @@ Version = "%(prog)s 0.1"
 configpath = os.getenv("HOME")+"/.config/decal.conf"
 config.read(configpath)
 #define arguments
-today = date.today()
+today = datetime.date.today()
 parser = argparse.ArgumentParser(description="Cal with events.")
 parser.add_argument("year",
                     action="store",
@@ -43,12 +41,6 @@ parser.add_argument("--create",
 parser.add_argument("--calendar",
                     action="append",
                     help="Specify a calendar (or multiple calendars) to sync from")
-parser.add_argument("-d",
-                    action="store_true",
-                    help="Show event details for selected day")
-parser.add_argument("-m",
-                    action="store_true",
-                    help="Show event details for entire month")
 parser.add_argument("-1", 
                     action="store_true",
                     help="show only a single month (default)")
@@ -62,9 +54,6 @@ parser.add_argument("-n",
                     action="store",
                     type=int,
                     help="show n months")
-parser.add_argument("-s","--sync",
-                    action="store_true",
-                    help="sync the calendar cache")
 
 args = vars(parser.parse_args())
 
@@ -72,15 +61,14 @@ args = vars(parser.parse_args())
 if args["create"]:
     print("Not implemented")
     exit(0)
-
+if args["json"]:
+    print("Not implemented")
+    exit(0)
 #check some stuff, do some warnings, initiate the config, etc.
 if not os.path.exists(configpath):
     config['DEFAULT'] = {'uri': 'your caldav server here',
                          'user': 'your username here',
-                         'password': 'your pass here',
-                         'cache':os.getenv('HOME')+'/.cache/decal.json',
-                         'cacheEnabled':1,
-                         'syncAfter':1}
+                         'password': 'your pass here'}
     print("Creating an empty config in ~/.config/decal.conf")
     with open(configpath,'w') as configfile:
         config.write(configfile)
@@ -101,14 +89,17 @@ if config['DEFAULT']['uri'] == "your caldav server here":
 
 #generate the actual calendar, line by line, output an array of lines.
 #it works trust me, idk what is happening in this one but it works.
-def gencal(year,month,firstweekday=6,cell_modifier=lambda d: d,append_year=True):
+def gencal(year,month,start_on_sunday=True,cell_modifier=lambda d: d,append_year=True):
+    firstweekday = 0
+    if start_on_sunday:
+        firstweekday = 6
     cal = calendar.Calendar(firstweekday=firstweekday)
     lines = [""]*6
     monthstart = False
     counter = 0
-    for curdate in cal.itermonthdates(year,month):
+    for date in cal.itermonthdates(year,month):
         lines[counter//7]
-        day = str(curdate)[-2:]
+        day = str(date)[-2:]
         if day == "01":
             monthstart = not monthstart
         if monthstart:
@@ -117,11 +108,14 @@ def gencal(year,month,firstweekday=6,cell_modifier=lambda d: d,append_year=True)
             lines[counter//7] += "  "
         lines[counter//7] +=" "
         counter+=1
-    weeklines = ["Mo","Tu","We","Th","Fr","Sa","Su"]
-    for times in range(firstweekday):
-        weeklines.append(weeklines.pop(0))
-    lines.insert(0," ".join(weeklines)+" ")
-    lines.insert(0,date(year,month,1).strftime("%B %Y").center(21))
+    month = datetime.date(year,month,1).strftime("%B %Y")
+    padding = (21-len(month))//2
+    rpadding = 21%(padding+len(month)+padding)
+    if start_on_sunday:
+        lines.insert(0,"Su Mo Tu We Th Fr Sa ")
+    else:
+        lines.insert(0,"Mo Tu We Th Fr Sa Su ")
+    lines.insert(0,(" "*padding)+month+(" "*(padding+rpadding)))
     lines[-1] += " "*(21-len(lines[-1]))
     return lines
 
@@ -161,12 +155,12 @@ def span(year,month,offset):
 
 #get 2 date values - start value to scan from and end value to scan up to.
 def getbounds(y,m,offset):
-    start = date(y,m,1)
+    start = datetime.date(y,m,1)
     postnextmonth = span(y,m,offset)
     nextmonth = span(postnextmonth[0],postnextmonth[1],-1)
-    end = date(nextmonth[0],
-               nextmonth[1],
-               (date(postnextmonth[0],postnextmonth[1],1)-timedelta(days=1)).day)
+    end = datetime.date(nextmonth[0],
+                       nextmonth[1],
+                       (datetime.date(postnextmonth[0],postnextmonth[1],1)-datetime.timedelta(days=1)).day)
     return start,end
 
 # generator for year/month pairs
@@ -195,101 +189,57 @@ else:
     start,end = getbounds(args["year"],args["month"],1)
     offset = 1
 
+# connect to the DAV and receive calendars
+client = caldav.DAVClient(url = config['DEFAULT']['uri'],
+                          username = config['DEFAULT']['user'],
+                          password = config['DEFAULT']['password'])
+principal = client.principal()
+calendars = principal.calendars()
+
 # aggregate selected calendars
-def aggregateCalendars(calendars):
+if "calendars" in config['DEFAULT']:
     calendars2 = []
     cals = config['DEFAULT']["calendars"].split(",")
     for cal in calendars:
         if cal.name in cal:
             calendars2.append(cal)
-    return calendars2
+    calendars = calendars2
 
-def daysOfEvent(event):
-    event = event.vobject_instance.vevent.contents
-    curdate = event["dtstart"][0].value
-    enddate = event["dtend"][0].value
-    while curdate <= enddate:
-        if type(curdate) == datetime.datetime:
-            yield str(curdate.date())
-        else:
-            yield str(curdate)
-        curdate += timedelta(days=1)
-    return
-
-def jsonifyEvent(event):
-    event = event.vobject_instance.vevent.contents
-    evdata = {
-            "uid": event["uid"][0].value,
-            "dtstart": str(event["dtstart"][0].value),
-            "dtend": str(event["dtend"][0].value)
-    }
-    # may or may not be there, idk why. vobject format is really weird
-    for key in ["summary","description","status"]:
-        if key in event:
-            evdata[key] = event[key][0].value
-    return evdata
-
-def generateDateTree(calendars):
-    events = {}
-    for cal in calendars:
-        events_fetched = cal.date_search(start,end)
-        for event in events_fetched:
-            for date in daysOfEvent(event):
-                if not date in events:
-                    events[date] = []
-                events[date].append(jsonifyEvent(event))
-    return events
-
-cache = None
-if "cache" in config['DEFAULT']:
-    if os.path.exists(config['DEFAULT']['cache']):
-        with open(config['DEFAULT']['cache'],"r") as file:
-            cache = json.loads(file.read())
-
-def updateCriteria():
-    if not ("cacheEnabled" in config["DEFAULT"]):
-        return False
-    if (not (config['DEFAULT']["cacheEnabled"] == "1")):
-        return False
-    if not cache:
-        return True
-    date = datetime.datetime.strptime(cache["lastsync"],"%Y-%m-%d")
-    if args["sync"]:
-        return True
-    return (date.date() <= today - timedelta(days=int(config['DEFAULT']["syncAfter"])))
-
-#Update cache if update criteria are met.
-if updateCriteria():
-    # connect to the DAV and receive calendars
-    client = caldav.DAVClient(url = config['DEFAULT']['uri'],
-                              username = config['DEFAULT']['user'],
-                              password = config['DEFAULT']['password'])
-    principal = client.principal()
-    calendars = principal.calendars()
-    if "calendars" in config['DEFAULT']:
-        calendars = aggregateCalendars(calendars)
-    cache = generateDateTree(calendars)
-    cache["lastsync"] = str(today)
-    with open(config['DEFAULT']['cache'],"w") as file:
-        file.write(json.dumps(cache))
-events = cache
-
-if args["json"]:
-    print(json.dumps(events))
-    exit(0)
+# hooo boy, fun things start here.
+# we generate a dict of (year,month) pairs for easier indexing
+events = {}
+for ympair in ympairs((args['year'],args['month']),offset,dstart=args['3']):
+    events[ympair] = {}
+# next, we iterate over events in each calendar, sorting them the folliwng way:
+# events[(int year,int month)][int day] = [event event1, event event2, ...]
+# looks awful, is awful, overall i love this.
+for cal in calendars:
+    events_fetched = cal.date_search(start,end)
+    for event in events_fetched:
+        event = event.vobject_instance.vevent.contents
+        curdate = event["dtstart"][0].value + datetime.timedelta(days=-1)
+        while curdate < event["dtend"][0].value:
+            curdate += datetime.timedelta(days=1)
+            curdindex = (curdate.year,curdate.month)
+            if curdindex in events:
+                if not curdate.day in events[curdindex]:
+                    events[curdindex][curdate.day] = []
+                events[curdindex][curdate.day].append(event)
+            else:
+                break
+# if you're reading the source code for this (oof), feel free to suggest improvements for this, or, well, anything above or below this comment (as long as it's not just "rewrite this entire thing in C++ for me because i think python bad", "idk how but optimize stuff kthx". just don't be a dick, ok? thanks).
 
 # and now we're just generating calendar lines
 cal_prints = []
-selected_date = date(args['year'],args['month'],args['day'])
 for year,month in ympairs((args['year'],args['month']),offset,dstart=args['3']):
     # a function to colorize cells in a more or less generic way
     def lambdafunc(cell):
-        day = date(year,month,int(cell))
-        if str(day) in events:
-            event = events[str(day)]
-            uid = event[0]["uid"].encode()
+        day = int(cell)
+        if day in events[(year,month)]:
+            event = events[(year,month)][day]
+            uid = event[0]["uid"][0].value.encode()
             cell = colorize(cell,uid)
-        if day == selected_date:
+        if datetime.date(year,month,day) == datetime.date.today():
             cell = colorize(cell,"inverse")
         return cell
     cal_prints.append(gencal(year,
@@ -313,21 +263,3 @@ for count in range(3-(len(cal_prints)%3)):
 for cal in range(0,len(cal_prints),3):
     printlines(cal_prints[cal],cal_prints[cal+1],cal_prints[cal+2])
 
-
-def printDailyEvents(events,evtrack=[]):
-    for event in events:
-        if not event in evtrack:
-            uid = event["uid"].encode()
-            print(colorize(event["dtstart"]+" - "+event["dtend"],uid)+":\n- "+event["summary"])
-            evtrack.append(event)
-
-evtrack = []
-if args["d"]:
-    printDailyEvents(events[str(selected_date)],evtrack=evtrack)
-    exit(0)
-
-if args["m"]:
-    for day in range(*calendar.monthrange(args['year'],args['month'])):
-        key = str(date(args['year'],args['month'],day))
-        if key in events:
-            printDailyEvents(events[key],evtrack=evtrack)