From 1b11c70430e63455847217d3327052aa0b790b69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tao=20Bror=20Bojl=C3=A9n?= Date: Thu, 21 Feb 2019 10:26:55 +0000 Subject: [PATCH] simplify folder structure --- .gitignore | 4 ++-- backend/{api => }/Dockerfile | 0 backend/api/scraper/tests.py | 3 --- backend/api/scraper/views.py | 3 --- backend/{api => }/apiv1/__init__.py | 0 backend/{api => }/apiv1/_util.py | 0 backend/{api => }/apiv1/apps.py | 0 backend/{api => }/apiv1/serializers.py | 0 backend/{api => }/apiv1/views.py | 0 backend/{api => }/backend/__init__.py | 0 backend/{api => }/backend/settings/base.py | 0 backend/{api => }/backend/settings/development.py | 0 backend/{api => }/backend/settings/production.py | 0 backend/{api => }/backend/urls.py | 0 backend/{api => }/backend/wsgi.py | 0 backend/{api => }/manage.py | 0 backend/{api => }/requirements.txt | 0 backend/{api => }/scraper/__init__.py | 0 backend/{api => }/scraper/admin.py | 0 backend/{api => }/scraper/apps.py | 0 backend/{api => }/scraper/management/commands/_util.py | 0 .../{api => }/scraper/management/commands/build_graph.py | 0 backend/{api => }/scraper/management/commands/scrape.py | 2 +- backend/{api => }/scraper/migrations/0001_initial.py | 0 backend/{api => }/scraper/migrations/__init__.py | 0 backend/{api => }/scraper/models.py | 0 backend/{api => }/scripts/docker-entrypoint.sh | 0 backend/{api => }/whitelist.txt | 0 docker-compose.production.yml | 2 +- docker-compose.yml | 6 +++--- 30 files changed, 7 insertions(+), 13 deletions(-) rename backend/{api => }/Dockerfile (100%) delete mode 100644 backend/api/scraper/tests.py delete mode 100644 backend/api/scraper/views.py rename backend/{api => }/apiv1/__init__.py (100%) rename backend/{api => }/apiv1/_util.py (100%) rename backend/{api => }/apiv1/apps.py (100%) rename backend/{api => }/apiv1/serializers.py (100%) rename backend/{api => }/apiv1/views.py (100%) rename backend/{api => }/backend/__init__.py (100%) rename backend/{api => }/backend/settings/base.py (100%) rename backend/{api => }/backend/settings/development.py (100%) rename backend/{api => }/backend/settings/production.py (100%) rename backend/{api => }/backend/urls.py (100%) rename backend/{api => }/backend/wsgi.py (100%) rename backend/{api => }/manage.py (100%) rename backend/{api => }/requirements.txt (100%) rename backend/{api => }/scraper/__init__.py (100%) rename backend/{api => }/scraper/admin.py (100%) rename backend/{api => }/scraper/apps.py (100%) rename backend/{api => }/scraper/management/commands/_util.py (100%) rename backend/{api => }/scraper/management/commands/build_graph.py (100%) rename backend/{api => }/scraper/management/commands/scrape.py (99%) rename backend/{api => }/scraper/migrations/0001_initial.py (100%) rename backend/{api => }/scraper/migrations/__init__.py (100%) rename backend/{api => }/scraper/models.py (100%) rename backend/{api => }/scripts/docker-entrypoint.sh (100%) rename backend/{api => }/whitelist.txt (100%) diff --git a/.gitignore b/.gitignore index a16a93d..75f3de8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,8 @@ *.csv .idea/ -backend/api/backend/static/ +backend/backend/static/ *.gexf -backend/api/backend/whitelist.txt +backend/backend/whitelist.txt data/ # Byte-compiled / optimized / DLL files diff --git a/backend/api/Dockerfile b/backend/Dockerfile similarity index 100% rename from backend/api/Dockerfile rename to backend/Dockerfile diff --git a/backend/api/scraper/tests.py b/backend/api/scraper/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/backend/api/scraper/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/backend/api/scraper/views.py b/backend/api/scraper/views.py deleted file mode 100644 index 91ea44a..0000000 --- a/backend/api/scraper/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here. diff --git a/backend/api/apiv1/__init__.py b/backend/apiv1/__init__.py similarity index 100% rename from backend/api/apiv1/__init__.py rename to backend/apiv1/__init__.py diff --git a/backend/api/apiv1/_util.py b/backend/apiv1/_util.py similarity index 100% rename from backend/api/apiv1/_util.py rename to backend/apiv1/_util.py diff --git a/backend/api/apiv1/apps.py b/backend/apiv1/apps.py similarity index 100% rename from backend/api/apiv1/apps.py rename to backend/apiv1/apps.py diff --git a/backend/api/apiv1/serializers.py b/backend/apiv1/serializers.py similarity index 100% rename from backend/api/apiv1/serializers.py rename to backend/apiv1/serializers.py diff --git a/backend/api/apiv1/views.py b/backend/apiv1/views.py similarity index 100% rename from backend/api/apiv1/views.py rename to backend/apiv1/views.py diff --git a/backend/api/backend/__init__.py b/backend/backend/__init__.py similarity index 100% rename from backend/api/backend/__init__.py rename to backend/backend/__init__.py diff --git a/backend/api/backend/settings/base.py b/backend/backend/settings/base.py similarity index 100% rename from backend/api/backend/settings/base.py rename to backend/backend/settings/base.py diff --git a/backend/api/backend/settings/development.py b/backend/backend/settings/development.py similarity index 100% rename from backend/api/backend/settings/development.py rename to backend/backend/settings/development.py diff --git a/backend/api/backend/settings/production.py b/backend/backend/settings/production.py similarity index 100% rename from backend/api/backend/settings/production.py rename to backend/backend/settings/production.py diff --git a/backend/api/backend/urls.py b/backend/backend/urls.py similarity index 100% rename from backend/api/backend/urls.py rename to backend/backend/urls.py diff --git a/backend/api/backend/wsgi.py b/backend/backend/wsgi.py similarity index 100% rename from backend/api/backend/wsgi.py rename to backend/backend/wsgi.py diff --git a/backend/api/manage.py b/backend/manage.py similarity index 100% rename from backend/api/manage.py rename to backend/manage.py diff --git a/backend/api/requirements.txt b/backend/requirements.txt similarity index 100% rename from backend/api/requirements.txt rename to backend/requirements.txt diff --git a/backend/api/scraper/__init__.py b/backend/scraper/__init__.py similarity index 100% rename from backend/api/scraper/__init__.py rename to backend/scraper/__init__.py diff --git a/backend/api/scraper/admin.py b/backend/scraper/admin.py similarity index 100% rename from backend/api/scraper/admin.py rename to backend/scraper/admin.py diff --git a/backend/api/scraper/apps.py b/backend/scraper/apps.py similarity index 100% rename from backend/api/scraper/apps.py rename to backend/scraper/apps.py diff --git a/backend/api/scraper/management/commands/_util.py b/backend/scraper/management/commands/_util.py similarity index 100% rename from backend/api/scraper/management/commands/_util.py rename to backend/scraper/management/commands/_util.py diff --git a/backend/api/scraper/management/commands/build_graph.py b/backend/scraper/management/commands/build_graph.py similarity index 100% rename from backend/api/scraper/management/commands/build_graph.py rename to backend/scraper/management/commands/build_graph.py diff --git a/backend/api/scraper/management/commands/scrape.py b/backend/scraper/management/commands/scrape.py similarity index 99% rename from backend/api/scraper/management/commands/scrape.py rename to backend/scraper/management/commands/scrape.py index 92b5ad7..205e680 100644 --- a/backend/api/scraper/management/commands/scrape.py +++ b/backend/scraper/management/commands/scrape.py @@ -24,7 +24,7 @@ SEED = 'mastodon.social' TIMEOUT = 20 # seconds NUM_THREADS = 16 # roughly 40MB each PERSONAL_INSTANCE_THRESHOLD = 5 # instances with < this many users won't be scraped -STATUS_SCRAPE_LIMIT = 5000 +STATUS_SCRAPE_LIMIT = 1000 class Command(BaseCommand): diff --git a/backend/api/scraper/migrations/0001_initial.py b/backend/scraper/migrations/0001_initial.py similarity index 100% rename from backend/api/scraper/migrations/0001_initial.py rename to backend/scraper/migrations/0001_initial.py diff --git a/backend/api/scraper/migrations/__init__.py b/backend/scraper/migrations/__init__.py similarity index 100% rename from backend/api/scraper/migrations/__init__.py rename to backend/scraper/migrations/__init__.py diff --git a/backend/api/scraper/models.py b/backend/scraper/models.py similarity index 100% rename from backend/api/scraper/models.py rename to backend/scraper/models.py diff --git a/backend/api/scripts/docker-entrypoint.sh b/backend/scripts/docker-entrypoint.sh similarity index 100% rename from backend/api/scripts/docker-entrypoint.sh rename to backend/scripts/docker-entrypoint.sh diff --git a/backend/api/whitelist.txt b/backend/whitelist.txt similarity index 100% rename from backend/api/whitelist.txt rename to backend/whitelist.txt diff --git a/docker-compose.production.yml b/docker-compose.production.yml index 158e50e..7b205ab 100644 --- a/docker-compose.production.yml +++ b/docker-compose.production.yml @@ -37,7 +37,7 @@ services: - database_network depends_on: - letsencrypt - web: + django: restart: always volumes: - gunicorn-socket:/var/gunicorn diff --git a/docker-compose.yml b/docker-compose.yml index 74dccd2..beddb8c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - "5432:5432" volumes: - pgdata:/var/lib/postgresql/data - web: + django: environment: # Set these in .env - SECRET_KEY @@ -20,10 +20,10 @@ services: - POSTGRES_DB - DJANGO_SETTINGS_MODULE - ENVIRONMENT=development - build: ./backend/api + build: ./backend command: bash scripts/docker-entrypoint.sh volumes: - - ./backend/api:/code + - ./backend:/code ports: - "8000:8000" depends_on: