From e30b0c673cae607175c5bae6df6e87d8b100bdf3 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sun, 24 Sep 2017 17:16:10 +0200
Subject: Suppression du modèle LastUpdate, utilisation du champ last_update à
 la place.

---
 management/commands/timetables.py | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'management/commands/timetables.py')

diff --git a/management/commands/timetables.py b/management/commands/timetables.py
index c82b0e4..45a57ee 100644
--- a/management/commands/timetables.py
+++ b/management/commands/timetables.py
@@ -17,20 +17,19 @@ from django.core.management.base import BaseCommand
 from django.db import transaction
 from django.utils import timezone
 
-from edt.models import Timetable, LastUpdate, Course
+from edt.models import Timetable, Course
+from edt.utils import get_week
 from ._private import delete_courses_in_week, get_events, get_update_date, get_weeks, get_xml
 
 import datetime
 
 @transaction.atomic
 def process_timetable_week(timetable, year, week, soup, weeks_in_soup):
-    last_update_date = None
+    begin, end = get_weeks(year, week)
+
+    last_update_date = Course.objects.filter(begin__gte=start, begin__lt=end).aggregate(Max("last_update"))["last_update__max"]
     new_update_date = get_update_date(soup)
-    try:
-        last_update = LastUpdate.objects.get(timetable=timetable, year=year, week=week)
-        last_update_date = last_update.updated_at
-    except:
-        last_update = LastUpdate(timetable=timetable, year=year, week=week)
+    updated_at = timezone.make_aware(datetime.datetime.now())
 
     if last_update_date is not None and new_update_date is not None and \
        last_update_date >= new_update_date:
@@ -43,6 +42,7 @@ def process_timetable_week(timetable, year, week, soup, weeks_in_soup):
         course.name = name
         course.type = type_
         course.notes = notes
+        course.updated_at = updated_at
 
         course.groups.add(*groups)
         if rooms is not None:
@@ -50,10 +50,6 @@ def process_timetable_week(timetable, year, week, soup, weeks_in_soup):
 
         course.save()
 
-    last_update.date = timezone.make_aware(datetime.datetime.now())
-    last_update.updated_at = new_update_date
-    last_update.save()
-
 def process_timetable(timetable, year, weeks):
     soup = get_xml(timetable.url)
     weeks_in_soup = get_weeks(soup)
-- 
cgit v1.2.1


From dc5618c3b3af18a5f6e1d50844097c745317125a Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sun, 24 Sep 2017 17:36:40 +0200
Subject: Ajout de la date et de l’heure automatiquement lors de la création
 d’un cours

---
 management/commands/timetables.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'management/commands/timetables.py')

diff --git a/management/commands/timetables.py b/management/commands/timetables.py
index 45a57ee..0716a91 100644
--- a/management/commands/timetables.py
+++ b/management/commands/timetables.py
@@ -15,6 +15,7 @@
 
 from django.core.management.base import BaseCommand
 from django.db import transaction
+from django.db.models import Max
 from django.utils import timezone
 
 from edt.models import Timetable, Course
@@ -27,9 +28,8 @@ import datetime
 def process_timetable_week(timetable, year, week, soup, weeks_in_soup):
     begin, end = get_weeks(year, week)
 
-    last_update_date = Course.objects.filter(begin__gte=start, begin__lt=end).aggregate(Max("last_update"))["last_update__max"]
+    last_update_date = Course.objects.filter(begin__gte=begin, begin__lt=end).aggregate(Max("last_update"))["last_update__max"]
     new_update_date = get_update_date(soup)
-    updated_at = timezone.make_aware(datetime.datetime.now())
 
     if last_update_date is not None and new_update_date is not None and \
        last_update_date >= new_update_date:
@@ -42,7 +42,6 @@ def process_timetable_week(timetable, year, week, soup, weeks_in_soup):
         course.name = name
         course.type = type_
         course.notes = notes
-        course.updated_at = updated_at
 
         course.groups.add(*groups)
         if rooms is not None:
-- 
cgit v1.2.1


