Merge branch 'davical'

Geoffrey PREUD'HOMME
2 parents a3046d70 86487554
Showing 3 changed files with 53 additions and 23 deletions Show diff stats
config.sh.example
davical.sh
parse.py
@@ -0,0 +1,6 @@
+ANNEE=3
+EDT=groupe12
+CID=1234
+BASELINK='https://davserver.tld/'
+USERNAME=username
+PASSWORD='password'
@@ -0,0 +1,25 @@
+#/bin/env bash
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+source $DIR/config.sh
+
+COOKIES=$(mktemp)
+FILE=$(mktemp)
+
+$DIR/parse.py $ANNEE $EDT -o $FILE
+
+curl --data "username=$USERNAME&password=$PASSWORD" \
+    --cookie-jar $COOKIES \
+    $BASELINK/ > /dev/null
+
+curl -v \
+    -F "collection_id=$CID" \
+    -F "ics_file=@$FILE;type=text/calendar" \
+    -F "mode=off" \
+    -F "_editor_action[editor_1]=update" \
+    -F "submit=true" \
+    --cookie $COOKIES \
+    "$BASELINK/admin.php?action=edit&t=collection&id=$CID" > /dev/null
+
+rm $COOKIES $FILE
@@ -5,6 +5,7 @@ import sys
 import argparse
 import datetime
 import urllib.request
+import dateutil.parser
 from icalendar import Calendar
 from html.parser import HTMLParser
 from icalendar import vDatetime, Calendar, Event as CalEvent
@@ -37,7 +38,7 @@ elif args.annee == 4:
 else:
     raise ValueError('Année inconnue : ' + annee)
  
-DAYS_PER_WEEK = 6
+DAYS_PER_WEEK = 5.5
  
 TABLE_1_DATE_X = 1
 TABLE_1_FIRST_SLOT_X = 2
@@ -120,9 +121,6 @@ class TableHTMLParser(HTMLParser):
         if self.iscell():
             self.cell += data
  
-# TODO Use HTTP header date
-UPDATE_TIME = datetime.datetime.now()
-
 # TODO Do something that really is OOP or do not...
  
 class Event:
@@ -160,7 +158,7 @@ class Event:
         self.shortName = self.shortText
         self.longName = self.longText
  
-        if self.longName:
+        if self.shortName:
             self.active = True
  
         if self.date and isinstance(self.begSlot, int) and isinstance(self.endSlot, int):
@@ -198,11 +196,12 @@ class Event:
         e.add('dtstart', self.startTime)
         e.add('dtend', self.endTime)
         e.add('location', self.location)
-        e.add('last-modified', UPDATE_TIME)
-        e.add('dtstamp', UPDATE_TIME)
+        e.add('last-modified', updateTime)
+        e.add('dtstamp', updateTime)
         return e
  
 with urllib.request.urlopen(url) as handle:
+    updateTime = dateutil.parser.parse(handle.headers['Last-Modified'])
     htmlStr = handle.read().decode('iso-8859-15')
  
 # Read HTML tables
@@ -251,25 +250,24 @@ days = dict()
 # Parsing table 1
 for line in tables[0]:
     try:
-        day1date = datetime.datetime.strptime(line[TABLE_1_DATE_X], DATE_FORMAT)
+        date = datetime.datetime.strptime(line[TABLE_1_DATE_X], DATE_FORMAT)
     except (ValueError, TypeError):
         # This is not a date, no data to grab here
         continue
  
-    for day in range(DAYS_PER_WEEK):
-        date = day1date + datetime.timedelta(days=day)
+    for weekSlot in range(int(DAYS_PER_WEEK * len(SLOTS))):
+        daySlot = weekSlot % len(SLOTS)
+
+        # New day
+        if daySlot == 0:
+            if weekSlot != 0:
+                date = date + datetime.timedelta(days=1)
  
-        if date not in days:
-            days[date] = [Event() for s in range(len(SLOTS))]
+            if date not in days:
+                days[date] = [Event() for s in range(len(SLOTS))]
  
-        for slot in range(len(SLOTS)):
-            try:
-                cell = line[day * len(SLOTS) + slot + TABLE_1_FIRST_SLOT_X]
-            except IndexError:
-                # Out of the table: saturday afternoon
-                break
-            days[date][slot].feedShortText(cell)
-            continue
+        cell = line[TABLE_1_FIRST_SLOT_X + weekSlot]
+        days[date][daySlot].feedShortText(cell)
  
 # Parsing table 2
 for line in tables[1]:
@@ -291,13 +289,15 @@ for day in days:
     prevEvent = False
     for slot in range(len(SLOTS)):
         event = days[day][slot]
+        sameAsPrevious = False
         if prevEvent:
-            if prevEvent.longText == event.longText:
+            sameAsPrevious = event.longText == prevEvent.longText if prevEvent.longText else event.shortText == prevEvent.shortText
+            if sameAsPrevious:
                 prevEvent.feedEndSlot(slot)
             else:
                 prevEvent.endFeed()
                 events.append(prevEvent)
-        if not prevEvent or (prevEvent and prevEvent.longText != event.longText):
+        if not prevEvent or (prevEvent and not sameAsPrevious):
             event.feedDate(day)
             event.feedBegSlot(slot)
             event.feedEndSlot(slot)
@@ -320,7 +320,6 @@ if os.path.isfile(&#39;custom.py&#39;):
  
 for event in events:
     if event.active:
-        print(event, file=sys.stderr)
         cal.add_component(event.getEvent())
  
 # Writing calendar to file