Merge pull request #53 from alan16742/master

support upload empty file
vcheckzen · Sep 21, 2024 · 8cc8a86 · 8cc8a86
2 parents 89da5a5 + f1625a4
commit 8cc8a86
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 35 deletions.
diff --git a/back-end-cf/index.js b/back-end-cf/index.js
@@ -43,7 +43,6 @@ const PATH_AUTH_STATES = Object.freeze({
 
 async function handleRequest(request) {
   let queryString, querySplited, requestPath;
-  let abnormalWay = false;
   const returnHeaders = {
     'Access-Control-Allow-Origin': '*',
     'Cache-Control': 'max-age=3600',
@@ -55,10 +54,9 @@ async function handleRequest(request) {
     queryString = decodeURIComponent(
       'file=/' + request.url.split('://')[1].split(/\/(.+)/)[1]
     );
-    abnormalWay = true;
   }
   if (queryString) querySplited = queryString.split('=');
-  if ((querySplited && querySplited[0] === 'file') || abnormalWay) {
+  if ((querySplited && querySplited[0] === 'file')) {
     const file = querySplited[1];
     const fileName = file.split('/').pop();
     if (fileName.toLowerCase() === PASSWD_FILENAME.toLowerCase())
@@ -279,10 +277,10 @@ async function uploadFiles(fileJsonList) {
   const batchRequest = {
     requests: fileList.map((file, index) => ({
       id: `${index + 1}`,
-      method: 'POST',
+      method: file['fileSize'] ? 'POST' : 'PUT',
       url: `/me/drive/root:${encodeURI(
         EXPOSE_PATH + file['remotePath']
-      )}:/createUploadSession`,
+      )}${file['fileSize'] ? ':/createUploadSession' : ':/content'}`,
       headers: { 'Content-Type': 'application/json' },
       body: {},
     })),

diff --git a/front-end/index.html b/front-end/index.html
@@ -15,9 +15,6 @@
       //   window.GLOBAL_CONFIG.SCF_GATEWAY += "/fodi/";
       //   window.GLOBAL_CONFIG.IS_CF = false;
       // }
-      // if (location.protocol === 'http:') {
-      //     location.href = location.href.replace(/http/, 'https');
-      // }
     </script>
     <meta charset="utf-8" />
     <meta
@@ -1446,43 +1443,17 @@
         }
 
         if (display === 'preview') {
-          // document.querySelector('.list-header').style.display = 'none';
-          // document.querySelector('#file-list').style.display = 'none';
-          // document.querySelector('.markdown-body').style.display = 'none';
-          // document.querySelector('.password').style.display = 'none';
-          // document.querySelector('.preview').style.display = 'initial';
           document.querySelector('.preview').dataset.hidden = '0';
         } else if (display === 'encrypted') {
-          // document.querySelector('.list-header').style.display = 'none';
-          // document.querySelector('#file-list').style.display = 'none';
-          // document.querySelector('.markdown-body').style.display = 'none';
-          // document.querySelector('.preview').style.display = 'none';
-          // document.querySelector('.password-wrapper').style.display = 'initial';
           document.querySelector('.password-wrapper').dataset.hidden = '0';
-          // document.querySelector('#readme').innerHTML = '';
-          // let content = document.querySelector('.preview .content');
-          // if (content) {
-          //   document.querySelector('.preview .content').innerHTML = '';
-          // }
         } else if (display === 'upload') {
           document.querySelector('.file-upload-progress').innerHTML = '';
           document.querySelector('.file-upload-progress').dataset.hidden = '1';
           document.querySelector('.file-upload-wrapper').dataset.hidden = '0';
         } else {
-          // document.querySelector('.list-header').style.display = 'initial';
-          // document.querySelector('#file-list').style.display = 'initial';
-
           document.querySelector('.list-header').dataset.hidden = '0';
           document.querySelector('#file-list').dataset.hidden = '0';
           document.querySelector('.markdown-body').dataset.hidden = '0';
-          // document.querySelector('.markdown-body').style.display = 'none';
-          // document.querySelector('.preview').style.display = 'none';
-          // document.querySelector('.password').style.display = 'none';
-          // document.querySelector('#readme').innerHTML = '';
-          // let content = document.querySelector('.preview .content');
-          // if (content) {
-          //   document.querySelector('.preview .content').innerHTML = '';
-          // }
         }
 
         document.querySelector('.main').dataset.hidden = '0';
@@ -1672,6 +1643,7 @@
         const odPath = window.backFordwardCache.current;
         const upFileList = fileInput.map((f) => ({
           remotePath: `${odPath}/${f.webkitRelativePath || f.name}`,
+          fileSize: f.size ? 1 : 0,
         }));
 
         function paginate(array, size) {
@@ -1750,7 +1722,7 @@
           }
 
           if (fileSize === 0) {
-            progressText.innerHTML = `${file.name}: 0 byte, skipped.`;
+            progressText.innerHTML = `${file.name}: Upload completed!`;
           } else {
             progressText.innerHTML += ' Upload completed!';
           }