vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-05-06 22:18:28 +00:00
Code Issues Projects Releases Wiki Activity

Remove prefix in Filelist and RemoveDir

Browse Source
This commit is contained in:
Sylvain Baubeau
2015-01-30 11:57:48 +01:00
committed by Sebastien Badia
parent bc357a19a1
commit 1ba06e828d
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
swift/public.go
+9 -1
View File
@@ -127,11 +127,15 @@ func (storage *PublishedStorage) Remove(path string) error {
func (storage *PublishedStorage) RemoveDirs(path string, progress aptly.Progress) error { func (storage *PublishedStorage) RemoveDirs(path string, progress aptly.Progress) error {
path = filepath.Join(storage.prefix, path) path = filepath.Join(storage.prefix, path)
opts := swift.ObjectsOpts{ opts := swift.ObjectsOpts{
Prefix: storage.prefix, Prefix: path,
} }
if objects, err := storage.conn.ObjectNamesAll(storage.container, &opts); err != nil { if objects, err := storage.conn.ObjectNamesAll(storage.container, &opts); err != nil {
return fmt.Errorf("error removing dir %s from %s: %s", path, storage, err) return fmt.Errorf("error removing dir %s from %s: %s", path, storage, err)
} else { } else {
for index, name := range objects {
objects[index] = name[len(storage.prefix):]
}
var multi_delete bool = true var multi_delete bool = true
if storage.support_bulk_delete { if storage.support_bulk_delete {
_, err := storage.conn.BulkDelete(storage.container, objects) _, err := storage.conn.BulkDelete(storage.container, objects)
@@ -199,6 +203,10 @@ func (storage *PublishedStorage) Filelist(prefix string) ([]string, error) {
return nil, fmt.Errorf("error listing under prefix %s in %s: %s", prefix, storage, err) return nil, fmt.Errorf("error listing under prefix %s in %s: %s", prefix, storage, err)
} }
for index, name := range contents {
contents[index] = name[len(prefix):]
}
return contents, nil return contents, nil
} }