GitLogParser.js

[gitlive] / GitLogParser.js

diff --git a/GitLogParser.js b/GitLogParser.js
index 876f4e5..de22d57 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)
     {
@@ -23,9 +27,9 @@ GitLogParser = {
         // read the lines, and fill in the 'spans'
         
         for (var i = 0; i < flines.length; i++) {
-            print("sl");
+            
             var xl = flines[i].split(/([0-9]{2}:[0-9]{2}:[0-9]{2})/);
-            print("as");
+            
             //print(JSON.stringify(xl));
             for (var ii=1; ii< xl.length; ii+=2) {
                 var p = lines.length;
@@ -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;
 
     },
@@ -70,8 +89,12 @@ GitLogParser = {
         var ret = { cmd : false,  line : l, span : 0 };
         var ar = l.split(/\s+/);
         //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');
@@ -108,6 +131,9 @@ GitLogParser = {
             print( "Unknown application: " + ret.line);
             throw { error : "TEST"};
         }
+        
+        print(ret.cmd);
+        print(ret.title);
         if (typeof(this[ret.cmd])=='string') {
             ret.project = this[ret.cmd]  
         } else {
@@ -123,8 +149,9 @@ GitLogParser = {
     '/usr/bin/perl' : function(ret) {
         if (ret.title.match(/^PAC/)) {
             ret.project = 'Unknown';
-            return;
+            return  'Unknown';
         }
+        return 'Unknown';
         throw "Unknown match: " + ret.line;
     },
     '/usr/lib/icedove/icedove-bin' : 'Checking Mail',