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

r1424 - oipf/js/utils
by ygrego＠users.nuiton.org 21 May '15

21 May '15

Author: ygrego Date: 2015-05-21 16:02:40 +0000 (Thu, 21 May 2015) New Revision: 1424 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1424 Log: Addition of the property "privateData" in method "init". Modified: oipf/js/utils/DRMSystem.js Modified: oipf/js/utils/DRMSystem.js =================================================================== --- oipf/js/utils/DRMSystem.js 2015-05-21 15:57:28 UTC (rev 1423) +++ oipf/js/utils/DRMSystem.js 2015-05-21 16:02:40 UTC (rev 1424) @@ -6,10 +6,11 @@ var DRMSytem = Class.extend({ - init: function(name, id, status, contentId) { + init: function(name, id, status, contentId, privateData) { this.name = name; this.id = id; this.status = status; this.contentId = contentId; + this.privateData = privateData; } });

1 0

r1423 - oipf/js/utils
by ygrego＠users.nuiton.org 21 May '15

21 May '15

Author: ygrego Date: 2015-05-21 15:57:28 +0000 (Thu, 21 May 2015) New Revision: 1423 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1423 Log: Addition of the class "DRMSystem". Added: oipf/js/utils/DRMSystem.js Added: oipf/js/utils/DRMSystem.js =================================================================== --- oipf/js/utils/DRMSystem.js (rev 0) +++ oipf/js/utils/DRMSystem.js 2015-05-21 15:57:28 UTC (rev 1423) @@ -0,0 +1,15 @@ +/* + * + * + * + */ + +var DRMSytem = Class.extend({ + + init: function(name, id, status, contentId) { + this.name = name; + this.id = id; + this.status = status; + this.contentId = contentId; + } +});

1 0

r1422 - oipf/js/impl
by ygrego＠users.nuiton.org 21 May '15

21 May '15

Author: ygrego Date: 2015-05-21 12:29:59 +0000 (Thu, 21 May 2015) New Revision: 1422 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1422 Log: Implementation of the methods "createChannelList", "_createChannelATSC_T", "_createChannelIPTV", "_createChannelDVB_SI_DIRECT", "_createChannelDVBOrISDB" and "_convertInInteger". Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-05-20 15:21:06 UTC (rev 1421) +++ oipf/js/impl/VideoBroadcastObject.js 2015-05-21 12:29:59 UTC (rev 1422) @@ -904,5 +904,158 @@ } } + }, + + /* + * Description: + * Creates a ChannelList object from the specified SD&S Broadcast Discovery + * Record. Channels in the returned channel list will not be included in the + * channel list that can be retrieved via calls to getChannelConfig(). + * + * Arguments: + * - bdr: An XML-encoded string containing an SD&S Broadcast Discovery + * Record as specified in [OIPF_META2]. If the string is not a valid + * Broadcast Discovery Record, this method SHALL return null. + * + * Return: ChannelList + * + * FIXME + * - Yannis 21/05/2015 Validate the parameter bdr + */ + createChannelList: function(bdr) { + var channelListArray = bdr.split(","); + var channelList = new ChannelList(); + var channelInfoNumber = { + 3: true, + 4: true, + 5: true, + 6: true + }; + + if (channelListArray.length > 1) { + + for (var i = 0, li = channelListArray.length; i < li; i++) { + var channelInfo = channelListArray[i]; + var channelInfoArray = channelInfo.split("-"); + + var isChannelInfoNumberExist = + channelInfoNumber[channelInfoArray.length]; + + if (!isChannelInfoNumberExist) { + return null; + } + //Validation of channel information return null if false + + //Create the channel + var channelObject = this._createChannel(channelInfoArray); + channelList.push(channelObject); + } + + if (!this._localChannelList) { + this._localChannelList = []; + } + + this._localChannelList.push(channelList); + + return channelList; + } + + return null; + }, + + /* + * We consider that the parameter of this method is valid concerning + * the type of channel information it contains but they are string-encoded. + * And call the associated method which must process a specific + * group of channel information according to the number of information. + */ + _createChannel: function(minimalChannelInfoArray) { + var mapping = { + 3: "_createChannelATSC_T", + 4: "_createChannelDVB_SI_DIRECT", + 5: "_createChannelDVBOrISDB", + 6: "_createChannelIPTV " + }; + var channelInfoNumber = minimalChannelInfoArray.length; + return this[mapping[channelInfoNumber]].call(minimalChannelInfoArray); + }, + + /* + * This method must transform the information which must be of type Integer. + * Then create and return a Channel object. + * The parameter contain in this order: + * 0:Integer, 1:Integer, 2:String + * + * Return: Channel + */ + _createChannelATSC_T: function(channelInfoArray) { + var i = 0; + + return new Channel( + this._convertInInteger(channelInfoArray[i++]), + this._convertInInteger(channelInfoArray[i++]), + channelInfoArray[i++]); + }, + + /* + * This method must transform the information which must be of type Integer. + * Then create and return a Channel object. + * The parameter contain in this order: + * 0:Integer, 1:Integer, 2:Integer, 3:Integer, 4:String, 5:String + * + * Return: Channel + */ + _createChannelIPTV: function(channelInfoArray) { + var i = 0; + + return new Channel( + this._convertInInteger(channelInfoArray[i++]), + this._convertInInteger(channelInfoArray[i++]), + this._convertInInteger(channelInfoArray[i++]), + this._convertInInteger(channelInfoArray[i++]), + channelInfoArray[i++], + channelInfoArray[i++]); + }, + + /* + * This method must transform the information which must be of type Integer. + * Then create and return a Channel object. + * The parameter contain in this order: + * 0:Integer, 1:Integer, 2:Integer, 3:Integer, 4:String + * + * Return: Channel + */ + _createChannelDVBOrISDB: function(channelInfoArray) { + var i = 0; + + return new Channel( + this._convertInInteger(channelInfoArray[i++]), + this._convertInInteger(channelInfoArray[i++]), + this._convertInInteger(channelInfoArray[i++]), + this._convertInInteger(channelInfoArray[i++]), + channelInfoArray[i++]); + }, + + /* + * This method must transform the information which must be of type Integer. + * Then create and return a Channel object. + * The parameter contain in this order: + * 0:Integer, 1:String, 2:Integer, 3:String + * + * Return: Channel + */ + _createChannelDVB_SI_DIRECT: function(channelInfoArray) { + var i = 0; + + return new Channel( + this._convertInInteger(channelInfoArray[i++]), + channelInfoArray[i++], + this._convertInInteger(channelInfoArray[i++]), + channelInfoArray[i++]); + }, + + _convertInInteger: function(stringValue) { + return Number.parseInt(stringValue); } + }); \ No newline at end of file

1 0

r1421 - oipf/data
by ygrego＠users.nuiton.org 20 May '15

20 May '15

Author: ygrego Date: 2015-05-20 15:21:06 +0000 (Wed, 20 May 2015) New Revision: 1421 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1421 Log: An instance of "Programme" is created in method "initProgrammes" Modified: oipf/data/XmlTvData.js Modified: oipf/data/XmlTvData.js =================================================================== --- oipf/data/XmlTvData.js 2015-05-20 15:18:34 UTC (rev 1420) +++ oipf/data/XmlTvData.js 2015-05-20 15:21:06 UTC (rev 1421) @@ -78,11 +78,13 @@ createProgramme(object, programme); programme.channel = this.initChannel(channelName); - this.programmes.push(programme); + programme.programmeID = createUUID(); + var programmeObject = new Programme(programme); + this.programmes.push(programmeObject); } }, - initChannel: function(name){ + initChannel: function(name) { return this.channelService.getADvbTChannel(name); }, @@ -108,10 +110,10 @@ }, transformInSecondSince01011970: function(wrongDateFormat) { - return this.transformToActualDate(wrongDateFormat).getTime(); + return this.transformToActualDate(wrongDateFormat).getTime() / 1000; }, - minutesToSeconds: function(minutes){ + minutesToSeconds: function(minutes) { return minutes*60; }

1 0

r1420 - oipf/view
by ygrego＠users.nuiton.org 20 May '15

20 May '15

Author: ygrego Date: 2015-05-20 15:18:34 +0000 (Wed, 20 May 2015) New Revision: 1420 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1420 Log: Deletion of directory 'oipf/view/css' Removed: oipf/view/css/

1 0

r1419 - oipf
by ygrego＠users.nuiton.org 20 May '15

20 May '15

Author: ygrego Date: 2015-05-20 15:14:22 +0000 (Wed, 20 May 2015) New Revision: 1419 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1419 Log: Deletion of file 'test' of directory oipf Removed: oipf/test Deleted: oipf/test ===================================================================

1 0

r1418 - oipf/js/test
by ygrego＠users.nuiton.org 20 May '15

20 May '15

Author: ygrego Date: 2015-05-20 14:59:01 +0000 (Wed, 20 May 2015) New Revision: 1418 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1418 Log: Deletion of files "newjavascript" and "test". Removed: oipf/js/test/newjavascript.js oipf/js/test/test.js Deleted: oipf/js/test/newjavascript.js =================================================================== --- oipf/js/test/newjavascript.js 2015-05-20 14:56:19 UTC (rev 1417) +++ oipf/js/test/newjavascript.js 2015-05-20 14:59:01 UTC (rev 1418) @@ -1,58 +0,0 @@ -/* - * To change license header, choose License Headers in Project Properties. - * To change template file, choose Tools | Templates - * and open the template in the editor. - */ -var SCHEDULED = 7; -var STARTED = 1; -var BEFORE_STARTED = 9; -var COMPLETED = 2; -var transitions = []; -var currentIndex; -var vidBroadObj = oipfObjectFactory.createVideoBroadcastObject(); -var recordingSchedulerObject = - oipfObjectFactory.createRecordingSchedulerObject(); -var previousState; - -function addTransitionWithError(begin, end, error, callback) { - transitions.push({ - begin: begin, - end: end, - error: error, - callback: callback - }); -}; - -function addTransition(begin, end, callback) { - addTransitionWithError(begin, end, null, callback); -}; - -recordingSchedulerObject.onPVREvent = function(newState, recordings) { - if (currentIndex < transitions.length) { - console.log("PVREvent received: State:", newState); - var currentTransition = transitions[currentIndex]; - var begin = currentTransition.begin; - var end = currentTransition.end; - - if (begin == previousState && end == newState) { - currentTransition.callback && currentTransition.callback(); - previousState = newState; - currentIndex++; - } else { - reject("Invalid state."); - } - } else { - console.log("Any others transitions have been set."); - } -}; - -addTransition(null, SCHEDULED); -addTransition(SCHEDULED, BEFORE_STARTED); -addTransition(BEFORE_STARTED, STARTED); -addTransition(STARTED, COMPLETED); -var channel = vidBroadObj.currentChannel; -var currentTime = Math.round(Date.now()/1000); -recording = recordingSchedulerObject.recordAt(currentTime, - 1*60, 0x00, channel.ccid); -console.log(recording); - Deleted: oipf/js/test/test.js =================================================================== --- oipf/js/test/test.js 2015-05-20 14:56:19 UTC (rev 1417) +++ oipf/js/test/test.js 2015-05-20 14:59:01 UTC (rev 1418) @@ -1,141 +0,0 @@ -function testCreatingVidBroadObj(){ - console.log("[TEST-RUNNING][Info] Creating of video/brodacast oipf object."); - - videoBroadcastObject=oipfObjectFactory.createVideoBroadcastObject(); - console.assert(videoBroadcastObject!=null,"The object video/broadcast is null."); - - console.log("[TEST-RUNNING][Result] Creating of video/brodacast oipf object [SUCESSFULL]."); -} - -function testCreatingSearchManagerObj(){ - - console.log("[TEST-RUNNING][Info] Creating of searchManager oipf object."); - - searchManagerObject=oipfObjectFactory.createSearchManagerObject(); - console.assert(searchManagerObject!=null,"The object searchManager is null."); - - console.log("[TEST-RUNNING][Result] Creating of searchManager oipf object [SUCESSFULL]."); - -} - -function testCreatingChannelConfigObj(){ - - console.log("[TEST-RUNNING][Info] Creating of channelConfig oipf object."); - currentChannelType = "TYPE_TV"; - currentChannelName = "ARTE"; - - currentchannel = new Channel(currentChannelName, currentChannelType); - console.assert(currentchannel != null,"The object currentChannel is null."); - console.assert(currentchannel.name == currentChannelName, "The current channel name don't match the affected name previously."); - console.assert(currentchannel.channelType == CHANNEL_CONSTANT[currentChannelType], "The current channel type don't match the affected type previously."); - - channelConfigObject=oipfObjectFactory.createChannelConfig(); - console.assert(channelConfigObject!=null,"The object channelConfig is null."); - - channelConfigObject.currentChannel = currentchannel; - console.assert(channelConfigObject.currentChannel == currentchannel, "Unconsistency about the current channel."); - - console.log("[TEST-RUNNING][Result] Creating of channelConfig oipf object [SUCESSFULL]."); - -} - -function testCreatingConfigurationObj(){ - - console.log("[TEST-RUNNING][Info] Creating of configuration oipf object."); - ///////////////////////////////////////////Before test: init//////////////////////////////// - tunerMain = new Tuner(); - tunerMain.name = "tnt"; - tunerArray = [tunerMain]; - - tunerCollection = new TunerCollection(tunerTab); - - configuration = new Configuration(); - - localsystem = new LocalSystem(); - localsystem.tuners=tunerCollection; - - ///////////////////////////////////////////Before test: init//////////////////////////////// - - currentchannel = new Channel(currentChannelName, currentChannelType); - console.assert(currentchannel != null,"The object currentChannel is null."); - console.assert(currentchannel.name == currentChannelName, "The current channel name don't match the affected name previously."); - console.assert(currentchannel.channelType == CHANNEL_CONSTANT[currentChannelType], "The current channel type don't match the affected type previously."); - - channelConfigObject=oipfObjectFactory.createChannelConfig(); - console.assert(channelConfigObject!=null,"The object channelConfig is null."); - - channelConfigObject.currentChannel = currentchannel; - console.assert(channelConfigObject.currentChannel == currentchannel, "Unconsistency about the current channel."); - - console.log("[TEST-RUNNING][Result] Creating of channelConfig oipf object [SUCESSFULL]."); - -} - -function testGetCurrentProgram(searchTarget, channel, startTime, offset, count){ - - var searchManagerObject = oipfObjectFactory.createSearchManagerObject(); - searchManagerObject.onMetadataSearch = function(search, state) { - - console.log("[INFO]: onMetadataSearch called"); - - switch(state) { - - case 0: - - console.log("[INFO] Result found."); - console.log(search.result[0]); - //for (var keys = Object.keys(search.result) in search.result) { - for (var i = 0; i< search.result.length; i++) { - var obj = search.result[i]; - console.log(obj); - var keys = Object.keys(obj); - console.log(keys); - //for (var j = 0; j< keys.length; j++) { - for (keys in obj){ - if (obj[keys] instanceof Object) { - - continue; - } - ////Test kind of obj - var h2 = document.createElement("H2"); - var t = document.createTextNode(keys); - h2.appendChild(t); - document.getElementById("prog").appendChild(h2); - var hr = document.createElement("HR"); - var p = document.createElement("P"); - t = document.createTextNode(obj[keys]); - p.appendChild(t); - document.getElementById("prog").appendChild(p); - document.getElementById("prog").appendChild(hr); - //break; - } - break; - } - document.getElementById("prog").style.visibility = "visible"; - - break; - - case 3: - - var message = "[INFO] MetadataSearch in Idle state because of either search abort or parameters have been modified (query, constraints or search target)"; - console.log(message); - break; - - case 4: - - message = "[INFO] The search cannot be complete because of lack of ressources or any other reason."; - console.log(message); - break; - - default: - console.log("Unknow state"); - - } - } - var channelConfig = oipfObjectFactory.createChannelConfig(); - var metaDataSearch = searchManagerObject.createSearch(searchTarget); - console.log(metaDataSearch); - metaDataSearch.findProgrammesFromStream(channelConfig.currentChannel, null); - metaDataSearch.result.getResults(offset, count); - console.log(">>>>>>>>>>>>>>>>>>>>>><<", metaDataSearch.result[0], ">>>>"); -} \ No newline at end of file

1 0

r1417 - oipf/css
by ygrego＠users.nuiton.org 20 May '15

20 May '15

Author: ygrego Date: 2015-05-20 14:56:19 +0000 (Wed, 20 May 2015) New Revision: 1417 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1417 Log: Addition of new rules to the display of tests statistics. Modified: oipf/css/test.css Modified: oipf/css/test.css =================================================================== --- oipf/css/test.css 2015-05-20 14:12:09 UTC (rev 1416) +++ oipf/css/test.css 2015-05-20 14:56:19 UTC (rev 1417) @@ -11,83 +11,92 @@ border: 3px navy solid; } +#menu { + position: fixed; + top: 0; + left: 50%; + margin-left: auto; + margin-right: auto; + border: 1px solid grey; +} + +#testControllerDiv { + margin: 0 0 1em 0; +} + +#title, #titleTestControllerDiv, #titleGlobalTestResultsDiv { + border: 1px solid grey; + background-color: #efe; + border-radius: 10px; +} + +#title { + margin: 0% 20% 0% 20%; +} + +#titleTestControllerDiv, #titleGlobalTestResultsDiv { + margin: 1em 90% 0 0; + padding: 0; +} + +#globalTestResultsDiv { + display: none; +} + +h1 { + text-align: center; + color: blue; +} + table { - font: 1em sans-serif; - background-color: #efe; - border-collapse: collapse; - empty-cells: show; - border: 1px solid #7a7; - } + font: 100% sans-serif; + background-color: #efe; + border-collapse: collapse; + empty-cells: show; + border: 1px solid #7a7; +} -table > caption { - text-align: left; - font-weight: bold; - font-size: 1.5em; - border-bottom: .2em solid #4ca; - margin-bottom: .5em; - } +table tbody td:nth-child(1) { + text-align: center; +} -/* shared basics rules */ +table tbody td:nth-child(4) { + background-color: gainsboro; +} + + table th, table td { - text-align: left; - padding-right: .5em; - border: 1px solid #7a7; - } + text-align: left; + border: 1px solid #7a7; +} table th { - font-weight: bold; - padding-left: .5em; - } + font-weight: bold; + padding-left: .5em; + padding-right: .5em; +} -/* header of table*/ + table > thead > tr:first-child > th { - text-align: center; - color: blue; - } + text-align: center; + color: blue; +} table > thead > tr + tr > th { - font-style: italic; - color: gray; - } + font-style: italic; + color: gray; +} -/* size of values exposing */ -table sup { - font-size: 75%; - } - -/* body of table */ table td { - background-color: #cef; - padding:.5em .5em .5em .3em; - } + background-color: #cef; + padding:.5em .5em .5em .5em; +} -table tbody td:nth-child(4) { - background-color: gainsboro; - } - -table tbody td:nth-child(1) { - text-align: center; - } +table tbody th:after { + content: " :"; +} -/* foot of table not used here*/ -table tfoot { - font-weight: bold; - } - -table tfoot th { - color: blue; - } - -table tfoot th:after { - content: " :"; - } - -table > tfoot td { - background-color: #cee; - } - -table > tfoot > tr:first-child td { - border-top: .2em solid #7a7; - } - +table tbody tr:nth-child(2n+3) { + background: #7a7; +} \ No newline at end of file

1 0

r1416 - oipf/js/test
by ygrego＠users.nuiton.org 20 May '15

20 May '15

Author: ygrego Date: 2015-05-20 14:12:09 +0000 (Wed, 20 May 2015) New Revision: 1416 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1416 Log: Reinitialize the parental control status in method "afterTest". Modified: oipf/js/test/ParentalControlManagerTest.js Modified: oipf/js/test/ParentalControlManagerTest.js =================================================================== --- oipf/js/test/ParentalControlManagerTest.js 2015-05-20 10:45:13 UTC (rev 1415) +++ oipf/js/test/ParentalControlManagerTest.js 2015-05-20 14:12:09 UTC (rev 1416) @@ -21,6 +21,7 @@ }, afterTest: function() { + this.parentalControlManagerObject.setParentalControlStatus(this.PIN, false); this.parentalControlManagerObject.setBlockUnrated(this.PIN, false); this.parentalControlManagerObject._setCurrentInvalidPINAttempts && this.parentalControlManagerObject._setCurrentInvalidPINAttempts(0);

1 0

r1415 - oipf/js/test
by ygrego＠users.nuiton.org 20 May '15

20 May '15

Author: ygrego Date: 2015-05-20 10:45:13 +0000 (Wed, 20 May 2015) New Revision: 1415 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1415 Log: Rename the methods "testGetParentalControlStatusWhenParentalControlStatusActivated" in "testGetParentalControlStatusWhenParentalControlStatusActivated" and "testGetParentalControlStatusWhenParentalControlStatusDeactivated" in "testGetParentalControlStatusWhenParentalControlStatusDeactivated". Somes modifications have been done on each one. Modified: oipf/js/test/ParentalControlManagerTest.js Modified: oipf/js/test/ParentalControlManagerTest.js =================================================================== --- oipf/js/test/ParentalControlManagerTest.js 2015-05-20 10:30:24 UTC (rev 1414) +++ oipf/js/test/ParentalControlManagerTest.js 2015-05-20 10:45:13 UTC (rev 1415) @@ -257,19 +257,19 @@ } }, - testGetParentalControlStatusWhenParentalControlActivated: function(resolve, reject) { - if (this.parentalControlManagerObject.getParentalControlStatus()) { + testGetParentalControlStatusWhenParentalControlStatusDeactivated: function(resolve, reject) { + if (!this.parentalControlManagerObject.getParentalControlStatus()) { resolve(); } else { reject(); } }, - testGetParentalControlStatusWhenParentalControlDeactivated: function(resolve, reject) { + testGetParentalControlStatusWhenParentalControlStatusActivated: function(resolve, reject) { this.parentalControlManagerObject - .setParentalControlStatus(this.PIN, false); + .setParentalControlStatus(this.PIN, true); - if (!this.parentalControlManagerObject.getParentalControlStatus()) { + if (this.parentalControlManagerObject.getParentalControlStatus()) { resolve(); } else { reject();

1 0