fix(import): import from slave not working / fix(recycle): skip sending delete request if no blob needs to be deleted in this batch
This commit is contained in:
@@ -190,8 +190,7 @@ func SlaveFileListRoute(srcPath string, recursive bool) string {
|
||||
query := url.Values{}
|
||||
query.Set("recursive", strconv.FormatBool(recursive))
|
||||
query.Set("path", srcPath)
|
||||
route, _ := url.Parse(constants.APIPrefixSlave + fmt.Sprintf("%s?%s", base, query.Encode()))
|
||||
return route.String()
|
||||
return fmt.Sprintf("%s?%s", base, query.Encode())
|
||||
}
|
||||
|
||||
func SlaveThumbUrl(base *url.URL, srcPath, ext string) *url.URL {
|
||||
|
||||
@@ -245,7 +245,7 @@ func (c *remoteClient) List(ctx context.Context, path string, recursive bool) ([
|
||||
}
|
||||
|
||||
if resp.Code != 0 {
|
||||
return nil, fmt.Errorf(resp.Error)
|
||||
return nil, serializer.NewErrorFromResponse(resp)
|
||||
}
|
||||
|
||||
var objects []fs.PhysicalObject
|
||||
|
||||
@@ -225,10 +225,12 @@ func (m *manager) RecycleEntities(ctx context.Context, force bool, entityIDs ...
|
||||
}), func(entity fs.Entity, index int) string {
|
||||
return entity.Source()
|
||||
})
|
||||
res, err := d.Delete(ctx, toBeDeletedSrc...)
|
||||
if err != nil {
|
||||
for _, src := range res {
|
||||
ae.Add(strconv.Itoa(mapSrcToId[src]), err)
|
||||
if len(toBeDeletedSrc) > 0 {
|
||||
res, err := d.Delete(ctx, toBeDeletedSrc...)
|
||||
if err != nil {
|
||||
for _, src := range res {
|
||||
ae.Add(strconv.Itoa(mapSrcToId[src]), err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user