mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-24 12:05:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

use ?download=1 to trigger download in /files/

Browse Source 
sets `Content-Disposition: attachment...`

- master sets this unconditionally
- 2.x sets this iff file is a notebook
This commit is contained in:
Min RK 2014-10-31 15:45:30 -07:00
parent 1281319cc9
commit 1d7f8803e0
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IPython/html/files/handlers.py
View File

@ -24,7 +24,10 @@ class FilesHandler(IPythonHandler):
path, name = os.path.split(path)
model = cm.get_model(name, path)
if self.get_argument("download", False):
self.set_header('Content-Disposition','attachment; filename="%s"' % name)
if model['type'] == 'notebook':
self.set_header('Content-Type', 'application/json')
else:
@ -32,8 +35,6 @@ class FilesHandler(IPythonHandler):
if cur_mime is not None:
self.set_header('Content-Type', cur_mime)
self.set_header('Content-Disposition','attachment; filename="%s"' % name)
if model['format'] == 'base64':
b64_bytes = model['content'].encode('ascii')
self.write(base64.decodestring(b64_bytes))

2
IPython/html/static/notebook/js/menubar.js
View File

@ -112,7 +112,7 @@ define([
notebook_path,
notebook_name
);
window.open(url);
window.open(url + '?download=1');
});
this.element.find('#print_preview').click(function () {

16
IPython/html/tests/test_files.py
View File

@ -98,7 +98,23 @@ class FilesTest(NotebookTestBase):
self.assertEqual(r.status_code, 200)
self.assertEqual(r.headers['content-type'], 'text/plain')
self.assertEqual(r.text, 'foobar')
def test_download(self):
nbdir = self.notebook_dir.name
base = self.base_url()
text = 'hello'
with open(pjoin(nbdir, 'test.txt'), 'w') as f:
f.write(text)
r = requests.get(url_path_join(base, 'files', 'test.txt'))
disposition = r.headers.get('Content-Disposition', '')
self.assertNotIn('attachment', disposition)
r = requests.get(url_path_join(base, 'files', 'test.txt') + '?download=1')
disposition = r.headers.get('Content-Disposition', '')
self.assertIn('attachment', disposition)
self.assertIn('filename="test.txt"', disposition)
def test_old_files_redirect(self):
"""pre-2.0 'files/' prefixed links are properly redirected"""