summaryrefslogtreecommitdiffstats
path: root/core/views/uploads.py
diff options
context:
space:
mode:
Diffstat (limited to 'core/views/uploads.py')
-rw-r--r--core/views/uploads.py46
1 files changed, 24 insertions, 22 deletions
diff --git a/core/views/uploads.py b/core/views/uploads.py
index 648e340..5f40b30 100644
--- a/core/views/uploads.py
+++ b/core/views/uploads.py
@@ -1,41 +1,43 @@
-import re, os, socket
-import subprocess
+import datetime
import json
-import settings
-import urllib
import operator
-import datetime
-
-from pathlib import Path
+import os
+import re
+import socket
+import subprocess
+import urllib
from functools import reduce
+from pathlib import Path
from urllib.parse import unquote
from django import forms
-
from django.conf import settings
-from django.urls import reverse
+from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
+from django.core.files.storage import FileSystemStorage, default_storage
from django.db.models import Q
from django.http import HttpResponse, HttpResponseRedirect
from django.shortcuts import render
from django.template import Context, loader
-from django.core.files.storage import FileSystemStorage, default_storage
-from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
-
+from django.urls import reverse
-#from troggle import settings
-from troggle.parsers.imports import import_caves, import_people, import_surveyscans
-from troggle.parsers.imports import import_logbooks, import_QMs, import_drawingsfiles, import_survex
-from troggle.parsers.scans import contentsjson
+import settings
+from troggle.core.models.caves import QM, Cave, LogbookEntry, PersonTrip
+from troggle.core.models.survex import (DrawingFile, SurvexBlock, SurvexFile,
+ SurvexPersonRole, Wallet)
# from databaseReset import reinit_db # don't do this. databaseRest runs code *at import time*
-from troggle.core.models.troggle import DataIssue
-from troggle.core.models.troggle import Expedition, Person, PersonExpedition
-from troggle.core.models.caves import LogbookEntry, QM, Cave, PersonTrip
-from troggle.core.models.survex import DrawingFile, Wallet, SurvexBlock, SurvexFile, SurvexPersonRole
-from troggle.core.views.scans import oldwallet, caveifywallet
+from troggle.core.models.troggle import (DataIssue, Expedition, Person,
+ PersonExpedition)
from troggle.core.views.caves import getCave
-
+from troggle.core.views.scans import caveifywallet, oldwallet
+#from troggle import settings
+from troggle.parsers.imports import (import_caves, import_drawingsfiles,
+ import_logbooks, import_people,
+ import_QMs, import_survex,
+ import_surveyscans)
+from troggle.parsers.scans import contentsjson
from .auth import login_required_if_public
+
#from django.views.decorators.csrf import ensure_csrf_cookie, csrf_exempt
'''File upload 'views'