commit a67edce2809feaa2c78177b99a481e5990195286 Author: Klaus-Uwe Mitterer Date: Sat Apr 25 18:32:32 2020 +0200 Initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5267fe3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +swbus/settings.py +_pycache__ +*.pyc +migrations/ \ No newline at end of file diff --git a/collector/__init__.py b/collector/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/collector/admin.py b/collector/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/collector/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/collector/apps.py b/collector/apps.py new file mode 100644 index 0000000..6522bc5 --- /dev/null +++ b/collector/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class CollectorConfig(AppConfig): + name = 'collector' diff --git a/collector/management/commands/collectbusses.py b/collector/management/commands/collectbusses.py new file mode 100644 index 0000000..67b5ab8 --- /dev/null +++ b/collector/management/commands/collectbusses.py @@ -0,0 +1,64 @@ +from django.core.management.base import BaseCommand, CommandError +from django.utils.timezone import make_aware +from django.contrib.gis.geos import Point + +from collector.models import * + +from urllib.request import urlopen +from datetime import datetime + +import json + +class Command(BaseCommand): + help = "Fetches current bus location data and stores it to the database" + + def handle(self, *args, **options): + try: + positions = json.loads(urlopen("https://stadtwerke.24stundenonline.de/request.php?action=getpositions").read()) + except: + raise CommandError("Could not load bus positions from the Interwebz.") + + devices = [device["id"] for device in positions] + + try: + status = json.loads(urlopen("http://stadtwerke.24stundenonline.de/request.php?action=getfmsdata&deviceid=%s" % ",".join(devices)).read()) + except: + raise CommandError("Could not load bus status from the Interwebz.") + + values = [] + + statuskeys = { key.key: key for key in list(StatusKey.objects.all()) } + + for device in positions: + bus = Bus.objects.get_or_create(id=device["id"])[0] + locts = make_aware(datetime.fromtimestamp(device["unix_ts"])) + + try: + Location.objects.get(bus=bus, timestamp=locts) + continue + except Location.DoesNotExist: + metats = make_aware(datetime.strptime(status["ts"][device["id"]], "%Y-%m-%d %H:%M:%S")) + + try: + meta = Status.objects.get(bus=bus, timestamp=metats) + except: + try: + meta = Status(bus=bus, timestamp=metats) + meta.save() + except Exception as e: + raise CommandError("Could not create status object: " + repr(e)) + + for key, value in status["fields"][device["id"]].items(): + if not key in statuskeys.keys(): + statuskeys[key] = StatusKey.objects.create(key=key) + + okey = statuskeys[key] + values.append(StatusValue(status=meta, key=okey, value=value)) + + try: + location = Point(device["WE"], device["NS"]) + Location.objects.create(bus=bus, location=location, status=meta, timestamp=locts) + except Exception as e: + raise CommandError("Could not create location object: " + repr(e)) + + StatusValue.objects.bulk_create(values) \ No newline at end of file diff --git a/collector/models.py b/collector/models.py new file mode 100644 index 0000000..6e7d2f1 --- /dev/null +++ b/collector/models.py @@ -0,0 +1,34 @@ +from django.contrib.gis.db.models import Model, CharField, TextField, ForeignKey, DateTimeField, PointField, CASCADE + +# Create your models here. + +class Bus(Model): + id = CharField(max_length=255, primary_key=True) + +class Status(Model): + bus = ForeignKey(Bus, on_delete=CASCADE) + timestamp = DateTimeField() + + class Meta: + unique_together = [["bus", "timestamp"]] + +class StatusKey(Model): + key = CharField(max_length=255, primary_key=True) + +class StatusValue(Model): + key = ForeignKey(StatusKey, on_delete=CASCADE) + status = ForeignKey(Status, on_delete=CASCADE) + value = CharField(max_length=255) + + class Meta: + unique_together = [["key", "status"]] + +class Location(Model): + bus = ForeignKey(Bus, on_delete=CASCADE) + status = ForeignKey(Status, on_delete=CASCADE) + timestamp = DateTimeField() + location = PointField() + + class Meta: + unique_together = [["bus", "timestamp"]] + \ No newline at end of file diff --git a/collector/tests.py b/collector/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/collector/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/collector/views.py b/collector/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/collector/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/manage.py b/manage.py new file mode 100755 index 0000000..c68ad30 --- /dev/null +++ b/manage.py @@ -0,0 +1,21 @@ +#!/usr/bin/env python +"""Django's command-line utility for administrative tasks.""" +import os +import sys + + +def main(): + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'swbus.settings') + try: + from django.core.management import execute_from_command_line + except ImportError as exc: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) from exc + execute_from_command_line(sys.argv) + + +if __name__ == '__main__': + main() diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..d3e4ba5 --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +django diff --git a/swbus/__init__.py b/swbus/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/swbus/asgi.py b/swbus/asgi.py new file mode 100644 index 0000000..10f4bbd --- /dev/null +++ b/swbus/asgi.py @@ -0,0 +1,16 @@ +""" +ASGI config for swbus project. + +It exposes the ASGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/3.0/howto/deployment/asgi/ +""" + +import os + +from django.core.asgi import get_asgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'swbus.settings') + +application = get_asgi_application() diff --git a/swbus/settings.dist.py b/swbus/settings.dist.py new file mode 100644 index 0000000..b8838b9 --- /dev/null +++ b/swbus/settings.dist.py @@ -0,0 +1,121 @@ +""" +Django settings for swbus project. + +Generated by 'django-admin startproject' using Django 3.0.4. + +For more information on this file, see +https://docs.djangoproject.com/en/3.0/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/3.0/ref/settings/ +""" + +import os + +# Build paths inside the project like this: os.path.join(BASE_DIR, ...) +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = 'changeme' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', + 'collector', +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'swbus.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'swbus.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/3.0/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } +} + + +# Password validation +# https://docs.djangoproject.com/en/3.0/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/3.0/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/3.0/howto/static-files/ + +STATIC_URL = '/static/' diff --git a/swbus/urls.py b/swbus/urls.py new file mode 100644 index 0000000..b592788 --- /dev/null +++ b/swbus/urls.py @@ -0,0 +1,21 @@ +"""swbus URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/3.0/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: path('', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.urls import include, path + 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) +""" +from django.contrib import admin +from django.urls import path + +urlpatterns = [ + path('admin/', admin.site.urls), +] diff --git a/swbus/wsgi.py b/swbus/wsgi.py new file mode 100644 index 0000000..d27e7e8 --- /dev/null +++ b/swbus/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for swbus project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/3.0/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'swbus.settings') + +application = get_wsgi_application()