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

r1233 - oipf/js/impl/model
by ygrego＠users.nuiton.org 20 Apr '15

20 Apr '15

Author: ygrego Date: 2015-04-20 10:46:42 +0000 (Mon, 20 Apr 2015) New Revision: 1233 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1233 Log: Implementation of class "SignalInfo" Added: oipf/js/impl/model/SignalInfo.js Added: oipf/js/impl/model/SignalInfo.js =================================================================== --- oipf/js/impl/model/SignalInfo.js (rev 0) +++ oipf/js/impl/model/SignalInfo.js 2015-04-20 10:46:42 UTC (rev 1233) @@ -0,0 +1,61 @@ +/* + * The SignalInfo object provides details on the signal strength of the tuner. + * If the tuner is not tuned to a transponder the all properties SHALL have + * the value undefined . + * + */ + +var SignalInfo = Class.extend({ + + /* + * Description: + * Signal strength measured in dBm, for example -31.5dBm. + * + * Type: readonly Number + */ + strength: null, + + /* + * Description: + * Signal quality with range from 0 to 100. Calculation of quality is a + * function of ber and snr . The specification remains silent as to + * how the calculation is made. + * + * Type: readonly Integer + */ + quality: null, + + /* + * Description: + * Bit error rate. + * + * Type: readonly Integer + */ + ber: null, + + /* + * Description: + * Signal to noise ratio (dB), for example 22.3dB. + * + * Type: readonly Number + */ + snr: null, + + /* + * Description: + * True if the tuner is locked to a transponder. + * + * Type: readonly Boolean + */ + lock: null, + + + init: function(strength, quality, quality, ber, snr, lock) { + this.strength = strength; + this.quality = quality; + this.ber = ber; + this.snr = snr; + this.lock = lock; + } +}); +

1 0

r1232 - in oipf/js/impl: . model
by ygrego＠users.nuiton.org 20 Apr '15

20 Apr '15

Author: ygrego Date: 2015-04-20 10:30:23 +0000 (Mon, 20 Apr 2015) New Revision: 1232 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1232 Log: Switch the directory location of class "Collection". Added: oipf/js/impl/model/Collection.js Removed: oipf/js/impl/Collection.js Deleted: oipf/js/impl/Collection.js =================================================================== --- oipf/js/impl/Collection.js 2015-04-20 10:15:38 UTC (rev 1231) +++ oipf/js/impl/Collection.js 2015-04-20 10:30:23 UTC (rev 1232) @@ -1,16 +0,0 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ - -var Collection = Array.extend({ - - item: function(index) { - return this[index]; - } - -}); - - - Copied: oipf/js/impl/model/Collection.js (from rev 1229, oipf/js/impl/Collection.js) =================================================================== --- oipf/js/impl/model/Collection.js (rev 0) +++ oipf/js/impl/model/Collection.js 2015-04-20 10:30:23 UTC (rev 1232) @@ -0,0 +1,16 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ + +var Collection = Array.extend({ + + item: function(index) { + return this[index]; + } + +}); + + +

1 0

r1231 - oipf/js/impl/model
by ygrego＠users.nuiton.org 20 Apr '15

20 Apr '15

Author: ygrego Date: 2015-04-20 10:15:38 +0000 (Mon, 20 Apr 2015) New Revision: 1231 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1231 Log: Initialization of others class properties directly in constructor. Modified: oipf/js/impl/model/Programme.js Modified: oipf/js/impl/model/Programme.js =================================================================== --- oipf/js/impl/model/Programme.js 2015-04-20 10:10:47 UTC (rev 1230) +++ oipf/js/impl/model/Programme.js 2015-04-20 10:15:38 UTC (rev 1231) @@ -324,12 +324,35 @@ init: function(name, startTime, duration, description, episode, channel, blocked) { this.name = name; - this.starTime = startTime; + this.startTime = startTime; this.duration = duration; this.description = description; this.episode = episode; this.channel = channel; this.blocked = blocked; + this.longName = null; + this.description = null; + this.longDescription = null; + this.duration = null; + this.channelID = null; + this.totalEpisodes = null; + this.is3D = null; + this.programmeID = null; + this.programmeIDType = null; + this.IMI = null; + this.parentalRatings = null; + this.groupCRIDs = null; + this.showType = null; + this.subtitles = null; + this.isHD = null; + this.audioType = null; + this.isMultilingual = null; + this.genre = null; + this.hasRecording = null; + this.audioLanguages = null; + this.subtitleLanguages = null; + this.locked = null; + this.recording = null; }, /*

1 0

r1230 - oipf/js/impl/model
by ygrego＠users.nuiton.org 20 Apr '15

20 Apr '15

Author: ygrego Date: 2015-04-20 10:10:47 +0000 (Mon, 20 Apr 2015) New Revision: 1230 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1230 Log: Implementation of class "NetworkCollection". Added: oipf/js/impl/model/NetworkInterfaceCollection.js Added: oipf/js/impl/model/NetworkInterfaceCollection.js =================================================================== --- oipf/js/impl/model/NetworkInterfaceCollection.js (rev 0) +++ oipf/js/impl/model/NetworkInterfaceCollection.js 2015-04-20 10:10:47 UTC (rev 1230) @@ -0,0 +1,11 @@ +/* + * The NetworkInterfaceCollection class represents a collection of + * NetworkInterface objects. See Annex K for the definition + * of the collection template. + */ + +var NetworkInterfaceCollection = Collection.extend({ + init: function() { + this.push.apply(this, arguments); + } +});

