fix s3 sorting by file size bug

one2nc · Sep 26, 2023 · 441d39a · 441d39a
1 parent 8c405ea
commit 441d39a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/internal/aws/types.go b/internal/aws/types.go
@@ -17,6 +17,7 @@ type EC2Resp struct {
 }
 
 type S3Object struct {
+	SizeInBytes int64
 	Name, ObjectType, LastModified, Size, StorageClass string
 }
 

diff --git a/internal/dao/buck_obj.go b/internal/dao/buck_obj.go
@@ -96,6 +96,7 @@ func setFoldersAndFiles(folders []types.CommonPrefix, files []types.Object) []aw
 					Name:         keyA[len(keyA)-1],
 					ObjectType:   "File",
 					LastModified: IST.Format("Mon Jan _2 15:04:05 2006"),
+					SizeInBytes:  fi.Size,
 					Size:         humanize.Bytes(uint64(fi.Size)),
 					StorageClass: string(fi.StorageClass),
 				}

diff --git a/internal/render/buck_obj.go b/internal/render/buck_obj.go
@@ -17,6 +17,7 @@ func (obj BObj) Header() Header {
 		HeaderColumn{Name: "Last-Modified", SortIndicatorIdx: 5, Align: tview.AlignLeft, Hide: false, Wide: false, MX: false, Time: true},
 		HeaderColumn{Name: "Size", SortIndicatorIdx: 0, Align: tview.AlignLeft, Hide: false, Wide: false, MX: false, Time: false},
 		HeaderColumn{Name: "Storage-Class", SortIndicatorIdx: 8, Align: tview.AlignLeft, Hide: false, Wide: false, MX: false, Time: true},
+		HeaderColumn{Name: "SizeInBytes", SortIndicatorIdx: 0, Align: tview.AlignLeft, Hide: true, Wide: false, MX: false, Time: false},
 	}
 }
 
@@ -33,6 +34,7 @@ func (obj BObj) Render(o interface{}, ns string, row *Row) error {
 		s3Resp.LastModified,
 		s3Resp.Size,
 		s3Resp.StorageClass,
+		fmt.Sprint(s3Resp.SizeInBytes),
 	}
 	return nil
 }
diff --git a/internal/ui/table.go b/internal/ui/table.go
@@ -133,7 +133,9 @@ func (t *Table) buildRow(r int, re, ore render.RowEvent, h render.Header) {
 		if col == 0 {
 			cell.SetReference(re.Row.ID)
 		}
-		t.SetCell(r, col, cell)
+		if !h[c].Hide {
+			t.SetCell(r, col, cell)
+		}
 		col++
 	}
 }
@@ -147,7 +149,9 @@ func (t *Table) AddHeaderCell(col int, h render.HeaderColumn) {
 	c.SetAttributes(tcell.AttrBold)
 	c.SetExpansion(1)
 	c.SetAlign(h.Align)
-	t.SetCell(0, col, c)
+	if !h.Hide{
+		t.SetCell(0, col, c)
+	}
 }
 
 // ClearMarks clear out marked items.

diff --git a/internal/view/buck_obj.go b/internal/view/buck_obj.go
@@ -39,7 +39,7 @@ func (obj *S3FileViewer) bindKeys(aa ui.KeyActions) {
 	aa.Add(ui.KeyActions{
 		ui.KeyShiftN:    ui.NewKeyAction("Sort Name", obj.GetTable().SortColCmd("Name", true), true),
 		ui.KeyShiftM:    ui.NewKeyAction("Sort Modification-Time", obj.GetTable().SortColCmd("Last-Modified", true), true),
-		ui.KeyShiftS:    ui.NewKeyAction("Sort Size", obj.GetTable().SortColCmd("Size", true), true),
+		ui.KeyShiftS:    ui.NewKeyAction("Sort Size", obj.GetTable().SortColCmd("SizeInBytes", true), true),
 		ui.KeyShiftC:    ui.NewKeyAction("Sort Storage-Class", obj.GetTable().SortColCmd("Storage-Class", true), true),
 		tcell.KeyEscape: ui.NewKeyAction("Back", obj.App().PrevCmd, false),
 		tcell.KeyEnter:  ui.NewKeyAction("View", obj.enterCmd, false),