From 8f5c3d591991ad1c27d2f3a7294f5b953bf0335a Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Sat, 2 Mar 2013 12:45:36 +0800 Subject: [PATCH] GitLogParser.js --- GitLogParser.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/GitLogParser.js b/GitLogParser.js index 2a859090..c6ff8d4b 100644 --- a/GitLogParser.js +++ b/GitLogParser.js @@ -11,6 +11,8 @@ GitLogParser = { parse : function(date) { + + if (typeof(date) == 'object') { this.date = date; var home = GLib.get_home_dir(); print( "READING FILE"); @@ -97,8 +99,9 @@ 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') : (new Date()).format('Y-m-d') + + ' ' + time, 'Y-m-d H:i:s'); while (ret.cmd === false) { var ta = ar.pop(); @@ -187,9 +190,8 @@ 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]) { -- 2.39.2