diff options
| author | Alban Gruin | 2019-02-13 19:59:07 +0100 | 
|---|---|---|
| committer | Alban Gruin | 2019-06-08 19:57:07 +0200 | 
| commit | 3786f8ac9be60d6f05a8281564270225b03f5326 (patch) | |
| tree | a66625096c767ef212bd79f09ab60c13f8c7d06d /management/commands | |
| parent | 44e17c23fc9285c24a0c1b3ea46e2ed27e55ae05 (diff) | |
commands: ajout d’un modèle abstrait de commande accédant au parseur
Pour les besoins de l’ajout de la notion de module, un nouvel outil
permettant de lister les attributs d’un cours sera rajouté.  À
l’instar de timetables, il fera aussi appel au parseur.  Pour éviter
de dupliquer du code, la partie accès au parseur est déplacé dans une
autre classe.
Signed-off-by: Alban Gruin <alban at pa1ch dot fr>
Diffstat (limited to 'management/commands')
| -rw-r--r-- | management/commands/__parsercommand.py | 26 | ||||
| -rw-r--r-- | management/commands/timetables.py | 16 | 
2 files changed, 30 insertions, 12 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/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  | 
