GitLogParser.js

[gitlive] / GitLogParser.js

diff --git a/GitLogParser.js b/GitLogParser.js
index bc3fe93..3090d42 100644 (file)
--- a/GitLogParser.js
+++ b/GitLogParser.js
@@ -146,7 +146,8 @@ GitLogParser = {
         
         for(var proj in this.regexes) {
             for(var r in this.regexes[proj]) {
-                if (ret.line.match(r)) {
+                if (ret.line.match(this.regexes[proj][r])) {
+                    //print("Match " + proj + " on " + r + ret.line + )
                     ret.project = proj;
                     break;
                 }
@@ -181,14 +182,27 @@ GitLogParser = {
     },
     
     regexes : {
-        'HPA' : [ /web.hpasite/, ],
-        'MediaOut' : [ /app\.WorkerBee/, /web.MediaOut/,
-                        /media-outreach/ , /Press Release Image Portal/, /Media Outreach Feed/ , /PressRelease/],
+        'HPA' : [ /web.hpasite/, /Roo Application Builder - Site/, /HP Intranet/ ],
+        'MediaOut' : [ /app\.WorkerBee/, /web\.MediaOut/, /workerbee/,
+                        /media-outreach/ , /Press Release Image Portal/, /Media Outreach Feed/ , /PressRelease/,
+                        /Media Clipping Portal/,
+                        /Auto Searching/ , // These are the excel files they send over..
+                        /sitemap\.xml/,
+                        /Builder - Clipping/
+                        ],
         'Habito' : [ /Interspire/ ],
-        'Hebe' :[ /web.hhyc_membership_system/ ]
+        'Hebe' :[ /web.hhyc_membership_system/ ,/Builder - Hebe/, /Hebe Haven Membership Managment/],
         
+        'RIS' : [ /Project web.Ris/ , /RIS HK/ , /Hydra/],
+        // for who thoug...
+        'Mailfort' : [ /web.FlexySpam/ ],
         
+        'COBA'  : [/Veridate Financial/, /web\.coba/, /COBA/ ],
         
+        'Unknown Project' : [ /PAC/ , /Guake/ , /WhatsApp/ ],
+        'Admin Work' : [ /roojs.com\/admin/, /RooJSolutions Management Portal/ ]
+            
+         
     },
     
     '/usr/bin/perl' : function(ret) {
@@ -234,7 +248,8 @@ if (typeof(Seed.argv[2]) == 'undefined') {
 }
  
 var res = GitLogParser.parse( Seed.argv[2][0] == '/' ? Seed.argv[2] : xDate.Date.parseDate(Seed.argv[2], 'Y-m-d'));
-var totals = { work : 0 , idle: 0, shortidle : 0}
+var totals = { work : 0 , idle: 0, shortidle : 0};
+var unknown = [];
 for (var h in res) {
     for (var p in res[h]) {
         if (p == 'LONGIDLE') {
@@ -257,15 +272,25 @@ for (var h in res) {
         
         //print(h + ' ' + Math.floor(res[h][p].total/60000) +'m ' + p );  
         totals.work += Math.floor(res[h][p].total/60000) ;
-        
+       
         if (h == -1) {
             
-            print( "\n" + p + ':');
+            print( "\n" + p + ':' + Math.floor(res[h][p].total/60000) + 'm');
             
-            for (var k in res[h][p].items) {
-                 
-                print( '     ' + Math.floor(res[h][p].items[k].span/60000) +'m ' + res[h][p].items[k].line );
+            if (p != 'Unknown') {
+        
+                for (var k in res[h][p].items) {
                      
+                    print( '     ' + Math.floor(res[h][p].items[k]/60000) +'m ' + k );
+                         
+                }
+            } else {
+                
+                for (var k in res[h][p].items) {
+                    unknown.push({ desc : k , tot : (res[h][p].items[k]/60000).toFixed(2)*1 }) ;
+                    
+                         
+                }
             }
         }
         
@@ -295,15 +320,11 @@ for (var h in GitLogParser.shours) {
         print ("  " + r.tot + "   : " + r.desc);
     });
 }
-print("\n\n" + h+': Totals (' + htot +')');
+  
  
-var hsum = [];
-for (var desc in totals) {    
-    hsum.push({ desc : desc, tot : totals[desc] });
-}
-hsum.sort(function(a,b) { if (a.tot == b.tot) { return 0; } return a.tot < b.tot ? 1 : -1 });
-print("\n\nDay Total");
-hsum.forEach(function(r) {
+unknown.sort(function(a,b) { if (a.tot == b.tot) { return 0; } return a.tot < b.tot ? 1 : -1 });
+print("\n\nUnclassified");
+unknown.forEach(function(r) {
     print ("  " + (r.tot.toFixed(2)*1) + "   : " + r.desc);
 });