From a82fa5d2d824f183476888b274ed574424d56893 2011-08-19 02:53:18 From: Brian E. Granger Date: 2011-08-19 02:53:18 Subject: [PATCH] Merge branch 'htmlnotebook_list_notebooks' of https://github.com/stefanv/ipython into stefanv-htmlnotebook_list_notebooks --- diff --git a/IPython/frontend/html/notebook/notebookmanager.py b/IPython/frontend/html/notebook/notebookmanager.py index 338a3bf..74017d4 100644 --- a/IPython/frontend/html/notebook/notebookmanager.py +++ b/IPython/frontend/html/notebook/notebookmanager.py @@ -19,6 +19,7 @@ Authors: import datetime import os import uuid +import glob from tornado import web @@ -52,9 +53,11 @@ class NotebookManager(LoggingConfigurable): dict(notebook_id=notebook,name=name) """ - names = os.listdir(self.notebook_dir) - names = [name.split(u'.')[0] - for name in names if name.endswith(self.filename_ext)] + 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] + data = [] for name in names: if name not in self.rev_mapping: