From d729ce7c2063c0de746a7c2ea39697040d0af5bf Mon Sep 17 00:00:00 2001 From: Min RK Date: Mon, 20 Jul 2015 12:10:10 -0700 Subject: [PATCH 1/4] set mime-type on /files/ --- IPython/html/files/handlers.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/IPython/html/files/handlers.py b/IPython/html/files/handlers.py index 7727d08..b358d94 100644 --- a/IPython/html/files/handlers.py +++ b/IPython/html/files/handlers.py @@ -40,6 +40,11 @@ def get(self, path): cur_mime = mimetypes.guess_type(name)[0] if cur_mime is not None: self.set_header('Content-Type', cur_mime) + else: + if model['format'] == 'base64': + self.set_header('Content-Type', 'application/octet-stream') + else: + self.set_header('Content-Type', 'text/plain') if model['format'] == 'base64': b64_bytes = model['content'].encode('ascii') From 50a1366a8fcfb94671c87199515ebc922882f447 Mon Sep 17 00:00:00 2001 From: Min RK Date: Mon, 20 Jul 2015 12:10:25 -0700 Subject: [PATCH 2/4] set model mimetype, even when content=False --- IPython/html/services/contents/filemanager.py | 12 +++++++----- IPython/html/services/contents/handlers.py | 3 --- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/IPython/html/services/contents/filemanager.py b/IPython/html/services/contents/filemanager.py index 01ce07b..c869c75 100644 --- a/IPython/html/services/contents/filemanager.py +++ b/IPython/html/services/contents/filemanager.py @@ -277,18 +277,20 @@ def _file_model(self, path, content=True, format=None): model['type'] = 'file' os_path = self._get_os_path(path) + model['mimetype'] = mimetypes.guess_type(os_path)[0] if content: content, format = self._read_file(os_path, format) - default_mime = { - 'text': 'text/plain', - 'base64': 'application/octet-stream' - }[format] + if model['mimetype'] is None: + default_mime = { + 'text': 'text/plain', + 'base64': 'application/octet-stream' + }[format] + model['mimetype'] = default_mime model.update( content=content, format=format, - mimetype=mimetypes.guess_type(os_path)[0] or default_mime, ) return model diff --git a/IPython/html/services/contents/handlers.py b/IPython/html/services/contents/handlers.py index 5cd849e..d77e70e 100644 --- a/IPython/html/services/contents/handlers.py +++ b/IPython/html/services/contents/handlers.py @@ -52,9 +52,6 @@ def validate_model(model, expect_content): ) maybe_none_keys = ['content', 'format'] - if model['type'] == 'file': - # mimetype should be populated only for file models - maybe_none_keys.append('mimetype') if expect_content: errors = [key for key in maybe_none_keys if model[key] is None] if errors: From df24d9153b86863ccfa98bf509704d9304143ce1 Mon Sep 17 00:00:00 2001 From: Min RK Date: Mon, 20 Jul 2015 12:11:04 -0700 Subject: [PATCH 3/4] only redirect to editor for text documents treat unidentified mime-types as text --- IPython/html/static/tree/js/notebooklist.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/IPython/html/static/tree/js/notebooklist.js b/IPython/html/static/tree/js/notebooklist.js index 0065143..d8c7b2a 100644 --- a/IPython/html/static/tree/js/notebooklist.js +++ b/IPython/html/static/tree/js/notebooklist.js @@ -532,6 +532,13 @@ define([ icon = 'running_' + icon; } var uri_prefix = NotebookList.uri_prefixes[model.type]; + if (model.type === 'file' && + model.mimetype && model.mimetype.substr(0,5) !== 'text/' + ) { + // send text/unidentified files to editor, others go to raw viewer + uri_prefix = 'files'; + } + item.find(".item_icon").addClass(icon).addClass('icon-fixed-width'); var link = item.find("a.item_link") .attr('href', From 2b835ca6daec2592d9127dc85bf2cdcfb718edf2 Mon Sep 17 00:00:00 2001 From: Min RK Date: Mon, 20 Jul 2015 12:11:23 -0700 Subject: [PATCH 4/4] Don't redirect from /edit/ to /files/ show failure to decode, instead --- IPython/html/static/edit/js/editor.js | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/IPython/html/static/edit/js/editor.js b/IPython/html/static/edit/js/editor.js index dd12ea4..75d65e0 100644 --- a/IPython/html/static/edit/js/editor.js +++ b/IPython/html/static/edit/js/editor.js @@ -90,19 +90,10 @@ function($, }).catch( function(error) { that.events.trigger("file_load_failed.Editor", error); - if (((error.xhr||{}).responseJSON||{}).reason === 'bad format') { - window.location = utils.url_path_join( - that.base_url, - 'files', - that.file_path - ); - } else { - console.warn('Error while loading: the error was:') - console.warn(error) - } + console.warn('Error loading: ', error); cm.setValue("Error! " + error.message + "\nSaving disabled.\nSee Console for more details."); - cm.setOption('readOnly','nocursor') + cm.setOption('readOnly','nocursor'); that.save_enabled = false; } ); @@ -186,7 +177,7 @@ function($, Editor.prototype._clean_state = function(){ var clean = this.codemirror.isClean(this.generation); if (clean === this.clean){ - return + return; } else { this.clean = clean; }