GitMonitor.js

[gitlive] / GitLogParser.js

diff --git a/GitLogParser.js b/GitLogParser.js
index 5ca3b9b..aa3fd8a 100644 (file)
--- a/GitLogParser.js
+++ b/GitLogParser.js
@@ -6,15 +6,23 @@ xDate = imports.Date;
 
 
 
-GitLogParser = { 
-
+GitLogParser = {
+    shours : false,
+    date : false,
     parse : function(date)
     {
-        this.date  = date;        
-        var home  = GLib.get_home_dir();
-        print( "READING FILE");
-        var flines = File.read(  home + '/.gitlog' + date.format('/Y/m/d') + '.log').split("\n");
-        print("loaded");
+        var filename = date;
+        if (typeof(date) == 'object') {
+            this.date  = date;        
+            var home  = GLib.get_home_dir();
+            //print( "READING FILE");
+            filename = home + '/.gitlog' + date.format('/Y/m/d') + '.log';
+        
+        
+        }
+        
+        var flines = File.read(  filename ).split("\n");        
+        //print("loaded");
         // first just convert them..
         // we had an old bug that did not put line breaks in there..
         // however 00:00:00: is pretty distinct, so let'st try and split on it..
@@ -44,7 +52,7 @@ GitLogParser = {
              
             
         }
-        print("parsed");
+        //print("parsed");
         //print(JSON.stringify(lines,null,4));
         
         // summarize data...
@@ -96,8 +104,10 @@ GitLogParser = {
         
         //print("time: " + time);
         
-        ret.start = xDate.Date.parseDate(this.date.format('Y-m-d') + ' ' + time, 'Y-m-d H:i:s');
-        
+        //ret.start = xDate.Date.parseDate(this.date.format('Y-m-d') + ' ' + time, 'Y-m-d H:i:s');
+        ret.start = xDate.Date.parseDate(
+                            (this.date ? this.date.format('Y-m-d')  :'2013-01-01') +
+                            ' ' + time, 'Y-m-d H:i:s');
 
         while (ret.cmd === false) {
             var ta = ar.pop();
@@ -131,8 +141,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 {
@@ -186,15 +196,14 @@ if (typeof(Seed.argv[2]) == 'undefined') {
     print("pick a date");
     Seed.quit();
 }
-
-
-var res = GitLogParser.parse(xDate.Date.parseDate(Seed.argv[2], 'Y-m-d'));
+ 
+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}
 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;
             
              
@@ -202,7 +211,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;
             
              
@@ -210,7 +219,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) {
              
@@ -222,12 +231,35 @@ for (var h in res) {
     }
     
 }
+
+
 print("\nLONGIDLE : " +(totals.idle/60).toFixed(2) +"h" );
 print("\nShort Idle : " +(totals.shortidle/60).toFixed(2) +"h" );
 
 print("Worked: " + (totals.work/60).toFixed(2) +"h\n" );
  
 
+
+for (var h in GitLogParser.shours) {
+    var hsum = [];
+    var htot = 0;
+    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 })
+    }
+    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 +')');
+    hsum.forEach(function(r) {
+        print ("  " + r.tot + "   : " + r.desc);
+    });
+}
+
+
+
+//print(JSON.stringify(GitLogParser.shours,null,4));
+
+
+
 // open file..
 
 // read lines