dwg upload and django admin extra search

1 files changed, 2 insertions, 149 deletions

diff --git a/core/views/other.py b/core/views/other.py
index 8ac7f34..0fc43a6 100644
--- a/core/views/other.py
+++ b/core/views/other.py
@@ -1,4 +1,5 @@
 import re, os
+import subprocess
 from pathlib import Path
 
 from django import forms
@@ -16,6 +17,7 @@ from troggle.parsers.imports import import_logbooks, import_QMs, import_drawings
 # from databaseReset import reinit_db # don't do this. databaseRest runs code *at import time*
 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
 from .auth import login_required_if_public
 
 '''Utility functions and code to serve the control panel and individual user's 
@@ -32,9 +34,7 @@ todo = '''
     so this is only a tool for a first pass, to be followed by extensive hand-editing!
     When we have done all the old logbooks, delete this function and the two templates.
 
--Do GIT stuff for upload forms
 
--Move upload forms to proper file locations
 '''
 
 def todos(request, module): 
@@ -200,150 +200,3 @@ def exportlogbook(request,year=None,extension=None):
 
         return render(request,'controlPanel.html', {'expeditions':Expedition.objects.all(),'jobs_completed':[completed]})
 
-
-class FilesForm(forms.Form):  # not a model-form, just a form-form
-    uploadfiles = forms.FileField() 
-
-@login_required_if_public
-def scanupload(request, wallet=None):
-    '''Upload scanned image files into a wallet on /expofiles
-    This does NOT use a Django model linked to a Django form. Just a simple Django form.
-    '''
-    filesaved = False
-    actual_saved = []
-    # print(f'! - FORM scanupload - start {wallet}')
-    if wallet is None:
-        wallet = "2021#01" # improve this later
-    if not re.match('(19|20)\d\d:\d\d', wallet):
-        wallet = "2021:01" # improve this later
-    
-    year = wallet[:4]
-    if int(year) < 1977: 
-        year = "1977"
-    if int(year) > 2050: 
-        year = "2050"
-    nexty = f'{int(year)+1}'
-    prevy = f'{int(year)-1}'
-
-    wnumber = wallet[5:]
-    next = f'{int(wnumber)+1:02d}'
-    prev = f'{int(wnumber)-1:02d}'
-    
-    if int(wnumber) == 0:
-        prev = f'{int(wnumber):02d}'
-    
-    context = {'year': year, 'prev': prev, 'next': next, 'prevy': prevy, 'nexty': nexty}
-    
-    wallet = wallet.replace(':','#')
-    dirpath = Path(settings.SURVEY_SCANS, year, wallet)
-    
-    form = FilesForm()
-    
-    if request.method == 'POST':
-        form = FilesForm(request.POST,request.FILES)
-        if form.is_valid():
-            f = request.FILES["uploadfiles"]
-            multiple = request.FILES.getlist('uploadfiles')
-            fs = FileSystemStorage(os.path.join(settings.SURVEY_SCANS, year, wallet))
-           
-            actual_saved = []
-            if multiple:
-                for f in multiple:
-                    actual_saved.append( fs.save(f.name, content=f) )
-                    # print(f'! - FORM scanupload multiple {actual_saved}')
-            filesaved = True
-    
-    files = []
-    dirs = []
-    # print(f'! - FORM scanupload - start {wallet} {dirpath}')
-    try:
-        for f in dirpath.iterdir():
-            if f.is_dir():
-                dirs.append(f.name)
-            if f.is_file():
-                if f.name != 'contents.json' and f.name != 'walletindex.html':
-                    files.append(f.name)
-    except FileNotFoundError:
-        files.append('(no wallet yet - would be created)')
-    if len(files) ==0 :
-        files.append('(no image files in wallet)')
-    else:
-        files = sorted(files)
-        
-    if dirs:
-        dirs = sorted(dirs)
-
-    return render(request, 'scanuploadform.html', 
-        {'form': form, 'wallet': wallet, **context, 'files': files, 'dirs': dirs, 'filesaved': filesaved, 'actual_saved': actual_saved})
-
-@login_required_if_public
-def dwgupload(request, folder=None):
-    '''Upload DRAWING files (tunnel or therion) into the upload folder in :drawings:
-    This does NOT use a Django model linked to a Django form. Just a simple Django form.
-    '''
-    def dwgvalid(name):
-        if name in [ '.gitignore', '.hgignore', ]:
-            return False
-        if Path(name).suffix in ['.xml', '.th', '.th2', '', '.svg', '.jpg']:
-            return True
-        return False
-        
-    filesaved = False
-    actual_saved = []
-    doesnotexist = ''
-    #print(f'! - FORM dwgupload - start "{folder}"')
-    if folder is None:
-        folder = "" # improve this later
-        dirpath = Path(settings.DRAWINGS_DATA)
-        urlfile = '/dwgdataraw'
-        urldir  = '/dwgupload'
-    else:
-        dirpath = Path(settings.DRAWINGS_DATA, folder)
-        urlfile = Path('/dwgdataraw/') / folder
-        urldir  = Path('/dwgupload/') / folder
-    
-    form = FilesForm()
-    
-    if request.method == 'POST':
-        form = FilesForm(request.POST,request.FILES)
-        if form.is_valid():
-            f = request.FILES["uploadfiles"]
-            multiple = request.FILES.getlist('uploadfiles')
-            fs = FileSystemStorage(os.path.join(settings.DRAWINGS_DATA, folder))
-           
-            actual_saved = []
-            if multiple:
-                for f in multiple:
-                    if dwgvalid(f.name):
-                        actual_saved.append( fs.save(f.name, content=f) )
-            # print(f'! - FORM dwgupload multiple {actual_saved}')
-            filesaved = True
-            
-            # DO GIT STUFF & load into Database too
-                # parsers.surveys.SetTunnelfileInfo(dwgfile) # commented out
-    # dwgfile.save()
-
-    
-    files = []
-    dirs = []
-    #print(f'! - FORM dwgupload - start {folder} \n"{dirpath}" \n"{dirpath.parent}" \n"{dirpath.exists()}"')
-    try:
-        for f in dirpath.iterdir():
-            if f.is_dir():
-                if f.name not in ['.git' ]:
-                    dirs.append(f.name)
-                    continue
-            if f.is_file():
-                if dwgvalid(f.name): 
-                    files.append(f.name)
-                    continue
-    except FileNotFoundError:
-        doesnotexist = True
-    if files:
-        files = sorted(files)
-        
-    if dirs:
-        dirs = sorted(dirs)
-
-    return render(request, 'dwguploadform.html', 
-        {'form': form, 'doesnotexist': doesnotexist, 'urlfile': urlfile, 'urldir': urldir,'folder': folder, 'files': files, 'dirs': dirs, 'filesaved': filesaved, 'actual_saved': actual_saved})