From aebd91489b153bb1d1b72c793723d6d0a73b9ba9 Mon Sep 17 00:00:00 2001 From: Yvan Sraka Date: Sun, 27 Aug 2017 16:07:22 +0200 Subject: [PATCH 1/2] % autopep8 -i parseBook.py --- src/parseBook.py | 62 +++++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 25 deletions(-) diff --git a/src/parseBook.py b/src/parseBook.py index 5613921..eef5162 100644 --- a/src/parseBook.py +++ b/src/parseBook.py @@ -10,37 +10,42 @@ latexEngine = "xelatex" # Output path outputPath = "." -if not os.path.exists(outputPath): os.makedirs(outputPath) +if not os.path.exists(outputPath): + os.makedirs(outputPath) pdfBookPath = os.path.join(outputPath, "book.pdf") texBookPath = os.path.join(outputPath, "book.tex") chapters = [] -def injectShaderBlocks( _folder, _text ): + +def injectShaderBlocks(_folder, _text): rta = "" - lines = _text.split('\n'); + lines = _text.split('\n') for line in lines: if line.find('
= 0: - shaderTextureResults = re.findall(r'
', line.rstrip()) - shaderFile = re.sub(r'
| .+>)
', r'\1', line.rstrip()) + shaderTextureResults = re.findall( + r'
', line.rstrip()) + shaderFile = re.sub( + r'
| .+>)
', r'\1', line.rstrip()) - shaderName,shaderExt = os.path.splitext(shaderFile) + shaderName, shaderExt = os.path.splitext(shaderFile) - shaderPath = folder+"/"+shaderFile; + shaderPath = folder + "/" + shaderFile if shaderTextureResults: - shaderTexturePaths = map (lambda f: folder+"/"+f, shaderTextureResults[0].split(",")) + shaderTexturePaths = map( + lambda f: folder + "/" + f, shaderTextureResults[0].split(",")) else: shaderTexturePaths = [] shaderString = open(shaderPath, 'r').read() - rta += '```glsl\n'+shaderString.rstrip('\n')+'\n```\n' - shaderImage = folder+"/tmp-"+shaderName+".png" + rta += '```glsl\n' + shaderString.rstrip('\n') + '\n```\n' + shaderImage = folder + "/tmp-" + shaderName + ".png" shaderCommand = "glslViewer " + shaderPath + " " + \ " ".join(shaderTexturePaths) + \ " -s 0.5 -o " + shaderImage print shaderCommand returnCode = subprocess.call(shaderCommand, shell=True) - rta += "![]("+shaderImage+")\n" + rta += "![](" + shaderImage + ")\n" elif line.find('.gif') >= 0: gifPath = re.sub(r'\!\[.*\]\((.*\.gif)\)', r'\1', line.rstrip()) gifName, gifExt = os.path.splitext(gifPath) @@ -48,50 +53,57 @@ def injectShaderBlocks( _folder, _text ): convertCommand = "convert " + gifPath + " " + pngImage print convertCommand returnCode = subprocess.call(convertCommand, shell=True) - rta += re.sub(r'\!\[(.*)\]\((.*)\.gif\)', r'![\1](\2-0.png)', line) + '\n' + rta += re.sub(r'\!\[(.*)\]\((.*)\.gif\)', + r'![\1](\2-0.png)', line) + '\n' else: - rta += line+'\n' + rta += line + '\n' return rta -d='.' -folders = [os.path.join(d,o) for o in os.listdir(d) if os.path.isdir(os.path.join(d,o))]; + +d = '.' +folders = [os.path.join(d, o) for o in os.listdir( + d) if os.path.isdir(os.path.join(d, o))] folders.sort() for folder in folders: - if os.path.isfile(folder+'/README.md'): - with open(folder+'/README.md', "r") as originalChapter: + if os.path.isfile(folder + '/README.md'): + with open(folder + '/README.md', "r") as originalChapter: fileString = originalChapter.read() # Correct path for images imgPattern = r'(\!\[.*?\]\()(.*)' subPattern = r'\1' + folder + r'/\2' modifiedChapterString = re.sub(imgPattern, subPattern, fileString) - modifiedChapterString = injectShaderBlocks(folder, modifiedChapterString) - modifiedChapterPath = folder+'/tmp.md' + modifiedChapterString = injectShaderBlocks( + folder, modifiedChapterString) + modifiedChapterPath = folder + '/tmp.md' with open(modifiedChapterPath, "w") as modifiedChapter: modifiedChapter.write(modifiedChapterString) chapters.append(modifiedChapterPath) -# # Set up the appropriate options for the pandoc command +# Set up the appropriate options for the pandoc command inputOptions = chapters -generalOptions = ["-N", "--smart", "--no-tex-ligatures", "--toc", "--standalone", "--preserve-tabs", "-V documentclass=scrbook", "-V papersize=a4", "-V links-as-note", "-S"] # -latexOptions = ["--latex-engine="+latexEngine] +generalOptions = ["-N", "--smart", "--no-tex-ligatures", "--toc", "--standalone", + "--preserve-tabs", "-V documentclass=scrbook", "-V papersize=a4", "-V links-as-note", "-S"] +latexOptions = ["--latex-engine=" + latexEngine] outputOptions = ["--output={0}".format(pdfBookPath)] -pandocCommand = ["pandoc"] + outputOptions + inputOptions + generalOptions + latexOptions +pandocCommand = ["pandoc"] + outputOptions + \ + inputOptions + generalOptions + latexOptions # Print out of the chapters being built and the flags being used print "Generating {0} from:".format(pdfBookPath) for chapter in inputOptions: print "\t{0}".format(chapter) print "Using the following flags:" -for flag in generalOptions+latexOptions: +for flag in generalOptions + latexOptions: print "\t{0}".format(flag) # For debugging purposes, it's a good idea to generate the .tex. Errors # printed out through pandoc aren't as useful as those printed # directly from trying to build a PDF in TeXworks. texOutputOptions = ["--output={0}".format(texBookPath)] -texPandocCommand = ["pandoc"] + texOutputOptions + inputOptions + generalOptions + latexOptions +texPandocCommand = ["pandoc"] + texOutputOptions + \ + inputOptions + generalOptions + latexOptions returnCode = subprocess.call(texPandocCommand) if returnCode == 0: print "Successful building of {0}".format(texBookPath) From 59c5e842ec66c2b1326e6361349402f836c97349 Mon Sep 17 00:00:00 2001 From: Yvan Sraka Date: Sun, 27 Aug 2017 16:07:40 +0200 Subject: [PATCH 2/2] % autopep8 -i makeThumbs.py --- src/makeThumbs.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/makeThumbs.py b/src/makeThumbs.py index d7ebb45..e7dcab5 100644 --- a/src/makeThumbs.py +++ b/src/makeThumbs.py @@ -1,22 +1,26 @@ #! /usr/bin/python2.7 -import glob, os, re, subprocess +import glob +import os +import re +import subprocess -d='..' -folders = [os.path.join(d,o) for o in os.listdir(d) if os.path.isdir(os.path.join(d,o))]; +d = '..' +folders = [os.path.join(d, o) for o in os.listdir( + d) if os.path.isdir(os.path.join(d, o))] folders.sort() for folder in folders: - for filename in glob.glob(folder+'/*.frag'): + for filename in glob.glob(folder + '/*.frag'): # print filename - shaderPath = filename; - shaderName,shaderExt = os.path.splitext(filename) - shaderImage = shaderName+".png" + shaderPath = filename + shaderName, shaderExt = os.path.splitext(filename) + shaderImage = shaderName + ".png" shaderCommand = "glslViewer " + shaderPath + " " + \ - " -s 0.5 -o " + shaderImage + " -s 0.5 -o " + shaderImage returnCode = subprocess.call(shaderCommand, shell=True) for filename in glob.glob(folder + '/*.gif'): - gifPath = filename; + gifPath = filename gifName, gifExt = os.path.splitext(filename) pngImage = gifName + ".png" convertCommand = "convert " + gifPath + " " + pngImage