|
|
@ -26,12 +26,14 @@ func DeleteFile(master string, fileId string, jwt security.EncodedJwt) error { |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
return fmt.Errorf("Failed to lookup %s:%v", fileId, err) |
|
|
return fmt.Errorf("Failed to lookup %s:%v", fileId, err) |
|
|
} |
|
|
} |
|
|
|
|
|
for i := 0; i < 5; i++ { |
|
|
err = util.Delete(fileUrl, jwt) |
|
|
err = util.Delete(fileUrl, jwt) |
|
|
if err != nil { |
|
|
|
|
|
return fmt.Errorf("Failed to delete %s:%v", fileUrl, err) |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
if err == nil { |
|
|
return nil |
|
|
return nil |
|
|
} |
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
return fmt.Errorf("Failed to delete %s:%v", fileUrl, err) |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
func ParseFileId(fid string) (vid string, key_cookie string, err error) { |
|
|
func ParseFileId(fid string) (vid string, key_cookie string, err error) { |
|
|
commaIndex := strings.Index(fid, ",") |
|
|
commaIndex := strings.Index(fid, ",") |
|
|
|