[Libreoffice-commits] dev-tools.git: esc-reporting/esc-collect.py

[jan Iversen]

 esc-reporting/esc-collect.py |   23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

New commits:
commit e5c2d3d87af00bcfaa685a4af96784463ba6670e
Author: jan Iversen <jani at libreoffice.org>
Date:   Wed May 17 07:36:06 2017 +0200

    esc-report, collect committer list using ssh (new format)

diff --git a/esc-reporting/esc-collect.py b/esc-reporting/esc-collect.py
index 6931773..af44973 100755
--- a/esc-reporting/esc-collect.py
+++ b/esc-reporting/esc-collect.py
@@ -562,18 +562,19 @@ def get_gerrit(cfg):
     searchDate, rawList = util_load_data_file(cfg, fileName, 'gerrit', {'patch': {}, 'committers' : []})
     print("Updating gerrit dump from " + rawList['newest-entry'])
 
-    urlBase = 'https://gerrit.libreoffice.org/'
-    uid = cfg['gerrit']['user']
-    upw = cfg['gerrit']['password']
     rawList['committers'] = []
-    tmp = util_load_url(urlBase + 'a/groups/Committers/members', uUser=uid, uPass=upw)
-    for row in tmp:
-      for i in 'username', 'email':
-        if not i in row:
-          row[i] = '*dummy*'
-      rawList['committers'].append(row)
-
-    url = urlBase + 'changes/?q=after:' + searchDate.strftime("%Y-%m-%d") + \
+    os.system('ssh gerrit.libreoffice.org "gerrit ls-members Committers" > /tmp/committerList')
+    fp = open('/tmp/committerList', encoding='utf-8')
+    tmp = fp.read().split('\n')[1:-1]
+    fp.close()
+    for line in tmp:
+      row = line.split('\t')
+      rawList['committers'].append({"_account_id": int(row[0]),
+                                    "email": row[3],
+                                    "name": row[2],
+                                    "username": row[1]})
+
+    url = 'https://gerrit.libreoffice.org/changes/?q=after:' + searchDate.strftime("%Y-%m-%d") + \
          '&o=DETAILED_LABELS&o=DETAILED_ACCOUNTS&o=MESSAGES&limit=200&start='
     offset = 0
     if 'offset' in rawList: