GitLogParser.js

[gitlive] / GitLogParser.js

diff --git a/GitLogParser.js b/GitLogParser.js
index c983908..a3861f1 100644 (file)
--- a/GitLogParser.js
+++ b/GitLogParser.js
@@ -20,9 +20,7 @@ GitLogParser = {
         
         
         }
-        print(File);
-        print(File.read);
-        print(File.read(filename));
+        
         var flines = File.read(  filename ).split("\n");        
         //print("loaded");
         // first just convert them..
@@ -64,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');
@@ -84,11 +82,22 @@ 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.push(line);
+            
             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.total = total;
         this.shours = shours;
         return hours;
 
@@ -133,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';
@@ -154,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';
@@ -223,13 +257,17 @@ 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].span/60000) +'m ' + res[h][p].items[k].line );
+                     
+            }
         }
         
-        
     }
     
 }
@@ -240,7 +278,7 @@ print("\nShort Idle : " +(totals.shortidle/60).toFixed(2) +"h" );
 
 print("Worked: " + (totals.work/60).toFixed(2) +"h\n" );
  
-
+var totals = {};
 
 for (var h in GitLogParser.shours) {
     var hsum = [];
@@ -248,6 +286,7 @@ for (var h in GitLogParser.shours) {
     for (var desc in GitLogParser.shours[h]) {
         htot += (GitLogParser.shours[h][desc]/60000).toFixed(2)*1;
         hsum.push({ desc : desc, tot : (GitLogParser.shours[h][desc]/60000).toFixed(2)*1 })
+        totals[desc] = (typeof(totals[desc]) == 'undefined' ? 0 : totals[desc]) + ((GitLogParser.shours[h][desc]/60000).toFixed(2)*1);
     }
     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 +')');
@@ -255,8 +294,17 @@ 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) {
+    print ("  " + (r.tot.toFixed(2)*1) + "   : " + r.desc);
+});
 
 //print(JSON.stringify(GitLogParser.shours,null,4));