GitLogParser.js

[gitlive] / GitLogParser.js

diff --git a/GitLogParser.js b/GitLogParser.js
index 888b84f..a781548 100644 (file)
--- a/GitLogParser.js
+++ b/GitLogParser.js
@@ -3,7 +3,11 @@ var File = imports.File.File;
 xDate = imports.Date;
 
 
-GitLogParser = { 
+
+
+
+GitLogParser = {
+    shours : false,
 
     parse : function(date)
     {
@@ -46,6 +50,12 @@ GitLogParser = {
         
         // summarize data...
         var hours = {};
+        var shours = {};
+        
+        // shours should be:
+        // hour : [ ]
+        
+        
         for (var i = 0; i < lines.length; i++) {
             var line = lines[i];
             var hour = line.start.format('H');
@@ -53,6 +63,9 @@ GitLogParser = {
             if (line.project == 'IDLE' && line.spanMin >= 5 ) {
                 line.project = 'LONGIDLE';
             }
+            if (line.project == 'IDLE' || line.project == 'LONGIDLE') {
+                line.desc = line.project;
+            }
             
             var project = line.project;
             hours[hour] = (typeof(hours[hour]) == 'undefined') ? {} : hours[hour];
@@ -61,7 +74,13 @@ GitLogParser = {
                     : hours[hour][project];
             hours[hour][project].total += line.span;
             hours[hour][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.shours = shours;
         return hours;
 
     },
@@ -69,9 +88,13 @@ GitLogParser = {
     {
         var ret = { cmd : false,  line : l, span : 0 };
         var ar = l.split(/\s+/);
-        print(JSON.stringify(ar));
+        //print(JSON.stringify(ar));
+        
             
         var time = ar.shift();
+        
+        ret.desc = ar.join(' ');
+        
         //print("time: " + time);
         
         ret.start = xDate.Date.parseDate(this.date.format('Y-m-d') + ' ' + time, 'Y-m-d H:i:s');
@@ -109,8 +132,8 @@ GitLogParser = {
             throw { error : "TEST"};
         }
         
-        print(ret.cmd);
-        print(ret.title);
+        //print(ret.cmd);
+        //print(ret.title);
         if (typeof(this[ret.cmd])=='string') {
             ret.project = this[ret.cmd]  
         } else {
@@ -126,7 +149,7 @@ GitLogParser = {
     '/usr/bin/perl' : function(ret) {
         if (ret.title.match(/^PAC/)) {
             ret.project = 'Unknown';
-            return;
+            return  'Unknown';
         }
         return 'Unknown';
         throw "Unknown match: " + ret.line;
@@ -172,7 +195,7 @@ for (var h in res) {
     for (var p in res[h]) {
         if (p == 'LONGIDLE') {
             var idletime = Math.floor(res[h][p].total/60000) ;
-            print(h + ' ' + Math.floor(res[h][p].total/60000) +'m LONGIDLE' );
+            //print(h + ' ' + Math.floor(res[h][p].total/60000) +'m LONGIDLE' );
             totals.idle += idletime;
             
              
@@ -180,7 +203,7 @@ for (var h in res) {
         }
         if (p == 'IDLE') {
             var idletime = Math.floor(res[h][p].total/60000) ;
-            print(h + ' ' + Math.floor(res[h][p].total/60000) +'m SHORT IDLE' );
+            //print(h + ' ' + Math.floor(res[h][p].total/60000) +'m SHORT IDLE' );
             totals.shortidle += idletime;
             
              
@@ -188,7 +211,7 @@ for (var h in res) {
         }
         
         
-        print(h + ' ' + Math.floor(res[h][p].total/60000) +'m ' + p );  
+        //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) {
              
@@ -200,6 +223,10 @@ for (var h in res) {
     }
     
 }
+print(JSON.stringify(GitLogParser.shours,null,4));
+
+
+
 print("\nLONGIDLE : " +(totals.idle/60).toFixed(2) +"h" );
 print("\nShort Idle : " +(totals.shortidle/60).toFixed(2) +"h" );