From a4fbe45dcdc89dbcfe50afd5058b0ecf09ed7642 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sun, 24 Sep 2017 17:37:21 +0200
Subject: Suppression des import inutilisés

---
 management/commands/timetables.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'management/commands/timetables.py')

diff --git a/management/commands/timetables.py b/management/commands/timetables.py
index 0716a91..efdd611 100644
--- a/management/commands/timetables.py
+++ b/management/commands/timetables.py
@@ -19,7 +19,6 @@ from django.db.models import Max
 from django.utils import timezone
 
 from edt.models import Timetable, Course
-from edt.utils import get_week
 from ._private import delete_courses_in_week, get_events, get_update_date, get_weeks, get_xml
 
 import datetime
-- 
cgit v1.2.1


From 020d204d393ebf8c7f2bc9f6848cd4892b278f70 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sun, 24 Sep 2017 18:13:44 +0200
Subject: Récupération de la dernière mise à jour en filtrant par emploi du
 temps Changement de la valeur par défaut de last_update, qui posait problème
 get_week, pas get_weeks

---
 management/commands/timetables.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'management/commands/timetables.py')

diff --git a/management/commands/timetables.py b/management/commands/timetables.py
index efdd611..e136f53 100644
--- a/management/commands/timetables.py
+++ b/management/commands/timetables.py
@@ -19,15 +19,16 @@ from django.db.models import Max
 from django.utils import timezone
 
 from edt.models import Timetable, Course
+from edt.utils import get_week
 from ._private import delete_courses_in_week, get_events, get_update_date, get_weeks, get_xml
 
 import datetime
 
 @transaction.atomic
 def process_timetable_week(timetable, year, week, soup, weeks_in_soup):
-    begin, end = get_weeks(year, week)
+    begin, end = get_week(year, week)
 
-    last_update_date = Course.objects.filter(begin__gte=begin, begin__lt=end).aggregate(Max("last_update"))["last_update__max"]
+    last_update_date = Course.objects.filter(timetable=timetable, begin__gte=begin, begin__lt=end).aggregate(Max("last_update"))["last_update__max"]
     new_update_date = get_update_date(soup)
 
     if last_update_date is not None and new_update_date is not None and \
-- 
cgit v1.2.1


From aa7ccf13a8735f162e2ea859ad1d8ebe9f34f657 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Mon, 25 Sep 2017 16:08:01 +0200
Subject: Utilisation de pylint pour améliorer la qualité du code

---
 management/commands/timetables.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'management/commands/timetables.py')

diff --git a/management/commands/timetables.py b/management/commands/timetables.py
index e136f53..f01ac3c 100644
--- a/management/commands/timetables.py
+++ b/management/commands/timetables.py
@@ -13,6 +13,8 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with celcatsanitizer.  If not, see <http://www.gnu.org/licenses/>.
 
+import datetime
+
 from django.core.management.base import BaseCommand
 from django.db import transaction
 from django.db.models import Max
@@ -22,13 +24,15 @@ from edt.models import Timetable, Course
 from edt.utils import get_week
 from ._private import delete_courses_in_week, get_events, get_update_date, get_weeks, get_xml
 
-import datetime
-
 @transaction.atomic
 def process_timetable_week(timetable, year, week, soup, weeks_in_soup):
     begin, end = get_week(year, week)
 
-    last_update_date = Course.objects.filter(timetable=timetable, begin__gte=begin, begin__lt=end).aggregate(Max("last_update"))["last_update__max"]
+    last_update_date = Course.objects.filter(timetable=timetable,
+                                             begin__gte=begin,
+                                             begin__lt=end) \
+                                     .aggregate(Max("last_update")) \
+                                     ["last_update__max"]
     new_update_date = get_update_date(soup)
 
     if last_update_date is not None and new_update_date is not None and \
@@ -38,7 +42,9 @@ def process_timetable_week(timetable, year, week, soup, weeks_in_soup):
     delete_courses_in_week(timetable, year, week)
     for name, type_, groups, rooms, notes, begin, end in \
         get_events(timetable, year, week, soup, weeks_in_soup):
