diff --git a/barcode-generator/barcodes.py b/barcode-generator/barcode-generator.py similarity index 63% rename from barcode-generator/barcodes.py rename to barcode-generator/barcode-generator.py index a93c64a..ff42955 100755 --- a/barcode-generator/barcodes.py +++ b/barcode-generator/barcode-generator.py @@ -8,38 +8,27 @@ import sys svghead = """ + """ -svgfoot = """ - +svgfoot = """ """ width = 4 scalex = 1.2 scaley = 1.2 -f = open('../dos/people.txt','r') -items = f.readlines() -f.close() - -items = map(lambda x: x.strip(), items) -itemss = map(lambda x: x[0:3], items) - -f = open('../dos/items.txt','r') -for l in f.readlines(): - l = l.strip().split(';') - if int(l[2]) >= 0: - items += [l[1]] - itemss += [l[0]] -f.close() - - p = 0 i = 0 j = 0 -for idx in xrange(len(items)): +f = None + +lines = sys.stdin.readlines() + +for idx in xrange(len(lines)): + items = lines[idx].strip().split(';') if idx % 8 == 0: - if not f.closed: + if f and not f.closed: f.write(svgfoot) f.close() f = open('barcodes' + str(p) + '.svg','w') @@ -47,13 +36,11 @@ for idx in xrange(len(items)): i = 0 j = 0 f.write(svghead) - elem = Popen(('zint','--directsvg','-d', itemss[idx]), stdout = PIPE).communicate()[0].split('\n') + elem = Popen(('zint','--directsvg','--notext', '-d', items[1]), stdout = PIPE).communicate()[0].split('\n') elem = elem[8:-2] elem[0] = elem[0].replace('id="barcode"', 'transform="matrix(%f,0,0,%f,%f,%f)"' % (scalex, scaley, 50+i*285 , 180+j*285) ) - elem[21] = elem[21].replace(' y="59.00" ', ' y="69.00" ') - elem[22] = elem[22].replace(' font-size="8.0" ', ' font-size="14.0" ') - elem[23] = items[idx] - f.write('\n'.join(elem)) + elem.insert(-1, ' %s' % items[0]) + f.write('\n'.join(elem)+'\n\n') i += 1 if i >= width: i = 0 diff --git a/server/brmbar-server b/server/brmbar-server index ee5d39a..81da832 100755 --- a/server/brmbar-server +++ b/server/brmbar-server @@ -1,6 +1,6 @@ #!/usr/bin/python -from flask import Flask, render_template +from flask import Flask, render_template, Response from re import match app = Flask('BrmBar') @@ -27,6 +27,18 @@ def code(code): def admin(): return render_template('admin.html') +@app.route('/admin/barcode-generator.txt') +def admin_barcodegeneratortxt(): + ret = [] + ret.append('Credit 100;$100') + ret.append('Credit 200;$200') + ret.append('Credit 500;$500') + ret.append('Credit 1000;$1000') + ret.append('RESET;RST') + # TODO: add users in form ;U + response = Response(response = '\n'.join(ret) + '\n', content_type = 'text/plain') + return response + @app.route('/log/') def log(): return render_template('log.html') diff --git a/server/templates/admin.html b/server/templates/admin.html index d47df29..56f47de 100644 --- a/server/templates/admin.html +++ b/server/templates/admin.html @@ -1,5 +1,7 @@ {% extends "base.html" %} {% block title %}Admin{% endblock %} {% block content %} -admin + +

barcode generator input

+ {% endblock %}