April 2015 - Sandbox-commits - mailman.cloud.codelutin.com

r1263 - oipf/js/impl/model
by ygrego＠users.nuiton.org April 27, 2015

April 27, 2015

Author: ygrego Date: 2015-04-27 14:38:18 +0000 (Mon, 27 Apr 2015) New Revision: 1263 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1263 Log: Modification of documentation for property "ipAddress" and affectation of property "macAddress" into constructor. Modified: oipf/js/impl/model/NetworkInterface.js Modified: oipf/js/impl/model/NetworkInterface.js =================================================================== --- oipf/js/impl/model/NetworkInterface.js 2015-04-27 14:33:21 UTC (rev 1262) +++ oipf/js/impl/model/NetworkInterface.js 2015-04-27 14:38:18 UTC (rev 1263) @@ -13,7 +13,7 @@ * may be link local, private or global, depending on which address block it * belongs to, as reserved by IANA. * - * Visibility Type: readonly Integer + * Visibility Type: readonly String */ ipAddress: null, @@ -44,7 +44,7 @@ init: function(ipAddress, macAddress, connected, enabled) { this.ipAddress= ipAddress; - this.macAddress= ipAddress; + this.macAddress= macAddress; this.connected= connected; this.enabled= enabled; }

1 0

r1262 - oipf/js/utils
by ygrego＠users.nuiton.org April 27, 2015

April 27, 2015

Author: ygrego Date: 2015-04-27 14:33:21 +0000 (Mon, 27 Apr 2015) New Revision: 1262 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1262 Log: Deletion of method "getChannelByName". Modified: oipf/js/utils/ChannelService.js Modified: oipf/js/utils/ChannelService.js =================================================================== --- oipf/js/utils/ChannelService.js 2015-04-27 14:29:28 UTC (rev 1261) +++ oipf/js/utils/ChannelService.js 2015-04-27 14:33:21 UTC (rev 1262) @@ -42,6 +42,6 @@ this.getNumber(), this.getNumber(), name); - } + } });

1 0

r1261 - oipf/js/impl
by ygrego＠users.nuiton.org April 27, 2015

April 27, 2015

Author: ygrego Date: 2015-04-27 14:29:28 +0000 (Mon, 27 Apr 2015) New Revision: 1261 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1261 Log: Implementation of methods: "record", "recordAt", "addEventListener", "removeEventListerner" and "_fireEvent". Modified: oipf/js/impl/RecordingSchedulerObject.js Modified: oipf/js/impl/RecordingSchedulerObject.js =================================================================== --- oipf/js/impl/RecordingSchedulerObject.js 2015-04-27 13:05:56 UTC (rev 1260) +++ oipf/js/impl/RecordingSchedulerObject.js 2015-04-27 14:29:28 UTC (rev 1261) @@ -1,7 +1,102 @@ var RecordingSchedulerObject = Class.extend({ + + /* + * Description: + * Provides a list of scheduled and recorded programmes in the system. + * This property may only provide access to a subset of the full list + * of recordings, as determined by the value of the manageRecordings + * attribute of the <recording> element in the client capability + * description (see section 9.3.3). + * + * Visibility Type: readonly ScheduledRecordingCollection + */ + recordings: null, + + /* + * Description: + * Get information about the status of the local storage device. + * The DiscInfo class is defined in section 7.16.4. + * + * Visibility Type: readonly ScheduledRecordingCollection + */ + discInfo: null, - init : function(){ + init: function() { + this.eventMnager = new EventManager(); + this.timerManager = new TimerManager(); + this._timeout = this.timermanager.createTimer; + this.callbacks = {}; + this.listeners = {}; + + this.recordings = new ScheduledRecordingCollection(); + + }, + /* + *Description: + * + * FIXME: + * Yannis - 27/04/2015 - Do verification on parameter + * Yannis - 27/04/2015 - Verify pvr capability in order to manage + * recordings in order to store them into properties "recordings". + */ + record: function(programme) { + return new ScheduledRecording(programme); + }, + + /* + * Description: + * + * FIXME: + * Yannis - 27/04/2015 - Do verification on parameters + * Yannis - 27/04/2015 - Verify pvr capability in order to manage + * recordings in order to store them into properties "recordings". + */ + recordAt: function(startTime, duration, repeatDays, channelID) { + var channel = this.getChannelConfig().channelList.getChannel(channelID); + + if (channel) { + return new ScheduledRecording( + startTime, duration, repeatDays, channel); + } + + return null; + }, + + getChannelConfig: function() { + + }, + + get onPVREvent() { + return this._getCallback("PVREvent"); + }, + + set onPVREvent(callback) { + this._setCallback(callback); + }, + + _getCallback : function(type) { + if(this._callbacks) { + return this._callbacks[type]; + } + }, + + _setCallback: function(type, callback){ + if(this._callbacks) { + this._callbacks[type] = callback; + } + }, + + addEventListener: function(type, listener) { + this._eventManager.addEventListener(type, listener, this); + }, + + _fireEvent: function(event) { + this._eventManager.fireEvent(event, this); + }, + + removeEventListener: function(type, listener) { + this._eventManager.removeEventListener(type, listener, this); } }); \ No newline at end of file

1 0

r1260 - in wit: . js js/services
by jruchaud＠users.nuiton.org April 27, 2015

April 27, 2015

Author: jruchaud Date: 2015-04-27 13:05:56 +0000 (Mon, 27 Apr 2015) New Revision: 1260 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1260 Log: Manage idle time Modified: wit/idle.html wit/js/main.js wit/js/services/TimerService.js Modified: wit/idle.html =================================================================== --- wit/idle.html 2015-04-27 12:55:55 UTC (rev 1259) +++ wit/idle.html 2015-04-27 13:05:56 UTC (rev 1260) @@ -3,6 +3,12 @@ <title>WIT idle</title> <link rel="stylesheet" href="./node_modules/bootstrap/dist/css/bootstrap.min.css"> + <style> + h1 { + text-align: center; + } + </style> + <script> var gui = require('nw.gui'); var window = gui.Window.get(); Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-04-27 12:55:55 UTC (rev 1259) +++ wit/js/main.js 2015-04-27 13:05:56 UTC (rev 1260) @@ -73,7 +73,7 @@ var current = gui.Window.get(); current.hide(); - var window = gui.Window.open('idle.html',{ + var window = gui.Window.open('idle.html', { "position": "center", "focus": true, "toolbar": false, Modified: wit/js/services/TimerService.js =================================================================== --- wit/js/services/TimerService.js 2015-04-27 12:55:55 UTC (rev 1259) +++ wit/js/services/TimerService.js 2015-04-27 13:05:56 UTC (rev 1260) @@ -16,7 +16,7 @@ var X = display.client; X.require('screen-saver', function(err, SS) { SS.QueryInfo(display.screen[0].root, function(err, info) { - console.log('Idle time ' + info.idle + "ms", info.idle >= TIME_IDLE); +// console.log('Idle time ' + info.idle + "ms"); if (info.idle >= TIME_IDLE && !idleTime) { idleTime = new Date();

1 0

r1259 - in wit: . js js/components js/services
by jruchaud＠users.nuiton.org April 27, 2015

April 27, 2015

Author: jruchaud Date: 2015-04-27 12:55:55 +0000 (Mon, 27 Apr 2015) New Revision: 1259 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1259 Log: Manage idle time Added: wit/idle.html Modified: wit/index.html wit/js/components/ActionsBar.js wit/js/components/Time.js wit/js/main.js wit/js/services/TimerService.js wit/package.json Copied: wit/idle.html (from rev 1256, wit/index.html) =================================================================== --- wit/idle.html (rev 0) +++ wit/idle.html 2015-04-27 12:55:55 UTC (rev 1259) @@ -0,0 +1,46 @@ +<html> + <head> + <title>WIT idle</title> + <link rel="stylesheet" href="./node_modules/bootstrap/dist/css/bootstrap.min.css"> + + <script> + var gui = require('nw.gui'); + var window = gui.Window.get(); + var timer = global.timer; + + var keepIdle = function() { + timer.keepIdle(); + window.close(); + }; + var removeIdle = function() { + timer.removeIdle(); + window.close(); + }; + var reassignIdle = function() { + timer.reassignIdle(); + window.close(); + }; + </script> + </head> + + <body> + <div class="container-fluid"> + <h1>Idle detected</h1> + <div class="alert alert-danger" role="alert">Idle detcted, please select your option:</div> + + <button type="button" class="btn btn-primary btn-lg btn-block" onclick="keepIdle()"> + <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> + Keep idle for current time + </button> + <button type="button" class="btn btn-primary btn-lg btn-block" onclick="removeIdle()"> + <span class="glyphicon glyphicon-minus" aria-hidden="true"></span> + Remove idle for current time + </button> + <button type="button" class="btn btn-primary btn-lg btn-block" onclick="reassignIdle()"> + <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> + Reassign idle time + </button> + </div> + </body> + +</html> Modified: wit/index.html =================================================================== --- wit/index.html 2015-04-27 11:48:09 UTC (rev 1258) +++ wit/index.html 2015-04-27 12:55:55 UTC (rev 1259) @@ -1,8 +1,6 @@ <html> <head> <title>WIT</title> - - <script type="application/javascript" src="js/gui.js"></script>  <script type="text/javascript" src="node_modules/react/dist/react-with-addons.js"></script> @@ -18,9 +16,12 @@ <script type="text/jsx" src="js/pages/Rapport.js"></script> <script type="text/jsx" src="js/pages/UserActivity.js"></script> <script type="text/jsx" src="js/main.js"></script> + <script type="application/javascript" src="js/gui.js"></script> +  + <link rel="stylesheet" href="./node_modules/bootstrap/dist/css/bootstrap.min.css"> +  - <link rel="stylesheet" href="./node_modules/bootstrap/dist/css/bootstrap.min.css"> <link rel="stylesheet/less" type="text/css" href="css/style.less" /> <link rel="stylesheet/less" type="text/css" href="css/timeline.less" /> <link rel="stylesheet/less" type="text/css" href="css/userActivity.less" /> Modified: wit/js/components/ActionsBar.js =================================================================== --- wit/js/components/ActionsBar.js 2015-04-27 11:48:09 UTC (rev 1258) +++ wit/js/components/ActionsBar.js 2015-04-27 12:55:55 UTC (rev 1259) @@ -7,7 +7,7 @@ }, onStop: function() { - timer.stop(); + timer.stop(true); }, render: function() { Modified: wit/js/components/Time.js =================================================================== --- wit/js/components/Time.js 2015-04-27 11:48:09 UTC (rev 1258) +++ wit/js/components/Time.js 2015-04-27 12:55:55 UTC (rev 1259) @@ -8,7 +8,6 @@ componentDidMount: function() { timer.subscribeTimeChanged(this.forceUpdate.bind(this)); - timer.subscribeIdle(this.forceUpdate.bind(this)); }, render: function() { Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-04-27 11:48:09 UTC (rev 1258) +++ wit/js/main.js 2015-04-27 12:55:55 UTC (rev 1259) @@ -8,11 +8,14 @@ global.document = window.document; global.navigator = window.navigator; -var React = require('react'); var timer = require('./js/services/TimerService.js'); -var Router = require('react-router'); +global.timer = timer; + var user = require('./js/services/UserActivityService.js'); +var React = require('react'); +var Router = require('react-router'); + var DefaultRoute = Router.DefaultRoute; var Link = Router.Link; var Route = Router.Route; @@ -63,3 +66,26 @@ Router.run(routes, function (Handler) { React.render(<Handler/>, document.body); }); + +timer.subscribeIdle(function() { + var gui = global.window.nwDispatcher.requireNwGui(); + + var current = gui.Window.get(); + current.hide(); + + var window = gui.Window.open('idle.html',{ + "position": "center", + "focus": true, + "toolbar": false, + "frame": true, + "width": 480, + "height": 300, + }); + + window.on('close', function() { + this.hide(); // Pretend to be closed already + this.close(true); + + current.show(); + }); +}); Modified: wit/js/services/TimerService.js =================================================================== --- wit/js/services/TimerService.js 2015-04-27 11:48:09 UTC (rev 1258) +++ wit/js/services/TimerService.js 2015-04-27 12:55:55 UTC (rev 1259) @@ -10,17 +10,16 @@ var tags = ["wit", "js", "dev"]; var time = null; var idleTime = null; -var deltaIdle = 0; var updateUserIdleTime = function() { x11.createClient(function(err, display) { var X = display.client; X.require('screen-saver', function(err, SS) { SS.QueryInfo(display.screen[0].root, function(err, info) { - console.log('Idle time ' + info.idle + "ms"); + console.log('Idle time ' + info.idle + "ms", info.idle >= TIME_IDLE); - if (info.idle >= TIME_IDLE) { - idleTime = idleTime || new Date(); + if (info.idle >= TIME_IDLE && !idleTime) { + idleTime = new Date(); eventEmitter.emit('onIdle'); } }); @@ -30,35 +29,34 @@ }; exports.start = function() { - time = new Date(); + time = idleTime || new Date(); + idleTime = null; timeChange(); }; -exports.stop = function() { - if (time) { - db.insertLog(tags, time, idleTime || new Date()); +exports.stop = function(force) { + + if (idleTime && force) { time = null; idleTime = null; - deltaIdle = 0; timeChange(); } + + if (time && !idleTime) { + db.insertLog(tags, time, new Date()); + time = null; + timeChange(); + } }; exports.getTime = function() { if (time) { - var start = idleTime ? moment(idleTime) : moment(); - var diff = moment(start.diff(time) + deltaIdle).utcOffset(0); + var start = moment(); + var diff = moment(start.diff(time)).utcOffset(0); return diff.format("HH:mm:ss"); } }; -exports.getIdle = function() { - if (idleTime) { - var diff = moment(moment().diff(time) + deltaIdle).utcOffset(0); - return diff.format("HH:mm:ss"); - } -}; - exports.getTags = function() { return tags; }; @@ -80,7 +78,7 @@ if (time) { timeChangeTimer = setTimeout(timeChange.bind(), 1000); - //updateUserIdleTime(); + updateUserIdleTime(); } }; @@ -92,15 +90,23 @@ eventEmitter.on('onIdle', callback); }; -exports.keepTime = function() { - var old = deltaIdle + moment(idleTime).diff(time); +exports.keepIdle = function() { + idleTime = null; +}; + +exports.removeIdle = function() { + db.insertLog(tags, time, idleTime); + time = null; + idleTime = null; - exports.stop(); - exports.start(); - - deltaIdle = old; + clearTimeout(timeChangeTimer); + eventEmitter.emit('onTimeChanged'); }; + +exports.reassignIdle = function() { + db.insertLog(tags, time, idleTime); + time = idleTime; -exports.keepIdle = function() { - idleTime = null; + clearTimeout(timeChangeTimer); + eventEmitter.emit('onTimeChanged'); }; Modified: wit/package.json =================================================================== --- wit/package.json 2015-04-27 11:48:09 UTC (rev 1258) +++ wit/package.json 2015-04-27 12:55:55 UTC (rev 1259) @@ -4,7 +4,7 @@ "version": "1.0.0", "window": { "width": 480, - "height": 450, + "height": 490, "toolbar": true, "frame": true, "transparent": false

1 0

r1258 - wit/js/components
by smaisonneuve＠users.nuiton.org April 27, 2015

April 27, 2015

Author: smaisonneuve Date: 2015-04-27 11:48:09 +0000 (Mon, 27 Apr 2015) New Revision: 1258 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1258 Log: [Wit] - Timeline: create a wrapper TimelineSession to take react key into account Modified: wit/js/components/Timeline.js Modified: wit/js/components/Timeline.js =================================================================== --- wit/js/components/Timeline.js 2015-04-27 09:48:55 UTC (rev 1257) +++ wit/js/components/Timeline.js 2015-04-27 11:48:09 UTC (rev 1258) @@ -40,28 +40,25 @@ // Build timeline - var items = [], style; + var items = [], data; if (sessions[0].startDate.isAfter(startDate)) { - var style = { - width: (sessions[0].startDate.diff(startDate) / endDate.diff(startDate) * 100 ) +"%", - }; - var items = [( - <div className="slice" style={style}></div> - )]; + + data = { width: (sessions[0].startDate.diff(startDate) / endDate.diff(startDate) * 100 ) +"%" } + items = [<TimelineSession key={startDate.unix()} data={data}/>]; + } - + items = items.concat( sessions.map(function(session) { - style = { - background: session.color, + data = { + title: session.name, + color: session.color, width: (session.duration / endDate.diff(startDate) * 100 || 0) +"%", - flexGrow: !session.duration ? "1":"0" + grow: !session.duration ? "1":"0" }; - var title = session.name; - return ( - <div className="slice" style={style} title={title}>{title}</div> - ); + + return <TimelineSession key={session.startDate.unix()} data={data} /> }) ); @@ -77,4 +74,20 @@ </div> ); } +}); + +var TimelineSession = React.createClass({ + render: function () { + var data = this.props.data; + + var title = data.title || ""; + var style = { + background: data.color, + width: data.width, + flexGrow: data.grow + }; + return ( + <div className="slice" style={style} title={title}>{title}</div> + ); + } }); \ No newline at end of file

1 0

r1257 - wit/js/services
by smaisonneuve＠users.nuiton.org April 27, 2015

April 27, 2015

Author: smaisonneuve Date: 2015-04-27 09:48:55 +0000 (Mon, 27 Apr 2015) New Revision: 1257 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1257 Log: [Wit] - Timeline: register events on active window so that we can listen to window name property change Modified: wit/js/services/UserActivityService.js Modified: wit/js/services/UserActivityService.js =================================================================== --- wit/js/services/UserActivityService.js 2015-04-27 09:22:05 UTC (rev 1256) +++ wit/js/services/UserActivityService.js 2015-04-27 09:48:55 UTC (rev 1257) @@ -27,7 +27,7 @@ } /* Inspired by : -http://stackoverflow.com/questions/19840459/linux-get-notification-on-focused-gui- window-change/19847998#19847998 +http://stackoverflow.com/questions/19840459/linux-get-notification-on-focused-gui-window-change/19847998#19847998 */ x11.createClient(function(err, display) { var X = display.client; @@ -38,11 +38,11 @@ // Init windows session with the currently active window - updateWindowSessions(X, display.screen[0].root) + addWindowSession(X, display.screen[0].root) // Listen to client display events to identify when the currently active window has change - X.on('event', onActiveWindowChange.bind(null, X)); + X.on('event', onActiveWindowChange.bind(null, X)); }); @@ -54,22 +54,51 @@ // if the property change refers to the currently active window, retrieve new active window name if (name == '_NET_ACTIVE_WINDOW') { - updateWindowSessions(X, ev.wid) + + registerWindowEvents(X, ev.wid); + addWindowSession(X, ev.wid); + + } else if (name == '_NET_WM_NAME') { + + updateWindowSession(ev.wid); } }); } }; -var updateWindowSessions = function (X, wid) { - return getWindowId(X, wid) +var registerWindowEvents = function (X, parentId) { + getActiveWindowId(X, parentId) + .then(function (wid) { + X.ChangeWindowAttributes(wid, { + eventMask:x11.eventMask.PropertyChange + }); + }); +}; + +var addWindowSession = function (X, parentId) { + return getActiveWindowId(X, parentId) .then(getWindowName) .then(createNewSession); }; -var getWindowId = function (X, wid) { +var updateWindowSession = function (wid) { + return getWindowName(wid) + .then(function (windowName) { + + // Let's create a new seesion but with same color attributes as the last one, since the active window has not change, only some of its attibutes + + var last = windowSessions[windowSessions.length - 1]; + if (last.name != windowName) { + createNewSession(windowName, last.color); + } + + }); +}; + +var getActiveWindowId = function (X, parentId) { return new Promise(function (resolve, reject) { - X.GetProperty(0, wid, _NET_ACTIVE_WINDOW, X.atoms.WINDOW, 0, 4, function(err, prop) { + X.GetProperty(0, parentId, _NET_ACTIVE_WINDOW, X.atoms.WINDOW, 0, 4, function(err, prop) { if (err) { console.log("Couldn't retrieve active window property"); @@ -103,7 +132,7 @@ }); }; -var createNewSession = function (windowName) { +var createNewSession = function (windowName, color, startDate) { if (windowSessions.length) { var now = Date.now(); var last = windowSessions[windowSessions.length - 1]; @@ -118,8 +147,8 @@ windowSessions.push({ name: windowName, - color: prev && prev.color || "#" + (Math.floor(Math.random() * (999 - 100 + 1)) + 100), - startDate: moment() + color: color || prev && prev.color || "#" + (Math.floor(Math.random() * (999 - 100 + 1)) + 100), + startDate: startDate || moment() }); };

1 0

r1256 - oipf/js/impl/model
by ygrego＠users.nuiton.org April 27, 2015

April 27, 2015

Author: ygrego Date: 2015-04-27 09:22:05 +0000 (Mon, 27 Apr 2015) New Revision: 1256 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1256 Log: This object extend from "Collection" and call his super constructor in his own constructor. Modified: oipf/js/impl/model/ChannelList.js Modified: oipf/js/impl/model/ChannelList.js =================================================================== --- oipf/js/impl/model/ChannelList.js 2015-04-27 08:48:06 UTC (rev 1255) +++ oipf/js/impl/model/ChannelList.js 2015-04-27 09:22:05 UTC (rev 1256) @@ -5,10 +5,10 @@ * properties and methods defined below. * */ -var ChannelList = Array.extend({ +var ChannelList = Collection.extend({ init: function() { - this.push.apply(this, arguments); + this.super.init.apply(this, arguments); }, /*

1 0

r1255 - wit/js/components
by smaisonneuve＠users.nuiton.org April 27, 2015

April 27, 2015

Author: smaisonneuve Date: 2015-04-27 08:48:06 +0000 (Mon, 27 Apr 2015) New Revision: 1255 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1255 Log: [Wit] - Timeline, stop timer when unmounting component Modified: wit/js/components/Timeline.js Modified: wit/js/components/Timeline.js =================================================================== --- wit/js/components/Timeline.js 2015-04-27 08:32:41 UTC (rev 1254) +++ wit/js/components/Timeline.js 2015-04-27 08:48:06 UTC (rev 1255) @@ -9,11 +9,15 @@ componentDidMount: function () { var self = this; - setInterval(function () { + this.pollingTimer = setInterval(function () { self.setState(self._refreshSessions()); }, this.poolingInterval); }, + componentWillUnmount: function () { + clearTimeout(this.pollingTimer); + }, + _refreshSessions: function () { // Retrieve window focus activity

1 0

r1254 - in wit: . js js/components js/pages js/services
by smaisonneuve＠users.nuiton.org April 27, 2015

April 27, 2015

Author: smaisonneuve Date: 2015-04-27 08:32:41 +0000 (Mon, 27 Apr 2015) New Revision: 1254 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1254 Log: [Wit] - Create pages and services packages Added: wit/js/pages/ wit/js/pages/Rapport.js wit/js/pages/Timer.js wit/js/pages/UserActivity.js wit/js/services/ wit/js/services/TimerService.js wit/js/services/UserActivityService.js wit/js/services/database.js Removed: wit/js/Rapport.js wit/js/Timer.js wit/js/TimerService.js wit/js/UserActivity.js wit/js/UserActivityService.js wit/js/database.js Modified: wit/index.html wit/js/components/FilterBar.js wit/js/main.js Modified: wit/index.html =================================================================== --- wit/index.html 2015-04-27 08:05:13 UTC (rev 1253) +++ wit/index.html 2015-04-27 08:32:41 UTC (rev 1254) @@ -14,9 +14,9 @@ <script type="text/jsx" src="js/components/FilterBar.js"></script> <script type="text/jsx" src="js/components/FilterLogs.js"></script> <script type="text/jsx" src="js/components/Timeline.js"></script> - <script type="text/jsx" src="js/Timer.js"></script> - <script type="text/jsx" src="js/Rapport.js"></script> - <script type="text/jsx" src="js/UserActivity.js"></script> + <script type="text/jsx" src="js/pages/Timer.js"></script> + <script type="text/jsx" src="js/pages/Rapport.js"></script> + <script type="text/jsx" src="js/pages/UserActivity.js"></script> <script type="text/jsx" src="js/main.js"></script>  Deleted: wit/js/Rapport.js =================================================================== --- wit/js/Rapport.js 2015-04-27 08:05:13 UTC (rev 1253) +++ wit/js/Rapport.js 2015-04-27 08:32:41 UTC (rev 1254) @@ -1,21 +0,0 @@ -/** @jsx React.DOM */ - -var Rapport = React.createClass({ - - getInitialState : function() { - return {result: []}; - }, - - handleSearchResult: function(result) { - this.setState({result: result}); - }, - - render: function() { - return ( - <div> - <FilterBar onSearchResult={this.handleSearchResult}/> - <FilterLogs data={this.state.result}/> - </div> - ); - } -}); Deleted: wit/js/Timer.js =================================================================== --- wit/js/Timer.js 2015-04-27 08:05:13 UTC (rev 1253) +++ wit/js/Timer.js 2015-04-27 08:32:41 UTC (rev 1254) @@ -1,13 +0,0 @@ -/** @jsx React.DOM */ - -var Timer = React.createClass({ - render: function() { - return ( - <div> - <Time /> - <Tags /> - <ActionsBar /> - </div> - ); - } -}); Deleted: wit/js/TimerService.js =================================================================== --- wit/js/TimerService.js 2015-04-27 08:05:13 UTC (rev 1253) +++ wit/js/TimerService.js 2015-04-27 08:32:41 UTC (rev 1254) @@ -1,106 +0,0 @@ -var moment = require('moment'); -var db = require("./database.js"); -var x11 = require('x11'); - -var events = require('events'); -var eventEmitter = new events.EventEmitter(); - -var TIME_IDLE = 4 * 1000; - -var tags = ["wit", "js", "dev"]; -var time = null; -var idleTime = null; -var deltaIdle = 0; - -var updateUserIdleTime = function() { - x11.createClient(function(err, display) { - var X = display.client; - X.require('screen-saver', function(err, SS) { - SS.QueryInfo(display.screen[0].root, function(err, info) { - console.log('Idle time ' + info.idle + "ms"); - - if (info.idle >= TIME_IDLE) { - idleTime = idleTime || new Date(); - eventEmitter.emit('onIdle'); - } - }); - }); - X.on('error', console.error); - }); -}; - -exports.start = function() { - time = new Date(); - timeChange(); -}; - -exports.stop = function() { - if (time) { - db.insertLog(tags, time, idleTime || new Date()); - time = null; - idleTime = null; - deltaIdle = 0; - timeChange(); - } -}; - -exports.getTime = function() { - if (time) { - var start = idleTime ? moment(idleTime) : moment(); - var diff = moment(start.diff(time) + deltaIdle).utcOffset(0); - return diff.format("HH:mm:ss"); - } -}; - -exports.getIdle = function() { - if (idleTime) { - var diff = moment(moment().diff(time) + deltaIdle).utcOffset(0); - return diff.format("HH:mm:ss"); - } -}; - -exports.getTags = function() { - return tags; -}; - -exports.addTag = function(tag) { - tags.push(tag); -}; - -exports.removeTag = function(index) { - tags.splice(index, 1); -}; - -var timeChangeTimer = null; - -var timeChange = function() { - clearTimeout(timeChangeTimer); - - eventEmitter.emit('onTimeChanged'); - if (time) { - timeChangeTimer = setTimeout(timeChange.bind(), 1000); - - //updateUserIdleTime(); - } -}; - -exports.subscribeTimeChanged = function(callback) { - eventEmitter.on('onTimeChanged', callback); -}; - -exports.subscribeIdle = function(callback) { - eventEmitter.on('onIdle', callback); -}; - -exports.keepTime = function() { - var old = deltaIdle + moment(idleTime).diff(time); - - exports.stop(); - exports.start(); - - deltaIdle = old; -}; - -exports.keepIdle = function() { - idleTime = null; -}; Deleted: wit/js/UserActivity.js =================================================================== --- wit/js/UserActivity.js 2015-04-27 08:05:13 UTC (rev 1253) +++ wit/js/UserActivity.js 2015-04-27 08:32:41 UTC (rev 1254) @@ -1,13 +0,0 @@ -/** @jsx React.DOM */ - -var UserActivity = React.createClass({ - - render: function() { - return ( - <div className="userActivity"> - <h1> What the hell did i do today ? </h1> - <Timeline /> - </div> - ); - } -}); \ No newline at end of file Deleted: wit/js/UserActivityService.js =================================================================== --- wit/js/UserActivityService.js 2015-04-27 08:05:13 UTC (rev 1253) +++ wit/js/UserActivityService.js 2015-04-27 08:32:41 UTC (rev 1254) @@ -1,128 +0,0 @@ -var x11 = require('x11'); -var xprop = require('xprop'); -var moment = require('moment'); - -var windowSessions = []; - -const _NET_ACTIVE_WINDOW = 334; - -exports.getSessions = function (startDate, endDate) { - var result = windowSessions, m; - - if (startDate) { - m = moment(startDate); - result = result.filter(function(s) { - return m.isBefore(s.endDate); - }); - } - - if (endDate) { - m = moment(endDate); - result = result.filter(function(s) { - return m.isAfter(s.startDate); - }); - } - - return result; -} - -/* Inspired by : -http://stackoverflow.com/questions/19840459/linux-get-notification-on-focused-gui- window-change/19847998#19847998 -*/ -x11.createClient(function(err, display) { - var X = display.client; - - X.ChangeWindowAttributes(display.screen[0].root, { - eventMask:x11.eventMask.PropertyChange - }); - - // Init windows session with the currently active window - - updateWindowSessions(X, display.screen[0].root) - - // Listen to client display events to identify when the currently active window has change - - X.on('event', onActiveWindowChange.bind(null, X)); -}); - - -var onActiveWindowChange = function (X, ev) { - if(ev.name == 'PropertyNotify') { - - X.GetAtomName(ev.atom, function(err, name) { - - // if the property change refers to the currently active window, retrieve new active window name - - if (name == '_NET_ACTIVE_WINDOW') { - updateWindowSessions(X, ev.wid) - } - }); - } -}; - -var updateWindowSessions = function (X, wid) { - return getWindowId(X, wid) - .then(getWindowName) - .then(createNewSession); -}; - -var getWindowId = function (X, wid) { - return new Promise(function (resolve, reject) { - - X.GetProperty(0, wid, _NET_ACTIVE_WINDOW, X.atoms.WINDOW, 0, 4, function(err, prop) { - if (err) { - - console.log("Couldn't retrieve active window property"); - reject(); - - } else { - - resolve(prop.data.readUInt32LE(0)); - - } - }); - }); -} - -var getWindowName = function (windowId) { - return new Promise(function (resolve, reject) { - - xprop({prop:'_NET_WM_NAME', id:windowId}, function(err, properties) { - - if (err) { - - console.log("Couldn't retrieve window name for id :", windowId); - reject(); - - } else { - - resolve(properties.length && properties[0].value); - - } - }); - }); -}; - -var createNewSession = function (windowName) { - if (windowSessions.length) { - var now = Date.now(); - var last = windowSessions[windowSessions.length - 1]; - last.endDate = moment(); - last.duration = last.endDate.diff(last.startDate); - } - - // Check if a session corresponding to the given name already exists, - // so that we can retrieve some properties - - var prev = getSessionByName(windowName); - - windowSessions.push({ - name: windowName, - color: prev && prev.color || "#" + (Math.floor(Math.random() * (999 - 100 + 1)) + 100), - startDate: moment() - }); -}; - -var getSessionByName = function (name) { - return windowSessions.filter(function (s) { return s.name == name })[0]; -}; \ No newline at end of file Modified: wit/js/components/FilterBar.js =================================================================== --- wit/js/components/FilterBar.js 2015-04-27 08:05:13 UTC (rev 1253) +++ wit/js/components/FilterBar.js 2015-04-27 08:32:41 UTC (rev 1254) @@ -19,7 +19,7 @@ onSearch: function() { var self = this; var moment = require('moment'); - var db = require("./js/database.js"); + var db = require("./js/services/database.js"); var beginDate = moment(React.findDOMNode(this.refs.beginDate).value).toDate(); var endDate = moment(React.findDOMNode(this.refs.endDate).value).toDate(); Deleted: wit/js/database.js =================================================================== --- wit/js/database.js 2015-04-27 08:05:13 UTC (rev 1253) +++ wit/js/database.js 2015-04-27 08:32:41 UTC (rev 1254) @@ -1,36 +0,0 @@ -var Datastore = require('nedb'); -var db = new Datastore(); - -exports.insertLog = function (tags, startDate, endDate) { - return new Promise(function(resolve, reject) { - db.insert({ - tags: tags, - startDate: startDate.getTime(), - endDate: endDate.getTime() - }, function(err, newDocs) { - if (!err) { - resolve(newDocs); - } else { - reject(err); - } - }); - }); -}; - -exports.searchLogs = function (tags, startDate, endDate) { - var query = {}; - - if (tags) { query.tags = { $in: tags }; } - if (startDate) { query.startDate = { $gte: startDate.getTime() } } - if (endDate) { query.endDate = { $lte: endDate.getTime() } } - - return new Promise(function(resolve, reject) { - db.find(query, function(err, docs) { - if (!err) { - resolve(docs); - } else { - reject(err); - } - }); - }); -}; Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-04-27 08:05:13 UTC (rev 1253) +++ wit/js/main.js 2015-04-27 08:32:41 UTC (rev 1254) @@ -9,9 +9,9 @@ global.navigator = window.navigator; var React = require('react'); -var timer = require('./js/TimerService.js'); +var timer = require('./js/services/TimerService.js'); var Router = require('react-router'); -var user = require('./js/UserActivityService.js'); +var user = require('./js/services/UserActivityService.js'); var DefaultRoute = Router.DefaultRoute; var Link = Router.Link; Copied: wit/js/pages/Rapport.js (from rev 1253, wit/js/Rapport.js) =================================================================== --- wit/js/pages/Rapport.js (rev 0) +++ wit/js/pages/Rapport.js 2015-04-27 08:32:41 UTC (rev 1254) @@ -0,0 +1,21 @@ +/** @jsx React.DOM */ + +var Rapport = React.createClass({ + + getInitialState : function() { + return {result: []}; + }, + + handleSearchResult: function(result) { + this.setState({result: result}); + }, + + render: function() { + return ( + <div> + <FilterBar onSearchResult={this.handleSearchResult}/> + <FilterLogs data={this.state.result}/> + </div> + ); + } +}); Copied: wit/js/pages/Timer.js (from rev 1253, wit/js/Timer.js) =================================================================== --- wit/js/pages/Timer.js (rev 0) +++ wit/js/pages/Timer.js 2015-04-27 08:32:41 UTC (rev 1254) @@ -0,0 +1,13 @@ +/** @jsx React.DOM */ + +var Timer = React.createClass({ + render: function() { + return ( + <div> + <Time /> + <Tags /> + <ActionsBar /> + </div> + ); + } +}); Copied: wit/js/pages/UserActivity.js (from rev 1253, wit/js/UserActivity.js) =================================================================== --- wit/js/pages/UserActivity.js (rev 0) +++ wit/js/pages/UserActivity.js 2015-04-27 08:32:41 UTC (rev 1254) @@ -0,0 +1,13 @@ +/** @jsx React.DOM */ + +var UserActivity = React.createClass({ + + render: function() { + return ( + <div className="userActivity"> + <h1> What the hell did i do today ? </h1> + <Timeline /> + </div> + ); + } +}); \ No newline at end of file Copied: wit/js/services/TimerService.js (from rev 1253, wit/js/TimerService.js) =================================================================== --- wit/js/services/TimerService.js (rev 0) +++ wit/js/services/TimerService.js 2015-04-27 08:32:41 UTC (rev 1254) @@ -0,0 +1,106 @@ +var moment = require('moment'); +var db = require("./database.js"); +var x11 = require('x11'); + +var events = require('events'); +var eventEmitter = new events.EventEmitter(); + +var TIME_IDLE = 4 * 1000; + +var tags = ["wit", "js", "dev"]; +var time = null; +var idleTime = null; +var deltaIdle = 0; + +var updateUserIdleTime = function() { + x11.createClient(function(err, display) { + var X = display.client; + X.require('screen-saver', function(err, SS) { + SS.QueryInfo(display.screen[0].root, function(err, info) { + console.log('Idle time ' + info.idle + "ms"); + + if (info.idle >= TIME_IDLE) { + idleTime = idleTime || new Date(); + eventEmitter.emit('onIdle'); + } + }); + }); + X.on('error', console.error); + }); +}; + +exports.start = function() { + time = new Date(); + timeChange(); +}; + +exports.stop = function() { + if (time) { + db.insertLog(tags, time, idleTime || new Date()); + time = null; + idleTime = null; + deltaIdle = 0; + timeChange(); + } +}; + +exports.getTime = function() { + if (time) { + var start = idleTime ? moment(idleTime) : moment(); + var diff = moment(start.diff(time) + deltaIdle).utcOffset(0); + return diff.format("HH:mm:ss"); + } +}; + +exports.getIdle = function() { + if (idleTime) { + var diff = moment(moment().diff(time) + deltaIdle).utcOffset(0); + return diff.format("HH:mm:ss"); + } +}; + +exports.getTags = function() { + return tags; +}; + +exports.addTag = function(tag) { + tags.push(tag); +}; + +exports.removeTag = function(index) { + tags.splice(index, 1); +}; + +var timeChangeTimer = null; + +var timeChange = function() { + clearTimeout(timeChangeTimer); + + eventEmitter.emit('onTimeChanged'); + if (time) { + timeChangeTimer = setTimeout(timeChange.bind(), 1000); + + //updateUserIdleTime(); + } +}; + +exports.subscribeTimeChanged = function(callback) { + eventEmitter.on('onTimeChanged', callback); +}; + +exports.subscribeIdle = function(callback) { + eventEmitter.on('onIdle', callback); +}; + +exports.keepTime = function() { + var old = deltaIdle + moment(idleTime).diff(time); + + exports.stop(); + exports.start(); + + deltaIdle = old; +}; + +exports.keepIdle = function() { + idleTime = null; +}; Copied: wit/js/services/UserActivityService.js (from rev 1253, wit/js/UserActivityService.js) =================================================================== --- wit/js/services/UserActivityService.js (rev 0) +++ wit/js/services/UserActivityService.js 2015-04-27 08:32:41 UTC (rev 1254) @@ -0,0 +1,128 @@ +var x11 = require('x11'); +var xprop = require('xprop'); +var moment = require('moment'); + +var windowSessions = []; + +const _NET_ACTIVE_WINDOW = 334; + +exports.getSessions = function (startDate, endDate) { + var result = windowSessions, m; + + if (startDate) { + m = moment(startDate); + result = result.filter(function(s) { + return m.isBefore(s.endDate); + }); + } + + if (endDate) { + m = moment(endDate); + result = result.filter(function(s) { + return m.isAfter(s.startDate); + }); + } + + return result; +} + +/* Inspired by : +http://stackoverflow.com/questions/19840459/linux-get-notification-on-focused-gui- window-change/19847998#19847998 +*/ +x11.createClient(function(err, display) { + var X = display.client; + + X.ChangeWindowAttributes(display.screen[0].root, { + eventMask:x11.eventMask.PropertyChange + }); + + // Init windows session with the currently active window + + updateWindowSessions(X, display.screen[0].root) + + // Listen to client display events to identify when the currently active window has change + + X.on('event', onActiveWindowChange.bind(null, X)); +}); + + +var onActiveWindowChange = function (X, ev) { + if(ev.name == 'PropertyNotify') { + + X.GetAtomName(ev.atom, function(err, name) { + + // if the property change refers to the currently active window, retrieve new active window name + + if (name == '_NET_ACTIVE_WINDOW') { + updateWindowSessions(X, ev.wid) + } + }); + } +}; + +var updateWindowSessions = function (X, wid) { + return getWindowId(X, wid) + .then(getWindowName) + .then(createNewSession); +}; + +var getWindowId = function (X, wid) { + return new Promise(function (resolve, reject) { + + X.GetProperty(0, wid, _NET_ACTIVE_WINDOW, X.atoms.WINDOW, 0, 4, function(err, prop) { + if (err) { + + console.log("Couldn't retrieve active window property"); + reject(); + + } else { + + resolve(prop.data.readUInt32LE(0)); + + } + }); + }); +} + +var getWindowName = function (windowId) { + return new Promise(function (resolve, reject) { + + xprop({prop:'_NET_WM_NAME', id:windowId}, function(err, properties) { + + if (err) { + + console.log("Couldn't retrieve window name for id :", windowId); + reject(); + + } else { + + resolve(properties.length && properties[0].value); + + } + }); + }); +}; + +var createNewSession = function (windowName) { + if (windowSessions.length) { + var now = Date.now(); + var last = windowSessions[windowSessions.length - 1]; + last.endDate = moment(); + last.duration = last.endDate.diff(last.startDate); + } + + // Check if a session corresponding to the given name already exists, + // so that we can retrieve some properties + + var prev = getSessionByName(windowName); + + windowSessions.push({ + name: windowName, + color: prev && prev.color || "#" + (Math.floor(Math.random() * (999 - 100 + 1)) + 100), + startDate: moment() + }); +}; + +var getSessionByName = function (name) { + return windowSessions.filter(function (s) { return s.name == name })[0]; +}; \ No newline at end of file Copied: wit/js/services/database.js (from rev 1253, wit/js/database.js) =================================================================== --- wit/js/services/database.js (rev 0) +++ wit/js/services/database.js 2015-04-27 08:32:41 UTC (rev 1254) @@ -0,0 +1,36 @@ +var Datastore = require('nedb'); +var db = new Datastore(); + +exports.insertLog = function (tags, startDate, endDate) { + return new Promise(function(resolve, reject) { + db.insert({ + tags: tags, + startDate: startDate.getTime(), + endDate: endDate.getTime() + }, function(err, newDocs) { + if (!err) { + resolve(newDocs); + } else { + reject(err); + } + }); + }); +}; + +exports.searchLogs = function (tags, startDate, endDate) { + var query = {}; + + if (tags) { query.tags = { $in: tags }; } + if (startDate) { query.startDate = { $gte: startDate.getTime() } } + if (endDate) { query.endDate = { $lte: endDate.getTime() } } + + return new Promise(function(resolve, reject) { + db.find(query, function(err, docs) { + if (!err) { + resolve(docs); + } else { + reject(err); + } + }); + }); +};

1 0