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

r1354 - oipf/view
by ygrego＠users.nuiton.org 18 May '15

18 May '15

Author: ygrego Date: 2015-05-18 09:28:59 +0000 (Mon, 18 May 2015) New Revision: 1354 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1354 Log: Addition of a javascript file "ParentalControlManagerObject". Modified: oipf/view/test.html Modified: oipf/view/test.html =================================================================== --- oipf/view/test.html 2015-05-18 09:25:23 UTC (rev 1353) +++ oipf/view/test.html 2015-05-18 09:28:59 UTC (rev 1354) @@ -68,6 +68,7 @@ <script src="../js/impl/SearchManagerObject.js" type="text/javascript"></script> <script src="../js/impl/RecordingSchedulerObject.js" type="text/javascript"></script> <script src="../js/impl/CapabilitiesObject.js" type="text/javascript"></script> + <script src="../js/impl/ParentalControlManagerObject.js" type="text/javascript"></script> <script src="../js/utils/ChannelService.js" type="text/javascript"></script> <script src="../data/data.js" type="text/javascript"></script>

1 0

r1353 - oipf/view
by ygrego＠users.nuiton.org 18 May '15

18 May '15

Author: ygrego Date: 2015-05-18 09:25:23 +0000 (Mon, 18 May 2015) New Revision: 1353 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1353 Log: Addition of a javascript file "ParentalControlManagerConstants". Modified: oipf/view/test.html Modified: oipf/view/test.html =================================================================== --- oipf/view/test.html 2015-05-18 09:19:01 UTC (rev 1352) +++ oipf/view/test.html 2015-05-18 09:25:23 UTC (rev 1353) @@ -15,11 +15,13 @@ var Promise = Promise || ES6Promise.Promise; </script> <script src="../js/impl/model/constants/VideoBroadcastConstants.js" type="text/javascript"></script> + <script src="../js/impl/model/constants/ParentalControlManagerConstants.js" type="text/javascript"></script> <script src="../js/impl/model/constants/RecordingSchedulerConstants.js" type="text/javascript"></script> <script src="../js/impl/model/constants/ConfigurationConstants.js" type="text/javascript"></script> <script src="../js/impl/model/constants/MetadataSearchConstants.js" type="text/javascript"></script> <script src="../js/impl/model/constants/DaeMimeType.js" type="text/javascript"></script> <script src="../js/impl/model/constants/IdType.js" type="text/javascript"></script> + <script src="../js/lib/Class.js" type="text/javascript"></script> <script src="../js/utils/Timeout.js" type="text/javascript"></script> <script src="../js/utils/Calculation.js" type="text/javascript"></script> @@ -31,8 +33,10 @@ <script src="../js/utils/MetadataManager.js" type="text/javascript"></script> <script src="../js/utils/DateUtils.js" type="text/javascript"></script> <script src="../js/utils/XmlParser.js" type="text/javascript"></script> + <script src="../js/configuration/ConfigDefaultProperties.js" type="text/javascript"></script> <script src="../js/configuration/CapabilitiesProperties.js" type="text/javascript"></script> + <script src="../js/impl/model/Collection.js" type="text/javascript"></script> <script src="../js/impl/model/SignalInfo.js" type="text/javascript"></script> <script src="../js/impl/model/LNBInfo.js" type="text/javascript"></script> @@ -56,6 +60,7 @@ <script src="../js/impl/model/SearchResults.js" type="text/javascript"></script> <script src="../js/impl/model/ScheduledRecording.js" type="text/javascript"></script> <script src="../js/impl/model/Recording.js" type="text/javascript"></script> + <script src="../js/impl/OipfObjectFactory.js" type="text/javascript"></script> <script src="../js/impl/ConfigurationObject.js" type="text/javascript"></script> <script src="../js/impl/ChannelConfig.js" type="text/javascript"></script> @@ -63,11 +68,13 @@ <script src="../js/impl/SearchManagerObject.js" type="text/javascript"></script> <script src="../js/impl/RecordingSchedulerObject.js" type="text/javascript"></script> <script src="../js/impl/CapabilitiesObject.js" type="text/javascript"></script> + <script src="../js/utils/ChannelService.js" type="text/javascript"></script> <script src="../data/data.js" type="text/javascript"></script> <script src="../data/XmlTvData.js" type="text/javascript"></script> <script src="../js/impl/model/ModelFactory.js" type="text/javascript"></script> <script src="../js/initObj/init.js" type="text/javascript"></script> + <script src="../js/test/TestCase.js" type="text/javascript"></script> <script src="../js/test/CapabilitiesTest.js" type="text/javascript"></script> <script src="../js/test/RecordingSchedulerTest.js" type="text/javascript"></script>

