projects
/
iron-blogger
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
payment from jeff
[iron-blogger]
/
render.py
diff --git
a/render.py
b/render.py
index 6e4e80ce53e708b007b00f656a9526ebda1333d2..58cb92e4f249af16c39cf9424fdf89c00c286109 100755
(executable)
--- a/
render.py
+++ b/
render.py
@@
-7,23
+7,19
@@
import sys
import os
import os.path
import subprocess
import os
import os.path
import subprocess
+import re
from mako.template import Template
from mako.template import Template
-START = datetime.datetime(2011, 10, 24, 6)
-HERE = os.path.dirname(__file__)
+from config import *
def get_balance(acct):
def get_balance(acct):
- p = subprocess.Popen(['ledger', '-f', os.path.join(HERE,'ledger'),
- '-n', 'balance', acct],
+ p = subprocess.Popen(BALANCE_CMD + [acct],
stdout=subprocess.PIPE)
(out, _) = p.communicate()
stdout=subprocess.PIPE)
(out, _) = p.communicate()
- return float(
out.split()[0][1:]
)
+ return float(
re.sub(r'\s*(\d+)\s+.*', r'\1', out)
)
def get_debts():
def get_debts():
- p = subprocess.Popen(['ledger', '-f',
- os.path.join(HERE, 'ledger'),
- '--no-color', '--flat',
- '--no-total', 'balance', 'Pool:Owed:'],
+ p = subprocess.Popen(DEBTS_CMD,
stdout=subprocess.PIPE)
(out, _) = p.communicate()
debts = []
stdout=subprocess.PIPE)
(out, _) = p.communicate()
debts = []
@@
-31,7
+27,8
@@
def get_debts():
if not line: continue
(val, acct) = line.split()
user = acct[len("Pool:Owed:"):]
if not line: continue
(val, acct) = line.split()
user = acct[len("Pool:Owed:"):]
- val = float(val[len("$"):])
+ if not user: continue
+ val = float(re.sub(r'(\D)?(\d+)$', r'\2', val))
debts.append((user, val))
return debts
debts.append((user, val))
return debts
@@
-75,6
+72,7
@@
def render_template(path, week=None, **kwargs):
lame = []
skip = []
userlist = []
lame = []
skip = []
userlist = []
+ punted = []
class User(object):
pass
class User(object):
pass
@@
-90,16
+88,21
@@
def render_template(path, week=None, **kwargs):
userlist.append(u)
userlist.append(u)
+ # create a subset of punted users
+ if u.end:
+ punted.append(u)
+
def user_key(u):
return (u.start, u.username)
userlist.sort(key=user_key)
def user_key(u):
return (u.start, u.username)
userlist.sort(key=user_key)
+ punted.sort(key=user_key)
for u in userlist:
for u in userlist:
- user_start =
parse(u.start, default=START
)
- if u.end and
parse(u.end, default=START
) <= week_start:
+ user_start =
datetime.datetime(*(u.start.timetuple()[:6])
)
+ if u.end and
datetime.datetime(*(u.end.timetuple()[:6])
) <= week_start:
continue
continue
-
+
if should_skip(u.skip, week):
pass
elif user_start > week_start:
if should_skip(u.skip, week):
pass
elif user_start > week_start:
@@
-111,11
+114,14
@@
def render_template(path, week=None, **kwargs):
debts = get_debts()
debts = get_debts()
- return Template(filename=path, output_encoding='utf-8').render(
+ return Template(filename=path, input_encoding='utf-8',
+ output_encoding='utf-8',
+ default_filters=['decode.utf8']).render(
week=week, week_start=week_start,week_end=week_end,
good=good, lame=lame, skip=skip, userlist=userlist,
pool=get_balance('Pool'), paid=get_balance('Pool:Paid'),
week=week, week_start=week_start,week_end=week_end,
good=good, lame=lame, skip=skip, userlist=userlist,
pool=get_balance('Pool'), paid=get_balance('Pool:Paid'),
- debts=debts, **kwargs)
+ debts=debts, punted=punted, currency=CURRENCY, fine=FINE_SIZE,
+ **kwargs)
if __name__ == '__main__':
if len(sys.argv) < 2:
if __name__ == '__main__':
if len(sys.argv) < 2:
Benjamin Mako Hill
||
Want to submit a patch?