fix date calc

[gitlive] / WindowLog.js

diff --git a/WindowLog.js b/WindowLog.js
index e1d080d..62fe24e 100644 (file)
--- a/WindowLog.js
+++ b/WindowLog.js
@@ -20,6 +20,8 @@ Gtk = imports.gi.Gtk ;
 Spawn = imports.Spawn;
 File  = imports.File.File;
 GLib        = imports.gi.GLib;
+Gio = imports.gi.Gio;
+
 //Gtk.init(Seed.argv);
 xDate = imports.Date;
 xorg = imports.xorg;
@@ -62,11 +64,12 @@ WindowLog = {
             var app = aw.get_application();
             var pid = app.get_pid();
             //print("PID " + pid);
-            cmd = File.read('/proc/'+ pid + '/cmdline');
+            //var cmd = File.realpath('/proc/'+ pid + '/exe');
+            var cmd = pid ? File.read('/proc/'+ pid + '/cmdline') : 'UNKNOWN';
             
             if (!this.win || (this.win && win != this.win)) { 
         
-                print((xDate.newDate()).format("Y-m-d H:i:s") + " " + cmd + ' ' + win);
+                print((xDate.newDate()).format("Y-m-d H:i:s") + " " + win + ' - '+ cmd );
                 this.write(cmd, win);
                 this.win=win;
             }
@@ -77,7 +80,11 @@ WindowLog = {
     },
     lastdir : false,
     
-    write : function (cmd , str) {
+    
+    
+    
+    write : function (cmd , str)
+    {
         
         var dir =  this.outdir + (xDate.newDate()).format("/Y/m");
         if (!this.lastdir || this.lastdir != dir) {
@@ -86,14 +93,31 @@ WindowLog = {
             }
             this.lastdir = dir;
         }
+        var ctime = xDate.newDate();
+        var fname = ctime.format("/d") + ".log";
+        var path  = dir + '/' + fname;
+        var time  = ctime.format("H:i:s ")
+        
+        File.append (path, "\n" +time + str + ' ' + cmd );
+
+ 
+        // copy to gitlive/gitlog (each user should check out their own gitlog!?
+        if (this.lastcopy && this.lastcopy > ctime.add(xDate.Date.HOUR, -1)) {
+            return;
+        }
+        this.lastcopy = ctime;
+        var cpdir = imports.GitMonitor.GitMonitor.gitlive +
+                    '/gitlog' +  (xDate.newDate()).format("/Y/m");
+                    
+        if (!File.isDirectory(cpdir)) {
+           File.mkdir(cpdir,true);
+        }
+        File.copy(path, cpdir + fname, Gio.FileCopyFlags.OVERWRITE );
         
-        var path = dir + (xDate.newDate()).format("/d") + ".log";
-        var time = (xDate.newDate()).format("H:i:s ")
         
-        File.append (path, time + cmd + ' ' + str + "\n");
     }
     
 }
 
 
-  
\ No newline at end of file
+