210714 fix for collection image path

backstage/static/js/editor.js

@@ -117,8 +117,11 @@ axios.get(contentApiUrl).then(({ data }) => {
         class: ImageTool,
         config: {
           endpoints: {
-            byFile: '/backstage/upload' + JSON.parse(document.getElementById('url').textContent).url, // Your backend file uploader endpoint
+/*             byFile: '/backstage/upload' + JSON.parse(document.getElementById('url').textContent).url, // Your backend file uploader endpoint
             byUrl: '/backstage/getimage' + JSON.parse(document.getElementById('url').textContent).url, // Your endpoint that provides uploading by Url
+*/            
+            byFile: '/backstage/upload/' + $('#ctitle').val(), // Your backend file uploader endpoint
+            byUrl: '/backstage/getimage/' + $('#ctitle').val(), // Your endpoint that provides uploading by Url
           }
         }
       }

backstage/upload/routes.py

@@ -42,21 +42,22 @@ def upload_post(filepath):
             #filename = secure_filename(file.filename)
 
             #fname = str(uuid.uuid4()) + file.filename[file.filename.rfind("."):]
-            sitepath = UPLOAD_PATH_MAP[0][0] + filepath[filepath.rfind("/")+1:] + "/img/"
+            #sitepath = UPLOAD_PATH_MAP[0][0] + filepath[filepath.rfind("/")+1:] + "/img/"
+            sitepath = UPLOAD_PATH_MAP[0][0] + filepath + "/img/"
             oimgtype = file.filename[file.filename.rfind(".")+1:]
             oimgtypeName = oimgtype
             if oimgtype.lower() == 'jpg':
                 oimgtypeName = 'jpeg'
 
             wfname = str(uuid.uuid4()) + ".webp"
-            owfname = wfname.replace('webp',oimgtype)
+            owfname = wfname.replace('webp', oimgtype)
             #fullpath = UPLOAD_PATH_MAP[0][0] + filepath[filepath.rfind("/")+1:] + "\\img\\" + fname
             #print(UPLOAD_PATH_MAP[0][1] + filepath[filepath.rfind("/")+1:] + "/img/" + fname)
             # file.save(fullpath)
             #image_object = Image.open(fullpath)
             #print(request.args.get('url', type=str))
-            wpath = os.getcwd() + "/backstage/upload/" + filepath[filepath.rfind("/")+1:]+"/img/"
-            owpath = os.getcwd() + "/backstage/upload/" + filepath[filepath.rfind("/")+1:]+"/img/orig/"
+            wpath = os.getcwd() + "/backstage/upload/" + filepath+"/img/"
+            owpath = os.getcwd() + "/backstage/upload/" + filepath+"/img/orig/"
             #fullpath = wpath + fname
             if not os.path.exists(wpath):
                 os.makedirs(wpath)
@@ -64,17 +65,17 @@ def upload_post(filepath):
                 os.makedirs(owpath)
             if not os.path.exists(sitepath):
                 os.makedirs(sitepath)
-            #file.save(fullpath)
+            # file.save(fullpath)
             image_object = Image.open(file)
             image_object.save(owpath+owfname, oimgtypeName)
             if image_object.size[0] > 1000:
                 image_object.thumbnail(size=((800, 800)))
             image_object.save(wpath+wfname, 'webp')
-            image_object.save(sitepath+wfname , 'webp')
+            image_object.save(sitepath+wfname, 'webp')
             #file.save(os.getcwd()+ "/backstage/upload/img/"+ fname)
             # return redirect(url_for('download_file', name=file.filename))
             aa = {"success": 1, "file": {"url": "/backstage/upload/" +
-                                         filepath[filepath.rfind("/")+1:]+"/img/" + wfname, "width": image_object.width, "height": image_object.height}}
+                                         filepath+"/img/" + wfname, "width": image_object.width, "height": image_object.height}}
             # aa = {"success": 1, "file": {"url": UPLOAD_PATH_MAP[0][1] + filepath[filepath.rfind(
             #    "/")+1:] + "/img/" + fname, "width": image_object.width, "height": image_object.height}}
             return aa
