Author: Apollon Oikonomopoulos Date: Sun Apr 27 11:56:44 2014 +0300 dconv: debianize - Use Debian bootstrap and jquery packages - Add Debian-related resources to the template - Use the package's version instead of HAProxy's git version - Move all assets under static/ diff --git a/debian/dconv/haproxy-dconv.py b/debian/dconv/haproxy-dconv.py index a43907c..3185b94 100755 --- a/debian/dconv/haproxy-dconv.py +++ b/debian/dconv/haproxy-dconv.py @@ -44,16 +44,11 @@ VERSION = "" HAPROXY_GIT_VERSION = False def main(): - global VERSION, HAPROXY_GIT_VERSION - - VERSION = get_git_version() - if not VERSION: - sys.exit(1) + global HAPROXY_GIT_VERSION usage="Usage: %prog --infile --outfile " optparser = OptionParser(description='Generate HTML Document from HAProxy configuation.txt', - version=VERSION, usage=usage) optparser.add_option('--infile', '-i', help='Input file mostly the configuration.txt') optparser.add_option('--outfile','-o', help='Output file') @@ -63,7 +58,7 @@ def main(): optparser.print_help() exit(1) - HAPROXY_GIT_VERSION = get_haproxy_git_version(os.path.dirname(option.infile)) + HAPROXY_GIT_VERSION = get_haproxy_debian_version(os.path.dirname(option.infile)) convert(option.infile, option.outfile) @@ -108,6 +103,15 @@ def get_haproxy_git_version(path): version = re.sub(r'-g.*', '', version) return version +def get_haproxy_debian_version(path): + try: + version = subprocess.check_output(["dpkg-parsechangelog", "-Sversion"], + cwd=os.path.join(path, "..")) + except subprocess.CalledProcessError: + return False + + return version.strip() + def getTitleDetails(string): array = string.split(".") @@ -447,7 +451,6 @@ def convert(infile, outfile): keywords = keywords, keywordsCount = keywordsCount, keyword_conflicts = keyword_conflicts, - version = VERSION, date = datetime.datetime.now().strftime("%Y/%m/%d"), ) except TopLevelLookupException: @@ -463,7 +466,6 @@ def convert(infile, outfile): keywords = keywords, keywordsCount = keywordsCount, keyword_conflicts = keyword_conflicts, - version = VERSION, date = datetime.datetime.now().strftime("%Y/%m/%d"), footer = footer ) diff --git a/debian/dconv/templates/parser/table/row.tpl b/debian/dconv/templates/parser/table/row.tpl index 16f4d7b..d92bd18 100644 --- a/debian/dconv/templates/parser/table/row.tpl +++ b/debian/dconv/templates/parser/table/row.tpl @@ -5,13 +5,13 @@ <% if data in ['yes']: style = "class=\"alert-success pagination-centered\"" - data = 'yes
yes

' + data = 'yes
yes

' elif data in ['no']: style = "class=\"alert-error pagination-centered\"" - data = 'no

' + data = 'no

' elif data in ['X']: style = "class=\"pagination-centered\"" - data = '

' + data = '

' elif data in ['-']: style = "class=\"pagination-centered\"" data = ' ' diff --git a/debian/dconv/templates/template.html b/debian/dconv/templates/template.html index 21e6ff2..abf5488 100644 --- a/debian/dconv/templates/template.html +++ b/debian/dconv/templates/template.html @@ -3,44 +3,27 @@ ${headers['title']} ${headers['version']} - ${headers['subtitle']} - - + + -

@@ -81,9 +64,8 @@

${headers['title']}

${headers['subtitle']}

${headers['version']}

${headers['version']} (Debian)

-
${headers['author']}
${headers['date']}

@@ -94,8 +76,8 @@

- - + +