X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=GitLogParser.js;h=8c13ff40051b4ab5ab82552d0d07a58b56aaf8ad;hp=e5fa3c174fb8779047905402fb4b57a6f2659ced;hb=9e641e366549656621a3e4fc4950b62c4b395650;hpb=6e3fa019a5c2b6a08b151bd4517440d2cd1537e3 diff --git a/GitLogParser.js b/GitLogParser.js index e5fa3c17..8c13ff40 100644 --- a/GitLogParser.js +++ b/GitLogParser.js @@ -182,16 +182,46 @@ GitLogParser = { }, regexes : { - 'HPA' : [ /web.hpasite/, /Roo Application Builder - Site/ ], - 'MediaOut' : [ /app\.WorkerBee/, /web.MediaOut/, - /media-outreach/ , /Press Release Image Portal/, /Media Outreach Feed/ , /PressRelease/], + 'HPA' : [ /web.hpasite/, /Roo Application Builder - Site/, /HP Intranet/, /Hpasite/ ], + 'MediaOut' : [ /app\.WorkerBee/, /web\.MediaOut/, /workerbee/, + /media-outreach/ , /Press Release Image Portal/, /Media Outreach Feed/ , /PressRelease/, + /Clipping Portal/, /Media OutReach/, + /Auto Searching/ , // These are the excel files they send over.. + /sitemap\.xml/, + /Builder - Clipping/ + ], 'Habito' : [ /Interspire/ ], 'Hebe' :[ /web.hhyc_membership_system/ ,/Builder - Hebe/, /Hebe Haven Membership Managment/], - 'RIS' : [ /Project web.Ris/ , /RIS HK/ ] + 'RIS' : [ /Project web.Ris/ , /RIS HK/ , /Hydra/, /hydrajobs/ ], + // for who thoug... + 'Mailfort' : [ /web.FlexySpam/ ], + 'Emily' : [ /greengarden/ ,/Inventory \| Warehouse/, /Emily/ ], + 'GPUK' : [/gp-wordpress/, /Greenpeace UK/], + 'COBA' : [/Veridate/, /web\.coba/, /COBA/ ,/Pipeline - DS view/, /Coba/, /Pman.BAdmin/ , /SoapUI/ ], + 'Regulation Asia' : [/Regulation Asia/, /comocracy/], + 'Unknown Project' : [ /PAC/ , /Guake/ , /WhatsApp/ ,/Mozilla Thunderbird/], + 'Admin Work' : [ /roojs.com\/admin/, /RooJSolutions Management Portal/ ] + + + }, + + match_project : function(line) { + for(var proj in this.regexes) { + for(var r in this.regexes[proj]) { + if (line.match(this.regexes[proj][r])) { + //print("Match " + proj + " on " + r + ret.line + ) + return proj; + + } + } + + } + return "Unknown"; }, + '/usr/bin/perl' : function(ret) { if (ret.title.match(/^PAC/)) { ret.project = 'Unknown'; @@ -268,7 +298,7 @@ for (var h in res) { for (var k in res[h][p].items) { - print( ' ' + Math.floor(res[h][p].items[k]/60000) +'m ' + k ); + print( ' ' + Math.floor(res[h][p].items[k]/60000) +'m ' + k ); } } else { @@ -304,7 +334,9 @@ for (var h in GitLogParser.shours) { hsum.sort(function(a,b) { if (a.tot == b.tot) { return 0; } return a.tot < b.tot ? 1 : -1 }); print("\n\n" + h+': Total (' + htot +')'); hsum.forEach(function(r) { - print (" " + r.tot + " : " + r.desc); + var pr = r.desc.match(/IDLE/) ? '' : (GitLogParser.match_project(r.desc) == "Unknown" ? '??? - ' : ''); + + print (" " + r.tot + " : " + pr + r.desc); }); }