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

r1798 - oipf/lib/js/utils
by ygrego＠users.nuiton.org 10 Jul '15

10 Jul '15

Author: ygrego Date: 2015-07-10 18:23:46 +0200 (Fri, 10 Jul 2015) New Revision: 1798 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1798 Log: Transform channel xmltv data into oipf channel object. Added: oipf/lib/js/utils/ChannelHelper.js Added: oipf/lib/js/utils/ChannelHelper.js =================================================================== --- oipf/lib/js/utils/ChannelHelper.js (rev 0) +++ oipf/lib/js/utils/ChannelHelper.js 2015-07-10 16:23:46 UTC (rev 1798) @@ -0,0 +1,95 @@ +class ChannelHelper { + + constructor(jsonChannels) { + this.map = { + "display-name": "setName", + icon: "setLogoUrl" + }; + this.oipfChannels = []; + this.jsonChannels = jsonChannels; + + this.channelDefaultConf = { + name: "", + channelType: "TYPE_TV", + idType: 12, + ccid: null, + tunerID: null, + onid: null, + nid: null, + tsid: null, + sid: null, + sourceID: null, + freq: null, + cni: null, + majorChannel: null, + minorChannel: null, + dsd: "", + favourite: false, + favIDs: null, + locked: false, + manualBlock: true, + ipBroadcastID: null, + channelMaxBitRate: null, + channelTTR: null, + recordable: true, + longName: null, + description: null, + authorised: null, + genre: null, + hidden: false, + is3D: false, + isHD: false, + logoURL: "" + } + } + + getOipfChannels() { + + for (var i = 0, li = this.jsonChannels.length; i < li; i++) { + var channelItem = this.jsonChannels[i]; + var channelConf = {} + var channelItemKeys = Object.keys(channelItem); + + for (var j = 0, lj = channelItemKeys.length; j < lj; j++) { + var channelKey = channelItemKeys[j]; + + var channelKeyValue = channelItem[channelKey]; + + var methodToCall = this.map[channelKey]; + + if (methodToCall) { + this[methodToCall].call(this, channelKeyValue, channelConf); + } + } + + var oipfChannel = this.getDVBTChannel(channelConf); + + if (oipfChannel) { + this.oipfChannels.push(oipfChannel); + } else { + console.log("Error in channel creation"); + } + } + + return this.oipfChannels; + } + + setName(name, channelConf) { + channelConf.name = name || null; + } + + setLogoUrl(logoObject, channelConf) { + channelConf.logoURL = logoObject && logoObject.src || null; + } + + getDVBTChannel(channelConf) { + channelConf.onid = OipfUtils.generateFourDigit(); + channelConf.tsid = OipfUtils.generateFourDigit(); + channelConf.sid = OipfUtils.generateFourDigit(); + channelConf.idType = 12; + + return new Channel(channelConf); + } + +} +

1 0

r1797 - oipf/lib
by ygrego＠users.nuiton.org 10 Jul '15

10 Jul '15

Author: ygrego Date: 2015-07-10 18:22:40 +0200 (Fri, 10 Jul 2015) New Revision: 1797 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1797 Log: Take into account new object 'ChannelHelper'. Modified: oipf/lib/paths.json Modified: oipf/lib/paths.json =================================================================== --- oipf/lib/paths.json 2015-07-10 16:20:07 UTC (rev 1796) +++ oipf/lib/paths.json 2015-07-10 16:22:40 UTC (rev 1797) @@ -21,6 +21,7 @@ "js/utils/ProgrammeService.js", "js/utils/XmlToJson.js", "js/utils/ProgrammeHelper.js", + "js/utils/ChannelHelper.js", "js/utils/ComplexPromise.js", "js/utils/Storage.js", "configuration/ConfigDefaultProperties.js", @@ -27,6 +28,10 @@ "configuration/CapabilitiesProperties.js", "configuration/OipfConfiguration.js", "js/impl/model/Collection.js", + "js/impl/model/ParentalRating.js", + "js/impl/model/ParentalRatingCollection.js", + "js/impl/model/ParentalRatingScheme.js", + "js/impl/model/ParentalRatingSchemeCollection.js", "js/impl/model/ComplexObject.js", "js/impl/model/SignalInfo.js", "js/impl/model/LNBInfo.js",

1 0

r1796 - oipf/emulator/css
by ygrego＠users.nuiton.org 10 Jul '15

10 Jul '15

Author: ygrego Date: 2015-07-10 18:20:07 +0200 (Fri, 10 Jul 2015) New Revision: 1796 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1796 Log: Manage the programme's progress. Modified: oipf/emulator/css/main.css Modified: oipf/emulator/css/main.css =================================================================== --- oipf/emulator/css/main.css 2015-07-09 17:37:32 UTC (rev 1795) +++ oipf/emulator/css/main.css 2015-07-10 16:20:07 UTC (rev 1796) @@ -1,17 +1,3 @@ -/* -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. -*/ -/* - Created on : 3 juin 2015, 11:33:14 - Author : root -*/ - -/*[class*="col-"] { - padding: 15px; -}*/ - #emulator { height: 600px; background-color: activecaption; @@ -70,11 +56,11 @@ object { width: 100%; height: 100%; - background-color: slategrey; +/* background-color: lightslategray;*/ } .off { - position: absolute; +/* position: absolute;*/ width: 100%; height: 100%; background-color: black; @@ -100,6 +86,18 @@ font-weight: bold; } -.paddingTop { - padding-top: 4px; +p { + padding-top: 3px; } + +#programmeState { + height: 100%; + width: 0.30%; + background-color: white; +} + +.container { + height: 20px; + padding: 0; + display: block; +}

1 0

r1795 - in oipf/lib: . js/impl js/utils
by smaisonneuve＠users.nuiton.org 09 Jul '15

09 Jul '15

Author: smaisonneuve Date: 2015-07-09 19:37:32 +0200 (Thu, 09 Jul 2015) New Revision: 1795 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1795 Log: [Utils] Adding a storage utility to share data into localStorage Added: oipf/lib/js/utils/Storage.js Modified: oipf/lib/js/impl/VideoBroadcastObject.js oipf/lib/paths.json Modified: oipf/lib/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/lib/js/impl/VideoBroadcastObject.js 2015-07-09 13:51:59 UTC (rev 1794) +++ oipf/lib/js/impl/VideoBroadcastObject.js 2015-07-09 17:37:32 UTC (rev 1795) @@ -159,11 +159,18 @@ this._timerManager = new TimerManager(); this._timeout = this._timerManager.createTimer.bind(this._timerManager, 0); + this._storage = new Storage(); } createdCallback() { console.log("[INFO] createdCallback called."); this.init(); + + // If multiple video/bcast lives in different windows they should be kept in sync + var changePlayState = this.changePlayState.bind(this); + this._storage.addListener("playState", function(event) { + changePlayState(parseInt(event.newValue)); + }) } _setChannelService() { @@ -239,7 +246,8 @@ * • Number state: * the new state of the video/broadcast object. Valid values are given in the definition of the playState property above. * - * • Number error – if the state has changed due to an error, this field contains an error code detailing the type of error. See the definition of * onChannelChangeError above for valid values. If no error has occurred, this argument SHALL take the value undefined . + * • Number error – if the state has changed due to an error, this field contains an error code detailing the type of error. + * See the definition of onChannelChangeError above for valid values. If no error has occurred, this argument SHALL take the value undefined . */ get onPlayStateChange() { return this._getCallback("PlayStateChange"); Added: oipf/lib/js/utils/Storage.js =================================================================== --- oipf/lib/js/utils/Storage.js (rev 0) +++ oipf/lib/js/utils/Storage.js 2015-07-09 17:37:32 UTC (rev 1795) @@ -0,0 +1,54 @@ +/** + * This class is meant to handle the localStorage data source + **/ +class Storage { + + constructor() { + let listeners = this.listeners = []; + window.addEventListener("storage", function(event) { + let listenersOnKey = listeners[event.key]; + if (listenersOnKey) { + for (let listener of listenersOnKey) { + listener(event); + } + } + }); + } + + /** + * Add a storage listener when a specific key is modified within the localStorage + * @param {String} key the key to listen for modifications + * @param {Function} callback the callback to call on when a modification has been detected + */ + addListener(key, callback) { + this.listeners[key] = this.listeners[key] || []; + this.listeners[key].push(callback); + } + + removeListener(key, callback) { + let listeners = this.listeners[key]; + let index = listeners.indexOf(callback); + if (index >= 0) { + listeners.splice(index, 1); + } + } + + set(key, value) { + // Let's stringify the value to be able to store objects + let string = JSON.stringify(value); + localStorage.setItem(key, string); + } + + get(key) { + let value = localStorage.getItem(key); + return JSON.parse(value); + } + + remove(key) { + localStorage.removeItem(key); + } + + clear() { + localStorage.clear(); + } +} Modified: oipf/lib/paths.json =================================================================== --- oipf/lib/paths.json 2015-07-09 13:51:59 UTC (rev 1794) +++ oipf/lib/paths.json 2015-07-09 17:37:32 UTC (rev 1795) @@ -22,6 +22,7 @@ "js/utils/XmlToJson.js", "js/utils/ProgrammeHelper.js", "js/utils/ComplexPromise.js", + "js/utils/Storage.js", "configuration/ConfigDefaultProperties.js", "configuration/CapabilitiesProperties.js", "configuration/OipfConfiguration.js",

1 0

r1794 - oipf/test
by smaisonneuve＠users.nuiton.org 09 Jul '15

09 Jul '15

Author: smaisonneuve Date: 2015-07-09 15:51:59 +0200 (Thu, 09 Jul 2015) New Revision: 1794 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1794 Log: [Build] - Launching server as a gulp task Modified: oipf/test/gulpfile.js Modified: oipf/test/gulpfile.js =================================================================== --- oipf/test/gulpfile.js 2015-07-09 13:02:08 UTC (rev 1793) +++ oipf/test/gulpfile.js 2015-07-09 13:51:59 UTC (rev 1794) @@ -8,6 +8,9 @@ var notifier = require("node-notifier"); var util = require("gulp-util"); +var express = require("express"); +var app = express(); + var paths = require("./paths.json"); var conf = { @@ -54,4 +57,8 @@ gulp.watch(conf.jsTestFiles, ["javascriptTests"]); }); -gulp.task("default", gulpSequence("javascriptTests", "watch")); +gulp.task("server", function() { + require("./server.js"); +}); + +gulp.task("default", gulpSequence("javascriptTests", "watch", "server"));

1 0

r1793 - oipf/emulator/js/utils
by ygrego＠users.nuiton.org 09 Jul '15

09 Jul '15

Author: ygrego Date: 2015-07-09 15:02:08 +0200 (Thu, 09 Jul 2015) New Revision: 1793 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1793 Log: Before use a some features of 'VideoBroadcastService', we must reset its transition plan. Modified: oipf/emulator/js/utils/Service.js Modified: oipf/emulator/js/utils/Service.js =================================================================== --- oipf/emulator/js/utils/Service.js 2015-07-09 12:23:59 UTC (rev 1792) +++ oipf/emulator/js/utils/Service.js 2015-07-09 13:02:08 UTC (rev 1793) @@ -38,6 +38,10 @@ }); }; + this.resetTransition = function() { + this.transitions.length = 0; + } + } });

1 0

r1792 - oipf/emulator/js/services
by ygrego＠users.nuiton.org 09 Jul '15

09 Jul '15

