aboutsummaryrefslogtreecommitdiff
path: root/management/commands/timetables.py
diff options
context:
space:
mode:
authorAlban Gruin2017-09-09 16:39:30 +0200
committerAlban Gruin2017-09-09 16:39:30 +0200
commit5c96538dfe708c4429d13397caedeb0b84a65b5a (patch)
tree855a9f31cb40a35805129d4f9edd3eac274cc11f /management/commands/timetables.py
parentab9df7a174e2debbf9c644c8ec3e2127eeeaa3cf (diff)
parent60ea5a0e2a5f61f7f764bcf01aafb362781c16da (diff)
Merge branch 'stable/0.9.z' into prod/pa1ch/0.y.z
Diffstat (limited to 'management/commands/timetables.py')
-rw-r--r--management/commands/timetables.py43
1 files changed, 25 insertions, 18 deletions
diff --git a/management/commands/timetables.py b/management/commands/timetables.py
index d596233..c82b0e4 100644
--- a/management/commands/timetables.py
+++ b/management/commands/timetables.py
@@ -1,32 +1,44 @@
# Copyright (C) 2017 Alban Gruin
#
-# celcatsanitizer is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# 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 General Public License for more details.
+# GNU Affero General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along
-# with celcatsanitizer; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# 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 django.db import transaction
from django.utils import timezone
-from edt.models import Timetable, LastUpdate, Course
-from ._private import delete_courses_in_week, get_events, get_weeks, get_xml
+from edt.models import Timetable, LastUpdate, Course
+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
+ 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)
+
+ if 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)
- for name, type_, groups, rooms, notes, begin, end in get_events(timetable, year, week, soup, weeks_in_soup):
+ 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_
@@ -38,14 +50,9 @@ def process_timetable_week(timetable, year, week, soup, weeks_in_soup):
course.save()
- date = timezone.make_aware(datetime.datetime.now())
- try:
- last_update = LastUpdate.objects.get(timetable=timetable, year=year, week=week)
- last_update.date = date
- except:
- last_update = LastUpdate(timetable=timetable, year=year, week=week, date=date)
- finally:
- last_update.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)