diff options
Diffstat (limited to 'core/view_surveys.py')
| -rw-r--r-- | core/view_surveys.py | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/core/view_surveys.py b/core/view_surveys.py index aad48c3..65a4f30 100644 --- a/core/view_surveys.py +++ b/core/view_surveys.py @@ -1,12 +1,12 @@ from django.conf import settings -import fileAbstraction +from . import fileAbstraction from django.shortcuts import render_to_response from django.http import HttpResponse, Http404 import os, stat import re from troggle.core.models import SurvexScansFolder, SurvexScanSingle, SurvexBlock, TunnelFile import parsers.surveys -import urllib +import urllib.request, urllib.parse, urllib.error # inline fileabstraction into here if it's not going to be useful anywhere else # keep things simple and ignore exceptions everywhere for now @@ -113,19 +113,19 @@ def UniqueFile(fname): # join it all up and then split them off for the directories that don't exist # anyway, this mkdir doesn't work def SaveImageInDir(name, imgdir, project, fdata, bbinary): - print ("hihihihi", fdata, settings.SURVEYS) + print(("hihihihi", fdata, settings.SURVEYS)) fimgdir = os.path.join(settings.SURVEYS, imgdir) if not os.path.isdir(fimgdir): - print "*** Making directory", fimgdir + print("*** Making directory", fimgdir) os.path.mkdir(fimgdir) fprojdir = os.path.join(fimgdir, project) if not os.path.isdir(fprojdir): - print "*** Making directory", fprojdir + print("*** Making directory", fprojdir) os.path.mkdir(fprojdir) - print "hhh" + print("hhh") fname = os.path.join(fprojdir, name) - print fname, "fff" + print(fname, "fff") fname = UniqueFile(fname) p2, p1 = os.path.split(fname) @@ -133,7 +133,7 @@ def SaveImageInDir(name, imgdir, project, fdata, bbinary): p4, p3 = os.path.split(p3) res = os.path.join(p3, p2, p1) - print "saving file", fname + print("saving file", fname) fout = open(fname, (bbinary and "wb" or "w")) fout.write(fdata.read()) fout.close() @@ -145,33 +145,33 @@ def SaveImageInDir(name, imgdir, project, fdata, bbinary): def jgtuploadfile(request): filesuploaded = [ ] project, user, password, tunnelversion = request.POST["tunnelproject"], request.POST["tunneluser"], request.POST["tunnelpassword"], request.POST["tunnelversion"] - print (project, user, tunnelversion) - for uploadedfile in request.FILES.values(): + print((project, user, tunnelversion)) + for uploadedfile in list(request.FILES.values()): if uploadedfile.field_name in ["tileimage", "backgroundimage"] and \ uploadedfile.content_type in ["image/png", "image/jpeg"]: fname = user + "_" + re.sub("[\\\\/]", "-", uploadedfile.name) # very escaped \ - print fname + print(fname) fileuploaded = SaveImageInDir(fname, uploadedfile.field_name, project, uploadedfile, True) filesuploaded.append(settings.URL_ROOT + "/jgtfile/" + fileuploaded) if uploadedfile.field_name in ["sketch"] and \ uploadedfile.content_type in ["text/plain"]: fname = user + "_" + re.sub("[\\\\/]", "-", uploadedfile.name) # very escaped \ - print fname + print(fname) fileuploaded = SaveImageInDir(fname, uploadedfile.field_name, project, uploadedfile, False) filesuploaded.append(settings.URL_ROOT + "/jgtfile/" + fileuploaded) #print "FF", request.FILES #print ("FFF", request.FILES.values()) message = "" - print "gothere" + print("gothere") return render_to_response('fileupload.html', {'message':message, 'filesuploaded':filesuploaded, 'settings': settings}) def surveyscansfolder(request, path): #print [ s.walletname for s in SurvexScansFolder.objects.all() ] - survexscansfolder = SurvexScansFolder.objects.get(walletname=urllib.unquote(path)) + survexscansfolder = SurvexScansFolder.objects.get(walletname=urllib.parse.unquote(path)) return render_to_response('survexscansfolder.html', { 'survexscansfolder':survexscansfolder, 'settings': settings }) def surveyscansingle(request, path, file): - survexscansfolder = SurvexScansFolder.objects.get(walletname=urllib.unquote(path)) + survexscansfolder = SurvexScansFolder.objects.get(walletname=urllib.parse.unquote(path)) survexscansingle = SurvexScanSingle.objects.get(survexscansfolder=survexscansfolder, name=file) return HttpResponse(content=open(survexscansingle.ffile), content_type=getMimeType(path.split(".")[-1])) #return render_to_response('survexscansfolder.html', { 'survexscansfolder':survexscansfolder, 'settings': settings }) @@ -187,21 +187,21 @@ def tunneldata(request): def tunnelfile(request, path): - tunnelfile = TunnelFile.objects.get(tunnelpath=urllib.unquote(path)) + tunnelfile = TunnelFile.objects.get(tunnelpath=urllib.parse.unquote(path)) tfile = os.path.join(settings.TUNNEL_DATA, tunnelfile.tunnelpath) return HttpResponse(content=open(tfile), content_type="text/plain") def tunnelfileupload(request, path): - tunnelfile = TunnelFile.objects.get(tunnelpath=urllib.unquote(path)) + tunnelfile = TunnelFile.objects.get(tunnelpath=urllib.parse.unquote(path)) tfile = os.path.join(settings.TUNNEL_DATA, tunnelfile.tunnelpath) project, user, password, tunnelversion = request.POST["tunnelproject"], request.POST["tunneluser"], request.POST["tunnelpassword"], request.POST["tunnelversion"] - print (project, user, tunnelversion) + print((project, user, tunnelversion)) - assert len(request.FILES.values()) == 1, "only one file to upload" + assert len(list(request.FILES.values())) == 1, "only one file to upload" - uploadedfile = request.FILES.values()[0] + uploadedfile = list(request.FILES.values())[0] if uploadedfile.field_name != "sketch": return HttpResponse(content="Error: non-sketch file uploaded", content_type="text/plain") |