-        course = Course.objects.create(timetable=timetable, begin=begin, end=end)
+        course = Course.objects.create(timetable=timetable,
+                                       begin=begin,
+                                       end=end)
         course.name = name
         course.type = type_
         course.notes = notes
@@ -86,8 +92,9 @@ class Command(BaseCommand):
 
             try:
                 process_timetable(timetable, year, weeks)
-            except Exception as e:
-                self.stderr.write(self.style.ERROR("Failed to process {0}: {1}".format(timetable, e)))
+            except Exception as exc:
+                self.stderr.write(
+                    self.style.ERROR("Failed to process {0}: {1}".format(timetable, exc)))
                 errcount += 1
 
         if errcount == 0:
-- 
cgit v1.2.1


From a8d35aee63f073674993b8afde78a8d5c1517e05 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Fri, 29 Sep 2017 21:19:01 +0200
Subject: get_events() renvoie des objets Course au lieu d’un tuple de données.
 Ajout de commentaires dans la fonction get_events() Les paramètres year et
 week des fonctions get_events(), process_timetable_week() et
 process_timetable() sont maintenant optionnels.

---
 management/commands/timetables.py | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

(limited to 'management/commands/timetables.py')

diff --git a/management/commands/timetables.py b/management/commands/timetables.py
index f01ac3c..7ee63af 100644
--- a/management/commands/timetables.py
+++ b/management/commands/timetables.py
@@ -25,7 +25,7 @@ from edt.utils import get_week
 from ._private import delete_courses_in_week, get_events, get_update_date, get_weeks, get_xml
 
 @transaction.atomic
-def process_timetable_week(timetable, year, week, soup, weeks_in_soup):
+def process_timetable_week(timetable, soup, weeks_in_soup, year=None, week=None):
     begin, end = get_week(year, week)
 
     last_update_date = Course.objects.filter(timetable=timetable,
@@ -40,27 +40,18 @@ def process_timetable_week(timetable, year, week, soup, weeks_in_soup):
         return
 
     delete_courses_in_week(timetable, year, week)
-    for name, type_, groups, rooms, notes, begin, end in \
-        get_events(timetable, year, week, soup, weeks_in_soup):
-        course = Course.objects.create(timetable=timetable,
-                                       begin=begin,
-                                       end=end)
-        course.name = name
-        course.type = type_
-        course.notes = notes
-
-        course.groups.add(*groups)
-        if rooms is not None:
-            course.rooms.add(*rooms)
-
+    for course in get_events(timetable, soup, weeks_in_soup, year, week):
         course.save()
 
-def process_timetable(timetable, year, weeks):
+def process_timetable(timetable, year=None, weeks=None):
     soup = get_xml(timetable.url)
     weeks_in_soup = get_weeks(soup)
 
-    for week in weeks:
-        process_timetable_week(timetable, year, week, soup, weeks_in_soup)
+    if year is not None and weeks is not None:
+        for week in weeks:
+            process_timetable_week(timetable, soup, weeks_in_soup, year, week)
+    else:
+        process_timetable_week(timetable, soup, weeks_in_soup)
 
 
 class Command(BaseCommand):
-- 
cgit v1.2.1


From 8d7b9f5e9156e9153b6060a8a7a0c33b188f21b7 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Fri, 29 Sep 2017 21:39:13 +0200
Subject: Ajout d’une option pour récupérer tout un emploi du temps Pas encore
 testé parce que j’aime vivre dangereusement

---
 management/commands/timetables.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'management/commands/timetables.py')

diff --git a/management/commands/timetables.py b/management/commands/timetables.py
index 7ee63af..279de89 100644
--- a/management/commands/timetables.py
+++ b/management/commands/timetables.py
@@ -60,12 +60,15 @@ class Command(BaseCommand):
     def add_arguments(self, parser):
         parser.add_argument("--week", type=int, choices=range(1, 54), nargs="+")
         parser.add_argument("--year", type=int, nargs=1)
+        parser.add_argument("--all", const=True, default=False, action="store_const")
 
     def handle(self, *args, **options):
         year = None
         errcount = 0
 