1 0

r1229 - oipf/js/impl
by ygrego＠users.nuiton.org 20 Apr '15

20 Apr '15

Author: ygrego Date: 2015-04-20 10:02:48 +0000 (Mon, 20 Apr 2015) New Revision: 1229 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1229 Log: Implementation of class "Collection". Added: oipf/js/impl/Collection.js Added: oipf/js/impl/Collection.js =================================================================== --- oipf/js/impl/Collection.js (rev 0) +++ oipf/js/impl/Collection.js 2015-04-20 10:02:48 UTC (rev 1229) @@ -0,0 +1,16 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ + +var Collection = Array.extend({ + + item: function(index) { + return this[index]; + } + +}); + + +

1 0

r1228 - oipf/js/impl/model
by ygrego＠users.nuiton.org 20 Apr '15

20 Apr '15

Author: ygrego Date: 2015-04-20 09:45:53 +0000 (Mon, 20 Apr 2015) New Revision: 1228 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1228 Log: Implementation of class "NetworkInterface". Added: oipf/js/impl/model/NetworkInterface.js Added: oipf/js/impl/model/NetworkInterface.js =================================================================== --- oipf/js/impl/model/NetworkInterface.js (rev 0) +++ oipf/js/impl/model/NetworkInterface.js 2015-04-20 09:45:53 UTC (rev 1228) @@ -0,0 +1,52 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ + +var NetworkInterface = Class.extend({ + /* + * Description: + * The IP address of the network interface, in dotted-quad notation for IPv4 + * or colon-hexadecimal notation for IPv6. This property SHALL take + * the value undefined if no IP address has been assigned. The IP address + * may be link local, private or global, depending on which address block it + * belongs to, as reserved by IANA. + * + * Visibility Type: readonly Integer + */ + ipAddress: null, + + /* + * Description: + * The colon-separated MAC address of the network interface. + * + * Visibility Type: readonly String + */ + macAddress: null, + + /* + * Description: + * Flag indicating whether the network interface is currently connected. + * + * Visibility Type: readonly Boolean + */ + connected: null, + + /* + * Description: + * Flag indicating whether the network interface is enabled. + * Setting this property SHALL enable or disable the network interface. + * + * Type: Boolean + */ + enabled: null, + + init: function(ipAddress, macAddress, connected, enabled) { + this.ipAddress= ipAddress; + this.macAddress= ipAddress; + this.connected= connected; + this.enabled= enabled; + } +}); +

1 0

r1227 - in oipf/js: . configuration
by ygrego＠users.nuiton.org 20 Apr '15

20 Apr '15

