mirror of
https://expo.survex.com/repositories/troggle/.git
synced 2025-12-18 13:47:11 +00:00
removed jgtfileupload
This commit is contained in:
Philip Sargent
@@ -8,33 +8,6 @@ from troggle.core.models_survex import SurvexScansFolder, SurvexScanSingle, Surv
|
||||
import parsers.surveys
|
||||
import urllib.request, urllib.parse, urllib.error
|
||||
|
||||
# inlined use of fileabstraction into here
|
||||
|
||||
# def fa_listdir(*path):
|
||||
# try:
|
||||
# strippedpath = [p for p in path if p]
|
||||
# root = os.path.join(settings.FILES, *strippedpath )
|
||||
# l = ""
|
||||
# #l = root + "\n"
|
||||
# isdir = os.path.isdir(root) #This seems to be required for os.path.isdir to work...
|
||||
# #l += str(isdir) + "\n"
|
||||
# for p in os.listdir(root):
|
||||
# if os.path.isdir(os.path.join(root, p)):
|
||||
# l += p + "/\n"
|
||||
|
||||
# elif os.path.isfile(os.path.join(root, p)):
|
||||
# l += p + "\n"
|
||||
# #Ignore non-files and non-directories
|
||||
# return l
|
||||
# except:
|
||||
# if strippedpath:
|
||||
# c = reduce(urljoin, strippedpath)
|
||||
# else:
|
||||
# c = ""
|
||||
# c = c.replace("#", "%23")
|
||||
# print(("FILE: ", settings.FILES + "listdir/" + c))
|
||||
# return urllib.request.urlopen(settings.FILES + "listdir/" + c).read()
|
||||
|
||||
def fa_readFile(*path):
|
||||
try:
|
||||
f = open(os.path.join(settings.FILES, *path))
|
||||
@@ -51,13 +24,6 @@ def getMimeType(extension):
|
||||
print("unknown file type")
|
||||
return "text/plain"
|
||||
|
||||
|
||||
# def listdir(request, path):
|
||||
# #try:
|
||||
# return HttpResponse(fa_listdir(path), content_type="text/plain")
|
||||
# #except:
|
||||
# # raise Http404
|
||||
|
||||
def upload(request, path):
|
||||
pass
|
||||
|
||||
@@ -68,68 +34,6 @@ def download(request, path):
|
||||
#except:
|
||||
# raise Http404
|
||||
|
||||
|
||||
#
|
||||
# julian's quick hack for something that works
|
||||
# could signal directories by ending with /, and forward cases where it's missing
|
||||
#
|
||||
extmimetypes = {".txt": "text/plain",
|
||||
".html": "text/html",
|
||||
".png": "image/png",
|
||||
".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:
|
||||
hpath = lf.replace("\\", "/") # for windows users
|
||||
if hpath[-1] != "/":
|
||||
hpath += "/"
|
||||
href = hpath.replace("#", "%23")
|
||||
lf = os.path.split(lf)[0]
|
||||
upperdirs.append((href, hpath))
|
||||
upperdirs.append(("", "/"))
|
||||
|
||||
return render_to_response('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()
|
||||
mimetype = extmimetypes.get(ext, "text/plain")
|
||||
fin = open(fp)
|
||||
ftext = fin.read()
|
||||
fin.close()
|
||||
return HttpResponse(ftext, content_type=mimetype)
|
||||
|
||||
return HttpResponse("unknown file::%s::" % f, content_type = "text/plain")
|
||||
|
||||
|
||||
def UniqueFile(fname):
|
||||
while True:
|
||||
if not os.path.exists(fname):
|
||||
@@ -170,31 +74,6 @@ def SaveImageInDir(name, imgdir, project, fdata, bbinary):
|
||||
res = os.path.join(imgdir, name)
|
||||
return res.replace("\\", "/")
|
||||
|
||||
|
||||
# do we want to consider saving project/field rather than field/project
|
||||
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 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)
|
||||
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)
|
||||
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")
|
||||
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.parse.unquote(path))
|
||||
|
||||
Reference in New Issue
Block a user