Skip to content

support cmd calling #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

support cmd calling #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90c531c
feat: support specific output path
williamfzc Jul 5, 2020
bd542a0
feat: support calling from cmd
williamfzc Jul 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
include LICENSE
include deps
recursive-exclude * __pycache__
recursive-exclude * *.pyc
recursive-exclude * *.pyo
prune screenshots
23 changes: 15 additions & 8 deletions diff2HtmlCompare.py → diff2HtmlCompare/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
from pygments.token import *

# Monokai is not quite right yet
PYGMENTS_STYLES = ["vs", "xcode"]
PYGMENTS_STYLES = ["vs", "xcode"]

HTML_TEMPLATE = """
<!DOCTYPE html>
Expand Down Expand Up @@ -134,7 +134,7 @@ class DefaultLexer(RegexLexer):

class DiffHtmlFormatter(HtmlFormatter):
"""
Formats a single source file with pygments and adds diff highlights based on the
Formats a single source file with pygments and adds diff highlights based on the
diff details given.
"""
isLeft = False
Expand Down Expand Up @@ -165,6 +165,7 @@ def getDiffLineNos(self):
else:
no = '<span class="lineno_q">' + str(left_no) + "</span>"
else:
# add coverage here
if change:
if isinstance(left_no, int) and isinstance(right_no, int):
no = '<span class="lineno_q lineno_rightchange">' + \
Expand Down Expand Up @@ -403,17 +404,19 @@ def show(outputpath):
path = os.path.abspath(outputpath)
webbrowser.open('file://' + path)

if __name__ == "__main__":

def cmd():
description = """Given two source files this application\
creates an html page which highlights the differences between the two. """
creates an html page which highlights the differences between the two. """

parser = argparse.ArgumentParser(description=description)
parser.add_argument('-s', '--show', action='store_true',
help='show html in a browser.')
parser.add_argument('-p', '--print-width', action='store_true',
help='Restrict code to 80 columns wide. (printer friendly in landscape)')
parser.add_argument('-p', '--print-width', action='store_true',
help='Restrict code to 80 columns wide. (printer friendly in landscape)')
parser.add_argument('-c', '--syntax-css', action='store', default="vs",
help='Pygments CSS for code syntax highlighting. Can be one of: %s' % str(PYGMENTS_STYLES))
help='Pygments CSS for code syntax highlighting. Can be one of: %s' % str(PYGMENTS_STYLES))
parser.add_argument('-o', '--output-path', action='store')
parser.add_argument('-v', '--verbose', action='store_true', help='show verbose output.')
parser.add_argument('file1', help='source file to compare ("before" file).')
parser.add_argument('file2', help='source file to compare ("after" file).')
Expand All @@ -423,7 +426,11 @@ def show(outputpath):
if args.syntax_css not in PYGMENTS_STYLES:
raise ValueError("Syntax CSS (-c) must be one of %r." % PYGMENTS_STYLES)

outputpath = "index.html"
outputpath = args.output_path or "index.html"
main(args.file1, args.file2, outputpath, args)
if args.show:
show(outputpath)


if __name__ == "__main__":
cmd()
17 changes: 17 additions & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import setuptools

with open("requirements.txt") as f:
requirements = [each.strip() for each in f.readlines()]

setuptools.setup(
name="diff2HtmlCompare",
version="0.1.0",
url="https://github.com/wagoodman/diff2HtmlCompare",
license="MIT",
author="wagoodman",
packages=setuptools.find_packages(),
install_requires=requirements,
entry_points={
"console_scripts": ["diff2HtmlCompare = diff2HtmlCompare:cmd"]
},
)