allow uploading to cwd

closes #79
mifi · Oct 22, 2024 · 9c14e6c · 9c14e6c
1 parent 0583756
commit 9c14e6c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/app.js b/app.js
@@ -47,11 +47,14 @@ export default ({ sharedPath: sharedPathIn, port, maxUploadSize, zipCompressionL
   // NOTE: Must support non latin characters
   app.post('/api/upload', bodyParser.json(), asyncHandler(async (req, res) => {
     // console.log(req.headers)
+    const uploadDirPathIn = req.query.path || '/';
+
+    const uploadDirPath = await getFileAbsPath(uploadDirPathIn);
 
     // parse a file upload
     const form = Formidable({
       keepExtensions: true,
-      uploadDir: sharedPath,
+      uploadDir: uploadDirPath,
       maxFileSize: maxUploadSize,
       maxFields,
     });
@@ -67,12 +70,12 @@ export default ({ sharedPath: sharedPathIn, port, maxUploadSize, zipCompressionL
         const files = Array.isArray(filesIn) ? filesIn : [filesIn];
 
         // console.log(JSON.stringify({ fields, files }, null, 2));
-        console.log('Uploaded files:');
+        console.log('Uploaded files to', uploadDirPath);
         files.forEach((f) => console.log(f.originalFilename, `(${f.size} bytes)`));
 
         await pMap(files, async (file) => {
           try {
-            const targetPath = join(sharedPath, filenamify(file.originalFilename, { maxLength: 255 }));
+            const targetPath = join(uploadDirPath, filenamify(file.originalFilename, { maxLength: 255 }));
             if (!(await pathExists(targetPath))) await fs.rename(file.filepath, targetPath); // to prevent overwrites
           } catch (err2) {
             console.error(`Failed to rename ${file.originalFilename}`, err2);

diff --git a/ezshare-frontend/src/App.jsx b/ezshare-frontend/src/App.jsx
@@ -47,7 +47,7 @@ const Section = ({ children, style }) => (
   </div>
 );
 
-const Uploader = ({ onUploadSuccess }) => {
+const Uploader = ({ onUploadSuccess, cwd }) => {
   const [uploadProgress, setUploadProgress] = useState();
   const [uploadSpeed, setUploadSpeed] = useState();
 
@@ -77,7 +77,7 @@ const Uploader = ({ onUploadSuccess }) => {
           if (dataLoaded && startTime) setUploadSpeed(dataLoaded / ((Date.now() - startTime) / 1000));
         };
 
-        await axios.post('/api/upload', data, { onUploadProgress });
+        await axios.post(`/api/upload?path=${encodeURIComponent(cwd)}`, data, { onUploadProgress });
 
         Toast.fire({ icon: 'success', title: 'File(s) uploaded successfully' });
         onUploadSuccess();
@@ -92,7 +92,7 @@ const Uploader = ({ onUploadSuccess }) => {
     }
 
     upload();
-  }, [onUploadSuccess]);
+  }, [cwd, onUploadSuccess]);
 
   const { getRootProps, getInputProps, isDragActive } = useDropzone({ onDrop });
 
@@ -288,7 +288,7 @@ const Browser = () => {
 
       <Section>
         <h2>Upload files</h2>
-        <Uploader onUploadSuccess={handleUploadSuccess} />
+        <Uploader cwd={currentDirFiles.cwd} onUploadSuccess={handleUploadSuccess} />
       </Section>
 
       <Section>