Skip to content

Commit cc58567

Browse files
simulotsimulot
committed
wip: fix for segfault
1 parent e258497 commit cc58567

File tree

17 files changed

+311
-309
lines changed

17 files changed

+311
-309
lines changed

‎cmdupload/upload.go‎

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ type iClient interface {
4040
type UpCmd struct {
4141
client iClient // Immich client
4242
log *logger.Logger // Application loader
43-
fsys fs.FS // pseudo file system to browse
43+
fsys []fs.FS // pseudo file system to browse
4444

4545
Recursive bool // Explore sub folders
4646
GooglePhotos bool // For reading Google Photos takeout files
@@ -142,23 +142,9 @@ func NewUpCmd(ctx context.Context, ic iClient, log *logger.Logger, args []string
142142
return nil, err
143143
}
144144

145-
for _, f := range cmd.Args() {
146-
if !fshelper.HasMagic(f) {
147-
app.Paths = append(app.Paths, f)
148-
} else {
149-
m, err := filepath.Glob(f)
150-
if err != nil {
151-
return nil, fmt.Errorf("can't use this file argument %q: %w", f, err)
152-
}
153-
if len(m) == 0 {
154-
return nil, fmt.Errorf("no file matches %q", f)
155-
}
156-
app.Paths = append(app.Paths, m...)
157-
}
158-
}
159-
160-
if len(app.Paths) == 0 {
161-
return nil, errors.Join(err, errors.New("must specify at least one path for local assets"))
145+
app.fsys, err = fshelper.ParsePath(cmd.Args())
146+
if err != nil {
147+
return nil, err
162148
}
163149

164150
if app.CreateStacks {
@@ -183,11 +169,6 @@ func NewUpCmd(ctx context.Context, ic iClient, log *logger.Logger, args []string
183169

184170
app.AssetIndex.ReIndex()
185171

186-
app.fsys, err = fshelper.OpenMultiFile(app.Paths...)
187-
if err != nil {
188-
return nil, err
189-
}
190-
191172
return &app, err
192173

193174
}
@@ -198,11 +179,13 @@ func UploadCommand(ctx context.Context, ic iClient, log *logger.Logger, args []s
198179
return err
199180
}
200181

201-
return app.Run(ctx)
182+
for _, fsys := range app.fsys {
183+
err = errors.Join(app.Run(ctx, fsys))
184+
}
185+
return err
202186
}
203187

204-
func (app *UpCmd) Run(ctx context.Context) error {
205-
fsys := app.fsys
188+
func (app *UpCmd) Run(ctx context.Context, fsys fs.FS) error {
206189
log := app.log
207190

208191
var browser assets.Browser
@@ -235,7 +218,7 @@ assetLoop:
235218
break assetLoop
236219
}
237220
if a.Err != nil {
238-
log.Warning("%s: %q", err.Error(), a.FileName)
221+
log.Warning("%s: %q", a.Err, a.FileName)
239222
} else {
240223
err = app.handleAsset(ctx, a)
241224
if err != nil {

‎cmdupload/upload_test.go‎

Lines changed: 127 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package cmdupload
33
import (
44
"cmp"
55
"context"
6+
"errors"
67
"immich-go/assets"
78
"immich-go/helpers/gen"
89
"immich-go/immich"
@@ -90,66 +91,37 @@ func TestUpload(t *testing.T) {
9091
expectedAssets []string
9192
expectedAlbums map[string][]string
9293
}{
93-
{
94-
name: "Simple file",
95-
args: []string{
96-
"TEST_DATA/folder/low/PXL_20231006_063000139.jpg",
97-
},
98-
expectedErr: false,
99-
expectedAssets: []string{"PXL_20231006_063000139.jpg"},
100-
expectedAlbums: map[string][]string{},
101-
},
102-
{
103-
name: "Simple file in an album",
104-
args: []string{
105-
"-album=the album",
106-
"TEST_DATA/folder/low/PXL_20231006_063000139.jpg",
107-
},
108-
expectedErr: false,
109-
expectedAssets: []string{
110-
"PXL_20231006_063000139.jpg",
111-
},
112-
expectedAlbums: map[string][]string{
113-
"the album": {"PXL_20231006_063000139.jpg"},
114-
},
115-
},
116-
{
117-
name: "Folders, no album creation",
118-
args: []string{
119-
"TEST_DATA/folder/high",
120-
},
121-
expectedErr: false,
122-
expectedAssets: []string{
123-
"AlbumA/PXL_20231006_063000139.jpg",
124-
"AlbumA/PXL_20231006_063029647.jpg",
125-
"AlbumA/PXL_20231006_063108407.jpg",
126-
"AlbumA/PXL_20231006_063121958.jpg",
127-
"AlbumA/PXL_20231006_063357420.jpg",
128-
"AlbumB/PXL_20231006_063528961.jpg",
129-
"AlbumB/PXL_20231006_063536303.jpg",
130-
"AlbumB/PXL_20231006_063851485.jpg",
131-
},
132-
expectedAlbums: map[string][]string{},
133-
},
134-
{
135-
name: "Folders, in given album",
136-
args: []string{
137-
"-album=the album",
138-
"TEST_DATA/folder/high",
94+
/*
95+
{
96+
name: "Simple file",
97+
args: []string{
98+
"TEST_DATA/folder/low/PXL_20231006_063000139.jpg",
99+
},
100+
expectedErr: false,
101+
expectedAssets: []string{"PXL_20231006_063000139.jpg"},
102+
expectedAlbums: map[string][]string{},
139103
},
140-
expectedErr: false,
141-
expectedAssets: []string{
142-
"AlbumA/PXL_20231006_063000139.jpg",
143-
"AlbumA/PXL_20231006_063029647.jpg",
144-
"AlbumA/PXL_20231006_063108407.jpg",
145-
"AlbumA/PXL_20231006_063121958.jpg",
146-
"AlbumA/PXL_20231006_063357420.jpg",
147-
"AlbumB/PXL_20231006_063528961.jpg",
148-
"AlbumB/PXL_20231006_063536303.jpg",
149-
"AlbumB/PXL_20231006_063851485.jpg",
104+
{
105+
name: "Simple file in an album",
106+
args: []string{
107+
"-album=the album",
108+
"TEST_DATA/folder/low/PXL_20231006_063000139.jpg",
109+
},
110+
expectedErr: false,
111+
expectedAssets: []string{
112+
"PXL_20231006_063000139.jpg",
113+
},
114+
expectedAlbums: map[string][]string{
115+
"the album": {"PXL_20231006_063000139.jpg"},
116+
},
150117
},
151-
expectedAlbums: map[string][]string{
152-
"the album": {
118+
{
119+
name: "Folders, no album creation",
120+
args: []string{
121+
"TEST_DATA/folder/high",
122+
},
123+
expectedErr: false,
124+
expectedAssets: []string{
153125
"AlbumA/PXL_20231006_063000139.jpg",
154126
"AlbumA/PXL_20231006_063029647.jpg",
155127
"AlbumA/PXL_20231006_063108407.jpg",
@@ -159,59 +131,78 @@ func TestUpload(t *testing.T) {
159131
"AlbumB/PXL_20231006_063536303.jpg",
160132
"AlbumB/PXL_20231006_063851485.jpg",
161133
},
134+
expectedAlbums: map[string][]string{},
162135
},
163-
},
164-
{
165-
name: "Folders, album after folder",
166-
args: []string{
167-
"-create-album-folder=TRUE",
168-
"TEST_DATA/folder/high",
169-
},
170-
expectedErr: false,
171-
expectedAssets: []string{
172-
"AlbumA/PXL_20231006_063000139.jpg",
173-
"AlbumA/PXL_20231006_063029647.jpg",
174-
"AlbumA/PXL_20231006_063108407.jpg",
175-
"AlbumA/PXL_20231006_063121958.jpg",
176-
"AlbumA/PXL_20231006_063357420.jpg",
177-
"AlbumB/PXL_20231006_063528961.jpg",
178-
"AlbumB/PXL_20231006_063536303.jpg",
179-
"AlbumB/PXL_20231006_063851485.jpg",
180-
},
181-
expectedAlbums: map[string][]string{
182-
"AlbumA": {
136+
{
137+
name: "Folders, in given album",
138+
args: []string{
139+
"-album=the album",
140+
"TEST_DATA/folder/high",
141+
},
142+
expectedErr: false,
143+
expectedAssets: []string{
183144
"AlbumA/PXL_20231006_063000139.jpg",
184145
"AlbumA/PXL_20231006_063029647.jpg",
185146
"AlbumA/PXL_20231006_063108407.jpg",
186147
"AlbumA/PXL_20231006_063121958.jpg",
187148
"AlbumA/PXL_20231006_063357420.jpg",
188-
},
189-
"AlbumB": {
190149
"AlbumB/PXL_20231006_063528961.jpg",
191150
"AlbumB/PXL_20231006_063536303.jpg",
192151
"AlbumB/PXL_20231006_063851485.jpg",
193152
},
153+
expectedAlbums: map[string][]string{
154+
"the album": {
155+
"AlbumA/PXL_20231006_063000139.jpg",
156+
"AlbumA/PXL_20231006_063029647.jpg",
157+
"AlbumA/PXL_20231006_063108407.jpg",
158+
"AlbumA/PXL_20231006_063121958.jpg",
159+
"AlbumA/PXL_20231006_063357420.jpg",
160+
"AlbumB/PXL_20231006_063528961.jpg",
161+
"AlbumB/PXL_20231006_063536303.jpg",
162+
"AlbumB/PXL_20231006_063851485.jpg",
163+
},
164+
},
194165
},
195-
},
196-
{
197-
name: "google photos, default options",
198-
args: []string{
199-
"-google-photos",
200-
"TEST_DATA/Takeout1",
201-
},
202-
expectedErr: false,
203-
expectedAssets: []string{
204-
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063000139.jpg",
205-
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063029647.jpg",
206-
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063108407.jpg",
207-
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063121958.jpg",
208-
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063357420.jpg",
209-
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063536303.jpg",
210-
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063851485.jpg",
211-
"Google Photos/Album test 6-10-23/PXL_20231006_063909898.LS.mp4",
166+
{
167+
name: "Folders, album after folder",
168+
args: []string{
169+
"-create-album-folder=TRUE",
170+
"TEST_DATA/folder/high",
171+
},
172+
expectedErr: false,
173+
expectedAssets: []string{
174+
"AlbumA/PXL_20231006_063000139.jpg",
175+
"AlbumA/PXL_20231006_063029647.jpg",
176+
"AlbumA/PXL_20231006_063108407.jpg",
177+
"AlbumA/PXL_20231006_063121958.jpg",
178+
"AlbumA/PXL_20231006_063357420.jpg",
179+
"AlbumB/PXL_20231006_063528961.jpg",
180+
"AlbumB/PXL_20231006_063536303.jpg",
181+
"AlbumB/PXL_20231006_063851485.jpg",
182+
},
183+
expectedAlbums: map[string][]string{
184+
"AlbumA": {
185+
"AlbumA/PXL_20231006_063000139.jpg",
186+
"AlbumA/PXL_20231006_063029647.jpg",
187+
"AlbumA/PXL_20231006_063108407.jpg",
188+
"AlbumA/PXL_20231006_063121958.jpg",
189+
"AlbumA/PXL_20231006_063357420.jpg",
190+
},
191+
"AlbumB": {
192+
"AlbumB/PXL_20231006_063528961.jpg",
193+
"AlbumB/PXL_20231006_063536303.jpg",
194+
"AlbumB/PXL_20231006_063851485.jpg",
195+
},
196+
},
212197
},
213-
expectedAlbums: map[string][]string{
214-
"Album test 6/10/23": {
198+
{
199+
name: "google photos, default options",
200+
args: []string{
201+
"-google-photos",
202+
"TEST_DATA/Takeout1",
203+
},
204+
expectedErr: false,
205+
expectedAssets: []string{
215206
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063000139.jpg",
216207
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063029647.jpg",
217208
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063108407.jpg",
@@ -221,28 +212,28 @@ func TestUpload(t *testing.T) {
221212
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063851485.jpg",
222213
"Google Photos/Album test 6-10-23/PXL_20231006_063909898.LS.mp4",
223214
},
215+
expectedAlbums: map[string][]string{
216+
"Album test 6/10/23": {
217+
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063000139.jpg",
218+
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063029647.jpg",
219+
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063108407.jpg",
220+
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063121958.jpg",
221+
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063357420.jpg",
222+
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063536303.jpg",
223+
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063851485.jpg",
224+
"Google Photos/Album test 6-10-23/PXL_20231006_063909898.LS.mp4",
225+
},
226+
},
224227
},
225-
},
226-
{
227-
name: "google photos, album name from folder",
228-
args: []string{
229-
"-google-photos",
230-
"--use-album-folder-as-name=TRUE",
231-
"TEST_DATA/Takeout1",
232-
},
233-
expectedErr: false,
234-
expectedAssets: []string{
235-
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063000139.jpg",
236-
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063029647.jpg",
237-
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063108407.jpg",
238-
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063121958.jpg",
239-
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063357420.jpg",
240-
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063536303.jpg",
241-
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063851485.jpg",
242-
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063909898.LS.mp4",
243-
},
244-
expectedAlbums: map[string][]string{
245-
"Album test 6-10-23": {
228+
{
229+
name: "google photos, album name from folder",
230+
args: []string{
231+
"-google-photos",
232+
"--use-album-folder-as-name=TRUE",
233+
"TEST_DATA/Takeout1",
234+
},
235+
expectedErr: false,
236+
expectedAssets: []string{
246237
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063000139.jpg",
247238
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063029647.jpg",
248239
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063108407.jpg",
@@ -252,8 +243,20 @@ func TestUpload(t *testing.T) {
252243
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063851485.jpg",
253244
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063909898.LS.mp4",
254245
},
246+
expectedAlbums: map[string][]string{
247+
"Album test 6-10-23": {
248+
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063000139.jpg",
249+
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063029647.jpg",
250+
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063108407.jpg",
251+
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063121958.jpg",
252+
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063357420.jpg",
253+
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063536303.jpg",
254+
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063851485.jpg",
255+
"Google\u00a0Photos/Album test 6-10-23/PXL_20231006_063909898.LS.mp4",
256+
},
257+
},
255258
},
256-
},
259+
*/
257260
{
258261
name: "google photo, ignore untitled, discard partner",
259262
args: []string{
@@ -341,7 +344,9 @@ func TestUpload(t *testing.T) {
341344
return
342345
}
343346

344-
err = app.Run(ctx)
347+
for _, fsys := range app.fsys {
348+
err = errors.Join(app.Run(ctx, fsys))
349+
}
345350
if (tc.expectedErr && err == nil) || (!tc.expectedErr && err != nil) {
346351
t.Errorf("unexpected error condition: %v,%s", tc.expectedErr, err)
347352
return

‎helpers/fshelper/TESTDATA/A/1.jpg‎

Loading

‎helpers/fshelper/TESTDATA/A/1.json‎

Whitespace-only changes.

‎helpers/fshelper/TESTDATA/A/2.jpg‎

Loading

‎helpers/fshelper/TESTDATA/A/2.json‎

Whitespace-only changes.

‎helpers/fshelper/TESTDATA/A/T/10.jpg‎

Loading

‎helpers/fshelper/TESTDATA/A/T/10.json‎

Whitespace-only changes.

‎helpers/fshelper/TESTDATA/B/4.jpg‎

Loading

‎helpers/fshelper/TESTDATA/B/4.json‎

Whitespace-only changes.

0 commit comments

Comments
 (0)