diff --git a/.gitignore b/.gitignore index 41645d9..2b24304 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,3 @@ venv secret.txt app/local_settings.py geo/GeoLite2-City.mmdb -data/ diff --git a/app/event/management/commands/extract_urls.py b/app/event/management/commands/extract_urls.py deleted file mode 100644 index 6215887..0000000 --- a/app/event/management/commands/extract_urls.py +++ /dev/null @@ -1,40 +0,0 @@ -import csv -import re -import sys -import ox - -from django.core.management.base import BaseCommand -from django.conf import settings - -from ... import models - - -class Command(BaseCommand): - help = 'extract urls' - args = '' - - def add_arguments(self, parser): - parser.add_argument('--debug', action='store_true', dest='debug', - default=False, help='debug something') - - def handle(self, **options): - urls = set() - for event in models.Event.objects.all(): - for url in re.compile('href="(.*?)"').findall(event.body): - urls.add(url) - for url in re.compile('src="(.*?)"').findall(event.body): - urls.add(url) - - writer = csv.writer(sys.stdout) - writer.writerow(['url', 'pandora', 'archive']) - for url in sorted(urls): - url = ox.decode_html(url) - if url[0] in ('/', '#'): - continue - if 'youtube' in url or 'vimeo' in url: - p = 'y' - else: - p = '' - writer.writerow([url, p, 'https://web.archive.org/web/*/' + url]) - - diff --git a/app/event/migrations/0007_alter_event_options.py b/app/event/migrations/0007_alter_event_options.py deleted file mode 100644 index 05bec62..0000000 --- a/app/event/migrations/0007_alter_event_options.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 4.0.4 on 2022-04-22 17:11 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('event', '0006_event_media_caption'), - ] - - operations = [ - migrations.AlterModelOptions( - name='event', - options={'ordering': ('position', 'date')}, - ), - ] diff --git a/app/media/__init__.py b/app/media/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/app/media/admin.py b/app/media/admin.py deleted file mode 100644 index e66dfa6..0000000 --- a/app/media/admin.py +++ /dev/null @@ -1,10 +0,0 @@ -from django.contrib import admin - -from . import models - - -@admin.decorators.register(models.Image) -class ImageAdmin(admin.ModelAdmin): - search_fields = ['file'] - list_display = ('image_tag', 'file') - readonly_fields = ('image_tag', 'get_absolute_url') diff --git a/app/media/apps.py b/app/media/apps.py deleted file mode 100644 index 955fd9e..0000000 --- a/app/media/apps.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.apps import AppConfig - - -class MediaConfig(AppConfig): - default_auto_field = 'django.db.models.BigAutoField' - name = 'app.media' diff --git a/app/media/migrations/0001_initial.py b/app/media/migrations/0001_initial.py deleted file mode 100644 index 71264e0..0000000 --- a/app/media/migrations/0001_initial.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 4.0.4 on 2022-04-22 17:11 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Image', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created', models.DateTimeField(auto_now_add=True)), - ('modified', models.DateTimeField(auto_now=True)), - ('file', models.ImageField(blank=True, null=True, upload_to='image')), - ], - ), - ] diff --git a/app/media/migrations/__init__.py b/app/media/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/app/media/models.py b/app/media/models.py deleted file mode 100644 index 8062e11..0000000 --- a/app/media/models.py +++ /dev/null @@ -1,25 +0,0 @@ -from django.db import models -from django.urls import reverse - - -class Image(models.Model): - created = models.DateTimeField(auto_now_add=True) - modified = models.DateTimeField(auto_now=True) - - file = models.ImageField(upload_to='image', null=True, blank=True) - - def get_absolute_url(self): - return self.file.url - get_absolute_url.short_description = 'URL' - - def image_tag(self): - from django.utils.html import mark_safe - return mark_safe('' % self.get_absolute_url()) - image_tag.short_description = 'Preview' - - def __str__(self): - if self.file: - name = self.file.name.split('/')[-1] - else: - name = 'None' - return name diff --git a/app/media/tests.py b/app/media/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/app/media/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/app/media/views.py b/app/media/views.py deleted file mode 100644 index 91ea44a..0000000 --- a/app/media/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here. diff --git a/app/settings.py b/app/settings.py index 175e39c..6552122 100755 --- a/app/settings.py +++ b/app/settings.py @@ -41,7 +41,6 @@ INSTALLED_APPS = [ 'app.user', 'app.page', 'app.event', - 'app.media', ] @@ -130,7 +129,6 @@ USE_TZ = True STATIC_URL = '/static/' STATIC_ROOT = BASE_DIR / 'www' / 'static' MEDIA_ROOT = BASE_DIR / 'data' / 'media' -MEDIA_URL = '/media/' TITLE = 'Example Timeline' URL_PREFIX = '' diff --git a/app/urls.py b/app/urls.py index 433950e..4e9dd1a 100755 --- a/app/urls.py +++ b/app/urls.py @@ -16,7 +16,7 @@ Including another URLconf from django.contrib import admin from django.urls import path from django.conf import settings -from django.conf.urls.static import static + from .event import views as event_views @@ -25,5 +25,4 @@ urlpatterns = [ path(settings.URL_PREFIX + 'events/', event_views.events, name='event'), path(settings.URL_PREFIX + 'events/', event_views.events, name='events'), path(settings.URL_PREFIX + '', event_views.timeline, name='timeline'), -] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) - +] diff --git a/manage.py b/manage.py index 5afca4b..118d972 100755 --- a/manage.py +++ b/manage.py @@ -3,13 +3,11 @@ import os import sys - def activate_venv(base): if os.path.exists(base): old_os_path = os.environ.get('PATH', '') os.environ['PATH'] = os.path.join(base, 'bin') + os.pathsep + old_os_path - version = '%s.%s' % (sys.version_info.major, sys.version_info.minor) - site_packages = os.path.join(base, 'lib', 'python%s' % version, 'site-packages') + site_packages = os.path.join(base, 'lib', 'python%s' % sys.version[:3], 'site-packages') prev_sys_path = list(sys.path) import site site.addsitedir(site_packages)