Merge pull request #5216 from minrk/notebook-dir-cli

fixup positional arg handling in notebook app

IPython/html/notebookapp.py

@@ -332,7 +332,12 b' class NotebookApp(BaseIPythonApplication):'
     auto_create = Bool(True)
 
     # file to be opened in the notebook server
-    file_to_run = Unicode('')
+    file_to_run = Unicode('', config=True)
+    def _file_to_run_changed(self, name, old, new):
+        path, base = os.path.split(new)
+        if path:
+            self.file_to_run = base
+            self.notebook_dir = path
 
     # Network related information.
 
@@ -545,10 +550,13 b' class NotebookApp(BaseIPythonApplication):'
             if not os.path.exists(f):
                 self.log.critical("No such file or directory: %s", f)
                 self.exit(1)
+            
+            # Use config here, to ensure that it takes higher priority than
+            # anything that comes from the profile.
             if os.path.isdir(f):
-                self.notebook_dir = f
+                self.config.NotebookApp.notebook_dir = f
             elif os.path.isfile(f):
-                self.file_to_run = f
+                self.config.NotebookApp.file_to_run = f
 
     def init_kernel_argv(self):
         """construct the kernel arguments"""
@@ -799,24 +807,17 b' class NotebookApp(BaseIPythonApplication):'
                 self.log.warn('No web browser found: %s.' % e)
                 browser = None
             
-            f = self.file_to_run
-            if f:
-                nbdir = os.path.abspath(self.notebook_manager.notebook_dir)
-                if f.startswith(nbdir):
-                    f = f[len(nbdir):]
-                else:
-                    self.log.warn(
-                        "Probably won't be able to open notebook %s "
-                        "because it is not in notebook_dir %s",
-                        f, nbdir,
-                    )
-
-            if os.path.isfile(self.file_to_run):
-                url = url_path_join('notebooks', f)
+            if self.file_to_run:
+                fullpath = os.path.join(self.notebook_dir, self.file_to_run)
+                if not os.path.exists(fullpath):
+                    self.log.critical("%s does not exist" % fullpath)
+                    self.exit(1)
+                
+                uri = url_path_join('notebooks', self.file_to_run)
             else:
-                url = url_path_join('tree', f)
+                uri = 'tree'
             if browser:
-                b = lambda : browser.open("%s%s" % (self.connection_url, url),
+                b = lambda : browser.open(url_path_join(self.connection_url, uri),
                                           new=2)
                 threading.Thread(target=b).start()
         try: