Show More
@@ -3,7 +3,7 b'' | |||||
3 | Authors : MinRK, gregcaporaso, dannystaple |
|
3 | Authors : MinRK, gregcaporaso, dannystaple | |
4 | """ |
|
4 | """ | |
5 | from os.path import exists, isfile, splitext, abspath, join, isdir |
|
5 | from os.path import exists, isfile, splitext, abspath, join, isdir | |
6 | from os import walk, sep |
|
6 | from os import walk, sep, listdir | |
7 |
|
7 | |||
8 | from IPython.core.display import DisplayObject |
|
8 | from IPython.core.display import DisplayObject | |
9 |
|
9 | |||
@@ -368,7 +368,8 b' class FileLinks(FileLink):' | |||||
368 | result_html_prefix='', |
|
368 | result_html_prefix='', | |
369 | result_html_suffix='<br>', |
|
369 | result_html_suffix='<br>', | |
370 | notebook_display_formatter=None, |
|
370 | notebook_display_formatter=None, | |
371 |
terminal_display_formatter=None |
|
371 | terminal_display_formatter=None, | |
|
372 | recursive=True): | |||
372 | """ |
|
373 | """ | |
373 | See :class:`FileLink` for the ``path``, ``url_prefix``, |
|
374 | See :class:`FileLink` for the ``path``, ``url_prefix``, | |
374 | ``result_html_prefix`` and ``result_html_suffix`` parameters. |
|
375 | ``result_html_prefix`` and ``result_html_suffix`` parameters. | |
@@ -421,6 +422,8 b' class FileLinks(FileLink):' | |||||
421 | self.terminal_display_formatter = \ |
|
422 | self.terminal_display_formatter = \ | |
422 | terminal_display_formatter or self._get_terminal_display_formatter() |
|
423 | terminal_display_formatter or self._get_terminal_display_formatter() | |
423 |
|
424 | |||
|
425 | self.recursive = recursive | |||
|
426 | ||||
424 | def _get_display_formatter(self, |
|
427 | def _get_display_formatter(self, | |
425 | dirname_output_format, |
|
428 | dirname_output_format, | |
426 | fname_output_format, |
|
429 | fname_output_format, | |
@@ -516,7 +519,10 b' class FileLinks(FileLink):' | |||||
516 |
|
519 | |||
517 | def _format_path(self): |
|
520 | def _format_path(self): | |
518 | result_lines = [] |
|
521 | result_lines = [] | |
519 | walked_dir = list(walk(self.path)) |
|
522 | if self.recursive: | |
|
523 | walked_dir = list(walk(self.path)) | |||
|
524 | else: | |||
|
525 | walked_dir = [walk(self.path).next()] | |||
520 | walked_dir.sort() |
|
526 | walked_dir.sort() | |
521 | for dirname, subdirs, fnames in walked_dir: |
|
527 | for dirname, subdirs, fnames in walked_dir: | |
522 | result_lines += self.notebook_display_formatter(dirname, fnames, self.included_suffixes) |
|
528 | result_lines += self.notebook_display_formatter(dirname, fnames, self.included_suffixes) | |
@@ -526,7 +532,10 b' class FileLinks(FileLink):' | |||||
526 | """return newline-separated absolute paths |
|
532 | """return newline-separated absolute paths | |
527 | """ |
|
533 | """ | |
528 | result_lines = [] |
|
534 | result_lines = [] | |
529 | walked_dir = list(walk(self.path)) |
|
535 | if self.recursive: | |
|
536 | walked_dir = list(walk(self.path)) | |||
|
537 | else: | |||
|
538 | walked_dir = [walk(self.path).next()] | |||
530 | walked_dir.sort() |
|
539 | walked_dir.sort() | |
531 | for dirname, subdirs, fnames in walked_dir: |
|
540 | for dirname, subdirs, fnames in walked_dir: | |
532 | result_lines += self.terminal_display_formatter(dirname, fnames, self.included_suffixes) |
|
541 | result_lines += self.terminal_display_formatter(dirname, fnames, self.included_suffixes) |
General Comments 0
You need to be logged in to leave comments.
Login now