diff options
| -rwxr-xr-x | git-arr | 5 | ||||
| -rw-r--r-- | utils.py | 15 | ||||
| -rw-r--r-- | views/blob.html | 4 |
3 files changed, 16 insertions, 8 deletions
@@ -55,6 +55,8 @@ def load_config(path): 'web_url_file': 'web_url', 'git_url': '', 'git_url_file': 'cloneurl', + 'embed_markdown': 'yes', + 'embed_images': 'no', } config = configparser.SafeConfigParser(defaults) @@ -115,6 +117,9 @@ def load_config(path): if not r.info.git_url and os.path.isfile(git_url_file): r.info.git_url = open(git_url_file).read() + r.info.embed_markdown = config.getboolean(s, 'embed_markdown') + r.info.embed_images = config.getboolean(s, 'embed_images') + repos[r.name] = r def find_git_dir(path): @@ -48,20 +48,23 @@ def can_colorize(s): return True -def can_markdown(fname): +def can_markdown(repo, fname): """True if we can process file through markdown, False otherwise.""" if markdown is None: return False + if not repo.info.embed_markdown: + return False + return fname.endswith(".md") -def can_embed_image(fname): +def can_embed_image(repo, fname): """True if we can embed image file in HTML, False otherwise.""" - exts = [ 'jpg', 'jpeg', 'png', 'gif' ] - if '.' in fname and fname.split('.')[-1].lower() in exts: - return True + if not repo.info.embed_images: + return False - return False + return (('.' in fname) and + (fname.split('.')[-1].lower() in [ 'jpg', 'jpeg', 'png', 'gif' ])) def colorize_diff(s): lexer = lexers.DiffLexer(encoding = 'utf-8') diff --git a/views/blob.html b/views/blob.html index 320cc89..9d0e9ff 100644 --- a/views/blob.html +++ b/views/blob.html @@ -36,9 +36,9 @@ <a href="">{{!fname.html}}</a> </h3> -% if can_embed_image(fname.unicode): +% if can_embed_image(repo, fname.unicode): {{!embed_image_blob(repo, dirname.raw, fname.raw)}} -% elif can_markdown(fname.unicode): +% elif can_markdown(repo, fname.unicode): {{!markdown_blob(blob)}} % elif can_colorize(blob): {{!colorize_blob(fname.unicode, blob)}} |