@@ -95,25 +96,25 @@ def upload_get(filepath):
     #aa = {"success" : 1,"file": { "url" : "https://www.tesla.com/tesla_theme/assets/img/_vehicle_redesign/roadster_and_semi/roadster/hero.jpg", } }
     # return redirect(url_for('upload.upload_get',filename=filename), code=301)
     # return send_from_directory(os.getcwd() + "/backstage/upload/"+filepath, filepath[filepath.rfind("/")+1:])
-     
+
     return send_file(os.getcwd() + "/backstage/upload/"+filepath)
 
 
 @upload_app.route('/backstage/getimage/<path:filepath>', methods=['POST', 'GET'])
 def get_image(filepath):
 
-    #print(request.get_json()['url'])
-    sitepath = UPLOAD_PATH_MAP[0][0] + filepath[filepath.rfind("/")+1:] + "/img/"
+    # print(request.get_json()['url'])
+    sitepath = UPLOAD_PATH_MAP[0][0] + filepath + "/img/"
     oimgtype = str(request.get_json()['url'])[str(request.get_json()['url']).rfind(".")+1:]
     oimgtypeName = oimgtype
     if oimgtype.lower() == 'jpg':
-       oimgtypeName = 'jpeg'
-    #fname = str(uuid.uuid4()) + str(request.get_json()
+        oimgtypeName = 'jpeg'
+    # fname = str(uuid.uuid4()) + str(request.get_json()
     #                                ['url'])[str(request.get_json()['url']).rfind("."):]
     wfname = str(uuid.uuid4()) + ".webp"
-    owfname = wfname.replace('webp',oimgtype)
-    wpath = os.getcwd() + "/backstage/upload/" + filepath[filepath.rfind("/")+1:]+"/img/"
-    owpath = os.getcwd() + "/backstage/upload/" + filepath[filepath.rfind("/")+1:]+"/img/orig/"
+    owfname = wfname.replace('webp', oimgtype)
+    wpath = os.getcwd() + "/backstage/upload/" + filepath+"/img/"
+    owpath = os.getcwd() + "/backstage/upload/" + filepath+"/img/orig/"
     """ fullpath = wpath + fname
     if not os.path.exists(wpath):
         os.makedirs(wpath)
@@ -126,12 +127,12 @@ def get_image(filepath):
         os.makedirs(owpath)
     if not os.path.exists(sitepath):
         os.makedirs(sitepath)
-    image_object = Image.open(requests.get(request.get_json()['url'],stream=True).raw)
+    image_object = Image.open(requests.get(request.get_json()['url'], stream=True).raw)
     image_object.save(owpath+owfname, oimgtypeName)
     if image_object.size[0] > 1000:
         image_object.thumbnail(size=((800, 800)))
     image_object.save(wpath+wfname, 'webp')
-    image_object.save(sitepath+wfname , 'webp')
+    image_object.save(sitepath+wfname, 'webp')
     # send_file()
     #aa = {"success" : 1,"file": { "url" : "http://localhost:9000/backstage/upload/avatar1.jpg", } }
     #resp = make_response(open(os.getcwd()+ "/backstage/upload/" + fname, 'br').read(), 301)
@@ -139,5 +140,5 @@ def get_image(filepath):
     #resp.content_encoding = "Unicode"
     # return redirect(request.get_json()['url'], code=301)
     aa = {"success": 1, "file": {"url": "/backstage/upload/" +
-                                 filepath[filepath.rfind("/")+1:]+"/img/" + wfname, "width": image_object.width, "height": image_object.height}}
+                                 filepath+"/img/" + wfname, "width": image_object.width, "height": image_object.height}}
     return aa