From f81a7a397a53e765795f50e9cba0a42c012bf3f6 Mon Sep 17 00:00:00 2001 From: Tobias Kunze Date: Mon, 18 Dec 2017 09:12:13 +0100 Subject: [PATCH] Prepend slug to exported filenames (#719) --- src/pretix/base/exporters/invoices.py | 2 +- src/pretix/base/exporters/json.py | 2 +- src/pretix/base/exporters/mail.py | 2 +- src/pretix/base/exporters/orderlist.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pretix/base/exporters/invoices.py b/src/pretix/base/exporters/invoices.py index a1e865c2f..5a63efb21 100644 --- a/src/pretix/base/exporters/invoices.py +++ b/src/pretix/base/exporters/invoices.py @@ -26,7 +26,7 @@ class InvoiceExporter(BaseExporter): i.file.close() with open(os.path.join(d, 'tmp.zip'), 'rb') as zipf: - return 'invoices.zip', 'application/zip', zipf.read() + return '{}_invoices.zip'.format(self.event.slug), 'application/zip', zipf.read() @receiver(register_data_exporters, dispatch_uid="exporter_invoices") diff --git a/src/pretix/base/exporters/json.py b/src/pretix/base/exporters/json.py index 04e3561ba..92dc87b00 100644 --- a/src/pretix/base/exporters/json.py +++ b/src/pretix/base/exporters/json.py @@ -101,7 +101,7 @@ class JSONExporter(BaseExporter): } } - return 'pretixdata.json', 'application/json', json.dumps(jo, cls=DjangoJSONEncoder) + return '{}_pretixdata.json'.format(self.event.slug), 'application/json', json.dumps(jo, cls=DjangoJSONEncoder) @receiver(register_data_exporters, dispatch_uid="exporter_json") diff --git a/src/pretix/base/exporters/mail.py b/src/pretix/base/exporters/mail.py index 8c9e9d335..31ec4fd24 100644 --- a/src/pretix/base/exporters/mail.py +++ b/src/pretix/base/exporters/mail.py @@ -23,7 +23,7 @@ class MailExporter(BaseExporter): ).values('attendee_email') data = "\r\n".join(set(a['email'] for a in addrs) | set(a['attendee_email'] for a in pos if a['attendee_email'])) - return 'pretixemails.txt', 'text/plain', data.encode("utf-8") + return '{}_pretixemails.txt'.format(self.event.slug), 'text/plain', data.encode("utf-8") @property def export_form_fields(self): diff --git a/src/pretix/base/exporters/orderlist.py b/src/pretix/base/exporters/orderlist.py index 32d31d7e7..03f2e8dca 100644 --- a/src/pretix/base/exporters/orderlist.py +++ b/src/pretix/base/exporters/orderlist.py @@ -171,7 +171,7 @@ class QuotaListExporter(BaseExporter): ] writer.writerow(row) - return 'quotas.csv', 'text/csv', output.getvalue().encode("utf-8") + return '{}_quotas.csv'.format(self.event.slug), 'text/csv', output.getvalue().encode("utf-8") @receiver(register_data_exporters, dispatch_uid="exporter_orderlist")