Merge pull request #3058 from minrk/redirect

ellisonbg · ellisonbg · commit c07e21f2edca · 2013-04-12T15:09:31.000-07:00
add redirect handler for notebooks by name
diff --git a/IPython/frontend/html/notebook/handlers.py b/IPython/frontend/html/notebook/handlers.py
@@ -609,6 +609,20 @@ def on_close(self):
 # Notebook web service handlers
 #-----------------------------------------------------------------------------
 
+class NotebookRedirectHandler(AuthenticatedHandler):
+    
+    @authenticate_unless_readonly
+    def get(self, notebook_name):
+        app = self.application
+        # strip trailing .ipynb:
+        notebook_name = os.path.splitext(notebook_name)[0]
+        notebook_id = app.notebook_manager.rev_mapping.get(notebook_name, '')
+        if notebook_id:
+            url = self.settings.get('base_project_url', '/') + notebook_id
+            return self.redirect(url)
+        else:
+            raise HTTPError(404)
+
 class NotebookRootHandler(AuthenticatedHandler):
 
     @authenticate_unless_readonly
diff --git a/IPython/frontend/html/notebook/notebookapp.py b/IPython/frontend/html/notebook/notebookapp.py
@@ -52,7 +52,7 @@
     ShellHandler, NotebookRootHandler, NotebookHandler, NotebookCopyHandler,
     RSTHandler, AuthenticatedFileHandler, PrintNotebookHandler,
     MainClusterHandler, ClusterProfileHandler, ClusterActionHandler,
-    FileFindHandler,
+    FileFindHandler, NotebookRedirectHandler,
 )
 from .nbmanager import NotebookManager
 from .filenbmanager import FileNotebookManager
@@ -86,6 +86,7 @@
 _kernel_id_regex = r"(?P<kernel_id>\w+-\w+-\w+-\w+-\w+)"
 _kernel_action_regex = r"(?P<action>restart|interrupt)"
 _notebook_id_regex = r"(?P<notebook_id>\w+-\w+-\w+-\w+-\w+)"
+_notebook_name_regex = r"(?P<notebook_name>.+\.ipynb)"
 _profile_regex = r"(?P<profile>[^\/]+)" # there is almost no text that is invalid
 _cluster_action_regex = r"(?P<action>start|stop)"
 
@@ -136,6 +137,7 @@ def __init__(self, ipython_app, kernel_manager, notebook_manager,
             (r"/logout", LogoutHandler),
             (r"/new", NewHandler),
             (r"/%s" % _notebook_id_regex, NamedNotebookHandler),
+            (r"/%s" % _notebook_name_regex, NotebookRedirectHandler),
             (r"/%s/copy" % _notebook_id_regex, NotebookCopyHandler),
             (r"/%s/print" % _notebook_id_regex, PrintNotebookHandler),
             (r"/kernels", MainKernelHandler),
@@ -170,6 +172,7 @@ def __init__(self, ipython_app, kernel_manager, notebook_manager,
             cookie_secret=os.urandom(1024),
             login_url=url_path_join(base_project_url,'/login'),
             cookie_name='username-%s' % uuid.uuid4(),
+            base_project_url = base_project_url,
         )
 
         # allow custom overrides for the tornado web app.
