apply enter function only for object folders

one2nc · Feb 7, 2023 · 71b0da4 · 71b0da4
1 parent 626cc8c
commit 71b0da4
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 15 deletions.
diff --git a/internal/dao/buck_obj.go b/internal/dao/buck_obj.go
@@ -71,9 +71,9 @@ func setFoldersAndFIles(Folder []*s3.CommonPrefix, File []*s3.Object) []S3Object
 		o := S3Object{
 			Name:         keyA[len(keyA)-2],
 			ObjectType:   "Folder",
-			LastModified: "_",
-			Size:         "0",
-			StorageClass: "_",
+			LastModified: "-",
+			Size:         "-",
+			StorageClass: "-",
 		}
 		s3Objects = append(s3Objects, o)
 		indx++

diff --git a/internal/ui/select_table.go b/internal/ui/select_table.go
@@ -79,6 +79,18 @@ func (s *SelectTable) GetSelectedItem() string {
 	return sel
 }
 
+func (s *SelectTable) GetSecondColumn() string {
+	if s.GetSelectedRowIndex() == 0 || s.model.Empty() {
+		return ""
+	}
+	sel := s.GetCell(s.GetSelectedRowIndex(), 1).Text
+
+	if s.selectedFn != nil {
+		return s.selectedFn(sel)
+	}
+	return sel
+}
+
 // GetSelectedCell returns the content of a cell for the currently selected row.
 func (s *SelectTable) GetSelectedCell(col int) string {
 	r, _ := s.GetSelection()

diff --git a/internal/view/buck_obj.go b/internal/view/buck_obj.go
@@ -34,18 +34,21 @@ func (obj *BObj) bindKeys(aa ui.KeyActions) {
 
 func (obj *BObj) enterCmd(evt *tcell.EventKey) *tcell.EventKey {
 	oName := obj.GetTable().GetSelectedItem()
-	o := NewS3FileViewer("OBJ")
-	ctx := obj.App().GetContext()
-	bn := ctx.Value(internal.BucketName)
-	fn := fmt.Sprintf("%v%v/", ctx.Value(internal.FolderName), oName)
-	log.Info().Msg(fmt.Sprintf("In view Folder Name: %v", fn))
-	ctx = context.WithValue(obj.App().context, internal.BucketName, bn)
-	obj.App().SetContext(ctx)
-	ctx = context.WithValue(obj.App().context, internal.FolderName, fn)
-	obj.App().SetContext(ctx)
+	fileType := obj.GetTable().GetSecondColumn()
+	if fileType == "Folder" {
+		o := NewS3FileViewer("OBJ")
+		ctx := obj.App().GetContext()
+		bn := ctx.Value(internal.BucketName)
+		fn := fmt.Sprintf("%v%v/", ctx.Value(internal.FolderName), oName)
+		log.Info().Msg(fmt.Sprintf("In view Folder Name: %v", fn))
+		ctx = context.WithValue(obj.App().context, internal.BucketName, bn)
+		obj.App().SetContext(ctx)
+		ctx = context.WithValue(obj.App().context, internal.FolderName, fn)
+		obj.App().SetContext(ctx)
 
-	obj.App().Flash().Info("Bucket Name: " + oName)
-	// println(bName)
-	obj.App().inject(o)
+		obj.App().Flash().Info("Bucket Name: " + oName)
+		// println(bName)
+		obj.App().inject(o)
+	}
 	return nil
 }