Update app.py

app.py

@@ -38,7 +38,7 @@ import deploying_3_3
 import Doors_Schedule
 import Code_2_7
 import Counting_Columns_2_1
-# import Find_Hyperlinking_text
+import Find_Hyperlinking_text
 import ezdxf
 from flask import Flask, render_template, session, redirect, url_for
 from flask_session import Session  # Capital "S"
@@ -221,7 +221,7 @@ def getfromdropboxImg(jsdata):
     jsdata=eval(jsdata)
     print('pdfnameeee==',jsdata)
 
-    dbPath='/TSA JOBS/ADR Test/'+jsdata[0][0]+'/'+jsdata[0][1]+'/'+jsdata[0][2]+'/Measured Plan/'+jsdata[1]
+    dbPath='/TSA JOBS/ADR Test/'+jsdata[0][0]+'/'+jsdata[0][1]+'/'+jsdata[0][2]+'/Measured Plan/'+'Measured_'+jsdata[1]
     print(dbPath)
     dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
     md, res =dbxTeam.files_download(path=dbPath)
@@ -338,7 +338,7 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0):
                 dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/'
                 print(dbPath,result[0]) 
                 # 
-                pdflink= tsadropboxretrieval.uploadanyFile(doc=doc,path=dbPath,pdfname=result[0]) #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/'
+                pdflink= tsadropboxretrieval.uploadanyFile(doc=doc,path=dbPath,pdfname='Measured_'+result[0]) #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/'
 
                 _, buffer = cv2.imencode('.png', outputimg)
                 arr=[ base64.b64encode(buffer).decode('utf-8'),SimilarAreaDictionary.to_dict(), spreadsheet_url,spreadsheetId,[],list1.to_dict(),pdflink,hatched_areas,namepathArr]#,hatched_areas,namepathArr]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
@@ -362,7 +362,7 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0):
                 dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/'
                 print(dbPath,result[0]) 
                 # 
-                pdflink= tsadropboxretrieval.uploadanyFile(doc=doc,path=dbPath,pdfname=result[0]) #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/'
+                pdflink= tsadropboxretrieval.uploadanyFile(doc=doc,path=dbPath,pdfname='Measured_'+result[0]) #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/'
 
                 _, buffer = cv2.imencode('.png', outputimg)
                 arr=[ base64.b64encode(buffer).decode('utf-8'),SimilarAreaDictionary.to_dict(), spreadsheet_url,spreadsheetId,[],list1.to_dict(),pdflink,[],namepathArr]#,hatched_areas,namepathArr]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
@@ -383,7 +383,7 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0):
         # annotatedimg,pdf_document,spreadsheet_url, list1 , df_doors=doors_fasterrcnn.main_run(img,dataDoc,'separated_classes_all.pth',result[0],pdfpath, result[4]) #single_double.pth
         annotatedimg, pdf_document , list1, repeated_labels , not_found =Doors_Schedule.mainRun(dataDocDoorsSchedule, dataDoc)
         dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/' 
-        pdflink= tsadropboxretrieval.uploadanyFile(doc=pdf_document,path=dbPath,pdfname=result[0]) #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/
+        pdflink= tsadropboxretrieval.uploadanyFile(doc=pdf_document,path=dbPath,pdfname='Measured_'+result[0]) #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/
         _, buffer = cv2.imencode('.png', annotatedimg)
         repeatedLabelsReturn=''
         NotFoundReturn=''
@@ -535,6 +535,30 @@ def modifyingcalcRefDynamic(img):
     return area, perimeter, blk , imgcopy
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________
+@app.route('/downloadPDFfromLink')
+def downloadPDFfromLinkFunc():
+    encoded_url = request.args.get('url')
+    link = urllib.parse.unquote(encoded_url)
+
+    if link and ('http' in link or 'dropbox' in link):
+        if 'dl=0' in link:
+            link = link.replace('dl=0', 'dl=1')
+        elif 'www.dropbox.com' in link and '?dl=1' not in link:
+            link += '?dl=1'
+
+    try:
+        res = requests.get(link)
+        res.raise_for_status()
+    except Exception as e:
+        return f"Error downloading PDF from link: {e}", 400
+
+    pdf_data = res.content
+    filename = link.split("/")[-1].split("?")[0] or "downloaded.pdf"
+
+    response = make_response(io.BytesIO(pdf_data).getvalue())
+    response.headers.set('Content-Type', 'application/pdf')
+    response.headers.set('Content-Disposition', f'attachment; filename="{filename}"')
+    return response
 
 @app.route('/get-pdf/<jsdata>')
 def get_pdf(jsdata):
@@ -544,11 +568,6 @@ def get_pdf(jsdata):
     print('pdfpath',pdfpath)
     dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
     md, res =dbxTeam.files_download(path=pdfpath) 
-
-    doc = fitz.open("pdf",res.content)
-    page=doc[0]
-    # print('get pdf size::',page.mediabox)
-
     pdf_data = res.content  # Ensure this is your correct PDF data from Dropbox
     response = make_response(io.BytesIO(pdf_data).getvalue())
     response.headers.set('Content-Type', 'application/pdf')