Fixing upload refresh duplicate bug

mod/filesystem/filesystem.go

@@ -109,10 +109,12 @@ func NewFileSystemHandler(option FileSystemOption) (*FileSystemHandler, error) {
 		if option.Hierarchy == "backup" {
 			//Backup disk. Create an Hierarchy Config for this drive
 			hierarchySpecificConfig = hybridBackup.BackupConfig{
-				DiskUID:   option.Uuid,
-				DiskPath:  option.Path,
-				ParentUID: option.Parentuid,
-				Mode:      option.BackupMode,
+				CycleCounter:  0,
+				LastCycleTime: time.Now().Unix(),
+				DiskUID:       option.Uuid,
+				DiskPath:      option.Path,
+				ParentUID:     option.Parentuid,
+				Mode:          option.BackupMode,
 			}
 		}
 

mod/filesystem/hybridBackup/fastwalk.go

@@ -0,0 +1,44 @@
+package hybridBackup
+
+import (
+	"io/ioutil"
+	"os"
+	"path/filepath"
+)
+
+/*
+	High speed file walk function with no file stats
+*/
+func fastWalk(root string, walkFunc func(string) error) error {
+	return walkDir(root, walkFunc)
+}
+
+func walkDir(dir string, walkFunc func(string) error) error {
+	files, err := ioutil.ReadDir(dir)
+	if err != nil {
+		return err
+	}
+
+	for _, f := range files {
+		if f.IsDir() {
+			err := walkDir(filepath.Join(dir, f.Name()), walkFunc)
+			if err != nil {
+				return err
+			}
+		} else if !f.IsDir() {
+			err := walkFunc(filepath.Join(dir, f.Name()))
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
+func fileExists(filename string) bool {
+	if _, err := os.Stat(filename); os.IsNotExist(err) {
+		return false
+	}
+	return true
+}

mod/filesystem/hybridBackup/hybridBackup.go

@@ -2,6 +2,9 @@ package hybridBackup
 
 import (
 	"log"
+	"path/filepath"
+	"strings"
+	"time"
 )
 
 /*
@@ -23,19 +26,55 @@ import (
 */
 
 type BackupConfig struct {
-	CycleCounter int64  //The number of backup executed in the background
-	DiskUID      string //The UID of the target fsandlr
-	DiskPath     string //The mount point for the disk
-	ParentUID    string //Parent virtal disk UUID
-	ParentPath   string //Parent disk path
-	Mode         string //Backup mode
+	CycleCounter  int64  //The number of backup executed in the background
+	LastCycleTime int64  //The execution time of the last cycle
+	DiskUID       string //The UID of the target fsandlr
+	DiskPath      string //The mount point for the disk
+	ParentUID     string //Parent virtal disk UUID
+	ParentPath    string //Parent disk path
+	Mode          string //Backup mode
 }
 
+//Main handler function for hybrid backup
 func HandleBackupProcess(backupConfig *BackupConfig) (string, error) {
 	log.Println(">>>>>> Running backup process: ", backupConfig)
+	rootPath := filepath.ToSlash(filepath.Clean(backupConfig.ParentPath))
+
+	//Check if the target disk is writable and mounted
+	if fileExists(filepath.Join(backupConfig.DiskPath, "aofs.db")) && fileExists(filepath.Join(backupConfig.DiskPath, "aofs.db.lock")) {
+		//This filesystem is mounted
+
+	} else {
+		//File system not mounted. Skipping
+		log.Println("*HybridBackup* Skipping backup cycle for " + backupConfig.ParentUID + ":/")
+		return "Parent drive (" + backupConfig.ParentUID + ":/) not mounted. Skipping", nil
+	}
 
 	if backupConfig.Mode == "smart" {
+		//Smart backup mode. Scan new files every minutes and compare creation time scan every hour minutes
+		if backupConfig.CycleCounter%5 == 0 {
+			//Perform deep backup, use walk function
+
+		} else {
+			//Perform shallow backup
+			fastWalk(rootPath, func(filename string) error {
+				rootAbs, _ := filepath.Abs(rootPath)
+				fileAbs, _ := filepath.Abs(filename)
+
+				rootAbs = filepath.ToSlash(filepath.Clean(rootAbs))
+				fileAbs = filepath.ToSlash(filepath.Clean(fileAbs))
+
+				relPath := strings.ReplaceAll(fileAbs, rootAbs, "")
+				assumedTargetPosition := filepath.Join(backupConfig.DiskPath, relPath)
+				if !fileExists(assumedTargetPosition) {
+					//Target file not exists in backup disk. Make a copy
+					//WIP
+					log.Println("Copying ", assumedTargetPosition)
+				}
 
+				return nil
+			})
+		}
 	} else if backupConfig.Mode == "nightly" {
 
 	} else if backupConfig.Mode == "append" {
@@ -44,6 +83,7 @@ func HandleBackupProcess(backupConfig *BackupConfig) (string, error) {
 
 	//Add one to the cycle counter
 	backupConfig.CycleCounter++
+	backupConfig.LastCycleTime = time.Now().Unix()
 
 	//Return the log information
 	return "", nil

storage.go

@@ -125,6 +125,10 @@ func FilesystemDaemonInit() {
 
 			backupConfig.ParentPath = parentFileSystemHandler.Path
 
+			//Debug backup execution
+			backupConfig.CycleCounter = 1
+			hybridBackup.HandleBackupProcess(&backupConfig)
+
 			//Create a scheudler for this disk
 			systemScheduler.CreateNewScheduledFunctionJob("backup-daemon ["+thisHandler.UUID+"]",
 				"Backup daemon from "+backupConfig.ParentUID+":/ to "+backupConfig.DiskUID+":/",

web/SystemAO/network/portforward.html

@@ -160,6 +160,11 @@
                 ports.push(parseInt(thisPort));
             });
 
+            if (ports.length == 0){
+                //Not selecting anything
+                return;
+            }
+
             //Confirm removal
             if (confirm("Confirm removing forward on: " + ports.join(", ") + "?")){
                 ports.forEach(port => {

web/desktop.system

@@ -2709,6 +2709,11 @@
                     
                 }
 
+                //Update the desktop hash to prevent the auto refresh by hash
+                getDesktopHash(function(hash){
+                    desktopFileHash = hash;
+                });
+
                 if (callback !== undefined) {
                     //console.log(callback);
                     callback();
@@ -5196,8 +5201,8 @@
         function uploadFile(file, callback=undefined) {
             let url = 'system/file_system/upload'
             let uploadCurrentPath = "user:/Desktop/";
-            let formData = new FormData()
-            let xhr = new XMLHttpRequest()
+            let formData = new FormData();
+            let xhr = new XMLHttpRequest();
             formData.append('file', file);
             formData.append('path', uploadCurrentPath);