1 0

r1352 - oipf/js/impl/model/constants
by ygrego＠users.nuiton.org 18 May '15

18 May '15

Author: ygrego Date: 2015-05-18 09:19:01 +0000 (Mon, 18 May 2015) New Revision: 1352 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1352 Log: Use of an object to obtain constants about "ParentalControlManager" object. Added: oipf/js/impl/model/constants/ParentalControlManagerConstants.js Added: oipf/js/impl/model/constants/ParentalControlManagerConstants.js =================================================================== --- oipf/js/impl/model/constants/ParentalControlManagerConstants.js (rev 0) +++ oipf/js/impl/model/constants/ParentalControlManagerConstants.js 2015-05-18 09:19:01 UTC (rev 1352) @@ -0,0 +1,12 @@ +/* + * Contain every constants usefull for object "ParentalControlManager". + */ + +var parentalControlManagerConstants = { + pin: {} +}; + +parentalControlManagerConstants.pin.CORRECT = 0; +parentalControlManagerConstants.pin.INCORRECT = 0; +parentalControlManagerConstants.pin.LOCKED = 0; +

1 0

r1351 - oipf/js/impl
by ygrego＠users.nuiton.org 18 May '15

18 May '15

Author: ygrego Date: 2015-05-18 08:49:23 +0000 (Mon, 18 May 2015) New Revision: 1351 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1351 Log: -Addition of defaults properties "isPINEntryLocked" and "parentalRatingSchemes". -Addition of technicals properties "_currentPIN", "_invalidPINAttempts", "_currentInvalidPINAttempts" and "_PINLockedTime". -First implementation of class constructor. Modified: oipf/js/impl/ParentalControlManagerObject.js Modified: oipf/js/impl/ParentalControlManagerObject.js =================================================================== --- oipf/js/impl/ParentalControlManagerObject.js 2015-05-18 07:45:08 UTC (rev 1350) +++ oipf/js/impl/ParentalControlManagerObject.js 2015-05-18 08:49:23 UTC (rev 1351) @@ -1,7 +1,47 @@ var ParentalControlManagerObject = Class.extend({ + + /* + * Descrioption: + * A reference to the collection of rating schemes known by the OITF. + * + * Visibilty Type:readonly ParentalRatingSchemeCollection + */ + parentalRatingSchemes: null, + /* + * Description: + * The lockout status of the parental control PIN. If the incorrect PIN has + * been entered too many times in the configured timeout period, parental + * control PIN entry SHALL be locked out for a period of time determined by + * the OITF. + * + * Visibility Type: readonly Boolean + */ + isPINEntryLocked: null, + + //The parental control PIN set. + _currentPIN: null, + + //Indicate the number of invalid PIN attemps. + _invalidPINAttempts: null, + + //Contain the number of invalid entry PIN attempts. + _currentInvalidPINAttempts: null, + + //When the PIN entry attempt has been reached this PIN entry must be locked. + _PINLockedTime: null, + + /* + * FIXME: + * -Yannis 18/05/2015 The properties "_currentPIN" and "_invalidPINAttemps" + * don't have to be innitialized here. + */ init : function(){ - + this.isPINEntryLocked = false; + + this._currentPIN = "0000"; + this._invalidPINAttempts = 4; + this._currentPINAttempts = 0; } }); \ No newline at end of file

1 0

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

18 May '15

Author: ygrego Date: 2015-05-18 07:45:08 +0000 (Mon, 18 May 2015) New Revision: 1350 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1350 Log: -This class extends "Collection". -Implementation of methods "addParentalRatingScheme" and "getParentalRatingScheme". Added: oipf/js/impl/model/ParentalRatingSchemeCollection.js Added: oipf/js/impl/model/ParentalRatingSchemeCollection.js =================================================================== --- oipf/js/impl/model/ParentalRatingSchemeCollection.js (rev 0) +++ oipf/js/impl/model/ParentalRatingSchemeCollection.js 2015-05-18 07:45:08 UTC (rev 1350) @@ -0,0 +1,82 @@ +/* + * typedef Collection<ParentalRatingScheme> ParentalRatingSchemeCollection + * A ParentalRatingSchemeCollection represents a collection of parental rating + * schemes, e.g. as returned by property parentalRatingSchemes of the + * "application/oipfParentalControlManager" object as defined in section 7.9.1. + * Next to the properties and methods defined below a + * ParentalRatingSchemeCollection object SHALL support the array notation to + * access the parental rating scheme objects in this collection. See Annex K for + * the definition of the collection template. In addition to the methods and + * properties defined for generic collections, + * the ParentalRatingSchemeCollection class supports the additional properties + * and methods defined below. + */ + +var ParentalRatingSchemeCollection = Collection.extend({ + /* + * Description: + * Create a new ParentalRatingScheme object and adds it to + * the ParentalRatingSchemeCollection . Applications MAY use this method to + * register additional parental rating schemes with the platform. + * When registered, the new parental rating scheme SHALL (temporarily) be + * accessible through the parentalRatingSchemes property of the + * "application/oipfParentalControlmanager" object as defined in section + * 7.9.1. The application SHALL make sure that the values are ordered in + * such a way to allow the rating values to be compared in the manner as + * defined for the threshold property for the respective parental rating + * system. This method returns a reference to the ParentalRatingScheme + * object representing the added scheme. If the value of the name parameter + * corresponds to an already-registered rating scheme, this method returns a + * reference to the existing ParentalRatingScheme object. If the newly + * defined rating scheme was not known to the OITF, the scheme MAY be + * stored persistently, and the OITF may offer a UI to set the parental + * rating blocking criteria for the newly added parental rating scheme. + * If the OITF has successfully stored (persistently or not persistently) + * the additional parental rating scheme, the method SHALL return a non-null + * ParentalRatingScheme object. + * + * Arguments: + * - name: + * A unique string identifying the parental rating scheme to which + * this value refers. See property name in section 7.9.1.1 for more + * information about possible values. + * + * - values: + * A comma-separated list of the possible values in the rating scheme, in + * ascending order of severity. In case the rating scheme is one of the + * [MPEG-7] rating classification schemes, this means that the list of + * parental rating values contains the values as specified by the <Name> + * elements of the <Term> elements in the order of appearance as they are + * defined for the classification scheme, with the exception of the Internet + * Content Rating Association (ICRA) based ratings, for which the reverse + * order has to be applied. The values must be ordered in such a way to allow the rating values to be compared in the manner as defined for property threshold for the respective parental rating system. + */ + addParentalRatingScheme: function(name, values) { + var parentalRatingScheme = new ParentalRatingScheme(name, values); + this.push(parentalRatingScheme); + }, + + /* + * Description: + * This method returns a reference to the ParentalRatingScheme object that + * is associated with the given scheme as specified through parameter + * "name". If the value of name does not correspond to the name property of + * any of the ParentalRatingScheme objects in + * the ParentalRatingSchemeCollection, the method SHALL return undefined. + * + * Arguments: + * - name: + * The unique name identifying a parental rating scheme. + */ + getParentalRatingScheme: function(name) { + for (var i = 0, li = this.length; i < li; i++) { + var currentParentalRatingScheme = this[i]; + if (currentParentalRatingScheme.name == name) { + return currentParentalRatingScheme; + } + } + return undefined; + } +}); + +

1 0

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

18 May '15

Author: ygrego Date: 2015-05-18 07:41:12 +0000 (Mon, 18 May 2015) New Revision: 1349 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1349 Log: -This class extends "Collection". -Implementation of method "addParentalRating". Added: oipf/js/impl/model/ParentalRatingCollection.js Added: oipf/js/impl/model/ParentalRatingCollection.js =================================================================== --- oipf/js/impl/model/ParentalRatingCollection.js (rev 0) +++ oipf/js/impl/model/ParentalRatingCollection.js 2015-05-18 07:41:12 UTC (rev 1349) @@ -0,0 +1,49 @@ +/* + * typedef Collection<ParentalRating> ParentalRatingCollection + * A ParentalRatingCollection represents a collection of parental rating values. + * See Annex K for the definition of the collection template. In addition to + * the methods and properties defined for generic collections, + * the ParentalRatingCollection class supports the additional properties and + * methods defined below. + */ + +var ParentalRatingCollection = Collection.extend({ + + init: function() { + this.super.init.apply(this, arguments); + }, + + /* + * Description: + * Creates a ParentalRating object instance for a given parental rating + * scheme and parental rating value, and adds it to + * the ParentalRatingCollection for a programme or channel. + * + * Arguments: + * - scheme A unique string identifying the parental rating scheme to which + * this value refers. See property scheme in section 7.9.4.1 for more + * information about possible values. + * + * -name: A string representation of the parental rating value. See property + * name in section 7.9.4.1 for more information about possible values. + * Values are not case sensitive. + * + * -value: The parental rating value represented as an Integer. See property + * value in section 7.9.4.1 for more information about possible values. + * + * -labels: A set of content rating labels that may provide additional + * information about the rating. See property labels in section 7.9.4.1 for + * more information about possible values.- region: The region to which the + * parental rating value applies as an alpha-2 region code as defined in + * ISO 3166-1. The value of this argument must be null or undefined if no + * specific region has been identified. Values are not case sensitive. + */ + addParentalRating: function(scheme, name, value, labels, region) { + var newParentalRating = + new ParentalRating(scheme, name, value, labels, region); + + this.push(newParentalRating); + } +}); + +

1 0

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

18 May '15

Author: ygrego Date: 2015-05-18 07:39:47 +0000 (Mon, 18 May 2015) New Revision: 1348 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1348 Log: -This class extends "Collection". -The properties name and values are initialized in constructor. -Addition of methods: "_additionnalProcessing", "_addRatingValue" and "_addSeveralRatingValues". Modified: oipf/js/impl/model/ParentalRatingScheme.js Modified: oipf/js/impl/model/ParentalRatingScheme.js =================================================================== --- oipf/js/impl/model/ParentalRatingScheme.js 2015-05-15 13:49:51 UTC (rev 1347) +++ oipf/js/impl/model/ParentalRatingScheme.js 2015-05-18 07:39:47 UTC (rev 1348) @@ -17,16 +17,25 @@ * collections, the ParentalRatingScheme class supports the additional * properties and methods defined below. */ -var ParentalRatingScheme = Array.extend({ +var ParentalRatingScheme = Collection.extend({ name: null, threshold: null, - init: function() { - this._iconUri = []; + /* + * + * FIXME: + * - Yannis 15/05/2015 Initialization of property threshold must be bone, + * when name unequal to "dvb-si" but i don't know with what values. + */ + init: function(name, values) { + this._iconUri = []; + this.name = name; + this._additionnalProcessing(name, values); + }, - + /* * Description: * Return the index of the rating represented by attribute ratingValue @@ -62,6 +71,28 @@ */ iconUri: function(index) { return this._iconUri[index]; + }, + + _additionnalProcessing: function(name, values) { + switch (name) { + case "dvb-si": + break; + + default: + var ratingValues = values.split(","); + ratingValues && this._addSeveralRatingValues(ratingValues); + } + }, + + _addRatingValue: function(ratingValue) { + this.push(ratingValue); + }, + + _addSeveralRatingValues: function(ratingValues) { + for (var i = 0, li = ratingValues.length; i < li; i++) { + var currentRatingValue = ratingValues[i]; + this.addRatingValue(currentRatingValue); + } } });

1 0

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

15 May '15

Author: ygrego Date: 2015-05-15 13:49:51 +0000 (Fri, 15 May 2015) New Revision: 1347 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1347 Log: New properties "name" and "threshold" have been added. Modified: oipf/js/impl/model/ParentalRatingScheme.js Modified: oipf/js/impl/model/ParentalRatingScheme.js =================================================================== --- oipf/js/impl/model/ParentalRatingScheme.js 2015-05-15 13:46:12 UTC (rev 1346) +++ oipf/js/impl/model/ParentalRatingScheme.js 2015-05-15 13:49:51 UTC (rev 1347) @@ -18,6 +18,11 @@ * properties and methods defined below. */ var ParentalRatingScheme = Array.extend({ + + name: null, + + threshold: null, + init: function() { this._iconUri = []; },

1 0

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

15 May '15

Author: ygrego Date: 2015-05-15 13:46:12 +0000 (Fri, 15 May 2015) New Revision: 1346 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1346 Log: Modification of comments for the methods "iconUri" and "indexOf". Modified: oipf/js/impl/model/ParentalRatingScheme.js Modified: oipf/js/impl/model/ParentalRatingScheme.js =================================================================== --- oipf/js/impl/model/ParentalRatingScheme.js 2015-05-15 13:42:44 UTC (rev 1345) +++ oipf/js/impl/model/ParentalRatingScheme.js 2015-05-15 13:46:12 UTC (rev 1346) @@ -24,9 +24,9 @@ /* * Description: - * Return the URI of the icon representing the rating at index in the rating - * scheme, or undefined if no item is present at that position. If no icon - * is available, this method SHALL return null. + * Return the index of the rating represented by attribute ratingValue + * inside the parental rating scheme string collection, or -1 if the rating + * value cannot be found in the collection. * * Argument: * - ratingValue: The string representation of a parental rating value. @@ -53,9 +53,7 @@ * is available, this method SHALL return null. * * Argument: - * - index: The string representation of a parental rating value. - * See property name in section 7.9.1.1 for more information about possible - * values. Values are not case sensitive. + * - index: The index of the parental rating scheme. */ iconUri: function(index) { return this._iconUri[index];

1 0

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

15 May '15

Author: ygrego Date: 2015-05-15 13:42:44 +0000 (Fri, 15 May 2015) New Revision: 1345 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1345 Log: Implementation of the method "iconUri", and addition of the property "_iconUri". Modified: oipf/js/impl/model/ParentalRatingScheme.js Modified: oipf/js/impl/model/ParentalRatingScheme.js =================================================================== --- oipf/js/impl/model/ParentalRatingScheme.js 2015-05-15 13:26:16 UTC (rev 1344) +++ oipf/js/impl/model/ParentalRatingScheme.js 2015-05-15 13:42:44 UTC (rev 1345) @@ -18,9 +18,8 @@ * properties and methods defined below. */ var ParentalRatingScheme = Array.extend({ - init: function() { - + this._iconUri = []; }, /* @@ -45,6 +44,21 @@ } return -1; + }, + + /* + * Description: + * Return the URI of the icon representing the rating at index in the rating + * scheme, or undefined if no item is present at that position. If no icon + * is available, this method SHALL return null. + * + * Argument: + * - index: The string representation of a parental rating value. + * See property name in section 7.9.1.1 for more information about possible + * values. Values are not case sensitive. + */ + iconUri: function(index) { + return this._iconUri[index]; } });

1 0