Merge branch 'ag/parser' into futur

4 files changed, 86 insertions, 15 deletions

diff --git a/management/commands/__parsercommand.py b/management/commands/__parsercommand.py
new file mode 100644
index 0000000..99480cc
--- /dev/null
+++ b/management/commands/__parsercommand.py
@@ -0,0 +1,26 @@
+#    Copyright (C) 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
+#    by the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    celcatsanitizer 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with celcatsanitizer.  If not, see <http://www.gnu.org/licenses/>.
+
+from importlib import import_module
+
+from django.conf import settings
+
+DEFAULT_PARSER = "edt.management.parsers.ups2017"
+
+
+class ParserCommand:
+    def get_parser(self):
+        parser_module = getattr(settings, "CS_PARSER", DEFAULT_PARSER)
+        return getattr(import_module(parser_module), "Parser")
diff --git a/management/commands/printvalues.py b/management/commands/printvalues.py
new file mode 100644
index 0000000..91dd18b
--- /dev/null
+++ b/management/commands/printvalues.py
@@ -0,0 +1,45 @@
+#    Copyright (C) 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
+#    by the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    celcatsanitizer 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with celcatsanitizer.  If not, see <http://www.gnu.org/licenses/>.
+
+from django.core.management.base import BaseCommand
+
+from ...models import Source
+from .__parsercommand import ParserCommand
+
+import json
+
+
+class Command(BaseCommand, ParserCommand):
+    help = "List values from courses from a source"
+
+    def add_arguments(self, parser):
+        parser.add_argument("--source", type=int, nargs=1, required=True)
+        parser.add_argument("--limit", type=int, nargs=1)
+
+    def handle(self, *args, **options):
+        source = Source.objects.get(pk=options["source"][0])
+        parser = self.get_parser()(source)
+        events = [event for month in parser.get_source() for event in month]
+
+        i = 0
+        limit = len(events)
+        if options["limit"] is not None:
+            limit = min(options["limit"][0], limit)
+
+        while i < limit:
+            self.stdout.write(json.dumps(events[i], indent=4, sort_keys=True))
+            i += 1
+
+        self.stdout.write(self.style.SUCCESS("Done."))
diff --git a/management/commands/timetables.py b/management/commands/timetables.py
index ee33f7e..f71accf 100644
--- a/management/commands/timetables.py
+++ b/management/commands/timetables.py
@@ -1,4 +1,4 @@
-#    Copyright (C) 2017-2018  Alban Gruin
+#    Copyright (C) 2017-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
@@ -13,20 +13,16 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with celcatsanitizer.  If not, see <http://www.gnu.org/licenses/>.
 
-from importlib import import_module
-
 import datetime
 import traceback
 
-from django.conf import settings
 from django.core.management.base import BaseCommand
 from django.db import transaction
 from django.db.models import Min
 
 from ...models import Course, Source
 from ...utils import get_week, tz_now
-
-DEFAULT_PARSER = "edt.management.parsers.ups2017"
+from .__parsercommand import ParserCommand
 
 
 def delete_courses_in_week(source, year, week, today):
@@ -122,7 +118,7 @@ def process_timetable(source, force, parser_cls, year=None, weeks=None):
         process_timetable_week(source, force, parser)
 
 
-class Command(BaseCommand):
+class Command(BaseCommand, ParserCommand):
     help = "Fetches registered celcat timetables"
 
     def add_arguments(self, parser):
@@ -134,14 +130,10 @@ class Command(BaseCommand):
                             nargs="+")
         parser.add_argument("--year", type=int, nargs=1)
 
-    def __get_parser(self):
-        parser_module = getattr(settings, "CS_PARSER", DEFAULT_PARSER)
-        return getattr(import_module(parser_module), "Parser")
-
     def handle(self, *args, **options):
         year = None
         errcount = 0
-        parser = self.__get_parser()
+        parser = self.get_parser()
 
         if options["all"]:
             weeks = None
diff --git a/management/parsers/ups2018.py b/management/parsers/ups2018.py
index f1da5bf..afbfc4b 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,7 +26,7 @@ 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
 
@@ -114,7 +114,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
@@ -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: