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

r1064 - oipf/data
by ygrego＠users.nuiton.org April 3, 2015

April 3, 2015

Author: ygrego Date: 2015-04-03 08:40:37 +0000 (Fri, 03 Apr 2015) New Revision: 1064 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1064 Log: New methods added and addition of a block "if" in method "initProgrammes". Modified: oipf/data/XmlTvData.js Modified: oipf/data/XmlTvData.js =================================================================== --- oipf/data/XmlTvData.js 2015-04-03 07:53:41 UTC (rev 1063) +++ oipf/data/XmlTvData.js 2015-04-03 08:40:37 UTC (rev 1064) @@ -56,6 +56,9 @@ if (element instanceof Object) { createProgramme(element, programme, key); } else { + if (key == "-start") { + element = this.transformInSecondSince01011970(element); + } if (key == "-channel") { channelName = self.channelNameMap[element]; console.log(channelName); @@ -81,6 +84,32 @@ initChannel: function(name){ return this.channelService.getADvbTChannel(name); + }, + + transformToActualDate: function(wrongDateFormat) { + pattern = /(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})\s\+(\d{2})/; + + var tmpDate = wrongDateFormat; + tmpDate = pattern.exec(tmpDate); + console.log(tmpDate); + var dateTmp = new Date(); + + /*year = parseInt(tmpSSTime[1]); + month = parseInt(tmpSSTime[2]); + day = parseInt(tmpSSTime[3]);*/ + var year = dateTmp.getFullYear(); + var month = dateTmp.getUTCMonth(); + var day = dateTmp.getUTCDate(); + var hs = parseInt(tmpDate[4]); + var mins = parseInt(tmpDate[5]); + var secs = parseInt(tmpDate[6]); + + var actualDate = new Date(year, month, day, hs, mins, secs); + return actualDate; + }, + + transformInSecondSince01011970: function(wrongDateFormat) { + return this.transformToActualDate(wrongDateFormat).getTime(); }

1 0

r1063 - oipf/js/test
by ygrego＠users.nuiton.org April 3, 2015

April 3, 2015

Author: ygrego Date: 2015-04-03 07:53:41 +0000 (Fri, 03 Apr 2015) New Revision: 1063 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1063 Log: Addition of variable "videoBroadcastObject" and "currentChannel" and modification of argument in "findProgrammesFromStream", all these modifications have been done in method "testGetCurrentProgram". Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-03 07:31:51 UTC (rev 1062) +++ oipf/js/test/SearchManagerTest.js 2015-04-03 07:53:41 UTC (rev 1063) @@ -22,11 +22,12 @@ testGetCurrentProgram: function (resolve, reject) { var stat = "Pending"; console.log("[TEST-RUNNING][Info] Label: Obtain current program according to oipf norm, State: " + stat); - + var videoBroadcastObject = oipfObjectFactory.createVideoBroadcastObject(); + var currentChannel = videoBroadcastObject.bindToCurrentChannel(); var searchTarget = 1; var metaDataSearch = this.searchManagerObj.createSearch(searchTarget); var startTime = null; - metaDataSearch.findProgrammesFromStream(oipfObjectFactory.createVideoBroadcastObject().currentChannel + metaDataSearch.findProgrammesFromStream(currentChannel , startTime); var offset = 0; var count = 1;

1 0

r1062 - oipf/js/impl
by ygrego＠users.nuiton.org April 3, 2015

April 3, 2015

Author: ygrego Date: 2015-04-03 07:31:51 +0000 (Fri, 03 Apr 2015) New Revision: 1062 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1062 Log: The search manager owns a instance of "MetadataManager" which provide him a source of metadata. New properties added: "_metadata" and "_metadataManager", their instanciation are performed in "init". Modified: oipf/js/impl/SearchManagerObject.js Modified: oipf/js/impl/SearchManagerObject.js =================================================================== --- oipf/js/impl/SearchManagerObject.js 2015-04-02 16:04:03 UTC (rev 1061) +++ oipf/js/impl/SearchManagerObject.js 2015-04-03 07:31:51 UTC (rev 1062) @@ -84,8 +84,13 @@ */ onMetadataSearch: null, + _metadata: null, + + _metadataManager: null, + init: function() { - + this._metadataManager = new MetadataManager(); + this._metadata = this._metadataManager.getMetadata("XML_TV"); }, /*

1 0

r1061 - oipf/view
by ygrego＠users.nuiton.org April 2, 2015

April 2, 2015

Author: ygrego Date: 2015-04-02 16:04:03 +0000 (Thu, 02 Apr 2015) New Revision: 1061 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1061 Log: The javascript file "MetadataManager" has been added. Modified: oipf/view/test.html Modified: oipf/view/test.html =================================================================== --- oipf/view/test.html 2015-04-02 16:01:36 UTC (rev 1060) +++ oipf/view/test.html 2015-04-02 16:04:03 UTC (rev 1061) @@ -21,6 +21,7 @@ <script src="../js/utils/Utils.js" type="text/javascript"></script> <script src="../js/utils/EventManager.js" type="text/javascript"></script> <script src="../js/utils/TimerManager.js" type="text/javascript"></script> + <script src="../js/utils/MetadataManager.js" type="text/javascript"></script> <script src="../js/impl/model/FavouriteList.js" type="text/javascript"></script> <script src="../js/impl/model/FavouriteListCollection.js" type="text/javascript"></script> <script src="../js/impl/model/IntegerCollection.js" type="text/javascript"></script>

1 0

r1060 - oipf/js/utils
by ygrego＠users.nuiton.org April 2, 2015

April 2, 2015

Author: ygrego Date: 2015-04-02 16:01:36 +0000 (Thu, 02 Apr 2015) New Revision: 1060 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1060 Log: This class permit to manage severals sources of metadata. Added: oipf/js/utils/MetadataManager.js Added: oipf/js/utils/MetadataManager.js =================================================================== --- oipf/js/utils/MetadataManager.js (rev 0) +++ oipf/js/utils/MetadataManager.js 2015-04-02 16:01:36 UTC (rev 1060) @@ -0,0 +1,34 @@ +/* + * 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 MetadataManager = Class.extend({ + + metadata: {}, + + init: function(metadata) { + + if (metadata && metadata.type) { + this.metadata[metadata.type] = metadata; + } + }, + + addMetadata: function(metadata) { + var type = metadata.type; + + if (type) { + this.metadata[type] = metadata; + return true; + } + return false; + }, + + getMetadata: function(type) { + if (type && this.metadata) { + return this.metadata[type]; + } + return null; + } +}); +

1 0

r1059 - oipf/data
by ygrego＠users.nuiton.org April 2, 2015

April 2, 2015

Author: ygrego Date: 2015-04-02 15:41:32 +0000 (Thu, 02 Apr 2015) New Revision: 1059 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1059 Log: Implementation of xml tv data as a class. Added: oipf/data/XmlTvData.js Added: oipf/data/XmlTvData.js =================================================================== --- oipf/data/XmlTvData.js (rev 0) +++ oipf/data/XmlTvData.js 2015-04-02 15:41:32 UTC (rev 1059) @@ -0,0 +1,88 @@ +/* + * 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 XmlTVData = Class.extend({ + + map: { + "title": "name", + "-start": "startTime", + "desc": "description", + "length#text": "duration", + "episode-num#text": "episode" + }, + + channelNameMap: { + "ART1.kazer.org" : "ARTE", + "EUR2.kazer.org" : "D17", + "FRA2.kazer.org" : "FRANCE_2", + "FRA3.kazer.org" : "FRANCE_3", + "FRA4.kazer.org" : "FRANCE_4", + "FRA5.kazer.org" : "FRANCE_5", + "M61.kazer.org" : "M6", + "NRJ1.kazer.org" : "NRJ_12", + "NT11.kazer.org" : "NT1", + "RTL2.kazer.org" : "RTL9", + "TF11.kazer.org" : "TF1", + "TMC1.kazer.org" : "TMC", + "W91.kazer.org" : "W9" + }, + + programmes: null, + + init: function(data) { + this.channelService = new ChannelService(); + this.type = "XML_TV"; + this.programmes = []; + data && this.initProgrammes(data.tv.programme); + }, + + /* + * Description: + * Don't take in charge the "credits" property of a xmlTv programmes for the moment. + */ + initProgrammes: function(programmeList) { + for (var i = 0, l = programmeList.length; i < l; i++) { + var programme = {}; + var object = programmeList[i]; + var channelName; + var self = this; + var createProgramme = function(object, programme, parentKey) { + var keys = Object.keys(object); + for (var j = 0, l1 = keys.length; j < l1; j++) { + var key = keys[j]; + var element = object[key]; + if (element instanceof Object) { + createProgramme(element, programme, key); + } else { + if (key == "-channel") { + channelName = self.channelNameMap[element]; + console.log(channelName); + } + if (key == "#text") { + key = parentKey+key; + } else { + var mapping = self.map[key]; + if (mapping) { + programme[mapping] = element; + } + } + } + } + }; + + createProgramme(object, programme); + programme.channel = this.initChannel(channelName); + this.programmes.push(programme); + } + console.log(this.programmes); + }, + + initChannel: function(name){ + return this.channelService.getADvbTChannel(name); + } + + +}); +

1 0

r1058 - oipf/js/utils
by ygrego＠users.nuiton.org April 2, 2015

April 2, 2015

Author: ygrego Date: 2015-04-02 15:24:18 +0000 (Thu, 02 Apr 2015) New Revision: 1058 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1058 Log: Renaming of method which ihas been bound with property "getNumber". Modified: oipf/js/utils/ChannelService.js Modified: oipf/js/utils/ChannelService.js =================================================================== --- oipf/js/utils/ChannelService.js 2015-04-02 14:56:53 UTC (rev 1057) +++ oipf/js/utils/ChannelService.js 2015-04-02 15:24:18 UTC (rev 1058) @@ -11,7 +11,7 @@ }, init: function(currentChannel) { - this.getNumber = oipf.utils.generateFiveDigit.bind(null); + this.getNumber = oipf.utils.generateFourDigit.bind(null); var channelName = "ARTE"; var channelIdType = 12; var channelArte = new Channel(channelIdType, 52, 53, 54, channelName);

1 0

r1057 - oipf/js/utils
by ygrego＠users.nuiton.org April 2, 2015

April 2, 2015

Author: ygrego Date: 2015-04-02 14:56:53 +0000 (Thu, 02 Apr 2015) New Revision: 1057 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1057 Log: Addition of property "getNumber" and method "getADvbTChannel". Modified: oipf/js/utils/ChannelService.js Modified: oipf/js/utils/ChannelService.js =================================================================== --- oipf/js/utils/ChannelService.js 2015-04-02 14:53:57 UTC (rev 1056) +++ oipf/js/utils/ChannelService.js 2015-04-02 14:56:53 UTC (rev 1057) @@ -11,7 +11,7 @@ }, init: function(currentChannel) { - + this.getNumber = oipf.utils.generateFiveDigit.bind(null); var channelName = "ARTE"; var channelIdType = 12; var channelArte = new Channel(channelIdType, 52, 53, 54, channelName); @@ -34,6 +34,14 @@ nextChannel: function(channelCollection, channel) { return channelUtils.findChannel(channelCollection, channel, 1); + }, + + getADvbTChannel: function(name) { + return new Channel(ID_DVB_T, + this.getNumber(), + this.getNumber(), + this.getNumber(), + name); } });

1 0

r1056 - oipf/js/utils
by ygrego＠users.nuiton.org April 2, 2015

April 2, 2015

Author: ygrego Date: 2015-04-02 14:53:57 +0000 (Thu, 02 Apr 2015) New Revision: 1056 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1056 Log: Modification of a method name. Modified: oipf/js/utils/Utils.js Modified: oipf/js/utils/Utils.js =================================================================== --- oipf/js/utils/Utils.js 2015-04-02 14:41:29 UTC (rev 1055) +++ oipf/js/utils/Utils.js 2015-04-02 14:53:57 UTC (rev 1056) @@ -10,7 +10,7 @@ return new Timeout(time); }; -oipf.utils.generateFiveDigit = function() { +oipf.utils.generateFourDigit = function() { return Math.floor(Math.random() * 9000) + 1000; };

1 0

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

April 2, 2015

Author: ygrego Date: 2015-04-02 14:41:29 +0000 (Thu, 02 Apr 2015) New Revision: 1055 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1055 Log: Implementation of class constructor. Modified: oipf/js/impl/model/Programme.js Modified: oipf/js/impl/model/Programme.js =================================================================== --- oipf/js/impl/model/Programme.js 2015-04-02 14:34:46 UTC (rev 1054) +++ oipf/js/impl/model/Programme.js 2015-04-02 14:41:29 UTC (rev 1055) @@ -322,8 +322,14 @@ */ recording: null, - init: function() { - + init: function(name, startTime, duration, description, episode, channel, blocked) { + this.name = name; + this.starTime = startTime; + this.duration = duration; + this.description = description; + this.episode = episode; + this.channel = channel; + this.blocked = blocked; }, /*

1 0