Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add timestamp to downloads

Browse Source 
svn: r20906
This commit is contained in:
Doug Blank 2012-12-31 14:58:09 +00:00
parent 62e56c09ac
commit dc18499c7e
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gramps/webapp/grampsdb/views.py
View File

@ -32,6 +32,7 @@ Each object can be operated on with the following actions:
import os import os
import sys import sys
import time
if sys.version_info[0] < 3: if sys.version_info[0] < 3:
import cPickle as pickle import cPickle as pickle
else: else:
@ -171,6 +172,12 @@ def user_page(request, username=None):
else: else:
raise Http404(_("Requested page is not accessible.")) raise Http404(_("Requested page is not accessible."))
def timestamp():
"""
Construct a string of current time for filenames.
"""
return time.strftime("%Y-%m-%d:%H:%M:%S")
def send_file(request, filename, mimetype): def send_file(request, filename, mimetype):
""" """
Send a file through Django without loading the whole file into Send a file through Django without loading the whole file into
@ -215,17 +222,18 @@ def process_report_run(request, handle):
args[key] = value args[key] = value
############################################################################# #############################################################################
if report.report_type == "report": if report.report_type == "report":
filename = "/tmp/%s-%s.%s" % (str(profile.user.username), str(handle), args["off"]) filename = "/tmp/%s-%s-%s.%s" % (str(profile.user.username), str(handle), timestamp(), args["off"])
run_report(db, handle, of=filename, **args) run_report(db, handle, of=filename, **args)
mimetype = 'application/%s' % args["off"] mimetype = 'application/%s' % args["off"]
elif report.report_type == "export": elif report.report_type == "export":
filename = "/tmp/%s-%s.%s" % (str(profile.user.username), str(handle), args["off"]) filename = "/tmp/%s-%s-%s.%s" % (str(profile.user.username), str(handle), timestamp(), args["off"])
export_file(db, filename, gramps.cli.user.User()) # callback export_file(db, filename, gramps.cli.user.User()) # callback
mimetype = 'text/plain' mimetype = 'text/plain'
elif report.report_type == "import": elif report.report_type == "import":
filename = download(args["i"], "/tmp/%s-%s.%s" % (str(profile.user.username), filename = download(args["i"], "/tmp/%s-%s-%s.%s" % (str(profile.user.username),
str(handle), str(handle),
args["iff"])) timestamp(),
args["iff"]))
if filename is not None: if filename is not None:
if True: # run in background, with error handling if True: # run in background, with error handling
import threading import threading