From 8529d952cd86eeda41c00e37653e982f3b8b6f03 Mon Sep 17 00:00:00 2001 From: RRA Date: Thu, 12 Sep 2019 19:18:56 +0200 Subject: [PATCH] clean up according to pep8 --- distribusi/cli.py | 17 +++++++++-------- distribusi/distribusi.py | 24 ++++++++++++------------ distribusi/mappings.py | 8 ++++---- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/distribusi/cli.py b/distribusi/cli.py index 7e0d51a..93d33d1 100644 --- a/distribusi/cli.py +++ b/distribusi/cli.py @@ -1,16 +1,17 @@ -import argparse, os +import argparse +import os from distribusi.distribusi import distribusify + def build_argparser(): parser = argparse.ArgumentParser(""" distbusi is a content management system for the web that produces static - index pages based on folders in the files system. It is inspired by the - automatic index functions featured in several popular web servers. It works by - traversing the file system and directory hierarchy to automatically list - all the files in the directory, detect the file types and providing them with - relevant html classes and tags for easy styling.""" - ) + index pages based on folders in the files system. + It is inspired by the automatic index functions featured in several popular web + servers. distribusi works by traversing the file system and directory hierarchy + to automatically list all the files in the directory, detect the file types and + providing them with relevant html classes and tags for easy styling.""") parser.add_argument( '-d', '--directory', help="Select which directory to distribute", default="." @@ -63,5 +64,5 @@ def build_argparser(): def cli_entrypoint(): parser = build_argparser() - args = parser.parse_args() + args = parser.parse_args() distribusify(args, args.directory) diff --git a/distribusi/distribusi.py b/distribusi/distribusi.py index 28b88d0..db00db8 100644 --- a/distribusi/distribusi.py +++ b/distribusi/distribusi.py @@ -14,15 +14,17 @@ MIME_TYPE = magic.Magic(mime=True) def caption(image): try: - process = subprocess.Popen(['exiftool', '-Comment', image], stdout=subprocess.PIPE) + process = subprocess.Popen( + ['exiftool', '-Comment', image], stdout=subprocess.PIPE) out, err = process.communicate() except Exception as e: print(e) print('Do you have exiftool installed?') try: caption = out.decode("utf-8").split(": ", 1)[1] - except: + except Exception as e: caption = '' + print(e) return caption @@ -43,9 +45,8 @@ def thumbnail(image, name, args): "
{}
" ).format(name, data_url, cap) except Exception as e: - print('Thumbnailer:',e) - return "
{}
".format(name, name,name) - + print('Thumbnailer:', e) + return "
{}
".format(name, name, name) def div(args, type_, subtype, tag, name): @@ -62,7 +63,7 @@ def div(args, type_, subtype, tag, name): elif 'dir' in type_ or 'html' in subtype or 'unkown-file' in subtype: html = '
{}
' else: - html = '
{}' + filename +'
' + html = '
{}' + filename + '
' return html.format(id_name, subtype, tag) @@ -71,7 +72,6 @@ def distribusify(args, directory): # noqa for root, dirs, files in os.walk(directory): if not args.remove_index: html = [] - if args.verbose: print('Generating directory listing for', root) @@ -80,10 +80,10 @@ def distribusify(args, directory): # noqa full_path = os.path.join(root, name) mime = MIME_TYPE.from_file(full_path) # example: MIME plain/text becomes 'type' plain 'subtype' text - type_, subtype = mime.split('/') + type_, subtype = mime.split('/') if args.verbose: - print('Found', name,'as', mime) + print('Found', name, 'as', mime) if type_ in FILE_TYPES: # expansion for different kind of textfiles @@ -99,7 +99,7 @@ def distribusify(args, directory): # noqa else: subtype = subtype+' unkown-file' a = "{}" - #a = FILE_TYPES[type_] + # a = FILE_TYPES[type_] if type_ == 'image': caption = name @@ -121,7 +121,7 @@ def distribusify(args, directory): # noqa if args.verbose: message = 'not in list of file types, adding as plain href: \n' print(type_, subtype, message, name) - type_ ='unkown-file' + type_ = 'unkown-file' a = a.replace('{}', name) html.append(div(args, type_, subtype, a, name)) @@ -130,7 +130,7 @@ def distribusify(args, directory): # noqa for name in dirs: a = "{}/".replace('{}', name) - html.append(div(args,'dir', 'dir', a, 'folder')) + html.append(div(args, 'dir', 'dir', a, 'folder')) with open(os.path.join(root, 'index.html'), 'w') as f: if not args.no_template: diff --git a/distribusi/mappings.py b/distribusi/mappings.py index 8a93def..b360c33 100644 --- a/distribusi/mappings.py +++ b/distribusi/mappings.py @@ -7,8 +7,8 @@ FILE_TYPES = { 'audio': (''), } -SUB_TYPES ={ - 'pdf': ( - '' - '') +SUB_TYPES = { + 'pdf': ( + '' + '') }