Author: ygrego Date: 2015-04-20 08:00:35 +0000 (Mon, 20 Apr 2015) New Revision: 1227 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1227 Log: A new directory: "configuration" containing a new javascritp file "TestConfig" in order to manage redefinition of class when the tests will be launch on TV platform. Added: oipf/js/configuration/ oipf/js/configuration/TestConfig.js Added: oipf/js/configuration/TestConfig.js =================================================================== --- oipf/js/configuration/TestConfig.js (rev 0) +++ oipf/js/configuration/TestConfig.js 2015-04-20 08:00:35 UTC (rev 1227) @@ -0,0 +1,175 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ + +if (!String.prototype.includes) { + String.prototype.includes = function() {'use strict'; + return String.prototype.indexOf.apply(this, arguments) !== -1; + }; +} + +var userAgent = navigator.userAgent; + +if (userAgent.includes("HbbTV") || userAgent.includes("SmartTv")) { + console.log("OIPF TESTS ON TV PLATFORM"); + var hbbTv = ApplicationManager.getWindows[2]; + hbbTv && hbbTv.deactivate(); + var ui = ApplicationManager.getWindows()[0]; //or getWindowsByName + ui && ui.keySet.setValue(0x10, []); + !ui.visible && ui.show(); + !ui.active && ui.activate(); + + + var VideoBroadcastManager = VideoBroadcastTest.extend({ + + init: function() { +// this.superBeforeTest = VideoBroadcastTest.prototype.super.beforeTest; + this.vidBroadObj = oipfObjectFactory.createVideoBroadcastObject(); + + this.superBeforeTest = this.super.beforeTest; + this.superOnChangeState = this.super.onChangeState; + }, + + onChangeState: function(resolve, reject, event) { + this.superOnChangeState.call(this, + resolve, reject, event.state, event.error); + }, + +// beforeTest: function(resolve, reject) { +// this.reject = reject.bind(null); +// this.resolve = resolve.bind(null); +// this.superBeforeTest.call(this, this.resolve, this.reject); +// this.cancel = true; +// }, + + beforeTest: function(resolve, reject) { + this.reject = reject.bind(null); + this.resolve = resolve.bind(null); + this.onPlayStateChange = this.onChangeState.bind(this, resolve, reject); + this.vidBroadObj.addEventListener("PlayStateChange", this.onPlayStateChange, false); + this.transitions = []; + this.previousState = this.vidBroadObj.playState; + this.currentIndex = 0; + this.channel = null; + this.timerManager = new TimerManager(); + this.timeout = this.timerManager.createTimer.bind(this.timerManager); + logTest("State: Pending"); + this.cancel = true; + }, + + unrealizedToConnecting: function(begin, end, callback) { + if (callback) { + throw ("Untestable Case."); + } + }, + + connectingToPresenting: function(begin, end, callback) { + /** + * Avoid that the future transition C->P be canceled. + * More extend super method beforeTest in order to reset + * 'startEndStates' property. + */ + if (this.cancel) { + callback && this.timeout().then(callback).then(console.log.bind(console, "TOTO")); + this.cancel = false; + } else { + this.pushTransition(begin, end, callback, null); + } + }, + + unrealizedToUnrealized: function(begin, end, callback) { + this.reject("Untestable Case."); + }, + + stopToStop: function(begin, end, callback) { + this.reject("Untestable Case."); + }, + + noStatesDefined: function(begin, end, callback) { + this.reject("Untestable Case."); + }, + + startEndStates: { + + "00": "unrealizedToUnrealized", + "01": "unrealizedToConnecting", + "12": "connectingToPresenting", + "33": "stopToStop", + "nullnull": "noStatesDefined" + }, + + pushTransition: function(begin, end, callback, error) { + this.transitions.push({ + begin: begin, + end: end, + error: error, + callback: callback + }); + }, + + pushTransitionWithError: function(begin, end, callback, error) { + var method = this.startEndStates[""+begin+end]; + if (method) { + this[method].call(this, begin, end, callback); + } else { + this.pushTransition(begin, end, callback, error); + } + }, + + addTransition: function(begin, end, callback) { + this.addTransitionWithError(begin, end, callback, null); + }, + + addTransitionWithError: function(begin, end, callback, error) { + this.pushTransitionWithError(begin, end, callback, error); + } + }); + + var VideoBroadcastTest = VideoBroadcastManager.extend({ + + init: function() { +// this.superBeforeTest = VideoBroadcastTest.prototype.super.beforeTest; +// this.vidBroadManager = new VideoBroadcastManager(); + + this.super.init(); +// this.onChangeState = this.super.beforeTest.bind(this); +// +// // beforeTest: function(resolve, reject) { +// // this.reject = reject.bind(null); +// // this.resolve = resolve.bind(null); +// // this.superBeforeTest.call(this, this.resolve, this.reject); +// // this.cancel = true; +// // }, +// +// this.beforeTest = this.super.beforeTest.bind(this); +// +// this.unrealizedToConnecting = this.super +// .unrealizedToConnecting.bind(this); +// +// this.connectingToPresenting = this.super +// .connectingToPresenting.bind(this); +// +// this.unrealizedToUnrealized = this.super. +// unrealizedToConnecting.bind(this); +// +// this.stopToStop = this.super.stopToStop.bind(this); +// +// this.noStatesDefined = this.super.noStatesDefined.bind(this); +// +// this.pushTransition = this.super.pushTransition.bind(this); +// +// this.pushTransitionWithError = this.super +// .pushTransitionWithError.bind(this); +// +// this.addTransition = this.super.addTransition.bind(this); +// +// this.addTransitionWithError = this.super +// .addTransitionWithError.bind(this); + } + + }); +} + +

1 0

r1226 - wit/js/components
by jruchaud＠users.nuiton.org 17 Apr '15

17 Apr '15

Author: jruchaud Date: 2015-04-17 16:22:12 +0000 (Fri, 17 Apr 2015) New Revision: 1226 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1226 Log: First try to manage idle Modified: wit/js/components/Time.js Modified: wit/js/components/Time.js =================================================================== --- wit/js/components/Time.js 2015-04-17 16:15:31 UTC (rev 1225) +++ wit/js/components/Time.js 2015-04-17 16:22:12 UTC (rev 1226) @@ -24,9 +24,9 @@ render: function() { return ( <div id="time"> - <span onClick={this.keepTime}>{this.state.getTime() || "Not started"}</span> + <span onClick={this.keepTime}>{this.state.getTime() ? "time: " + this.state.getTime() : "Not started"}</span>   - <span onClick={this.keepIdle}>{this.state.getIdle() || ""}</span> + <span onClick={this.keepIdle}>{this.state.getIdle() ? "idle: " + this.state.getIdle() : ""}</span> </div> ); }

1 0

r1225 - in wit/js: . components
by jruchaud＠users.nuiton.org 17 Apr '15

17 Apr '15

Author: jruchaud Date: 2015-04-17 16:15:31 +0000 (Fri, 17 Apr 2015) New Revision: 1225 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1225 Log: First try to manage idle Modified: wit/js/TimerService.js wit/js/components/Time.js wit/js/gui.js Modified: wit/js/TimerService.js =================================================================== --- wit/js/TimerService.js 2015-04-17 15:24:59 UTC (rev 1224) +++ wit/js/TimerService.js 2015-04-17 16:15:31 UTC (rev 1225) @@ -1,12 +1,34 @@ 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(); @@ -14,19 +36,29 @@ exports.stop = function() { if (time) { - db.insertLog(tags, time, new Date()); + db.insertLog(tags, time, idleTime || new Date()); time = null; + idleTime = null; + deltaIdle = 0; timeChange(); } }; exports.getTime = function() { if (time) { - var diff = moment(moment().diff(time)).utcOffset(0); + 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; }; @@ -47,9 +79,28 @@ 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; +}; Modified: wit/js/components/Time.js =================================================================== --- wit/js/components/Time.js 2015-04-17 15:24:59 UTC (rev 1224) +++ wit/js/components/Time.js 2015-04-17 16:15:31 UTC (rev 1225) @@ -8,11 +8,26 @@ componentDidMount: function() { timer.subscribeTimeChanged(this.forceUpdate.bind(this)); + timer.subscribeIdle(this.forceUpdate.bind(this)); }, + keepTime: function() { + timer.keepTime(); + this.forceUpdate(); + }, + + keepIdle: function() { + timer.keepIdle(); + this.forceUpdate(); + }, + render: function() { return ( - <div id="time">{this.state.getTime() || "Not started"}</div> + <div id="time"> + <span onClick={this.keepTime}>{this.state.getTime() || "Not started"}</span> +   + <span onClick={this.keepIdle}>{this.state.getIdle() || ""}</span> + </div> ); } }); Modified: wit/js/gui.js =================================================================== --- wit/js/gui.js 2015-04-17 15:24:59 UTC (rev 1224) +++ wit/js/gui.js 2015-04-17 16:15:31 UTC (rev 1225) @@ -27,17 +27,3 @@ tray = null; }); }); - -var x11 = require('x11'); - -var getUserIdleTime = 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"); - }); - }); - X.on('error', console.error); - }); -};

1 0

r1224 - oipf/js/test
by ygrego＠users.nuiton.org 17 Apr '15

17 Apr '15

Author: ygrego Date: 2015-04-17 15:24:59 +0000 (Fri, 17 Apr 2015) New Revision: 1224 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1224 Log: Deletion of method "testBindToCurrentChannel". Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-04-17 14:45:25 UTC (rev 1223) +++ oipf/js/test/VideoBroadcastTest.js 2015-04-17 15:24:59 UTC (rev 1224) @@ -109,23 +109,6 @@ }, /* - * Descrtiption: - * This method test the binding between the video broadcast object and the current program stream. - * ToDO: Extraction of method onPlayStateChange out. - */ - testBindToCurrentChannel: function(resolve, reject) { - var self = this; - - this.addTransition(this.UNREALIZED, this.CONNECTING, function() { - self.vidBroadObj.bindToCurrentChannel(); - }); - - this.addTransition(this.CONNECTING, this.PRESENTING, resolve); - - this.vidBroadObj.bindToCurrentChannel(); - }, - - /* * This method must throw a error by using the method reject. * * @param {type} resolve

1 0