fix: Add path and pathname

Author: frankpagan

CoCreate.config.js

@@ -8,17 +8,16 @@ module.exports = {
             "object": {
                 "_id": "61a12db2a8b6b4001a9f5a2e",
                 "name": "index.html",
-                "path": "/docs/file/index.html",
+                "path": "/docs/file/",
+                "pathname": "/docs/file/index.html",
                 "src": "{{./docs/index.html}}",
                 "host": [
                     "*",
                     "general.cocreate.app"
                 ],
-                "directory": "/docs/file",
-                "parentDirectory": "{{parentDirectory}}",
+                "directory": "file",
                 "content-type": "{{content-type}}",
-                "public": "true",
-                "website_id": "644d4bff8036fb9d1d1fd69c"
+                "public": "true"
             }
         }
     ]

src/client.js

@@ -117,8 +117,8 @@ async function fileEvent(event) {
                 files[i] = await readFile(files[i])
 
             files[i].directory = handle.directory || '/'
-            files[i].parentDirectory = handle.parentDirectory || ''
-            files[i].path = handle.path || '/' + handle.name
+            files[i].path = handle.path || '/'
+            files[i].pathname = handle.pathname || '/' + handle.name
             files[i]['content-type'] = files[i].type
             files[i].input = input
             files[i].id = await getFileId(files[i])
@@ -159,9 +159,9 @@ async function fileEvent(event) {
 async function getDirectoryHandles(handle, name) {
     let handles = [];
     for await (const entry of handle.values()) {
-        entry.directory = '/' + name
-        entry.parentDirectory = name.split("/").pop();
-        entry.path = '/' + name + '/' + entry.name
+        entry.directory = name
+        entry.path = '/' + name + '/'
+        entry.pathname = '/' + name + '/' + entry.name
         if (!entry.webkitRelativePath)
             entry.webkitRelativePath = name
 
@@ -631,8 +631,8 @@ async function create(directory, type, name, src = "") {
             }
 
             if (directory.input) {
-                file.directory = directory.path
-                file.parentDirectory = directory.name
+                file.directory = directory.name
+                file.pathname = directory.path + '/' + file.name
                 file.path = directory.path + '/' + file.name
                 file.input = directory.input
                 file.handle = handle

src/server.js

@@ -121,7 +121,7 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
 
 
     crud.socket.create(config)
-    config.broadcastSender = false
+    // config.broadcastBrowser = false
 
     if (config.email && config.password) {
         let request = {
@@ -195,14 +195,9 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
             let name = file
             let source = ''
             let directoryName = parentDirectory || '';
-            let parentDirectoryOnly = parentDirectory || '';
-            let index = parentDirectoryOnly.lastIndexOf('/') + 1
-            if (parentDirectoryOnly && index) {
-                parentDirectoryOnly = parentDirectoryOnly.substring(index)
-            }
+
             const fileExtension = path.extname(file);
             let mimeType = mimeTypes[fileExtension]
-            let pathName = '';
 
             if (!directoryName && directory.object && directory.object.directory)
                 directoryName = directory.object.directory.replace('{{directory}}', '').trim()
@@ -211,12 +206,23 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
 
             if (exclude && exclude.includes(directoryName)) continue
 
+            let Path = '';
             if (directoryName.endsWith("/"))
-                pathName = directoryName + name
+                Path = directoryName
             else if (directoryName)
-                pathName = directoryName + '/' + name
+                Path = directoryName + '/'
             else
-                pathName = '/' + name
+                Path = '/'
+
+            let pathname = Path + name;
+
+            let folder = ''
+            if (Path === '/')
+                folder = Path
+            else {
+                let result = Path.split('/');
+                folder = result[result.length - 2];
+            }
 
             if (isDirectory)
                 mimeType = "text/directory"
@@ -226,9 +232,9 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
             let values = {
                 '{{name}}': name,
                 '{{source}}': source,
-                '{{directory}}': directoryName,
-                '{{parentDirectory}}': parentDirectoryOnly,
-                '{{path}}': pathName,
+                '{{directory}}': folder,
+                '{{path}}': Path,
+                '{{pathname}}': pathname,
                 '{{content-type}}': mimeType
             }
 
@@ -239,10 +245,10 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
                 object.src = "{{source}}"
             if (!object.directory)
                 object.directory = "/{{directory}}"
-            if (!object.parentDirectory)
-                object.parentDirectory = "{{parentDirectory}}"
             if (!object.path)
                 object.path = "{{path}}"
+            if (!object.pathname)
+                object.pathname = "{{pathname}}"
             if (!object["content-type"])
                 object["content-type"] = '{{content-type}}'
             if (!object.public && object.public != false && object.public != 'false')
@@ -259,7 +265,7 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
                     if (variables) {
                         for (let variable of variables) {
                             if (variable == '{{directory}}') {
-                                if (parentDirectory)
+                                if (folder)
                                     newObject.object[key] = values[variable]
                                 else
                                     newObject.object[key] = newObject.object[key].replace(variable, '');
@@ -276,21 +282,21 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
 
             if (!newObject.object._id)
                 newObject.$filter = {
-                    query: [{ key: 'path', value: pathName, operator: '$or' }]
+                    query: [{ key: 'pathname', value: pathname, operator: '$or' }]
                 }
 
             response = await runStore(newObject);
             if (response.error)
                 errorLog.push(response.error)
 
-            if (isDirectory && pathName) {
+            if (isDirectory && pathname) {
                 let newEntry
                 if (entry.endsWith("/"))
                     newEntry = entry + name
                 else
                     newEntry = entry + '/' + name
 
-                await runFiles(directory, newEntry, exclude, pathName)
+                await runFiles(directory, newEntry, exclude, pathname)
             }
         }
         if (errorLog.length)
@@ -377,9 +383,9 @@ module.exports = async function file(CoCreateConfig, configPath, match) {
                         }
 
                     let data = { array, object }
-                    if (!object._id && object.path)
+                    if (!object._id && object.pathname)
                         data.$filter = {
-                            query: [{ key: 'path', value: object.path, operator: '$or' }]
+                            query: [{ key: 'pathname', value: object.pathname, operator: '$or' }]
                         }
 
                     if (match.length && isMatch)