瀏覽代碼

Cleaned up latest changes dbg log

luis 7 年之前
父節點
當前提交
bfab160aa9
共有 3 個文件被更改,包括 8 次插入12 次删除
  1. 2 2
      internal/core/core.go
  2. 5 9
      internal/fs/gdrivefs/gdrivefs.go
  3. 1 1
      version.go

+ 2 - 2
internal/core/core.go

@@ -54,7 +54,7 @@ func New() *Core {
 			Daemonize:   false,
 			Type:        "gdrive",
 			VerboseLog:  false,
-			RefreshTime: 2 * time.Minute,
+			RefreshTime: 5 * time.Second,
 			HomeDir:     filepath.Join(usr.HomeDir, ".cloudmount"),
 			Source:      filepath.Join(usr.HomeDir, ".cloudmount", "gdrive.json"),
 			UID:         uint32(uid),
@@ -80,7 +80,7 @@ func (c *Core) Init() (err error) {
 func (c *Core) Mount() {
 
 	// Start Selected driveFS
-	c.CurrentFS.Start()
+	c.CurrentFS.Start() // Should not block
 	//////////////
 	// Server
 	/////////

+ 5 - 9
internal/fs/gdrivefs/gdrivefs.go

@@ -75,11 +75,12 @@ func New(core *core.Core) core.Driver {
 	return fs
 }
 
+// Async
 func (fs *GDriveFS) Start() {
 	go func() {
-		fs.Refresh()
+		fs.Refresh() // First load
 
-		log.Println("Checking changes:")
+		// Change reader loop
 		startPageTokenRes, err := fs.client.Changes.GetStartPageToken().Do()
 		if err != nil {
 			log.Println("GDrive err", err)
@@ -93,14 +94,9 @@ func (fs *GDriveFS) Start() {
 					log.Println("Err fetching changes", err)
 					break
 				}
-				log.Println("Changes:", len(changesRes.Changes))
+				//log.Println("Changes:", len(changesRes.Changes))
 				for _, c := range changesRes.Changes {
-					if c.File != nil {
-						log.Printf("File %s changed", c.File.Name)
-						log.Println("Parents:", c.File.Parents)
-					}
 					entry := fs.root.FindByGID(c.FileId)
-					log.Println("Is entry nil?", entry)
 					if c.Removed {
 						if entry == nil {
 							continue
@@ -123,7 +119,7 @@ func (fs *GDriveFS) Start() {
 				pageToken = changesRes.NextPageToken
 			}
 
-			time.Sleep(10 * time.Second)
+			time.Sleep(fs.config.RefreshTime)
 		}
 	}()
 }

+ 1 - 1
version.go

@@ -2,5 +2,5 @@ package main
 
 const (
   //Version contains version of the package
-  Version = "0.3-3-gadf4880 - built: 2017-07-11 01:34:58 UTC"
+  Version = "0.4-1-g48bf168 - built: 2017-07-11 17:00:31 UTC"
 )