##// END OF EJS Templates
fix regular expression for detecting links in stdout...
fix regular expression for detecting links in stdout The previous expression was matching both the beginning and the end of the line, which would end up swallowing the next match, ultimately matching every other URL in the string. This removes the end-of-line check, so it will match every URL. The wrapURLs function to make URLs easier to identify does not seem to have been necessary, and has thus been removed. closes #2834

File last commit:

r10019:412aa845
r10045:d8ed554e
Show More
filenbmanager.py
196 lines | 7.2 KiB | text/x-python | PythonLexer
Brian E. Granger
More review changes....
r4609 """A notebook manager that uses the local file system for storage.
Authors:
* Brian Granger
"""
Brian E. Granger
Massive work on the notebook document format....
r4484 #-----------------------------------------------------------------------------
Brian Granger
Refactoring notebook managers and adding Azure backed storage....
r8180 # Copyright (C) 2011 The IPython Development Team
Brian E. Granger
Massive work on the notebook document format....
r4484 #
# Distributed under the terms of the BSD License. The full license is in
Brian E. Granger
More review changes....
r4609 # the file COPYING, distributed as part of this software.
Brian E. Granger
Massive work on the notebook document format....
r4484 #-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
import datetime
Thomas Kluyver
Save notebook as script using unicode file handle....
r6030 import io
Brian E. Granger
Massive work on the notebook document format....
r4484 import os
Stefan van der Walt
Move glob to global level import.
r4624 import glob
Brian E. Granger
Massive work on the notebook document format....
r4484
from tornado import web
Brian Granger
Renaming BaseNotebookManager->NotebookManager to preserve config.
r8194 from .nbmanager import NotebookManager
Brian E. Granger
Massive work on the notebook document format....
r4484 from IPython.nbformat import current
Brian Granger
Refactoring notebook managers and adding Azure backed storage....
r8180 from IPython.utils.traitlets import Unicode, Dict, Bool, TraitError
Brian E. Granger
Massive work on the notebook document format....
r4484
#-----------------------------------------------------------------------------
Fernando Perez
Add --script flag as shorthand for the script autosave notebook option.
r5758 # Classes
#-----------------------------------------------------------------------------
Brian E. Granger
Massive work on the notebook document format....
r4484
Brian Granger
Renaming BaseNotebookManager->NotebookManager to preserve config.
r8194 class FileNotebookManager(NotebookManager):
MinRK
allow saving notebook.py next to notebook.ipynb...
r5653
save_script = Bool(False, config=True,
Fernando Perez
Fix typo in help string
r5760 help="""Automatically create a Python script when saving the notebook.
MinRK
allow saving notebook.py next to notebook.ipynb...
r5653
Matthias BUSSONNIER
remove references to loadpy...
r6765 For easier use of import, %run and %load across notebooks, a
Fernando Perez
Add --script flag as shorthand for the script autosave notebook option.
r5758 <notebook-name>.py script will be created next to any
<notebook-name>.ipynb on each save. This can also be set with the
short `--script` flag.
MinRK
allow saving notebook.py next to notebook.ipynb...
r5653 """
)
Brian E. Granger
Massive work on the notebook document format....
r4484 filename_ext = Unicode(u'.ipynb')
# Map notebook names to notebook_ids
rev_mapping = Dict()
Brian Granger
Refactoring notebook managers and adding Azure backed storage....
r8180 def get_notebook_names(self):
"""List all notebook names in the notebook dir."""
Stefan van der Walt
Allow period characters in notebook names.
r4623 names = glob.glob(os.path.join(self.notebook_dir,
'*' + self.filename_ext))
names = [os.path.splitext(os.path.basename(name))[0]
for name in names]
Brian Granger
Refactoring notebook managers and adding Azure backed storage....
r8180 return names
def list_notebooks(self):
"""List all notebooks in the notebook dir."""
names = self.get_notebook_names()
Stefan van der Walt
Allow period characters in notebook names.
r4623
Brian E. Granger
Massive work on the notebook document format....
r4484 data = []
for name in names:
if name not in self.rev_mapping:
notebook_id = self.new_notebook_id(name)
else:
notebook_id = self.rev_mapping[name]
data.append(dict(notebook_id=notebook_id,name=name))
Brian E. Granger
Implemented basic notebook browser and fixed numerous bugs.
r4488 data = sorted(data, key=lambda item: item['name'])
Brian E. Granger
Massive work on the notebook document format....
r4484 return data
def new_notebook_id(self, name):
"""Generate a new notebook_id for a name and store its mappings."""
Brian Granger
Fixing minor things for the Azure backed nb storage.
r8181 notebook_id = super(FileNotebookManager, self).new_notebook_id(name)
Brian E. Granger
Massive work on the notebook document format....
r4484 self.rev_mapping[name] = notebook_id
return notebook_id
def delete_notebook_id(self, notebook_id):
Brian Granger
Refactoring notebook managers and adding Azure backed storage....
r8180 """Delete a notebook's id in the mapping."""
Brian E. Granger
Massive work on the notebook document format....
r4484 name = self.mapping[notebook_id]
Brian Granger
Fixing minor things for the Azure backed nb storage.
r8181 super(FileNotebookManager, self).delete_notebook_id(notebook_id)
Brian E. Granger
Massive work on the notebook document format....
r4484 del self.rev_mapping[name]
def notebook_exists(self, notebook_id):
"""Does a notebook exist?"""
Brian Granger
Fixing minor things for the Azure backed nb storage.
r8181 exists = super(FileNotebookManager, self).notebook_exists(notebook_id)
Brian Granger
Refactoring notebook managers and adding Azure backed storage....
r8180 if not exists:
Brian E. Granger
Massive work on the notebook document format....
r4484 return False
path = self.get_path_by_name(self.mapping[notebook_id])
Brian E. Granger
More review changes....
r4609 return os.path.isfile(path)
Brian E. Granger
Massive work on the notebook document format....
r4484
def find_path(self, notebook_id):
"""Return a full path to a notebook given its notebook_id."""
try:
name = self.mapping[notebook_id]
except KeyError:
Brian E. Granger
Adding messages to HTTPError raising....
r4676 raise web.HTTPError(404, u'Notebook does not exist: %s' % notebook_id)
Brian E. Granger
Massive work on the notebook document format....
r4484 return self.get_path_by_name(name)
def get_path_by_name(self, name):
"""Return a full path to a notebook given its name."""
filename = name + self.filename_ext
path = os.path.join(self.notebook_dir, filename)
return path
Brian Granger
Refactoring notebook managers and adding Azure backed storage....
r8180 def read_notebook_object(self, notebook_id):
Brian E. Granger
Massive work on the notebook document format....
r4484 """Get the NotebookNode representation of a notebook by notebook_id."""
path = self.find_path(notebook_id)
if not os.path.isfile(path):
Brian E. Granger
Adding messages to HTTPError raising....
r4676 raise web.HTTPError(404, u'Notebook does not exist: %s' % notebook_id)
Brian E. Granger
Massive work on the notebook document format....
r4484 info = os.stat(path)
last_modified = datetime.datetime.utcfromtimestamp(info.st_mtime)
Brian E. Granger
Making JSON the default .ipynb format.
r4633 with open(path,'r') as f:
s = f.read()
try:
# v1 and v2 and json in the .ipynb files.
nb = current.reads(s, u'json')
except:
Brian E. Granger
Adding messages to HTTPError raising....
r4676 raise web.HTTPError(500, u'Unreadable JSON notebook.')
Brian Granger
Always use filename as the notebook name.
r7231 # Always use the filename as the notebook name.
Kent Inverarity
change to minrk's suggestion from mailing list
r7615 nb.metadata.name = os.path.splitext(os.path.basename(path))[0]
Brian E. Granger
Massive work on the notebook document format....
r4484 return last_modified, nb
Brian Granger
Refactoring notebook managers and adding Azure backed storage....
r8180 def write_notebook_object(self, nb, notebook_id=None):
"""Save an existing notebook object by notebook_id."""
Brian E. Granger
Massive work on the notebook document format....
r4484 try:
Brian Granger
Refactoring notebook managers and adding Azure backed storage....
r8180 new_name = nb.metadata.name
except AttributeError:
raise web.HTTPError(400, u'Missing notebook name')
Brian E. Granger
File upload/import working from notebook browser.
r4491
Brian Granger
Refactoring notebook managers and adding Azure backed storage....
r8180 if notebook_id is None:
notebook_id = self.new_notebook_id(new_name)
Brian E. Granger
Massive work on the notebook document format....
r4484
if notebook_id not in self.mapping:
Brian E. Granger
Adding messages to HTTPError raising....
r4676 raise web.HTTPError(404, u'Notebook does not exist: %s' % notebook_id)
Brian Granger
Refactoring notebook managers and adding Azure backed storage....
r8180
Brian E. Granger
Massive work on the notebook document format....
r4484 old_name = self.mapping[notebook_id]
path = self.get_path_by_name(new_name)
try:
with open(path,'w') as f:
Brian E. Granger
Making JSON the default .ipynb format.
r4633 current.write(nb, f, u'json')
MinRK
include error in 'Unexpected error' message.
r5709 except Exception as e:
raise web.HTTPError(400, u'Unexpected error while saving notebook: %s' % e)
Brian Granger
Refactoring notebook managers and adding Azure backed storage....
r8180
MinRK
allow saving notebook.py next to notebook.ipynb...
r5653 # save .py script as well
if self.save_script:
pypath = os.path.splitext(path)[0] + '.py'
try:
Thomas Kluyver
Specify UTF-8 encoding for saving notebook as script.
r6031 with io.open(pypath,'w', encoding='utf-8') as f:
MinRK
allow saving notebook.py next to notebook.ipynb...
r5653 current.write(nb, f, u'py')
MinRK
include error in 'Unexpected error' message.
r5709 except Exception as e:
raise web.HTTPError(400, u'Unexpected error while saving notebook as script: %s' % e)
MinRK
allow saving notebook.py next to notebook.ipynb...
r5653
Brian Granger
Refactoring notebook managers and adding Azure backed storage....
r8180 # remove old files if the name changed
Brian E. Granger
Massive work on the notebook document format....
r4484 if old_name != new_name:
old_path = self.get_path_by_name(old_name)
if os.path.isfile(old_path):
os.unlink(old_path)
MinRK
allow saving notebook.py next to notebook.ipynb...
r5653 if self.save_script:
old_pypath = os.path.splitext(old_path)[0] + '.py'
if os.path.isfile(old_pypath):
os.unlink(old_pypath)
Brian E. Granger
Massive work on the notebook document format....
r4484 self.mapping[notebook_id] = new_name
self.rev_mapping[new_name] = notebook_id
Takafumi Arakaki
Fix a bug in renaming notebook...
r7359 del self.rev_mapping[old_name]
Brian Granger
Refactoring notebook managers and adding Azure backed storage....
r8180
return notebook_id
Brian E. Granger
Massive work on the notebook document format....
r4484
def delete_notebook(self, notebook_id):
"""Delete notebook by notebook_id."""
path = self.find_path(notebook_id)
if not os.path.isfile(path):
Brian E. Granger
Adding messages to HTTPError raising....
r4676 raise web.HTTPError(404, u'Notebook does not exist: %s' % notebook_id)
Brian E. Granger
Massive work on the notebook document format....
r4484 os.unlink(path)
self.delete_notebook_id(notebook_id)
Brian Granger
Finishing work on "Make a Copy" functionality.
r5861 def increment_filename(self, basename):
Brian Granger
Fixing docstring in the notebook manager.
r5877 """Return a non-used filename of the form basename<int>.
This searches through the filenames (basename0, basename1, ...)
until is find one that is not already being used. It is used to
create Untitled and Copy names that are unique.
"""
Brian E. Granger
Massive work on the notebook document format....
r4484 i = 0
while True:
Brian Granger
Finishing work on "Make a Copy" functionality.
r5861 name = u'%s%i' % (basename,i)
Brian E. Granger
Massive work on the notebook document format....
r4484 path = self.get_path_by_name(name)
if not os.path.isfile(path):
break
else:
i = i+1
Brian Granger
Refactoring notebook managers and adding Azure backed storage....
r8180 return name
Paul Ivanov
print info string on interrupt, log it on startup
r10019
def info_string(self):
return "Serving notebooks from local directory: %s" % self.notebook_dir