X-Git-Url: https://piware.de/gitweb/?a=blobdiff_plain;f=workitems.py;h=fa40e47764b0800d579b0f252df41171a2e1d27c;hb=440cd71f9afa01857159a5881b513aa7694b8354;hp=d5621062e2a58e07da80ac6575bf17b9cfcaeeaf;hpb=5d50bc350abcad898a0d1cc235758dfc3cccfac0;p=bin.git
diff --git a/workitems.py b/workitems.py
index d562106..fa40e47 100755
--- a/workitems.py
+++ b/workitems.py
@@ -23,6 +23,10 @@ def get_db(dbpath):
workitem VARCHAR(255) NOT NULL,
status VARCHAR(20) NOT NULL,
date TIMESTAMP NOT NULL)''')
+ cur.execute('''CREATE TABLE status (
+ blueprint VARCHAR(255) NOT NULL,
+ status VARCHAR(1000) NOT NULL,
+ date TIMESTAMP NOT NULL)''')
db.commit()
return db
@@ -130,6 +134,36 @@ def get_blueprint_workitems(blueprint_url):
return result
+def get_blueprint_status(blueprint_url):
+ '''Collect status from a particular blueprint URL.
+
+ This will return a list of lines.
+ '''
+ status_re = re.compile('(
|^)status:\s*
', re.I)
+
+ found_status = False
+ result = []
+ for l in urllib.urlopen(blueprint_url):
+ end = False
+ if not found_status:
+ if status_re.search(l):
+ found_status = True
+ continue
+
+ if '
' in l:
+ end = True
+ l = l.replace('
', '').replace('', '').replace('', '').strip()
+
+ if not l:
+ break
+
+ result.append(l.strip())
+
+ if end:
+ break
+
+ return "\n".join(result)
+
def get_moin_workitems(url):
'''Collect work items from a moin wiki URL.
@@ -160,8 +194,15 @@ def dump(db):
cur = db.cursor()
cur.execute('SELECT * FROM work_items')
- for (blueprint, workitem, status, date) in cur:
- print '%s [%s]\t%s: %s' % (date, blueprint, workitem, status)
+ print '== Work items: =='
+ for (blueprint, workitem, item_status, date) in cur:
+ print '%s [%s]\t%s: %s' % (date, blueprint, workitem, item_status)
+
+ print '\n== Status =='
+ cur = db.cursor()
+ cur.execute('SELECT * FROM status')
+ for (blueprint, status, date) in cur:
+ print '%s: %s [%s]' % (blueprint, status, date)
def add_work_item(db, blueprint, item, status):
'''Add work item to database.'''
@@ -170,23 +211,36 @@ def add_work_item(db, blueprint, item, status):
cur.execute('INSERT INTO work_items VALUES (?, ?, ?, date(CURRENT_TIMESTAMP))',
(blueprint, item, status))
+def add_status(db, blueprint, status):
+ '''Add blueprint status to database.'''
+
+ if not status:
+ return
+
+ cur = db.cursor()
+ cur.execute('INSERT INTO status VALUES (?, ?, date(CURRENT_TIMESTAMP))',
+ (blueprint, status))
+
def import_lp(db, name_pattern, release):
- '''Collect blueprint work items from Launchpad into DB.'''
+ '''Collect blueprint work items and status from Launchpad into DB.'''
blueprints = get_blueprints('%s//ubuntu/%s/+specs?batch=300' % (blueprints_base_url,
opts.release), name_pattern)
cur = db.cursor()
cur.execute('DELETE FROM work_items WHERE date = date(CURRENT_TIMESTAMP)')
+ cur.execute('DELETE FROM status WHERE date = date(CURRENT_TIMESTAMP)')
for bp in blueprints:
#print 'Checking', bp
bpname = bp.split('/')[-1]
work_items = get_blueprint_workitems(bp)
+ status = get_blueprint_status(bp)
if not work_items:
print >> sys.stderr, 'WARNING: %s has no work items' % bpname
- for (item, status) in work_items:
- add_work_item(db, bpname, item, status)
+ for (item, state) in work_items:
+ add_work_item(db, bpname, item, state)
+ add_status(db, bpname, status)
def workitems_over_time(db):
'''Calculate work item development over time.
@@ -202,10 +256,10 @@ def workitems_over_time(db):
data.setdefault(date, {})[s] = num
return data
-def blueprint_status(db):
- '''Determine current blueprint status.
+def blueprint_completion(db):
+ '''Determine current blueprint completion.
- Return blueprint -> [todo, done, postponed] mapping.
+ Return blueprint -> [todo, done, postponed, status] mapping.
'''
data = {}
@@ -217,17 +271,19 @@ def blueprint_status(db):
index = 0
for s in valid_states:
cur = db.cursor()
- cur.execute('SELECT blueprint, count(workitem) FROM work_items '
- 'WHERE status = ? AND date = ? GROUP BY blueprint',
+ cur.execute('SELECT w.blueprint, count(w.workitem), s.status FROM work_items w '
+ 'LEFT JOIN status s ON w.blueprint = s.blueprint '
+ 'WHERE w.status = ? AND w.date = ? GROUP BY w.blueprint',
(s, last_date))
- for (bp, num) in cur:
- data.setdefault(bp, [0, 0, 0])[index] = num
+ for (bp, num, status) in cur:
+ data.setdefault(bp, [0, 0, 0, ''])[index] = num
+ data[bp][-1] = status or ''
index += 1
return data
def text(db):
- '''Print work item status as text.'''
+ '''Print work item completion as text.'''
data = workitems_over_time(db)
@@ -235,9 +291,10 @@ def text(db):
for d in sorted(data.keys()):
print d, data[d]
- print '\nBlueprint status:'
- data = blueprint_status(db)
- for (bp, (todo, done, postponed)) in data.iteritems():
+ print '\nBlueprint completion:'
+ data = blueprint_completion(db)
+ for (bp, (todo, done, postponed, status)) in data.iteritems():
+ # TODO print status
print '%s: %i/%i (%i%%)' % (bp, postponed+done, todo+done+postponed,
int(float(postponed+done)/(todo+done+postponed)*100 + 0.5))
@@ -297,22 +354,23 @@ def html(db):
Status by blueprint
- Blueprint | todo/postponed/done | Completion |
+ Blueprint | todo/postponed/done | Completion | Status |
'''
- data = blueprint_status(db)
+ data = blueprint_completion(db)
completion = []
- for (bp, (todo, done, postponed)) in data.iteritems():
+ for (bp, (todo, done, postponed, status)) in data.iteritems():
completion.append((bp,
int(float(postponed+done)/(todo+done+postponed)*100 + 0.5)))
completion.sort(key=lambda k: k[1], reverse=True)
for (bp, percent) in completion:
- print ' %s | %i/%i/%i | %i%% |
' % (
+ print ' %s | %i/%i/%i | %i%% | %s |
' % (
blueprints_base_url, bp, bp, data[bp][0], data[bp][2],
- data[bp][1], percent)
+ data[bp][1], percent,
+ data[bp][-1])
print '
'