-        if options["week"] is None:
+        if options["all"]:
+            weeks = None
+        elif options["week"] is None:
             _, week, day = timezone.now().isocalendar()
             if day >= 6:
                 year, week, _ = (timezone.now() + datetime.timedelta(weeks=1)).isocalendar()
@@ -73,10 +76,11 @@ class Command(BaseCommand):
         else:
             weeks = options["week"]
 
-        if options["year"] is None and year is None:
-            year = timezone.now().year
-        elif year is None:
-            year = options["year"][0]
+        if not options["all"]:
+            if options["year"] is None and year is None:
+                year = timezone.now().year
+            elif year is None:
+                year = options["year"][0]
 
         for timetable in Timetable.objects.all():
             self.stdout.write("Processing {0}".format(timetable))
-- 
cgit v1.2.1


From bb15653aecf1bd13fd892eb54d04c8f3e0fee270 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Fri, 29 Sep 2017 22:18:53 +0200
Subject: Ajout d’un paramètre à la commande timetables pour forcer la mise à
 jour

---
 management/commands/timetables.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'management/commands/timetables.py')

diff --git a/management/commands/timetables.py b/management/commands/timetables.py
index 279de89..c5c6dfa 100644
--- a/management/commands/timetables.py
+++ b/management/commands/timetables.py
@@ -25,7 +25,7 @@ from edt.utils import get_week
 from ._private import delete_courses_in_week, get_events, get_update_date, get_weeks, get_xml
 
 @transaction.atomic
-def process_timetable_week(timetable, soup, weeks_in_soup, year=None, week=None):
+def process_timetable_week(timetable, soup, weeks_in_soup, force, year=None, week=None):
     begin, end = get_week(year, week)
 
     last_update_date = Course.objects.filter(timetable=timetable,
@@ -35,7 +35,7 @@ def process_timetable_week(timetable, soup, weeks_in_soup, year=None, week=None)
                                      ["last_update__max"]
     new_update_date = get_update_date(soup)
 
-    if last_update_date is not None and new_update_date is not None and \
+    if not force and last_update_date is not None and new_update_date is not None and \
        last_update_date >= new_update_date:
         return
 
@@ -43,24 +43,25 @@ def process_timetable_week(timetable, soup, weeks_in_soup, year=None, week=None)
     for course in get_events(timetable, soup, weeks_in_soup, year, week):
         course.save()
 
-def process_timetable(timetable, year=None, weeks=None):
+def process_timetable(timetable, force, year=None, weeks=None):
     soup = get_xml(timetable.url)
     weeks_in_soup = get_weeks(soup)
 
     if year is not None and weeks is not None:
         for week in weeks:
-            process_timetable_week(timetable, soup, weeks_in_soup, year, week)
+            process_timetable_week(timetable, soup, weeks_in_soup, force, year, week)
     else:
-        process_timetable_week(timetable, soup, weeks_in_soup)
+        process_timetable_week(timetable, soup, weeks_in_soup, force)
 
 
 class Command(BaseCommand):
     help = "Fetches registered celcat timetables"
 
     def add_arguments(self, parser):
+        parser.add_argument("--all", const=True, default=False, action="store_const")
+        parser.add_argument("--force", const=True, default=False, action="store_const")
         parser.add_argument("--week", type=int, choices=range(1, 54), nargs="+")
         parser.add_argument("--year", type=int, nargs=1)
-        parser.add_argument("--all", const=True, default=False, action="store_const")
 
     def handle(self, *args, **options):
         year = None
@@ -86,7 +87,7 @@ class Command(BaseCommand):
             self.stdout.write("Processing {0}".format(timetable))
 
             try:
-                process_timetable(timetable, year, weeks)
+                process_timetable(timetable, options["force"], year, weeks)
             except Exception as exc:
                 self.stderr.write(
                     self.style.ERROR("Failed to process {0}: {1}".format(timetable, exc)))
-- 
cgit v1.2.1


From 7a34fc91521373dddacd1595354da53187d46a5d Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sat, 30 Sep 2017 16:30:21 +0200
Subject: Suppression de tous les cours d’un edt si jamais aucune semaine n’est
 fournie. Pas de filtre de début ou de fin dans le cas où aucune semaine n’est
 fournie. Changement du type d’aggrégation (minimum au lieu de maximum).

---
 management/commands/timetables.py | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'management/commands/timetables.py')

