v0.4.0: scroll log, worker slots, disk skip, color gradient, parallel export
This commit is contained in:
Ein Anderssono
+409
-7
@@ -6,6 +6,7 @@ import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
"strings"
|
||||
"sync/atomic"
|
||||
"testing"
|
||||
|
||||
"gitea.k3s.k0.nu/tools/photocli/internal/photos"
|
||||
@@ -49,6 +50,12 @@ func (m *mockBridge) ExportOriginal(assetID, out string, index int) (photos.Expo
|
||||
}
|
||||
return photos.ExportResult{Filename: "test.jpg", Size: 2048, Cloud: "cloud"}, nil
|
||||
}
|
||||
func (m *mockBridge) ExportPreviewWithSlot(assetID, out string, targetSize, index, slotIndex int) (photos.ExportResult, error) {
|
||||
return m.ExportPreview(assetID, out, targetSize, index)
|
||||
}
|
||||
func (m *mockBridge) ExportOriginalWithSlot(assetID, out string, index, slotIndex int) (photos.ExportResult, error) {
|
||||
return m.ExportOriginal(assetID, out, index)
|
||||
}
|
||||
func (m *mockBridge) Cancel() { m.cancelled = true }
|
||||
func (m *mockBridge) IsCancelled() bool { return m.cancelled }
|
||||
|
||||
@@ -161,13 +168,16 @@ func TestCmdPhotosMissingAlbumID(t *testing.T) {
|
||||
|
||||
func TestCmdPhotosSuccess(t *testing.T) {
|
||||
b := &mockBridge{
|
||||
assets: []photos.Asset{{ID: "as1", Filename: "IMG_0001.JPG", Cloud: "local"}, {ID: "as2", Filename: "IMG_0002.JPG", Cloud: "cloud"}},
|
||||
assets: []photos.Asset{
|
||||
{ID: "as1", Filename: "IMG_0001.JPG", Cloud: "local", MediaType: "image", PixelWidth: 4032, PixelHeight: 3024},
|
||||
{ID: "as2", Filename: "IMG_0002.JPG", Cloud: "cloud", MediaType: "image", PixelWidth: 1920, PixelHeight: 1080},
|
||||
},
|
||||
}
|
||||
out, _, rc := runWith([]string{"photos", "--album-id", "x"}, b)
|
||||
if rc != 0 {
|
||||
t.Errorf("rc = %d", rc)
|
||||
}
|
||||
expected := "as1\tIMG_0001.JPG\tlocal\nas2\tIMG_0002.JPG\tcloud\n"
|
||||
expected := "as1\tIMG_0001.JPG\tlocal\timage\t4032x3024\nas2\tIMG_0002.JPG\tcloud\timage\t1920x1080\n"
|
||||
if out != expected {
|
||||
t.Errorf("out = %q, want %q", out, expected)
|
||||
}
|
||||
@@ -317,7 +327,7 @@ func TestCmdBackupAllExportError(t *testing.T) {
|
||||
if rc != 0 {
|
||||
t.Fatalf("rc = %d, stderr = %q", rc, stderr)
|
||||
}
|
||||
if !strings.Contains(stderr, "failed: img.jpg: disk full") {
|
||||
if !strings.Contains(stderr, "\u274c img.jpg: disk full") {
|
||||
t.Errorf("stderr should contain failure detail, got: %q", stderr)
|
||||
}
|
||||
if !strings.Contains(stderr, "(1 failed)") {
|
||||
@@ -416,7 +426,7 @@ func TestCmdExportBridgeError(t *testing.T) {
|
||||
if !strings.Contains(stderr, "all exports failed") {
|
||||
t.Errorf("stderr = %q", stderr)
|
||||
}
|
||||
if !strings.Contains(stderr, "failed: img.jpg: disk full") {
|
||||
if !strings.Contains(stderr, "\u274c img.jpg: disk full") {
|
||||
t.Errorf("stderr should contain failure detail, got: %q", stderr)
|
||||
}
|
||||
}
|
||||
@@ -461,7 +471,7 @@ func TestCmdExportOriginalsBridgeError(t *testing.T) {
|
||||
if !strings.Contains(stderr, "all exports failed") {
|
||||
t.Errorf("stderr = %q", stderr)
|
||||
}
|
||||
if !strings.Contains(stderr, "failed: img.jpg: copy failed") {
|
||||
if !strings.Contains(stderr, "\u274c img.jpg: copy failed") {
|
||||
t.Errorf("stderr should contain failure detail, got: %q", stderr)
|
||||
}
|
||||
}
|
||||
@@ -646,7 +656,7 @@ func TestCmdExportPartialFailure(t *testing.T) {
|
||||
if rc != 0 {
|
||||
t.Errorf("rc = %d, stderr = %q", rc, stderr)
|
||||
}
|
||||
if !strings.Contains(stderr, "failed: bad.jpg: disk full") {
|
||||
if !strings.Contains(stderr, "\u274c bad.jpg: disk full") {
|
||||
t.Errorf("stderr should contain failure detail, got: %q", stderr)
|
||||
}
|
||||
if !strings.Contains(stderr, "(1 failed)") {
|
||||
@@ -666,7 +676,7 @@ func TestCmdBackupAllSkippedAlbum(t *testing.T) {
|
||||
if rc != 0 {
|
||||
t.Fatalf("rc = %d, stderr = %q", rc, stderr)
|
||||
}
|
||||
if !strings.Contains(stderr, "skipped album Broken") {
|
||||
if !strings.Contains(stderr, "\u26a0 album Broken") {
|
||||
t.Errorf("stderr should contain skipped album, got: %q", stderr)
|
||||
}
|
||||
}
|
||||
@@ -684,3 +694,395 @@ func TestResolveAlbumIDNotFoundMessage(t *testing.T) {
|
||||
t.Errorf("err = %q", err.Error())
|
||||
}
|
||||
}
|
||||
|
||||
func TestFormatSpeed(t *testing.T) {
|
||||
tests := []struct {
|
||||
bps float64
|
||||
want string
|
||||
}{
|
||||
{0, ""},
|
||||
{500, "500 B/s"},
|
||||
{1500, "1.5 KB/s"},
|
||||
{1024 * 1024, "1.0 MB/s"},
|
||||
{2.5 * 1024 * 1024, "2.5 MB/s"},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
got := formatSpeed(tt.bps)
|
||||
if got != tt.want {
|
||||
t.Errorf("formatSpeed(%v) = %q, want %q", tt.bps, got, tt.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestFormatSize(t *testing.T) {
|
||||
tests := []struct {
|
||||
bytes int64
|
||||
want string
|
||||
}{
|
||||
{0, ""},
|
||||
{-1, ""},
|
||||
{500, "500 B"},
|
||||
{1500, "1.5 KB"},
|
||||
{1024 * 1024, "1.0 MB"},
|
||||
{2.5 * 1024 * 1024, "2.5 MB"},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
got := formatSize(tt.bytes)
|
||||
if got != tt.want {
|
||||
t.Errorf("formatSize(%d) = %q, want %q", tt.bytes, got, tt.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestSanitizePathComponent(t *testing.T) {
|
||||
tests := []struct {
|
||||
input string
|
||||
want string
|
||||
}{
|
||||
{"Hello World", "Hello World"},
|
||||
{"Hello/World", "Hello_World"},
|
||||
{"Hello\\World", "Hello_World"},
|
||||
{" spaces ", "spaces"},
|
||||
{"", "Untitled"},
|
||||
{" ", "Untitled"},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
got := sanitizePathComponent(tt.input)
|
||||
if got != tt.want {
|
||||
t.Errorf("sanitizePathComponent(%q) = %q, want %q", tt.input, got, tt.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestExportMode(t *testing.T) {
|
||||
if exportMode(true) != "originals" {
|
||||
t.Error("exportMode(true) should be originals")
|
||||
}
|
||||
if exportMode(false) != "previews" {
|
||||
t.Error("exportMode(false) should be previews")
|
||||
}
|
||||
}
|
||||
|
||||
func TestCountAlbums(t *testing.T) {
|
||||
nodes := []photos.CollectionNode{
|
||||
{Name: "folder", Kind: "folder", Children: []photos.CollectionNode{
|
||||
{Name: "album1", Kind: "album"},
|
||||
{Name: "sub", Kind: "folder", Children: []photos.CollectionNode{
|
||||
{Name: "album2", Kind: "album"},
|
||||
}},
|
||||
}},
|
||||
{Name: "album3", Kind: "album"},
|
||||
}
|
||||
if n := countAlbums(nodes); n != 3 {
|
||||
t.Errorf("countAlbums = %d, want 3", n)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCmdExportAllFailures(t *testing.T) {
|
||||
b := &mockBridge{
|
||||
assets: []photos.Asset{{ID: "a1", Filename: "bad.jpg"}},
|
||||
exportPreviewFn: func(string, string, int, int) (photos.ExportResult, error) {
|
||||
return photos.ExportResult{}, fmt.Errorf("error")
|
||||
},
|
||||
}
|
||||
_, stderr, rc := runWith([]string{"export", "--album-id", "x", "--out", "/tmp"}, b)
|
||||
if rc != 1 {
|
||||
t.Errorf("rc = %d, want 1", rc)
|
||||
}
|
||||
if !strings.Contains(stderr, "all exports failed") {
|
||||
t.Errorf("stderr = %q", stderr)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCmdPhotosAssetsError(t *testing.T) {
|
||||
b := &mockBridge{
|
||||
albums: []photos.Album{{ID: "x", Title: "Album"}},
|
||||
assetsByAlbum: map[string][]photos.Asset{},
|
||||
}
|
||||
_, stderr, rc := runWith([]string{"photos", "--album-id", "x"}, b)
|
||||
if rc != 1 {
|
||||
t.Errorf("rc = %d, want 1", rc)
|
||||
}
|
||||
if !strings.Contains(stderr, "album not found") {
|
||||
t.Errorf("stderr = %q", stderr)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCmdBackupAllAuthDenied(t *testing.T) {
|
||||
b := &mockBridge{accessErr: fmt.Errorf("denied")}
|
||||
_, stderr, rc := runWith([]string{"backup-all", "--out", "/tmp"}, b)
|
||||
if rc != 1 {
|
||||
t.Errorf("rc = %d, want 1", rc)
|
||||
}
|
||||
if !strings.Contains(stderr, "denied") {
|
||||
t.Errorf("stderr = %q", stderr)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCmdExportAssetsByAlbumMap(t *testing.T) {
|
||||
b := &mockBridge{
|
||||
albums: []photos.Album{{ID: "a1", Title: "TestAlbum"}},
|
||||
assetsByAlbum: map[string][]photos.Asset{
|
||||
"a1": {{ID: "x1", Filename: "photo.jpg", Cloud: "cloud"}},
|
||||
},
|
||||
}
|
||||
_, stderr, rc := runWith([]string{"export", "--album-id", "TestAlbum", "--out", "/tmp"}, b)
|
||||
if rc != 0 {
|
||||
t.Errorf("rc = %d, stderr = %q", rc, stderr)
|
||||
}
|
||||
if !strings.Contains(stderr, "exported 1") {
|
||||
t.Errorf("stderr = %q", stderr)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCmdBackupAllWithFolder(t *testing.T) {
|
||||
b := &mockBridge{
|
||||
tree: []photos.CollectionNode{
|
||||
{Name: "MyFolder", Kind: "folder", Children: []photos.CollectionNode{
|
||||
{ID: "a1", Name: "SubAlbum", Kind: "album"},
|
||||
}},
|
||||
},
|
||||
assetsByAlbum: map[string][]photos.Asset{
|
||||
"a1": {{ID: "x1", Filename: "photo.jpg"}},
|
||||
},
|
||||
}
|
||||
_, stderr, rc := runWith([]string{"backup-all", "--out", "/backup"}, b)
|
||||
if rc != 0 {
|
||||
t.Fatalf("rc = %d, stderr = %q", rc, stderr)
|
||||
}
|
||||
if !strings.Contains(stderr, "exported 1 preview files across 1 albums") {
|
||||
t.Errorf("stderr = %q", stderr)
|
||||
}
|
||||
}
|
||||
|
||||
func TestProgressDisplayRenderBar(t *testing.T) {
|
||||
var buf bytes.Buffer
|
||||
d := newProgressBar(&buf, 1)
|
||||
d.setTotal(5, 10, "1.0 MB")
|
||||
d.setAlbum("DnD", 3, 5)
|
||||
d.setWorker(0, "photo.jpg", 0, "cloud", "exporting")
|
||||
d.draw()
|
||||
output := buf.String()
|
||||
if !strings.Contains(output, "Total") {
|
||||
t.Error("should contain Total")
|
||||
}
|
||||
if !strings.Contains(output, "Album") {
|
||||
t.Error("should contain Album")
|
||||
}
|
||||
if !strings.Contains(output, "DnD") {
|
||||
t.Error("should contain album name DnD")
|
||||
}
|
||||
if !strings.Contains(output, "photo.jpg") {
|
||||
t.Error("should contain filename")
|
||||
}
|
||||
}
|
||||
|
||||
func TestProgressDisplayLocalFile(t *testing.T) {
|
||||
var buf bytes.Buffer
|
||||
d := newProgressBar(&buf, 1)
|
||||
d.setTotal(1, 1, "500 B")
|
||||
d.setAlbum("", 0, 0)
|
||||
d.logCompleted("\u2705 local.jpg - 500 B - copied")
|
||||
output := buf.String()
|
||||
if !strings.Contains(output, "copied") {
|
||||
t.Error("local files should show copied status")
|
||||
}
|
||||
if !strings.Contains(output, "\u2705") {
|
||||
t.Error("local files should show check mark")
|
||||
}
|
||||
}
|
||||
|
||||
func TestProgressDisplaySkippedFile(t *testing.T) {
|
||||
var buf bytes.Buffer
|
||||
d := newProgressBar(&buf, 1)
|
||||
d.setTotal(1, 1, "0 B")
|
||||
d.setAlbum("", 0, 0)
|
||||
d.logCompleted("\u23ed exists.jpg")
|
||||
output := buf.String()
|
||||
if !strings.Contains(output, "\u23ed") {
|
||||
t.Error("skipped files should show skipped status")
|
||||
}
|
||||
}
|
||||
|
||||
func TestProgressDisplayError(t *testing.T) {
|
||||
var buf bytes.Buffer
|
||||
d := newProgressBar(&buf, 1)
|
||||
d.logCompleted("\u274c bad.jpg: some error")
|
||||
output := buf.String()
|
||||
if !strings.Contains(output, "\u274c") {
|
||||
t.Error("should contain error marker")
|
||||
}
|
||||
}
|
||||
|
||||
func TestProgressDisplayClear(t *testing.T) {
|
||||
var buf bytes.Buffer
|
||||
d := newProgressBar(&buf, 1)
|
||||
d.setTotal(1, 1, "0 B")
|
||||
d.draw()
|
||||
d.clear()
|
||||
output := buf.String()
|
||||
if !strings.Contains(output, "\x1b[") {
|
||||
t.Error("clear should use ANSI escape codes")
|
||||
}
|
||||
}
|
||||
|
||||
func TestExportParallelWithCancel(t *testing.T) {
|
||||
var cancelFlag int32
|
||||
call := int32(0)
|
||||
bridge := &mockBridge{
|
||||
albums: []photos.Album{{ID: "a1", Title: "Test"}},
|
||||
assetsByAlbum: map[string][]photos.Asset{
|
||||
"a1": {
|
||||
{ID: "x1", Filename: "img1.jpg"},
|
||||
{ID: "x2", Filename: "img2.jpg"},
|
||||
{ID: "x3", Filename: "img3.jpg"},
|
||||
{ID: "x4", Filename: "img4.jpg"},
|
||||
{ID: "x5", Filename: "img5.jpg"},
|
||||
},
|
||||
},
|
||||
exportOrigFn: func(string, string, int) (photos.ExportResult, error) {
|
||||
if atomic.AddInt32(&call, 1) >= 2 {
|
||||
atomic.StoreInt32(&cancelFlag, 1)
|
||||
}
|
||||
return photos.ExportResult{Filename: "img.jpg", Size: 1024, Cloud: "local"}, nil
|
||||
},
|
||||
}
|
||||
_, _, _ = runWith([]string{"export", "--album-id", "Test", "--out", "/tmp", "--originals"}, bridge)
|
||||
_ = cancelFlag
|
||||
}
|
||||
|
||||
func TestExportParallelPartialFailure(t *testing.T) {
|
||||
b := &mockBridge{
|
||||
albums: []photos.Album{{ID: "a1", Title: "Test"}},
|
||||
assetsByAlbum: map[string][]photos.Asset{
|
||||
"a1": {
|
||||
{ID: "x1", Filename: "ok1.jpg"},
|
||||
{ID: "x2", Filename: "bad.jpg"},
|
||||
{ID: "x3", Filename: "ok2.jpg"},
|
||||
{ID: "x4", Filename: "ok3.jpg"},
|
||||
{ID: "x5", Filename: "ok4.jpg"},
|
||||
},
|
||||
},
|
||||
exportPreviewFn: func(_ string, _ string, _ int, idx int) (photos.ExportResult, error) {
|
||||
if idx == 1 {
|
||||
return photos.ExportResult{}, fmt.Errorf("fail")
|
||||
}
|
||||
return photos.ExportResult{Filename: "ok.jpg", Size: 2048, Cloud: "local"}, nil
|
||||
},
|
||||
}
|
||||
_, stderr, rc := runWith([]string{"export", "--album-id", "Test", "--out", "/tmp"}, b)
|
||||
if rc != 0 {
|
||||
t.Errorf("rc = %d, want 0 (partial success)", rc)
|
||||
}
|
||||
if !strings.Contains(stderr, "1 failed") {
|
||||
t.Errorf("stderr should contain failed count, got: %q", stderr)
|
||||
}
|
||||
}
|
||||
|
||||
func TestBackupAllEmptyTree(t *testing.T) {
|
||||
b := &mockBridge{tree: []photos.CollectionNode{}}
|
||||
_, stderr, rc := runWith([]string{"backup-all", "--out", "/tmp"}, b)
|
||||
if rc != 0 {
|
||||
t.Errorf("rc = %d", rc)
|
||||
}
|
||||
if !strings.Contains(stderr, "exported 0") {
|
||||
t.Errorf("stderr = %q", stderr)
|
||||
}
|
||||
}
|
||||
|
||||
func TestFilterVideos(t *testing.T) {
|
||||
assets := []photos.Asset{
|
||||
{ID: "1", Filename: "a.jpg", MediaType: "image"},
|
||||
{ID: "2", Filename: "b.mov", MediaType: "video"},
|
||||
{ID: "3", Filename: "c.jpg", MediaType: "image"},
|
||||
{ID: "4", Filename: "d.mp3", MediaType: "audio"},
|
||||
{ID: "5", Filename: "e.heic", MediaType: "image"},
|
||||
}
|
||||
filtered, count := filterVideos(assets)
|
||||
if count != 3 {
|
||||
t.Errorf("count = %d, want 3", count)
|
||||
}
|
||||
for _, a := range filtered {
|
||||
if a.MediaType == "video" || a.MediaType == "audio" {
|
||||
t.Errorf("found %s asset: %+v", a.MediaType, a)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestPhotosOutputWithCreationDate(t *testing.T) {
|
||||
date := "2024-06-15T12:30:00+0200"
|
||||
b := &mockBridge{
|
||||
assets: []photos.Asset{
|
||||
{ID: "a1", Filename: "IMG.jpg", Cloud: "local", MediaType: "image", PixelWidth: 4032, PixelHeight: 3024, CreationDate: &date},
|
||||
},
|
||||
}
|
||||
out, _, rc := runWith([]string{"photos", "--album-id", "x"}, b)
|
||||
if rc != 0 {
|
||||
t.Errorf("rc = %d", rc)
|
||||
}
|
||||
if !strings.Contains(out, date) {
|
||||
t.Errorf("out = %q, want creation date %s", out, date)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPhotosOutputWithDuration(t *testing.T) {
|
||||
b := &mockBridge{
|
||||
assets: []photos.Asset{
|
||||
{ID: "v1", Filename: "clip.mov", Cloud: "cloud", MediaType: "video", PixelWidth: 1920, PixelHeight: 1080, Duration: 12.5},
|
||||
},
|
||||
}
|
||||
out, _, rc := runWith([]string{"photos", "--album-id", "x"}, b)
|
||||
if rc != 0 {
|
||||
t.Errorf("rc = %d", rc)
|
||||
}
|
||||
if !strings.Contains(out, "12.5s") {
|
||||
t.Errorf("out = %q, want duration", out)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPhotosOutputWithFavorite(t *testing.T) {
|
||||
b := &mockBridge{
|
||||
assets: []photos.Asset{
|
||||
{ID: "f1", Filename: "fav.jpg", Cloud: "local", MediaType: "image", PixelWidth: 1000, PixelHeight: 1000, IsFavorite: true},
|
||||
},
|
||||
}
|
||||
out, _, rc := runWith([]string{"photos", "--album-id", "x"}, b)
|
||||
if rc != 0 {
|
||||
t.Errorf("rc = %d", rc)
|
||||
}
|
||||
if !strings.Contains(out, "*") {
|
||||
t.Errorf("out = %q, want favorite marker", out)
|
||||
}
|
||||
}
|
||||
|
||||
func TestExportSkipsVideos(t *testing.T) {
|
||||
b := &mockBridge{
|
||||
assets: []photos.Asset{
|
||||
{ID: "1", Filename: "a.jpg", MediaType: "image"},
|
||||
{ID: "2", Filename: "b.mov", MediaType: "video"},
|
||||
},
|
||||
}
|
||||
_, stderr, rc := runWith([]string{"export", "--album-id", "x", "--out", "/tmp"}, b)
|
||||
if rc != 0 {
|
||||
t.Errorf("rc = %d", rc)
|
||||
}
|
||||
if !strings.Contains(stderr, "1 assets") {
|
||||
t.Errorf("stderr = %q, want 1 asset (video skipped)", stderr)
|
||||
}
|
||||
}
|
||||
|
||||
func TestExportIncludesVideos(t *testing.T) {
|
||||
b := &mockBridge{
|
||||
assets: []photos.Asset{
|
||||
{ID: "1", Filename: "a.jpg", MediaType: "image"},
|
||||
{ID: "2", Filename: "b.mov", MediaType: "video"},
|
||||
},
|
||||
}
|
||||
_, stderr, rc := runWith([]string{"export", "--album-id", "x", "--out", "/tmp", "--include-videos"}, b)
|
||||
if rc != 0 {
|
||||
t.Errorf("rc = %d", rc)
|
||||
}
|
||||
if !strings.Contains(stderr, "2 assets") {
|
||||
t.Errorf("stderr = %q, want 2 assets (video included)", stderr)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user