From 946f5696388a13a996b7f51d78cbbf4d3d9fac85 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 27 Oct 2019 21:11:08 -0600
Subject: [PATCH] Don't export s3 URLs if not requested
---
controllers/data_controller/export_controller.go | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/controllers/data_controller/export_controller.go b/controllers/data_controller/export_controller.go
index 45fe10fc..b05bbd03 100644
--- a/controllers/data_controller/export_controller.go
+++ b/controllers/data_controller/export_controller.go
@@ -184,9 +184,12 @@ func StartUserExport(userId string, s3urls bool, includeData bool, log *logrus.E
}
mediaManifest := make(map[string]*manifestRecord)
for _, m := range media {
- s3url, err := ds_s3.GetS3URL(m.DatastoreId, m.Location)
- if err != nil {
- log.Warn(err)
+ var s3url string
+ if s3urls {
+ s3url, err = ds_s3.GetS3URL(m.DatastoreId, m.Location)
+ if err != nil {
+ log.Warn(err)
+ }
}
mediaManifest[m.MxcUri()] = &manifestRecord{
ArchivedName: archivedName(m),
--
GitLab