diff --git a/management/commands/timetables.py b/management/commands/timetables.py
index c5c6dfa..58c86fd 100644
--- a/management/commands/timetables.py
+++ b/management/commands/timetables.py
@@ -17,29 +17,35 @@ import datetime
 
 from django.core.management.base import BaseCommand
 from django.db import transaction
-from django.db.models import Max
+from django.db.models import Min
 from django.utils import timezone
 
-from edt.models import Timetable, Course
+from edt.models import Course, Timetable
 from edt.utils import get_week
 from ._private import delete_courses_in_week, get_events, get_update_date, get_weeks, get_xml
 
 @transaction.atomic
 def process_timetable_week(timetable, soup, weeks_in_soup, force, year=None, week=None):
-    begin, end = get_week(year, week)
-
-    last_update_date = Course.objects.filter(timetable=timetable,
-                                             begin__gte=begin,
-                                             begin__lt=end) \
-                                     .aggregate(Max("last_update")) \
-                                     ["last_update__max"]
+    criteria = {}
+    if year is not None and week is not None:
+        begin, end = get_week(year, week)
+        criteria["begin__gte"] = begin
+        criteria["begin__lt"] = end
+
+    last_update_date = Course.objects.filter(timetable=timetable, **criteria) \
+                                     .aggregate(Min("last_update")) \
+                                     ["last_update__min"]
     new_update_date = get_update_date(soup)
 
     if not force and last_update_date is not None and new_update_date is not None and \
        last_update_date >= new_update_date:
         return
 
-    delete_courses_in_week(timetable, year, week)
+    if year is not None and week is not None:
+        delete_courses_in_week(timetable, year, week)
+    else:
+        Course.objects.filter(timetable=timetable).delete()
+
     for course in get_events(timetable, soup, weeks_in_soup, year, week):
         course.save()
 
-- 
cgit v1.2.1


From be6f084c336e285652088fe2d86694b2645a0b93 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sat, 30 Sep 2017 16:34:58 +0200
Subject: On ne supprime pas les éléments plus anciens que ceux référencés par
 Celcat

---
 management/commands/timetables.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'management/commands/timetables.py')

diff --git a/management/commands/timetables.py b/management/commands/timetables.py
index 58c86fd..e82fd55 100644
--- a/management/commands/timetables.py
+++ b/management/commands/timetables.py
@@ -44,7 +44,8 @@ def process_timetable_week(timetable, soup, weeks_in_soup, force, year=None, wee
     if year is not None and week is not None:
         delete_courses_in_week(timetable, year, week)
     else:
-        Course.objects.filter(timetable=timetable).delete()
+        Course.objects.filter(timetable=timetable,
+                              begin__gte=min(weeks_in_soup.values())).delete()
 
     for course in get_events(timetable, soup, weeks_in_soup, year, week):
         course.save()
-- 
cgit v1.2.1


From f0c61f1a3a26f8c76f43b21f7860d83041b7fe89 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sun, 1 Oct 2017 16:44:53 +0200
Subject: Ajout d’une colonne pour stocker la date de dernière mise à jour

---
 management/commands/timetables.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'management/commands/timetables.py')

diff --git a/management/commands/timetables.py b/management/commands/timetables.py
index e82fd55..76f0a7c 100644
--- a/management/commands/timetables.py
+++ b/management/commands/timetables.py
@@ -50,6 +50,9 @@ def process_timetable_week(timetable, soup, weeks_in_soup, force, year=None, wee
     for course in get_events(timetable, soup, weeks_in_soup, year, week):
         course.save()
 
+    timetable.last_update_date = new_update_date
+    timetable.save()
+
 def process_timetable(timetable, force, year=None, weeks=None):
     soup = get_xml(timetable.url)
     weeks_in_soup = get_weeks(soup)
-- 
cgit v1.2.1