Skip to content

Commit 455da30

Browse files
fix argument parser
1 parent 839cd56 commit 455da30

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

index_generator/__main__.py

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@
55
import os
66
import jinja2
77
import argparse
8-
from datetime import datetime
98

109
from index_generator.models.entries import Entry
11-
from index_generator.models.exceptions import IndexGeneratorException
1210
from . import *
1311

14-
indexIgnore = ('index.html' 'images' 'favicon.ico')
12+
indexIgnore = ('index.html', 'images', 'favicon.ico')
1513

1614

1715
def main():
@@ -24,16 +22,21 @@ def main():
2422
parser.add_argument('--name', '-n', type=str, default='index.html',
2523
help='Default output filename.')
2624
parser.add_argument('--print', '-P', action='store_true', default=False, help='Whether to print to stdout.')
27-
parser.add_argument('path', type=str, default='', help='Path')
28-
parser.add_argument('--depth','-d', type=int, default=0, help='Set cutoff depth.')
29-
arguments = parser.parse_args(sys.argv[1:])
25+
parser.add_argument('--depth', '-d', type=int, default=0, help='Set cutoff depth.')
26+
parser.add_argument('path', type=str, default='', help='Path', nargs='?')
27+
arguments = parser.parse_args()
3028
app(arguments)
3129

3230

3331
def app(args):
3432
if args.version:
3533
print(APP_NAME + ' ' + APP_VERSION + ' ' + APP_URL)
3634
sys.exit(0)
35+
if not args.path:
36+
print(APP_NAME + ' ' + APP_VERSION + ' ' + APP_URL)
37+
print('Usage: index-generator [OPTIONS] PATH.')
38+
print('See: index-generator --help')
39+
sys.exit(0)
3740
if args.no_recursive:
3841
generate_once(args.template, args.path, os.listdir(args.path), args.name, args.print)
3942
else:
@@ -47,10 +50,10 @@ def generate_once(template_dir, root, files, name, if_print):
4750
)
4851
template = environment.get_template(name)
4952

50-
entries = list(map(lambda f: Entry(f,root), files))
51-
#entries.sort(key=lambda x: x.isDir, reverse=True)
53+
entries = list(map(lambda f1: Entry(f1, root), files))
54+
# entries.sort(key=lambda x: x.isDir, reverse=True)
5255

53-
filelist=[]
56+
filelist = []
5457
for entry in entries:
5558
if entry.name in indexIgnore:
5659
continue
@@ -78,6 +81,7 @@ def generate_once(template_dir, root, files, name, if_print):
7881
with open(root+os.path.sep+name, 'w') as f:
7982
print(html, file=f)
8083

84+
8185
def generate_recursively(template_dir, path, name, if_print, max_depth=0):
8286
for root, dirs, files in os.walk(path):
8387
if max_depth != 0 and root.count(os.sep) >= max_depth:

0 commit comments

Comments
 (0)