Merge branch 'futur'

1 files changed, 18 insertions, 10 deletions

diff --git a/management/parsers/ups2018.py b/management/parsers/ups2018.py
index f1da5bf..ad8322c 100644
--- a/management/parsers/ups2018.py
+++ b/management/parsers/ups2018.py
@@ -1,4 +1,4 @@
-#    Copyright (C) 2018  Alban Gruin
+#    Copyright (C) 2018-2019  Alban Gruin
 #
 #    celcatsanitizer is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as published
@@ -26,12 +26,16 @@ from django.utils import timezone
 import lxml.html
 import requests
 
-from ...models import Course, Group, Room
+from ...models import Course, Group, Module, Room
 from ...utils import get_current_week, get_week
 from .abstractparser import AbstractParser, ParserError
 
 VARNAME = "v.events.list = "
 
+GROUP_PREFIXES = ("L1 ", "L2 ", "L3 ", "L3P ", "M1 ", "M2 ", "DEUST ", "MAG1 ",
+                  "1ERE ANNEE ", "2EME ANNEE ", "3EME ANNEE ",
+                  "MAT-Agreg Interne ")
+
 
 def find_events_list(soup):
     res = []
@@ -114,7 +118,8 @@ class Parser(AbstractParser):
             return
 
         course = Course.objects.create(
-            source=self.source, begin=begin, end=end
+            source=self.source, begin=begin, end=end,
+            celcat_id=int(event["id"])
         )
 
         min_i = 0
@@ -122,11 +127,7 @@ class Parser(AbstractParser):
             min_i = 1
 
         i = min_i
-        while i < len(data) and not data[i].startswith(
-                ("L1 ", "L2 ", "L3 ", "L3P ", "M1 ", "M2 ", "DEUST ", "MAG1 ",
-                 "1ERE ANNEE ", "2EME ANNEE ", "3EME ANNEE ",
-                 "MAT-Agreg Interne ")
-        ):
+        while i < len(data) and not data[i].startswith(GROUP_PREFIXES):
             i += 1
 
         groups = data[i]
@@ -136,6 +137,13 @@ class Parser(AbstractParser):
             # par un dictionnaire classique.
             names = OrderedDict.fromkeys(data[i - 1].split(';'))
             course.name = ", ".join(names.keys())
+
+            module_names = [t for t in event["tag"]
+                            if len(t) > 0 and
+                            any(n.startswith(t) for n in names.keys())]
+            if len(module_names) > 0:
+                module, _ = Module.objects.get_or_create(name=module_names[0])
+                course.module = module
         else:
             course.name = "Sans nom"
         if i - 2 >= min_i:
@@ -213,10 +221,10 @@ class Parser(AbstractParser):
         responses = yield from asyncio.gather(*futures)
         return responses
 
-    def get_source_from_months(self, async=True):
+    def get_source_from_months(self, asynchronous=True):
         events = []
 
-        if async:
+        if asynchronous:
             loop = asyncio.get_event_loop()
             events = loop.run_until_complete(self.get_months_async())
         else: