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

r1334 - oipf/js/impl/model
by ygrego＠users.nuiton.org 12 May '15

12 May '15

Author: ygrego Date: 2015-05-12 08:14:29 +0000 (Tue, 12 May 2015) New Revision: 1334 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1334 Log: Addition of method "getXmlParser". Modification of method "getAProgrammeFromXmlTvData" in order to generate a ramdom number. Modified: oipf/js/impl/model/ModelFactory.js Modified: oipf/js/impl/model/ModelFactory.js =================================================================== --- oipf/js/impl/model/ModelFactory.js 2015-05-12 07:46:13 UTC (rev 1333) +++ oipf/js/impl/model/ModelFactory.js 2015-05-12 08:14:29 UTC (rev 1334) @@ -34,7 +34,8 @@ getAProgrammeFromXmlTvData: function() { console.log("Method createXmlTvData"); - var randomIndex = 150; + var randomIndex = oipf.utils.getRandomNumberBetweenMinMax(0, + this.xmlTvData.programmes.length); if (this.xmlTvData && this.xmlTvData.programmes[randomIndex]) { return this.xmlTvData.programmes[15]; @@ -65,6 +66,10 @@ return this.getProperty("metadataManager"); }, + getXmlParser: function() { + return new XmlParser(); + }, + getMetadataManager: function() { console.log("Method getMetadataManager"); return this.getProperty("metadataManager");

1 0

r1333 - oipf/js/impl
by ygrego＠users.nuiton.org 12 May '15

12 May '15

Author: ygrego Date: 2015-05-12 07:46:13 +0000 (Tue, 12 May 2015) New Revision: 1333 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1333 Log: The property "capabilitiesObject" takes at its instanciation in method "init", the object "modelFactory". Modified: oipf/js/impl/OipfObjectFactory.js Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-05-12 07:41:24 UTC (rev 1332) +++ oipf/js/impl/OipfObjectFactory.js 2015-05-12 07:46:13 UTC (rev 1333) @@ -9,7 +9,7 @@ init: function(modelFactory, dateUtils) { console.log("[INFO] constructor of OipfObjectFactory class called."); //this.applicationManagerObject = new ApplicationManagerObject(); - this.capabilitiesObject = new CapabilitiesObject(); + this.capabilitiesObject = new CapabilitiesObject(modelFactory); //this.codManagerObject = new CodManagerObject(); this.channelConfig = new ChannelConfig(); //this.imsObject = new IMSObecjet();

1 0

r1332 - oipf/js/configuration
by ygrego＠users.nuiton.org 12 May '15

12 May '15

Author: ygrego Date: 2015-05-12 07:41:24 +0000 (Tue, 12 May 2015) New Revision: 1332 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1332 Log: This class contains the minimal data in order to create oipf object "CapabilitiesObject". Added: oipf/js/configuration/CapabilitiesProperties.js Added: oipf/js/configuration/CapabilitiesProperties.js =================================================================== --- oipf/js/configuration/CapabilitiesProperties.js (rev 0) +++ oipf/js/configuration/CapabilitiesProperties.js 2015-05-12 07:41:24 UTC (rev 1332) @@ -0,0 +1,148 @@ +/* + * The OITF SHALL support following non-visual embedded object with + * the mime type application/oipfCapabilities. + */ +var CapabilitiesProperties = Class.extend({ + profileNameMapping: { + "+TRICKMODE": { + value: [ + "VK_PLAY", + "VK_PAUSE", + "VK_PLAY_PAUSE", + "VK_STOP", + "VK_REWIND", + "VK_FAST_FWD"] + }, + "+ITV_KEYS": { + value: [ + "VK_HOME", + "VK_MENU", + "VK_CANCEL", + "VK_SUBTITLE"] + }, + "+CONTROLLED": { + value: [ + "VK_CHANNEL_UP", + "VK_CHANNEL_DOWN", + "VK_VOLUME_UP", + "VK_VOLUME_DOWN", + "VK_MUTE"], + tagName: [ + "configurationChanges", + "extendedAVControl", + "remote_diagnostics" + ] + }, + "+PVR": { + value: "VK_RECORD", + tagName: "recording", + }, + "+DRM": { + tagName: "drm", + }, + "+CommunicationServices": { + tagName: "communicationServices", + }, + "+SVG": { + tagName: "mime-extensions", + }, + "+POINTER": { + tagName: "pointer", + }, + "+WIDGETS": { + tagName: "widgets", + }, + "+HTML5_MEDIA": { + tagName: "html5_media", + }, + "+RCF": { + tagName: "remoteControlFunction", + }, + "+AVCAD": { + attributeValue: "application/vnd.oipf.ContentAccessStreaming+xml" + }, + "+DL": { + attributeValue: "http" + }, + "+IPTV_SDS": { + attributeValue: "ID_IPTV_SDS" + }, + "+IPTV_URI": { + attributeValue: "ID_IPTV_URI" + }, + "+ANA": { + attributeValue: "ID_ANALOG" + }, + "+DVB_C": { + attributeValue: "ID_DVB_C ID_DVB_SI_DIRECT" + }, + "+DVB_T": { + attributeValue: "ID_DVB_T ID_DVB_SI_DIRECT" + }, + "+DVB_S": { + attributeValue: "ID_DVB_S ID_DVB_SI_DIRECT" + }, + "+DVB_C2": { + attributeValue: "ID_DVB_C2 ID_DVB_SI_DIRECT" + }, + "+DVB_T2": { + attributeValue: "ID_DVB_T2 ID_DVB_SI_DIRECT" + }, + "+DVB_S2": { + attributeValue: "ID_DVB_S2 ID_DVB_SI_DIRECT" + }, + "+META_BCG": { + attributeValue: "bcg" + }, + "+META_EIT": { + attributeValue: "eit-pf" + }, + "+META_SI": { + attributeValue: "dvb-si" + } + }, + + roots: "profilelist", + + default: { + "video_broadcast": { + "value": true, + "attributes": { + type: "ID_DVB_S ID_DVB_T", + transport: "", + nrstreams: 1, + scaling: "arbitrary", + minSize: 0, + postList: false, + networkTimeshift: false, + localTimeshift: false + } + }, + "overlaylocaltuner": { + "value": "per-pixel", + }, + "recording": { + "value": true, + "attributes": { + ipBroadcast: false, + HAS: false, + DASH: false, + manageRecordings: "initiator", + postList: false + } + }, + "clientMetadata": { + "value": true, + "attributes": { + type: "eit-pf" + } + }, + "configurationChanges": { + "value": true, + "attributes": { + + } + } + } +}); +

1 0

r1331 - oipf/js/impl
by ygrego＠users.nuiton.org 12 May '15

12 May '15

Author: ygrego Date: 2015-05-12 07:34:25 +0000 (Tue, 12 May 2015) New Revision: 1331 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1331 Log: Deletion of class property "_modelFactory". Differents objects instanciated in method "init" just received the parameter "modelFactory". A new parameter "dateUtils" appears in method "init", the property "recordingSchedulerOject" take its this one at its intanciation in construtor of this class. Modified: oipf/js/impl/OipfObjectFactory.js Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-05-11 08:37:40 UTC (rev 1330) +++ oipf/js/impl/OipfObjectFactory.js 2015-05-12 07:34:25 UTC (rev 1331) @@ -6,11 +6,10 @@ */ var OipfObjectFactory = Class.extend({ - init: function() { + init: function(modelFactory, dateUtils) { console.log("[INFO] constructor of OipfObjectFactory class called."); - this._modelFactory = new ModelFactory(data); //this.applicationManagerObject = new ApplicationManagerObject(); - //this.capabilitiesObject = new CapabilitiesObject(); + this.capabilitiesObject = new CapabilitiesObject(); //this.codManagerObject = new CodManagerObject(); this.channelConfig = new ChannelConfig(); //this.imsObject = new IMSObecjet(); @@ -19,8 +18,8 @@ //this.parentalControlManagerObject = new ParentalControlManagerObject(); this.configurationObject = new ConfigurationObject(); this.recordingSchedulerObject = new RecordingSchedulerObject( - this.configurationObject.configuration, this._modelFactory); - this.searchManagerObject = new SearchManagerObject(this._modelFactory); + this.configurationObject.configuration, modelFactory, dateUtils); + this.searchManagerObject = new SearchManagerObject(modelFactory); //this.downloadManagerObject= new DownloadManagerObject(); //this.downloadTriggerObject= new DownloadTriggerObject(); //this.drmAgentObject= new DrmAgentObject();

1 0

r1330 - in oipf/js: . server
by ygrego＠users.nuiton.org 11 May '15

11 May '15

Author: ygrego Date: 2015-05-11 08:37:40 +0000 (Mon, 11 May 2015) New Revision: 1330 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1330 Log: Added: oipf/js/server/ oipf/js/server/static-server.js Added: oipf/js/server/static-server.js =================================================================== --- oipf/js/server/static-server.js (rev 0) +++ oipf/js/server/static-server.js 2015-05-11 08:37:40 UTC (rev 1330) @@ -0,0 +1,11 @@ +var express = require('express'); +var app = express(); + +app.use(express.static('oipf')); +app.get('/', function(req, res){ + res.sendFile('view/test.html',{root:'oipf'}); +}); +app.listen(3000); + +console.log('Server running at http://192.168.99.190:3000/'); +

1 0

r1329 - oipf/js/impl/model
by ygrego＠users.nuiton.org 06 May '15

06 May '15

Author: ygrego Date: 2015-05-06 15:45:38 +0000 (Wed, 06 May 2015) New Revision: 1329 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1329 Log: Rename a property and call of the method "createMetadataManager" in constructor. Reimplementation of method "createMetadataManager". Addition of a log message in each method. Modified: oipf/js/impl/model/ModelFactory.js Modified: oipf/js/impl/model/ModelFactory.js =================================================================== --- oipf/js/impl/model/ModelFactory.js 2015-05-06 15:24:59 UTC (rev 1328) +++ oipf/js/impl/model/ModelFactory.js 2015-05-06 15:45:38 UTC (rev 1329) @@ -8,30 +8,32 @@ init: function(metadataObject) { this.metadataObject = metadataObject; - this.metadaManager = null; + this.metadataManager = null; this.xmlTvData = null; this.createXmlTvData(); + this.createMetadataManager(); }, createXmlTvData: function() { - - return this.return("xmlTvData") || + console.log("Method createXmlTvData"); + return this.getProperty("xmlTvData") || this.setProperty("xmlTvData", new XmlTvData(this.metadataObject)); }, getXmlTvData: function() { - return this.xmlTvData; + console.log("Method createXmlTvData"); + return this.getProperty("xmlTvData"); }, - /* * FIXME: Yannis - 06/05/2015 - Get a method to find an available number for * randomIndex. */ getAProgrammeFromXmlTvData: function() { - + console.log("Method createXmlTvData"); + var randomIndex = 150; if (this.xmlTvData && this.xmlTvData.programmes[randomIndex]) { @@ -41,24 +43,40 @@ }, createScheduledRecording: function() { + console.log("Method createScheduledRecording"); return new ScheduledRecording(this.getAPrgrammeFromXmlTvData()); }, createRecording: function() { + console.log("Method createRecording"); return new Recording(this.createScheduledRecording()); }, createMetadataManager: function() { - return this.return("metadaManager") || - this.setProperty("metadaManager", - new MetadataManager()); + console.log("Method createMetadataManager"); + + if (this.getProperty("metadataManager")) { + return this.getProperty("metadataManager"); + } + + this.setProperty("metadataManager", new MetadataManager()); + this.getProperty("metadataManager").addMetadata(this.getXmlTvData()); + + return this.getProperty("metadataManager"); }, + getMetadataManager: function() { + console.log("Method getMetadataManager"); + return this.getProperty("metadataManager"); + }, + getProperty: function(propertyName) { + console.log("Method getProperty"); return this[propertyName]; }, setProperty: function(propertyName, value) { + console.log("Method setProperty"); this[propertyName] = value; }

1 0

r1328 - oipf/js/impl
by ygrego＠users.nuiton.org 06 May '15

06 May '15

Author: ygrego Date: 2015-05-06 15:24:59 +0000 (Wed, 06 May 2015) New Revision: 1328 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1328 Log: Deletion of property "_metadataManager" in method "init" and in the class's prototype. Instanciation modification of property "_metadata". Modified: oipf/js/impl/SearchManagerObject.js Modified: oipf/js/impl/SearchManagerObject.js =================================================================== --- oipf/js/impl/SearchManagerObject.js 2015-05-06 15:12:13 UTC (rev 1327) +++ oipf/js/impl/SearchManagerObject.js 2015-05-06 15:24:59 UTC (rev 1328) @@ -104,15 +104,13 @@ _metadata: null, - _metadataManager: null, - init: function(modelFactory) { this._modelFactory = modelFactory; this._listeners = {}; this._callbacks = {}; this._eventManager = new EventManager(); - this._metadataManager = new MetadataManager(new XmlTvData(metadata)); - this._metadata = this._metadataManager.getMetadata("XML_TV"); + this._metadata = this._modelFactory + .getMetadataManager().getMetadata("XML_TV"); }, /*

1 0

r1327 - oipf/js/impl
by ygrego＠users.nuiton.org 06 May '15

06 May '15

Author: ygrego Date: 2015-05-06 15:12:13 +0000 (Wed, 06 May 2015) New Revision: 1327 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1327 Log: Addition of a parameter in constructor call of "ModelFactory" into method "init". Modified: oipf/js/impl/OipfObjectFactory.js Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-05-06 14:35:13 UTC (rev 1326) +++ oipf/js/impl/OipfObjectFactory.js 2015-05-06 15:12:13 UTC (rev 1327) @@ -8,7 +8,7 @@ init: function() { console.log("[INFO] constructor of OipfObjectFactory class called."); - this._modelFactory = new ModelFactory(); + this._modelFactory = new ModelFactory(data); //this.applicationManagerObject = new ApplicationManagerObject(); //this.capabilitiesObject = new CapabilitiesObject(); //this.codManagerObject = new CodManagerObject();

1 0

r1326 - oipf/js/utils
by ygrego＠users.nuiton.org 06 May '15

06 May '15

Author: ygrego Date: 2015-05-06 14:35:13 +0000 (Wed, 06 May 2015) New Revision: 1326 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1326 Log: Deletion of constructor. Modified: oipf/js/utils/MetadataManager.js Modified: oipf/js/utils/MetadataManager.js =================================================================== --- oipf/js/utils/MetadataManager.js 2015-05-06 14:34:26 UTC (rev 1325) +++ oipf/js/utils/MetadataManager.js 2015-05-06 14:35:13 UTC (rev 1326) @@ -7,13 +7,6 @@ metadata: {}, - init: function(metadata) { - - if (metadata && metadata.type) { - this.metadata[metadata.type] = metadata; - } - }, - addMetadata: function(metadata) { var type = metadata.type;

1 0

r1325 - oipf/js/impl
by ygrego＠users.nuiton.org 06 May '15

06 May '15

Author: ygrego Date: 2015-05-06 14:34:26 +0000 (Wed, 06 May 2015) New Revision: 1325 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1325 Log: Addition of a property "_modelFactory". Modified: oipf/js/impl/SearchManagerObject.js Modified: oipf/js/impl/SearchManagerObject.js =================================================================== --- oipf/js/impl/SearchManagerObject.js 2015-05-06 14:32:37 UTC (rev 1324) +++ oipf/js/impl/SearchManagerObject.js 2015-05-06 14:34:26 UTC (rev 1325) @@ -106,7 +106,8 @@ _metadataManager: null, - init: function() { + init: function(modelFactory) { + this._modelFactory = modelFactory; this._listeners = {}; this._callbacks = {}; this._eventManager = new EventManager();

1 0