Author: ygrego Date: 2015-07-09 14:23:59 +0200 (Thu, 09 Jul 2015) New Revision: 1792 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1792 Log: Be able to receive event when the current channel change. Modified: oipf/emulator/js/services/VideoBroadcastService.js Modified: oipf/emulator/js/services/VideoBroadcastService.js =================================================================== --- oipf/emulator/js/services/VideoBroadcastService.js 2015-07-09 09:19:40 UTC (rev 1791) +++ oipf/emulator/js/services/VideoBroadcastService.js 2015-07-09 12:23:59 UTC (rev 1792) @@ -96,6 +96,9 @@ var deferred = $q.defer(); this.currentIndex = 0; + this.videoBroadcastObject.onPlayStateChange = + this.onChangeState.bind(this, deferred.resolve, deferred.reject); + this.previousState = this.videoBroadcastObject.playState; this.addTransition(this.previousState,

1 0

r1791 - oipf/emulator/css
by ygrego＠users.nuiton.org 09 Jul '15

09 Jul '15

Author: ygrego Date: 2015-07-09 11:19:40 +0200 (Thu, 09 Jul 2015) New Revision: 1791 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1791 Log: Display parental rating contained in a programme. Modified: oipf/emulator/css/main.css Modified: oipf/emulator/css/main.css =================================================================== --- oipf/emulator/css/main.css 2015-07-09 09:12:28 UTC (rev 1790) +++ oipf/emulator/css/main.css 2015-07-09 09:19:40 UTC (rev 1791) @@ -88,3 +88,18 @@ .panel2 { width: 140px } + +.csa { + width: 25px; + height: 25px; + background: black; + -moz-border-radius: 50px; + -webkit-border-radius: 50px; + border-radius: 50px; + color: white; + font-weight: bold; +} + +.paddingTop { + padding-top: 4px; +}

1 0

r1790 - oipf/emulator/view
by ygrego＠users.nuiton.org 09 Jul '15

09 Jul '15

Author: ygrego Date: 2015-07-09 11:12:28 +0200 (Thu, 09 Jul 2015) New Revision: 1790 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1790 Log: Use all available space in panel channel info, 'span' is more appropriated to display items inlines with angularJS repeater. Modified: oipf/emulator/view/index.html Modified: oipf/emulator/view/index.html =================================================================== --- oipf/emulator/view/index.html 2015-07-09 09:08:25 UTC (rev 1789) +++ oipf/emulator/view/index.html 2015-07-09 09:12:28 UTC (rev 1790) @@ -37,13 +37,18 @@ <div class="col-md-2"> <img ng-src="{{chanLogo}}"/> </div> - <div class="col-md-6"> + <div class="col-md-10"> <div> <b>{{programmeTitle}}</b> </div> <div> - <p ng-repeat="genre in genres">{{genre}} </p> + <span ng-repeat="genre in genres">{{genre}} </span> </div> + <div> + <div class="col-md-1">12H45</div> + <div class="col-md-10"></div> + <div class="col-md-1">15h06</div> + </div> </div> </div>

1 0

r1789 - oipf/emulator/js/services
by ygrego＠users.nuiton.org 09 Jul '15

09 Jul '15

Author: ygrego Date: 2015-07-09 11:08:25 +0200 (Thu, 09 Jul 2015) New Revision: 1789 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1789 Log: The panel info about current channel didn't display after an emulator starting up again. Modified: oipf/emulator/js/services/VideoBroadcastService.js Modified: oipf/emulator/js/services/VideoBroadcastService.js =================================================================== --- oipf/emulator/js/services/VideoBroadcastService.js 2015-07-08 14:36:48 UTC (rev 1788) +++ oipf/emulator/js/services/VideoBroadcastService.js 2015-07-09 09:08:25 UTC (rev 1789) @@ -28,8 +28,12 @@ this.previousState = this.videoBroadcastObject.playState; this.currentIndex = 0; - this.videoBroadcastObject.onPlayStateChange = - this.onChangeState.bind(this, deferred.resolve.bind(deferred), deferred.reject.bind(deferred)); + this.videoBroadcastObject.onPlayStateChange = function(state, error) { + if (state == videoBroadcastConstants.state.PRESENTING) { + deferred.resolve(); + } + }; +// this.onChangeState.bind(this, deferred.resolve.bind(deferred), deferred.reject.bind(deferred)); this.addTransition(videoBroadcastConstants.state.UNREALIZED, videoBroadcastConstants.state.CONNECTING);

1 0