瀏覽代碼

Fixed more bugs

Toby Chui 3 年之前
父節點
當前提交
7ef75ffbd1
共有 2 個文件被更改,包括 7 次插入6 次删除
  1. 2 1
      build.sh
  2. 5 5
      file_system.go

+ 2 - 1
build.sh

@@ -48,7 +48,8 @@ rm ../aroz_online_autorelease/system/auth/authlog.db
 
 #Remove modules that should not go into the build folder
 rm -rf "../aroz_online_autorelease/web/Cyinput"
-rm -rf "../aroz_online_autorelease/system/Label Maker"
+rm -rf "../aroz_online_autorelease/web/Label Maker"
+rm -rf "../aroz_online_autorelease/web/Dummy"
 
 
 echo "Creating tarball for all required files"

+ 5 - 5
file_system.go

@@ -563,25 +563,25 @@ func system_fs_handleLowMemoryUpload(w http.ResponseWriter, r *http.Request) {
 	out.Close()
 
 	//Check if the size fit in user quota
-	fi, err := os.Stat(targetUploadLocation)
+	fi, err := os.Stat(decodedUploadLocation)
 	if err != nil {
 		// Could not obtain stat, handle error
-		log.Println("Failed to validate uploaded file: ", targetUploadLocation, ". Error Message: ", err.Error())
+		log.Println("Failed to validate uploaded file: ", decodedUploadLocation, ". Error Message: ", err.Error())
 		c.WriteMessage(1, []byte(`{\"error\":\"Failed to validate uploaded file\"}`))
 		return
 	}
 
 	if !userinfo.StorageQuota.HaveSpace(fi.Size()) {
 		c.WriteMessage(1, []byte(`{\"error\":\"User Storage Quota Exceeded\"}`))
-		os.RemoveAll(targetUploadLocation)
+		os.RemoveAll(decodedUploadLocation)
 		return
 	}
 
 	//Log the upload filename
-	log.Println(userinfo.Username + " uploaded a file: " + filepath.Base(targetUploadLocation))
+	log.Println(userinfo.Username + " uploaded a file: " + filepath.Base(decodedUploadLocation))
 
 	//Set owner of the new uploaded file
-	userinfo.SetOwnerOfFile(targetUploadLocation)
+	userinfo.SetOwnerOfFile(decodedUploadLocation)
 
 	//Return complete signal
 	c.WriteMessage(1, []byte("OK"))