diff --git a/py-packages/SimpleWebPage/simplewebpage/__init__.py b/py-packages/SimpleWebPage/simplewebpage/__init__.py old mode 100755 new mode 100644 index b79c7dc..62f9d4d --- a/py-packages/SimpleWebPage/simplewebpage/__init__.py +++ b/py-packages/SimpleWebPage/simplewebpage/__init__.py @@ -14,8 +14,10 @@ from glob import fnmatch import base64 import random from pprint import pprint + try: import markdown + MARKDOWN_AVAILABLE = True except ImportError: MARKDOWN_AVAILABLE = False @@ -33,19 +35,20 @@ SAFE_OPTS = ( "media", "includes", "no_readme", - "reverse" + "reverse", ) def setup(): - """ Setup the command line options """ + """Setup the command line options""" from argparse import ArgumentParser parser = ArgumentParser( epilog="Recursively generate indexes: \n# find . -type d -not -path '*/.*' -exec SimpleWebPage \{\} \;" ) parser.add_argument( - "-f","--force", + "-f", + "--force", action="store_true", dest="overwrite", default=False, @@ -105,7 +108,7 @@ def setup(): action="store_true", dest="reverse", default=False, - help="Reverse sort" + help="Reverse sort", ) parser.add_argument( "--images", @@ -166,7 +169,7 @@ def setup2JSON(opts): def HTML2setup(opts, overwrite): - """ returns new opts and was it able to read HTML, if overwriting, do not update config """ + """returns new opts and was it able to read HTML, if overwriting, do not update config""" try: read_config = False @@ -178,7 +181,7 @@ def HTML2setup(opts, overwrite): for key in config: if key in SAFE_OPTS: if not overwrite: - setattr(opts, key, config[key]) + setattr(opts, key, config[key]) read_config = True if not overwrite: print("Read options from existing " + opts.filename) @@ -238,8 +241,8 @@ def generate_index(opts): files = [f for f in files if f != opts.password_filename] files = match_files(files, opts.includes) dirs = match_files(dirs, opts.includes) - dirs.sort(reverse = opts.reverse) - files.sort(reverse = opts.reverse) + dirs.sort(reverse=opts.reverse) + files.sort(reverse=opts.reverse) files.sort(key=lambda x: x.find("/") > 0) readme = get_readme(path, opts.no_readme) with open(os.path.join(path, opts.filename), "wt") as f: @@ -303,15 +306,16 @@ def get_filelink(path, fname, images=False, media=False): fdate = time.localtime(os.path.getmtime(os.path.join(path, fname))) fdstr = time.strftime("%Y/%m/%d %H:%M:%S", fdate) fname_str = fname + fname_media = "" if images and is_imagefile(fname): - fname_str = get_imagestr(fname) + fname_media = get_imagestr(fname) if media and is_audiofile(fname): - fname_str = get_audiostr(fname) + fname_media = get_audiostr(fname) if media and is_videofile(fname): - fname_str = get_videostr(fname) + fname_media = get_videostr(fname) return ( - '