GitLogParser.js

[gitlive] / GitLogParser.js

diff --git a/GitLogParser.js b/GitLogParser.js
index 14712e2..ddec340 100644 (file)
--- a/GitLogParser.js
+++ b/GitLogParser.js
@@ -62,7 +62,7 @@ GitLogParser = {
         // shours should be:
         // hour : [ ]
         
-        
+         
         for (var i = 0; i < lines.length; i++) {
             var line = lines[i];
             var hour = line.start.format('H');
@@ -82,12 +82,23 @@ GitLogParser = {
             hours[hour][project].total += line.span;
             hours[hour][project].items.push(line);
             
+            hours[-1] = (typeof(hours[-1]) == 'undefined') ? {} : hours[-1];
+            hours[-1][project] = (typeof(hours[-1][project]) == 'undefined') ? 
+                    { total : 0, items : {} } 
+                    : hours[-1][project];
+            
+            hours[-1][project].total += line.span;
+            hours[-1][project].items[line.desc] = (typeof(hours[-1][project].items[line.desc]) == 'undefined' ?
+                0 : hours[-1][project].items[line.desc]) + line.span;
+            
             shours[hour] = (typeof(shours[hour]) == 'undefined') ? {} : shours[hour];
             shours[hour][line.desc] = (typeof(shours[hour][line.desc] ) == 'undefined') ? 0 : shours[hour][line.desc] ;
             shours[hour][line.desc] += line.span;
+             
+            
             
         }
-        this.shours = shours;
+         this.shours = shours;
         return hours;
 
     },
@@ -131,8 +142,21 @@ GitLogParser = {
             ret.project = 'IDLE';
             return ret;        
         }
-                
+        ret.project = 'Unknown';
         
+        for(var proj in this.regexes) {
+            for(var r in this.regexes[proj]) {
+                if (ret.line.match(r)) {
+                    ret.project = proj;
+                    break;
+                }
+            }
+            if (ret.project != 'Unknown') {
+                break;
+            }
+        }
+        return ret;
+        /*
 
         if (typeof(this[ret.cmd])=='undefined') {
              ret.project = 'Unknown';
@@ -152,9 +176,21 @@ GitLogParser = {
 
 
         return ret;
+        */
 
     },
- 
+    
+    regexes : {
+        'HPA' : [ /web.hpasite/, ],
+        'MediaOut' : [ /app\.WorkerBee/, /web.MediaOut/,
+                        /media-outreach/ , /Press Release Image Portal/, /Media Outreach Feed/ , /PressRelease/],
+        'Habito' : [ /Interspire/ ],
+        'Hebe' :[ /web.hhyc_membership_system/ ]
+        
+        
+        
+    },
+    
     '/usr/bin/perl' : function(ret) {
         if (ret.title.match(/^PAC/)) {
             ret.project = 'Unknown';
@@ -221,13 +257,18 @@ 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) ;
-        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 (h == -1) {
+            
+            print( "\n" + p + ':');
+            
+            for (var k in res[h][p].items) {
                  
+                print( '     ' + Math.floor(res[h][p].items[k]/60000) +'m ' + k );
+                     
+            }
         }
         
-        
     }
     
 }