diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..d30ebd5 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,8 @@ +*.example +.dockerignore +.git +.gitignore +Dockerfile +README.md +__pycache__ +docker-compose.yml diff --git a/.gitignore b/.gitignore index 789cefa..935cc0f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ -db.sqlite3 *.pyc +.env.* +__pycache__ +db.sqlite3 eve_data/*.yaml -dscantool/settings.py \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..d5e1b65 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,96 @@ +### BUILDER + +FROM python:3.9-alpine as builder + +ENV PYTHONDONTWRITEBYTECODE 1 +ENV PYTHONUNBUFFERED 1 + +WORKDIR /usr/src/main + +COPY ./requirements.txt . + +RUN set -eux; \ + apk add \ + gcc \ + libc-dev \ + libffi-dev \ + postgresql-dev \ + python3-dev \ + musl-dev \ + ; \ + pip wheel --no-cache-dir --no-deps --wheel-dir /usr/src/main/wheels -r requirements.txt + +### FINAL + +FROM python:3.9-alpine + +ENV DSCAN_HOME_DIR ${DSCAN_HOME_DIR:-/dscantool} +ENV DSCAN_WORK_DIR $DSCAN_HOME_DIR/app +ENV DSCAN_STATIC_DIR $DSCAN_HOME_DIR/static +ENV DSCAN_GROUP ${DSCAN_GROUP:-dscantool} +ENV DSCAN_GID ${DSCAN_GID:-10000} +ENV DSCAN_USER ${DSCAN_USER:-dscantool} +ENV DSCAN_UID ${DSCAN_UID:-10000} +ENV DSCAN_PORT ${DSCAN_PORT:-8000} +ENV GOSU_VERSION 1.16 + +WORKDIR $DSCAN_WORK_DIR + +COPY --from=builder /usr/src/main/wheels /wheels +COPY --from=builder /usr/src/main/requirements.txt . +COPY . $DSCAN_WORK_DIR + +# Install gosu +RUN set -eux; \ + \ + apk add --no-cache --virtual .gosu-deps \ + ca-certificates \ + dpkg \ + gnupg \ + ; \ + \ + dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \ + wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \ + wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \ + \ +# verify the signature + export GNUPGHOME="$(mktemp -d)"; \ + gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \ + gpgconf --kill all; \ + rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \ + \ +# clean up fetch dependencies + apk del --no-network .gosu-deps; \ + \ + chmod +x /usr/local/bin/gosu; \ +# verify that the binary works + gosu --version; \ + gosu nobody true + +# Install dscantool +RUN \ + set -eux; \ + mkdir -p $DSCAN_WORK_DIR; \ + mkdir -p $DSCAN_STATIC_DIR; \ + addgroup -g $DSCAN_GID $DSCAN_GROUP; \ + adduser -u $DSCAN_UID -h $DSCAN_HOME_DIR -G $DSCAN_GROUP -D $DSCAN_USER; \ + apk add libpq tini; \ + pip install --no-cache /wheels/*; \ + chmod +x $DSCAN_WORK_DIR/run.sh; \ + chown -R $DSCAN_USER:$DSCAN_GROUP $DSCAN_HOME_DIR + +# Get the EVE Static Data Export (SDE) +RUN \ + set -eux; \ + wget https://eve-static-data-export.s3-eu-west-1.amazonaws.com/tranquility/sde.zip; \ + unzip sde.zip; \ + for f in `find sde -iname "groupIDs.yaml"`; do cp $f ./eve_data/; done; \ + for f in `find sde -iname "typeIDs.yaml"`; do cp $f ./eve_data/; done; \ + rm -rf sde* + +EXPOSE $DSCAN_PORT +VOLUME $DSCAN_STATIC_DIR +ENTRYPOINT ["tini", "--"] + +CMD ["./run.sh"] diff --git a/README.md b/README.md index 18cdaaf..f049234 100644 --- a/README.md +++ b/README.md @@ -1,26 +1,54 @@ # Nimos' Intel Tool -Nimos' Intel Tool is a web application that parses DScans and local scans from the game Eve Online. +Nimos' Intel Tool is a web application that parses DScans and local scans from the game Eve Online. I made it because my previous favorite Intel Tool dscan.me shut down and I wanted another one with a dark theme. +## Standalone installation + +(I have not tested this method) -## Installation 1. Clone this repository -2. Install requirements with `pip3 install -r requirements.txt` or from another source of your liking -3. Edit `dscan/settings.py` to your liking -4. Install database with `python3 manage.py migrate` +2. Install requirements with `pip install -r requirements.txt` or from another source of your liking +3. Edit `dscantool/settings.py` to your liking +4. Install database with `python manage.py migrate` +5. Generate static files `python manage.py collectstatic --noinput` + +### Optional: Import Type information from SDE -## Optional: Import Type information from SDE Note: Nimos' Intel Tool pulls all missing type information from ESI when needed. When starting out with an empty cache that can make the first scans take a couple of seconds to parse, but once a ship type is cached it won't be requested again. You can import all ship type information from SDE to "seed" the cache, but doing so is optional and the script is no longer maintained. Use at your own discretion or feel free to import the SDE another way. 1. Get the EVE Static Data Export (SDE) from https://developers.eveonline.com/resource/resources -2. Extract `groupIDs.yaml` and `typeIDs.yaml` from the SDE into eve_data -3. Run `python3 manage.py import_types` - +2. Extract `groupIDs.yaml` and `typeIDs.yaml` from the SDE into `eve_data` +3. Run `python manage.py import_sde` + +## Docker installation + +### Environment Variables + +| Variable | Default | Dscription | +|----------------------|-------------------------------------------------------|------------| +|`DSCAN_SECRET_KEY` |`&f8lk5k-b$^)-sdfij8gu9df7g9aa2zagdfh8iooijioukhrs_` |A secret key for a particular Django installation.| +|`DSCAN_ALLOWED_HOST` |`dscan.nimos.ws` |String representing the host/domain name that this Django site can serve.| +|`DSCAN_DB_ENGINE` |`django.db.backends.postgresql` |The database backend to use. The built-in database backends are: `django.db.backends.postgresql`, `django.db.backends.mysql`, `django.db.backends.sqlite3`, `django.db.backends.oracle`| +|`DSCAN_DB_NAME` |`dscantool` |The name of the database to use.| +|`DSCAN_DB_USER` |`dscantool` |The username to use when connecting to the database.| +|`DSCAN_DB_PASSWORD` |`dscantool` |The password to use when connecting to the database.| +|`DSCAN_DB_HOST` |`127.0.0.1` |Which host to use when connecting to the database.| +|`DSCAN_DB_PORT` |`5432` |The port to use when connecting to the database.| +|`DSCAN_LANGUAGE_CODE` |`en-us` |A string representing the language code for this installation.| +|`DSCAN_STATIC_URL` |`/static/` |URL to use when referring to static files located in `DSCAN_STATIC_ROOT`.| +|`DSCAN_STATIC_ROOT` |`/dscantool/static/` |The absolute path to the directory where collectstatic will collect static files for deployment.| +|`DSCAN_SITE_NAME` |`Nimos' Intel Tools` |The site name.| +|`DSCAN_EVE_IMAGE_URL` |`https://image.eveonline.com` |Link to EVE Online image server.| +|`DSCAN_REPOSITORY_URL`|`https://github.com/nimos/dscantool` |Link to development repository.| +|`DSCAN_ZKILLBOARD_URL`|`https://zkillboard.com` |Link to zKillboard.| +|`DSCAN_DOTLAN_URL` |`https://evemaps.dotlan.net` |Link to Dotlan.| +|`DSCAN_FEEDBACK` |`Brought to you by Nimos Endashi • Discord: Nimos#4951`|Feedback information.| ## Notes + This is just a little 2-day project, so don't expect the sleekest code. This tool relies heavily on caching. The first few scans will be slow until the database has seen most ship types and corporations, after a couple of scans performance should increase significantly. The up-side is that you never have to update the static data like you have to for many other EVE tools. -This tool has been tested with MySQL and SQLite. Feel free to use other database backends, but they might require minor fixes. When using MySQL, make sure your tables (specifically the dscan_scan and esi_invtype) use the 'utf8mb4' encoding. Otherwise it will error out trying to save certain characters. \ No newline at end of file +This tool has been tested with MySQL and SQLite. Feel free to use other database backends, but they might require minor fixes. When using MySQL, make sure your tables (specifically the `dscan_scan` and `esi_invtype`) use the 'utf8mb4' encoding. Otherwise it will error out trying to save certain characters. diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..6342d7c --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,55 @@ +version: '3.9' + +# +# !!! ATTENTION !!! +# It doesn't work. +# Use it as an example. +# + +networks: + front: + dscan: + +services: + + nginx: + image: "nginx:alpine" + container_name: nginx + restart: always + volumes: + - ./dscan/dscantool/static:/dscantool/static + ports: + - 80:80 + networks: + - front + + dscan: + build: + context: ./ + dockerfile: Dockerfile + container_name: dscan + restart: always + environment: + - DSCAN_ALLOWED_HOST=dscan.localdomain + - DSCAN_DB_HOST=dscan_postgres + volumes: + - ./dscan/dscantool/static:/dscantool/static + depends_on: + - dscan_postgres + networks: + - front + - dscan + logging: *default-logging + + dscan_postgres: + image: "postgres:15-alpine" + container_name: dscan_postgres + restart: always + environment: + - POSTGRES_DB=dscantool + - POSTGRES_USER=dscantool + - POSTGRES_PASSWORD=dscantool + networks: + - dscan + volumes: + - ./dscan/postgres/data:/var/lib/postgresql/data diff --git a/dscan/templates/about.html b/dscan/templates/about.html index b342555..90a2e0e 100644 --- a/dscan/templates/about.html +++ b/dscan/templates/about.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% block title %}- About{%endblock title %} +{% block title %}About | {{site_name}}{%endblock title %} {% block content %}
@@ -25,9 +25,8 @@

License

GNU Affero General Public License for more details.

- The full license can be found here. + The full license can be found here.

{% endblock content %} - diff --git a/dscan/templates/base.html b/dscan/templates/base.html index ac07a81..27dbccc 100644 --- a/dscan/templates/base.html +++ b/dscan/templates/base.html @@ -5,11 +5,8 @@ - - + + {% if debug %} @@ -17,7 +14,7 @@ {% else %} {% endif %} - {% block title %}Nimos' Intel Tool{% endblock title %} + {% block title %}{{site_name}}{% endblock title %} {% block meta %} {% endblock meta %} @@ -26,14 +23,9 @@ {% endblock content %} -
+
-
-
- Brought to you by Nimos Endashi • Discord: Nimos#4951
- All Eve Related Materials are property of CCP Games • Released under AGPL3 • Github -
-
+
  • L: {{stats.l}} / D: {{stats.d}}
    • @@ -42,14 +34,20 @@
+
+
+ {{feedback}}
+ All Eve Related Materials are property of CCP Games • Released under AGPL3 • Github +
+
{% if debug %} {% endif %} - - + + {% block scripts %} {% endblock %} - + diff --git a/dscan/templates/dscan.html b/dscan/templates/dscan.html index f2aed51..ae6001d 100644 --- a/dscan/templates/dscan.html +++ b/dscan/templates/dscan.html @@ -3,31 +3,28 @@ {% block meta %} - - + + {% endblock meta %} {% block title %} - D-Scan {{token}} - Nimos' Intel Tools + D-Scan {{token}} | {{site_name}} {% endblock title %} {% block content %}
- - Home > Directional Scan + + Home > Directional Scan [{{token}}] / Created {{created|date:"M d, Y - H:i:s"}} ({{ created|timesince }} ago) - Solar System: {% if solarSystem %} - {{solarSystem}} - - - {%else%} - Unknown + Solar System: + {{solarSystem}} + + {%endif%}
@@ -55,7 +52,7 @@ {{group.count}}{{group.name}} - {% endfor %} + {% endfor %}
@@ -86,4 +83,4 @@ }) -{% endblock scripts %} \ No newline at end of file +{% endblock scripts %} diff --git a/dscan/templates/landing.html b/dscan/templates/landing.html index e8f95f6..f2d08cf 100644 --- a/dscan/templates/landing.html +++ b/dscan/templates/landing.html @@ -5,12 +5,11 @@
-

Nimos' Intel Tool

+

{{site_name}}

-
-
+
{% if error %} {% autoescape off %}
{{error|safe}}
@@ -19,11 +18,11 @@

Nimos' Intel Tool

Paste Anything
{% csrf_token %} - +
-
+

What's this?

This is an intel tool. There's many like it, but this one is mine and it has a dark theme.

Currently it supports parsing of both local scans and dscans.

@@ -39,4 +38,4 @@

What's this?

$('.content').addClass('loading') }) -{% endblock scripts %} \ No newline at end of file +{% endblock scripts %} diff --git a/dscan/templates/localscan.html b/dscan/templates/localscan.html index 1e1d4d8..c4f1a53 100644 --- a/dscan/templates/localscan.html +++ b/dscan/templates/localscan.html @@ -3,13 +3,12 @@ {% block meta %} - + {% endblock meta %} {% block title %} - Local Scan {{token}} - Nimos' Intel Tools + Local Scan {{token}} | {{site_name}} {% endblock title %} {% block content %} @@ -29,7 +28,7 @@ {% for alliance in data.alliances %} [{{alliance.ticker}}] - {{alliance.name}} + {{alliance.name}} {{alliance.count}} {% endfor %} @@ -46,11 +45,11 @@ {% if corp.alliance == -1 %} [{{corp.ticker}}] - {{corp.name}} + {{corp.name}} {{corp.count}} {% endif %} - {% endfor %} + {% endfor %}
@@ -64,11 +63,11 @@ {% if corp.alliance != -1 %} [{{corp.ticker}}] - {{corp.name}} + {{corp.name}} {{corp.count}} - {% endif %} - {% endfor %} + {% endif %} + {% endfor %}
@@ -99,4 +98,4 @@ }) -{% endblock scripts %} \ No newline at end of file +{% endblock scripts %} diff --git a/dscan/views.py b/dscan/views.py index fc1b372..41f1a14 100644 --- a/dscan/views.py +++ b/dscan/views.py @@ -1,384 +1,384 @@ -from django.shortcuts import render, redirect, get_object_or_404 -from django.http import HttpResponse -from esi.models import InvType, InvGroup -from django.conf import settings -from secrets import token_urlsafe -import re, json -from dscan.models import Scan, Corporation, Alliance -from esi.api import esiRequest -from django.utils.html import escape - - -# Create your views here. -def landing(request): - return render(request, "landing.html") - -def parse(request): - if request.method != "POST": - return landing(request) - - data = request.POST.get("data", None) - - if not data or data == "": - return render(request, "landing.html", {"error": "Error: No Data submitted"}) - - # Remove \r - data = data.replace("\r", "") - data = data.split("\n") - if "\t" in data[0]: - return _parse_dscan(request, data) - else: - return _parse_local(request, data) - - -def _parse_dscan(request, scan_data): - - # Parse input and count ships - shipCount = {} - solarSystem = None - - solarSystemIdentifierTypes = InvType.objects.filter(group_id__in=settings.SOLAR_SYSTEM_IDENTIFIERS).values_list("typeID", flat=True) - - # Parse Raw Data - for line in scan_data: - line = line.split("\t") - try: - line[0] = int(line[0]) - except: - continue - - if not shipCount.get(line[0], False): - shipCount[line[0]] = 1 - else: - shipCount[line[0]] += 1 - - # Detect solar system - if not solarSystem and line[0] in solarSystemIdentifierTypes: - # Format for citadels and other structures - matches = re.match(r'([A-z0-9\- ]+?) -', line[1]) - if matches: - solarSystem = matches.group(1) - - # Format for planets, moons and belts - matches = re.match(r'([A-z0-9\- ]+) [XVI]+', line[1]) - if matches: - solarSystem = matches.group(1) - - # Format for Customs Offices - matches = re.match(r'Customs Office \(([A-z0-9\- ]+) [XVI]+\)', line[1]) - if matches: - solarSystem = matches.group(1) - - # Get item type information from cache - typeIDs = list(shipCount.keys()) - cachedTypes = InvType.objects.filter(typeID__in=typeIDs) - - # Figure out what's missing - cachedIDs = set(cachedTypes.values_list("typeID", flat=True)) - missingIDs = list(set(typeIDs)-cachedIDs) - - if missingIDs: - # Get missing IDs from ESI - newTypes = [] - newGroups = [] - for typeID in missingIDs: - try: - result = esiRequest('/universe/types/'+str(typeID)+'/') - - # Create DB object for type - invType = InvType(typeID=typeID) - invType.typeName = result["name"] - invType.group_id = result["group_id"] - - newTypes.append(invType) - - # Check if we need to fetch group information too - if not InvGroup.objects.filter(groupID=invType.group_id).exists(): - result = esiRequest('/universe/groups/'+str(invType.group_id)+'/') - - invGroup = InvGroup(groupID=result["group_id"]) - invGroup.groupName = result["name"] - invGroup.categoryID = result["category_id"] - - invGroup.save() - - except Exception as e: - # To avoid malicious users making us spam ESI calls with invalid typeIDs we'll abort after the first error - print("Parse Error:", e) - return render(request, "landing.html", {"error": "Something's wrong with your dscan data: Error retrieving type info for typeID "+str(typeID)}) - - # Save new objects - InvType.objects.bulk_create(newTypes) - - # Get a fresh queryset with the new types - cachedTypes = InvType.objects.filter(typeID__in=typeIDs) - - - ships = [] - groupCount = {} - for ship in cachedTypes: - ships.append({"name": ship.typeName, "count": shipCount[ship.typeID], "group": ship.group_id, "category": ship.group.categoryID}) - - if not groupCount.get(ship.group_id, False): - groupCount[ship.group_id] = shipCount[ship.typeID] - else: - groupCount[ship.group_id] += shipCount[ship.typeID] - - # Sum up groups and add group information - groupIDs = list(groupCount.keys()) - invGroups = InvGroup.objects.filter(groupID__in=groupIDs) - groups = [] - for invGroup in invGroups: - groups.append({"id": invGroup.groupID, "name": invGroup.groupName, "count": groupCount[invGroup.groupID], "category": invGroup.categoryID}) - - - # Sort by how many of each they are - groups = sorted(groups, key=lambda g: g["count"], reverse=True) - ships = sorted(ships, key=lambda g: g["count"], reverse=True) - - # Sort everything into preset categories - categories = {"ships": {}, "groups": {}} - summary = [] - - for ship in ships: - default = True - for category in settings.DSCAN_CATEGORIES: - if ship["group"] in settings.DSCAN_CATEGORIES[category]["groups"] or ship["category"] in settings.DSCAN_CATEGORIES[category]["categories"]: - if not categories["ships"].get(category, False): - categories["ships"][category] = [[], 0] - categories["ships"][category][0].append(ship) - categories["ships"][category][1] += ship["count"] - default = False - if default: - if not categories["ships"].get("Ships", False): - categories["ships"]["Ships"] = [[], 0] - categories["ships"]["Ships"][0].append(ship) - categories["ships"]["Ships"][1] += ship["count"] - - if ship["category"] == 6: - summary.append(ship) - - for group in groups: - default = True - for category in settings.DSCAN_CATEGORIES: - if group["id"] in settings.DSCAN_CATEGORIES[category]["groups"] or group["category"] in settings.DSCAN_CATEGORIES[category]["categories"]: - if not categories["groups"].get(category, False): - categories["groups"][category] = [] - categories["groups"][category].append(group) - default = False - if default: - if not categories["groups"].get("Ships", False): - categories["groups"]["Ships"] = [] - categories["groups"]["Ships"].append(group) - - - # Prepare summary for meta tags - totalCount = 0 - for ship in summary: - totalCount += ship["count"] - - summaryText = "" - for ship in summary[0:3]: - summaryText += str(ship["count"]) + " " + ship["name"] + "\n" - - if totalCount > 0: - summaryText += "("+str(totalCount)+" total)" - - # Prepare data for template - result = [] - for category in settings.CATEGORY_ORDER: - if categories["ships"].get(category, False): - result.append((category, categories["ships"][category], categories["groups"][category])) - - token = token_urlsafe(6)[:6] - while Scan.objects.filter(token=token).exists(): - token = token_urlsafe(6)[:6] - - savedScan = Scan(token=token, data=json.dumps(result), solarSystem=solarSystem, type=Scan.DSCAN, summaryText=summaryText, raw="\n".join(scan_data)) - savedScan.save() - - - return redirect("dscan:show", token=token) - -# Parse a local list -def _parse_local(request, scan_data): - # Convert to set to remove duplicates - data = list(set(scan_data)) - - # Remove empty lines - data = [x for x in data if x != ''] - - n = 0 - affiliations = [] - while 500*n <= len(data): - - ids = esiRequest('/universe/ids/', data[500*n:500*(n+1)]) - - if not ids.get("characters", False): - return render(request, "landing.html", {"error": "Error: Didn't detect any valid characters in this local."}) - - ids = [c["id"] for c in ids["characters"]] - affiliations += esiRequest('/characters/affiliation/', ids) - - n += 1 - - - # Count - corps = {} - alliances = {} - for character in affiliations: - character["alliance_id"] = character.get("alliance_id", -1) - - try: - corps[character["corporation_id"]]["count"] += 1 - except: - corps[character["corporation_id"]] = {"alliance": character["alliance_id"]} - corps[character["corporation_id"]]["count"] = 1 - - try: - alliances[character["alliance_id"]]["count"] += 1 - except: - alliances[character["alliance_id"]] = {"count": 1} - - - # Get names and tickers - result = {"corps": [], "alliances": []} - - # Get cached names from DB - corpIDs = list(corps.keys()) - cachedCorps = Corporation.objects.filter(corporationID__in=corpIDs) - - for corp in cachedCorps: - corps[corp.corporationID]["name"] = corp.name - corps[corp.corporationID]["ticker"] = corp.ticker - corps[corp.corporationID]["id"] = corp.corporationID - - result["corps"].append(corps[corp.corporationID]) - - - # Check which corps we need to get from ESI - cachedIDs = set(cachedCorps.values_list("corporationID", flat=True)) - missingIDs = list(set(corpIDs)-cachedIDs) - - - # Get missing corps and save - newCorpCache = [] - for corpID in missingIDs: - corporation = Corporation(corporationID=corpID) - - corpInfo = esiRequest('/corporations/'+str(corpID)+'/') - - corporation.ticker = corpInfo["ticker"] - corporation.name = corpInfo["name"] - newCorpCache.append(corporation) - - corps[corpID]["name"] = corporation.name - corps[corpID]["ticker"] = corporation.ticker - corps[corpID]["id"] = corpID - - result["corps"].append(corps[corpID]) - - Corporation.objects.bulk_create(newCorpCache) - - - # Same thing for alliances - - # Get cached alliances from DB - allianceIDs = list(alliances.keys()) - cachedAlliances = Alliance.objects.filter(allianceID__in=allianceIDs) - - for alliance in cachedAlliances: - alliances[alliance.allianceID]["name"] = alliance.name - alliances[alliance.allianceID]["ticker"] = alliance.ticker - alliances[alliance.allianceID]["id"] = alliance.allianceID - - result["alliances"].append(alliances[alliance.allianceID]) - - # Check which ones are missing - cachedIDs = set(cachedAlliances.values_list("allianceID", flat=True)) - missingIDs = list(set(allianceIDs)-cachedIDs) - - # Get missing alliances from ESI - newAllianceCache = [] - for allianceID in missingIDs: - if allianceID == -1: - alliances[allianceID]["name"] = "" - alliances[allianceID]["ticker"] = "" - continue - - alliance = Alliance(allianceID=allianceID) - - allianceInfo = esiRequest('/alliances/'+str(allianceID)+'/') - - alliance.ticker = allianceInfo["ticker"] - alliance.name = allianceInfo["name"] - newAllianceCache.append(alliance) - - alliances[allianceID]["name"] = alliance.name - alliances[allianceID]["ticker"] = alliance.ticker - alliances[allianceID]["id"] = allianceID - - result["alliances"].append(alliances[allianceID]) - - Alliance.objects.bulk_create(newAllianceCache) - - - # Sort result - result["alliances"] = sorted(result["alliances"], key=lambda x: x["count"], reverse=True) - result["corps"] = sorted(result["corps"], key=lambda x: x["count"], reverse=True) - - - # Prepare summary for meta tags - othersCount = 0 - for alliance in result["alliances"][3:]: - othersCount += alliance["count"] - - summaryText = "" - for alliance in result["alliances"][0:3]: - summaryText += str(alliance["count"]) + " " + alliance["name"] + "\n" - - if othersCount > 0: - summaryText += "("+str(othersCount)+" more)" - - # Generate url token - token = token_urlsafe(6)[:6] - while Scan.objects.filter(token=token).exists(): - token = token_urlsafe(6)[:6] - - # Save - savedScan = Scan(token=token, data=json.dumps(result), type=Scan.LOCALSCAN, summaryText=summaryText, raw="\n".join(scan_data)) - savedScan.save() - - - return redirect("dscan:show", token=token) - - - -# About page with CCP Legal notice and License -def about(request): - return render(request, "about.html") - - -# Show a saved scan -def show(request, token): - scan = get_object_or_404(Scan, token=token) - - if scan.type == Scan.DSCAN: - return render(request, "dscan.html", {"created": scan.created, "token": token, "solarSystem": scan.solarSystem, "data": json.loads(scan.data), "summaryText": scan.summaryText}) - elif scan.type == Scan.LOCALSCAN: - return render(request, "localscan.html", {"created": scan.created, "token": token, "data": json.loads(scan.data), "summaryText": scan.summaryText}) - -# Prettier error handling -def error404(request, exception, template_name=""): - token = escape(request.path[1:]) - return render(request, "landing.html", {"error": "
Error 404 - Not Found

Could not find a saved scan with the token \""+token+"\"."}, status=404) - -def error500(request, exception=None, template_name=""): - print("ERROR 500 on ", request.method, request.path) - print("Exception: ", exception) - return render(request, "landing.html", {"error": "
Error 500 - Internal Server Error
If this problem persists please contact me on Discord, send me a mail ingame or create an issue on Github.
Check the footer for contact information."}, status=500) - -def error400(request, exception=None, template_name=""): - print("ERROR 400 on ", request.method, request.path) - print("Exception: ", exception) - return render(request, "landing.html", {"error": "
Error 400 - Bad Request
If this problem persists please contact me on Discord, send me a mail ingame or create an issue on Github.
Check the footer for contact information."}, status=400) +from django.shortcuts import render, redirect, get_object_or_404 +from django.http import HttpResponse +from esi.models import InvType, InvGroup +from django.conf import settings +from secrets import token_urlsafe +import re, json +from dscan.models import Scan, Corporation, Alliance +from esi.api import esiRequest +from django.utils.html import escape + + +# Create your views here. +def landing(request): + return render(request, "landing.html") + +def parse(request): + if request.method != "POST": + return landing(request) + + data = request.POST.get("data", None) + + if not data or data == "": + return render(request, "landing.html", {"error": "Error: No Data submitted"}) + + # Remove \r + data = data.replace("\r", "") + data = data.split("\n") + if "\t" in data[0]: + return _parse_dscan(request, data) + else: + return _parse_local(request, data) + + +def _parse_dscan(request, scan_data): + + # Parse input and count ships + shipCount = {} + solarSystem = None + + solarSystemIdentifierTypes = InvType.objects.filter(group_id__in=settings.SOLAR_SYSTEM_IDENTIFIERS).values_list("typeID", flat=True) + + # Parse Raw Data + for line in scan_data: + line = line.split("\t") + try: + line[0] = int(line[0]) + except: + continue + + if not shipCount.get(line[0], False): + shipCount[line[0]] = 1 + else: + shipCount[line[0]] += 1 + + # Detect solar system + if not solarSystem and line[0] in solarSystemIdentifierTypes: + # Format for citadels and other structures + matches = re.match(r'([A-z0-9\- ]+?) -', line[1]) + if matches: + solarSystem = matches.group(1) + + # Format for planets, moons and belts + matches = re.match(r'([A-z0-9\- ]+) [XVI]+', line[1]) + if matches: + solarSystem = matches.group(1) + + # Format for Customs Offices + matches = re.match(r'Customs Office \(([A-z0-9\- ]+) [XVI]+\)', line[1]) + if matches: + solarSystem = matches.group(1) + + # Get item type information from cache + typeIDs = list(shipCount.keys()) + cachedTypes = InvType.objects.filter(typeID__in=typeIDs) + + # Figure out what's missing + cachedIDs = set(cachedTypes.values_list("typeID", flat=True)) + missingIDs = list(set(typeIDs)-cachedIDs) + + if missingIDs: + # Get missing IDs from ESI + newTypes = [] + newGroups = [] + for typeID in missingIDs: + try: + result = esiRequest('/universe/types/'+str(typeID)+'/') + + # Create DB object for type + invType = InvType(typeID=typeID) + invType.typeName = result["name"] + invType.group_id = result["group_id"] + + newTypes.append(invType) + + # Check if we need to fetch group information too + if not InvGroup.objects.filter(groupID=invType.group_id).exists(): + result = esiRequest('/universe/groups/'+str(invType.group_id)+'/') + + invGroup = InvGroup(groupID=result["group_id"]) + invGroup.groupName = result["name"] + invGroup.categoryID = result["category_id"] + + invGroup.save() + + except Exception as e: + # To avoid malicious users making us spam ESI calls with invalid typeIDs we'll abort after the first error + print("Parse Error:", e) + return render(request, "landing.html", {"error": "Something's wrong with your dscan data: Error retrieving type info for typeID "+str(typeID)}) + + # Save new objects + InvType.objects.bulk_create(newTypes) + + # Get a fresh queryset with the new types + cachedTypes = InvType.objects.filter(typeID__in=typeIDs) + + + ships = [] + groupCount = {} + for ship in cachedTypes: + ships.append({"name": ship.typeName, "count": shipCount[ship.typeID], "group": ship.group_id, "category": ship.group.categoryID}) + + if not groupCount.get(ship.group_id, False): + groupCount[ship.group_id] = shipCount[ship.typeID] + else: + groupCount[ship.group_id] += shipCount[ship.typeID] + + # Sum up groups and add group information + groupIDs = list(groupCount.keys()) + invGroups = InvGroup.objects.filter(groupID__in=groupIDs) + groups = [] + for invGroup in invGroups: + groups.append({"id": invGroup.groupID, "name": invGroup.groupName, "count": groupCount[invGroup.groupID], "category": invGroup.categoryID}) + + + # Sort by how many of each they are + groups = sorted(groups, key=lambda g: g["count"], reverse=True) + ships = sorted(ships, key=lambda g: g["count"], reverse=True) + + # Sort everything into preset categories + categories = {"ships": {}, "groups": {}} + summary = [] + + for ship in ships: + default = True + for category in settings.DSCAN_CATEGORIES: + if ship["group"] in settings.DSCAN_CATEGORIES[category]["groups"] or ship["category"] in settings.DSCAN_CATEGORIES[category]["categories"]: + if not categories["ships"].get(category, False): + categories["ships"][category] = [[], 0] + categories["ships"][category][0].append(ship) + categories["ships"][category][1] += ship["count"] + default = False + if default: + if not categories["ships"].get("Ships", False): + categories["ships"]["Ships"] = [[], 0] + categories["ships"]["Ships"][0].append(ship) + categories["ships"]["Ships"][1] += ship["count"] + + if ship["category"] == 6: + summary.append(ship) + + for group in groups: + default = True + for category in settings.DSCAN_CATEGORIES: + if group["id"] in settings.DSCAN_CATEGORIES[category]["groups"] or group["category"] in settings.DSCAN_CATEGORIES[category]["categories"]: + if not categories["groups"].get(category, False): + categories["groups"][category] = [] + categories["groups"][category].append(group) + default = False + if default: + if not categories["groups"].get("Ships", False): + categories["groups"]["Ships"] = [] + categories["groups"]["Ships"].append(group) + + + # Prepare summary for meta tags + totalCount = 0 + for ship in summary: + totalCount += ship["count"] + + summaryText = "" + for ship in summary[0:3]: + summaryText += str(ship["count"]) + " " + ship["name"] + "\n" + + if totalCount > 0: + summaryText += "("+str(totalCount)+" total)" + + # Prepare data for template + result = [] + for category in settings.CATEGORY_ORDER: + if categories["ships"].get(category, False): + result.append((category, categories["ships"][category], categories["groups"][category])) + + token = token_urlsafe(6)[:6] + while Scan.objects.filter(token=token).exists(): + token = token_urlsafe(6)[:6] + + savedScan = Scan(token=token, data=json.dumps(result), solarSystem=solarSystem, type=Scan.DSCAN, summaryText=summaryText, raw="\n".join(scan_data)) + savedScan.save() + + + return redirect("dscan:show", token=token) + +# Parse a local list +def _parse_local(request, scan_data): + # Convert to set to remove duplicates + data = list(set(scan_data)) + + # Remove empty lines + data = [x for x in data if x != ''] + + n = 0 + affiliations = [] + while 500*n <= len(data): + + ids = esiRequest('/universe/ids/', data[500*n:500*(n+1)]) + + if not ids.get("characters", False): + return render(request, "landing.html", {"error": "Error: Didn't detect any valid characters in this local."}) + + ids = [c["id"] for c in ids["characters"]] + affiliations += esiRequest('/characters/affiliation/', ids) + + n += 1 + + + # Count + corps = {} + alliances = {} + for character in affiliations: + character["alliance_id"] = character.get("alliance_id", -1) + + try: + corps[character["corporation_id"]]["count"] += 1 + except: + corps[character["corporation_id"]] = {"alliance": character["alliance_id"]} + corps[character["corporation_id"]]["count"] = 1 + + try: + alliances[character["alliance_id"]]["count"] += 1 + except: + alliances[character["alliance_id"]] = {"count": 1} + + + # Get names and tickers + result = {"corps": [], "alliances": []} + + # Get cached names from DB + corpIDs = list(corps.keys()) + cachedCorps = Corporation.objects.filter(corporationID__in=corpIDs) + + for corp in cachedCorps: + corps[corp.corporationID]["name"] = corp.name + corps[corp.corporationID]["ticker"] = corp.ticker + corps[corp.corporationID]["id"] = corp.corporationID + + result["corps"].append(corps[corp.corporationID]) + + + # Check which corps we need to get from ESI + cachedIDs = set(cachedCorps.values_list("corporationID", flat=True)) + missingIDs = list(set(corpIDs)-cachedIDs) + + + # Get missing corps and save + newCorpCache = [] + for corpID in missingIDs: + corporation = Corporation(corporationID=corpID) + + corpInfo = esiRequest('/corporations/'+str(corpID)+'/') + + corporation.ticker = corpInfo["ticker"] + corporation.name = corpInfo["name"] + newCorpCache.append(corporation) + + corps[corpID]["name"] = corporation.name + corps[corpID]["ticker"] = corporation.ticker + corps[corpID]["id"] = corpID + + result["corps"].append(corps[corpID]) + + Corporation.objects.bulk_create(newCorpCache) + + + # Same thing for alliances + + # Get cached alliances from DB + allianceIDs = list(alliances.keys()) + cachedAlliances = Alliance.objects.filter(allianceID__in=allianceIDs) + + for alliance in cachedAlliances: + alliances[alliance.allianceID]["name"] = alliance.name + alliances[alliance.allianceID]["ticker"] = alliance.ticker + alliances[alliance.allianceID]["id"] = alliance.allianceID + + result["alliances"].append(alliances[alliance.allianceID]) + + # Check which ones are missing + cachedIDs = set(cachedAlliances.values_list("allianceID", flat=True)) + missingIDs = list(set(allianceIDs)-cachedIDs) + + # Get missing alliances from ESI + newAllianceCache = [] + for allianceID in missingIDs: + if allianceID == -1: + alliances[allianceID]["name"] = "" + alliances[allianceID]["ticker"] = "" + continue + + alliance = Alliance(allianceID=allianceID) + + allianceInfo = esiRequest('/alliances/'+str(allianceID)+'/') + + alliance.ticker = allianceInfo["ticker"] + alliance.name = allianceInfo["name"] + newAllianceCache.append(alliance) + + alliances[allianceID]["name"] = alliance.name + alliances[allianceID]["ticker"] = alliance.ticker + alliances[allianceID]["id"] = allianceID + + result["alliances"].append(alliances[allianceID]) + + Alliance.objects.bulk_create(newAllianceCache) + + + # Sort result + result["alliances"] = sorted(result["alliances"], key=lambda x: x["count"], reverse=True) + result["corps"] = sorted(result["corps"], key=lambda x: x["count"], reverse=True) + + + # Prepare summary for meta tags + othersCount = 0 + for alliance in result["alliances"][3:]: + othersCount += alliance["count"] + + summaryText = "" + for alliance in result["alliances"][0:3]: + summaryText += str(alliance["count"]) + " " + alliance["name"] + "\n" + + if othersCount > 0: + summaryText += "("+str(othersCount)+" more)" + + # Generate url token + token = token_urlsafe(6)[:6] + while Scan.objects.filter(token=token).exists(): + token = token_urlsafe(6)[:6] + + # Save + savedScan = Scan(token=token, data=json.dumps(result), type=Scan.LOCALSCAN, summaryText=summaryText, raw="\n".join(scan_data)) + savedScan.save() + + + return redirect("dscan:show", token=token) + + + +# About page with CCP Legal notice and License +def about(request): + return render(request, "about.html") + + +# Show a saved scan +def show(request, token): + scan = get_object_or_404(Scan, token=token) + + if scan.type == Scan.DSCAN: + return render(request, "dscan.html", {"created": scan.created, "token": token, "solarSystem": scan.solarSystem, "data": json.loads(scan.data), "summaryText": scan.summaryText}) + elif scan.type == Scan.LOCALSCAN: + return render(request, "localscan.html", {"created": scan.created, "token": token, "data": json.loads(scan.data), "summaryText": scan.summaryText}) + +# Prettier error handling +def error404(request, exception, template_name=""): + token = escape(request.path[1:]) + return render(request, "landing.html", {"error": "
Error404 - Not Found

Could not find a saved scan with the token \""+token+"\"."}, status=404) + +def error500(request, exception=None, template_name=""): + print("ERROR 500 on ", request.method, request.path) + print("Exception: ", exception) + return render(request, "landing.html", {"error": "
Error 500 - Internal Server Error
If this problem persists please contact me on Discord, send me a mail ingame or create an issue on Github.
Check the footer for contact information."}, status=500) + +def error400(request, exception=None, template_name=""): + print("ERROR 400 on ", request.method, request.path) + print("Exception: ", exception) + return render(request, "landing.html", {"error": "
Error 400 - Bad Request
If this problem persists please contact me on Discord, send me a mail ingame or create an issue on Github.
Check the footer for contact information."}, status=400) diff --git a/dscantool/preprocessors.py b/dscantool/preprocessors.py index 33450bb..d25c126 100644 --- a/dscantool/preprocessors.py +++ b/dscantool/preprocessors.py @@ -4,5 +4,11 @@ # Provides settings from the configuration file in templates def template_settings(request): return { - 'debug': settings.DEBUG - } \ No newline at end of file + 'debug': settings.DEBUG, + 'site_name': settings.DSCAN_SITE_NAME, + 'eve_image_url': settings.DSCAN_EVE_IMAGE_URL, + 'repository_url': settings.DSCAN_REPOSITORY_URL, + 'zkillboard_url': settings.DSCAN_ZKILLBOARD_URL, + 'dotlan_url': settings.DSCAN_DOTLAN_URL, + 'feedback': settings.DSCAN_FEEDBACK + } diff --git a/dscantool/settings.py b/dscantool/settings.py new file mode 100644 index 0000000..5d9c063 --- /dev/null +++ b/dscantool/settings.py @@ -0,0 +1,175 @@ +""" +Django settings for dscantool project. + +Generated by 'django-admin startproject' using Django 2.1.2. + +For more information on this file, see +https://docs.djangoproject.com/en/2.1/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/2.1/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__))) + +# The site name +DSCAN_SITE_NAME = os.environ.get('DSCAN_SITE_NAME', "Nimos' Intel Tools") + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/2.1/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = os.environ.get('DSCAN_SECRET_KEY', '&f8lk5k-b$^)-sdfij8gu9df7g9aa2zagdfh8iooijioukhrs_') + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = False + +ALLOWED_HOSTS = [os.environ.get('DSCAN_ALLOWED_HOST', 'dscan.nimos.ws')] + + +# Application definition + +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', + 'dscan', + 'dscantool', + 'esi' +] + +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 = 'dscantool.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', + 'dscantool.preprocessors.template_settings', + 'dscan.preprocessors.template_stats' + ], + }, + }, +] + +WSGI_APPLICATION = 'dscantool.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/2.1/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': os.environ.get('DSCAN_DB_ENGINE', 'django.db.backends.postgresql'), + 'NAME': os.environ.get('DSCAN_DB_NAME', 'dscantool'), + 'USER': os.environ.get('DSCAN_DB_USER', 'dscantool'), + 'PASSWORD': os.environ.get('DSCAN_DB_PASSWORD', 'dscantool'), + 'HOST': os.environ.get('DSCAN_DB_HOST', '127.0.0.1'), + 'PORT': os.environ.get('DSCAN_DB_PORT', '5432'), + } +} + +# Password validation +# https://docs.djangoproject.com/en/2.1/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/2.1/topics/i18n/ + +LANGUAGE_CODE = os.environ.get('DSCAN_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/2.1/howto/static-files/ + +STATIC_URL = os.environ.get('DSCAN_STATIC_URL', '/static/') + +STATIC_ROOT = os.environ.get('DSCAN_STATIC_ROOT', '/dscantool/static/'); + +# Categories to sort DScans +DSCAN_CATEGORIES = { + "Capitals": { + "categories": [], + "groups": [883, 485, 547, 1538, 30, 659] + }, + "Structures": { + "categories": [22, 23, 46, 65, 15, 16, 40], + "groups": [] + }, + "Misc.": { + "categories": [2, 8, 3, 18, 87, 11], + "groups": [] + } +} + +CATEGORY_ORDER = ["Capitals", "Ships", "Structures", "Misc."] + +# 6 - Sun +# 7 - Planet +# 8 - Moon +# 9 - Asteroid Belt +# 15 - Station +# 1025 - Poco +# 1404 - Engineering Complex +# 1406 - Refinery +# 1657 - Citadels +SOLAR_SYSTEM_IDENTIFIERS = [6, 7, 8, 9, 15, 1657, 1404, 1406, 1025] + +ESI_BASE = 'https://esi.evetech.net/latest' + +# EVE Online Image Server +DSCAN_EVE_IMAGE_URL = os.environ.get('DSCAN_EVE_IMAGE_URL', 'https://image.eveonline.com') + +# Link to the dscantool development repository +DSCAN_REPOSITORY_URL = os.environ.get('DSCAN_REPOSITORY_URL', 'https://github.com/nimos/dscantool') + +DSCAN_ZKILLBOARD_URL = os.environ.get('DSCAN_ZKILLBOARD_URL', 'https://zkillboard.com') + +DSCAN_DOTLAN_URL = os.environ.get('DSCAN_DOTLAN_URL', 'https://evemaps.dotlan.net') + +DSCAN_FEEDBACK = os.environ.get('DSCAN_FEEDBACK', 'Brought to you by Nimos Endashi • Discord: Nimos#4951') diff --git a/dscantool/urls.py b/dscantool/urls.py index 48540c0..bbe0c95 100644 --- a/dscantool/urls.py +++ b/dscantool/urls.py @@ -1,25 +1,26 @@ -"""dscantool URL Configuration - -The `urlpatterns` list routes URLs to views. For more information please see: - https://docs.djangoproject.com/en/2.1/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.urls import path -from django.conf.urls import include, url - -urlpatterns = [ - url(r'^', include('dscan.urls', namespace='dscan')), -] - -handler400 = 'dscan.views.error400' -handler404 = 'dscan.views.error404' +"""dscantool URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/2.1/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')) + mmm +""" +from django.urls import path +from django.conf.urls import include, url + +urlpatterns = [ + url(r'^', include('dscan.urls', namespace='dscan')), +] + +handler400 = 'dscan.views.error400' +handler404 = 'dscan.views.error404' handler500 = 'dscan.views.error500' \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index a1869cb..6063db9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,6 @@ -Django~=2.1.5 -colorama==0.4.1 -termcolor==1.1.0 -pytz==2018.5 -PyYAML==5.4 \ No newline at end of file +Django~=2.2.28 +colorama==0.4.1 +termcolor==1.1.0 +pytz==2018.5 +PyYAML==6.0.1 +psycopg2==2.8.6 diff --git a/run.sh b/run.sh new file mode 100755 index 0000000..bbfcbf3 --- /dev/null +++ b/run.sh @@ -0,0 +1,29 @@ +#!/bin/sh -eu + +DSCAN_USER=${DSCAN_USER:-dscantool} +DSCAN_PORT=${DSCAN_PORT:-8000} +DSCAN_DB_HOST=${DSCAN_DB_HOST:-127.0.0.1} +DSCAN_DB_PORT=${DSCAN_DB_PORT:-5432} + +if [ -z "$DSCAN_DB_HOST" ]; then + echo "Error: DSCAN_DB_HOST is not set." + exit 1 +fi + +if [ -z "$DSCAN_DB_PORT" ]; then + echo "Error: DSCAN_DB_PORT is not set." + exit 1 +fi + +echo "Info: Waiting for postgresql..." +while ! nc -z $DSCAN_DB_HOST $DSCAN_DB_PORT; do + echo "Info: waiting." + sleep 0.1 +done +echo "Info: Postgresql started." + +gosu $DSCAN_USER python manage.py makemigrations +gosu $DSCAN_USER python manage.py migrate +python manage.py collectstatic --noinput & +gosu $DSCAN_USER python manage.py import_sde & +gosu $DSCAN_USER python manage.py runserver 0.0.0.0:$DSCAN_PORT