From 43dfe946b6385037141b94b775112037fe5f032f Mon Sep 17 00:00:00 2001 From: Sam Wenham Date: Mon, 24 Feb 2020 15:04:07 +0000 Subject: Just removing dud whitespace --- core/view_surveys.py | 68 ++++++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'core/view_surveys.py') diff --git a/core/view_surveys.py b/core/view_surveys.py index 04c6ca6..05e617e 100644 --- a/core/view_surveys.py +++ b/core/view_surveys.py @@ -8,7 +8,7 @@ from troggle.core.models import SurvexScansFolder, SurvexScanSingle, SurvexBlock import parsers.surveys import urllib -# inline fileabstraction into here if it's not going to be useful anywhere else +# inline fileabstraction into here if it's not going to be useful anywhere else # keep things simple and ignore exceptions everywhere for now @@ -33,7 +33,7 @@ def upload(request, path): def download(request, path): #try: - + return HttpResponse(fileAbstraction.readFile(path), content_type=getMimeType(path.split(".")[-1])) #except: # raise Http404 @@ -49,32 +49,32 @@ extmimetypes = {".txt": "text/plain", ".jpg": "image/jpeg", ".jpeg": "image/jpeg", } - + # dead def jgtfile(request, f): fp = os.path.join(settings.SURVEYS, f) # could also surf through SURVEX_DATA - + # directory listing if os.path.isdir(fp): listdirfiles = [ ] listdirdirs = [ ] - + for lf in sorted(os.listdir(fp)): hpath = os.path.join(f, lf) # not absolute path if lf[0] == "." or lf[-1] == "~": continue - + hpath = hpath.replace("\\", "/") # for windows users href = hpath.replace("#", "%23") # '#' in file name annoyance - + flf = os.path.join(fp, lf) if os.path.isdir(flf): nfiles = len([sf for sf in os.listdir(flf) if sf[0] != "."]) listdirdirs.append((href, hpath + "/", nfiles)) else: listdirfiles.append((href, hpath, os.path.getsize(flf))) - + upperdirs = [ ] lf = f while lf: @@ -85,9 +85,9 @@ def jgtfile(request, f): lf = os.path.split(lf)[0] upperdirs.append((href, hpath)) upperdirs.append(("", "/")) - + return render(request, 'listdir.html', {'file':f, 'listdirfiles':listdirfiles, 'listdirdirs':listdirdirs, 'upperdirs':upperdirs, 'settings': settings}) - + # flat output of file when loaded if os.path.isfile(fp): ext = os.path.splitext(fp)[1].lower() @@ -123,16 +123,16 @@ def SaveImageInDir(name, imgdir, project, fdata, bbinary): print "*** Making directory", fprojdir os.path.mkdir(fprojdir) print "hhh" - + fname = os.path.join(fprojdir, name) print fname, "fff" fname = UniqueFile(fname) - + p2, p1 = os.path.split(fname) p3, p2 = os.path.split(p2) p4, p3 = os.path.split(p3) res = os.path.join(p3, p2, p1) - + print "saving file", fname fout = open(fname, (bbinary and "wb" or "w")) fout.write(fdata.read()) @@ -175,61 +175,61 @@ def surveyscansingle(request, path, file): survexscansingle = SurvexScanSingle.objects.get(survexscansfolder=survexscansfolder, name=file) return HttpResponse(content=open(survexscansingle.ffile), content_type=getMimeType(path.split(".")[-1])) #return render(request, 'survexscansfolder.html', { 'survexscansfolder':survexscansfolder, 'settings': settings }) - + def surveyscansfolders(request): survexscansfolders = SurvexScansFolder.objects.all() return render(request, 'survexscansfolders.html', { 'survexscansfolders':survexscansfolders, 'settings': settings }) - - + + def tunneldata(request): tunnelfiles = TunnelFile.objects.all() return render(request, 'tunnelfiles.html', { 'tunnelfiles':tunnelfiles, 'settings': settings }) - + def tunnelfile(request, path): tunnelfile = TunnelFile.objects.get(tunnelpath=urllib.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)) 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) - - + + assert len(request.FILES.values()) == 1, "only one file to upload" - + uploadedfile = request.FILES.values()[0] - + if uploadedfile.field_name != "sketch": return HttpResponse(content="Error: non-sketch file uploaded", content_type="text/plain") if uploadedfile.content_type != "text/plain": return HttpResponse(content="Error: non-plain content type", content_type="text/plain") - + # could use this to add new files - if os.path.split(path)[1] != uploadedfile.name: + if os.path.split(path)[1] != uploadedfile.name: return HttpResponse(content="Error: name disagrees", content_type="text/plain") - + orgsize = tunnelfile.filesize # = os.stat(tfile)[stat.ST_SIZE] - + ttext = uploadedfile.read() - + # could check that the user and projects agree here - + fout = open(tfile, "w") fout.write(ttext) fout.close() - - # redo its settings of + + # redo its settings of parsers.surveys.SetTunnelfileInfo(tunnelfile) tunnelfile.save() - + uploadedfile.close() message = "File size %d overwritten with size %d" % (orgsize, tunnelfile.filesize) return HttpResponse(content=message, content_type="text/plain") - - + + -- cgit v1.2.3