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

r1093 - oipf/js/test
by ygrego＠users.nuiton.org 07 Apr '15

07 Apr '15

Author: ygrego Date: 2015-04-07 21:01:15 +0000 (Tue, 07 Apr 2015) New Revision: 1093 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1093 Log: Implementation of "beforeTest" in order to manage video-broadcast object. Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-07 14:35:22 UTC (rev 1092) +++ oipf/js/test/SearchManagerTest.js 2015-04-07 21:01:15 UTC (rev 1093) @@ -13,6 +13,14 @@ beforeTest: function() { this.searchManagerObj = oipfObjectFactory.createSearchManagerObject(); + this.vidBroadObj = oipfObjectFactory.createVideoBroadcastObject(); + this.onPlayStateChange = this.onChangeState.bind(this, resolve, reject); + this.vidBroadObj.addEventListener("PlayStateChange", this.onPlayStateChange, false); + this.transitions = []; + this.previousState = this.vidBroadObj.playState; + this.currentIndex = 0; + this.channel = null; + logTest("State: Pending"); }, afterTest: function(resolve, reject) {

1 0

r1092 - oipf/js/impl/model
by ygrego＠users.nuiton.org 07 Apr '15

07 Apr '15

Author: ygrego Date: 2015-04-07 14:35:22 +0000 (Tue, 07 Apr 2015) New Revision: 1092 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1092 Log: The property "_type" is added and instanciated in constructor. Modified: oipf/js/impl/model/Query.js Modified: oipf/js/impl/model/Query.js =================================================================== --- oipf/js/impl/model/Query.js 2015-04-07 14:04:45 UTC (rev 1091) +++ oipf/js/impl/model/Query.js 2015-04-07 14:35:22 UTC (rev 1092) @@ -7,6 +7,8 @@ */ var Query = Class.extend({ + _type: null, + _field: null, _comparison: null, @@ -14,6 +16,12 @@ _value: null, init: function(field, comparison, value, count) { + if (field == "startTime" && value == null) { + this._type = "current"; + } else { + this._type = "undifferent"; + } + this._field = field; this._comparison = comparison; this._value = value;

1 0

r1091 - oipf/js/utils
by ygrego＠users.nuiton.org 07 Apr '15

07 Apr '15

Author: ygrego Date: 2015-04-07 14:04:45 +0000 (Tue, 07 Apr 2015) New Revision: 1091 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1091 Log: New method "isPresent" has been added to namespace "oipf.utils". Modified: oipf/js/utils/Utils.js Modified: oipf/js/utils/Utils.js =================================================================== --- oipf/js/utils/Utils.js 2015-04-07 13:35:43 UTC (rev 1090) +++ oipf/js/utils/Utils.js 2015-04-07 14:04:45 UTC (rev 1091) @@ -43,6 +43,15 @@ return Math.floor(Math.random() * 9000) + 1000; }; +oipf.utils.isPresent = function(list, element) { + + for (var i = 0, l = list.length; i < l; i++) { + if (oipf.utils.equals(list[i], element)) { + return true; + } + } +}; + function createUUID() { // http://www.ietf.org/rfc/rfc4122.txt var s = [];

1 0

r1090 - oipf/js/utils
by ygrego＠users.nuiton.org 07 Apr '15

07 Apr '15

Author: ygrego Date: 2015-04-07 13:35:43 +0000 (Tue, 07 Apr 2015) New Revision: 1090 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1090 Log: New useful method added to namespace "oipf.utils". Modified: oipf/js/utils/Utils.js Modified: oipf/js/utils/Utils.js =================================================================== --- oipf/js/utils/Utils.js 2015-04-07 13:03:31 UTC (rev 1089) +++ oipf/js/utils/Utils.js 2015-04-07 13:35:43 UTC (rev 1090) @@ -10,6 +10,34 @@ return new Timeout(time); }; +oipf.utils.equals = function(field1, field2) { + return field1 == field2; +}; + +oipf.utils.notEquals = function(field1, field2) { + return field1 != field2; +}; + +oipf.utils.superior = function(field1, field2) { + return field1 > field2; +}; + +oipf.utils.superiorOrEquals = function(field1, field2) { + return field1 >= field2; +}; + +oipf.utils.inferior = function(field1, field2) { + return field1 < field2; +}; + +oipf.utils.inferiorOrEquals = function(field1, field2) { + return field1 <= field2; +}; + +oipf.utils.contains = function(field1, field2) { + return field1 == field2; +}; + oipf.utils.generateFourDigit = function() { return Math.floor(Math.random() * 9000) + 1000;

1 0

r1089 - oipf/js/impl/model
by ygrego＠users.nuiton.org 07 Apr '15

07 Apr '15

Author: ygrego Date: 2015-04-07 13:03:31 +0000 (Tue, 07 Apr 2015) New Revision: 1089 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1089 Log: Dispatch a event when a query is malformed in method "getResults". Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-04-07 12:59:18 UTC (rev 1088) +++ oipf/js/impl/model/SearchResults.js 2015-04-07 13:03:31 UTC (rev 1089) @@ -167,8 +167,11 @@ } }, 0); + + } else { + this._fireEvent(createCustomEvent("MetadataSearch", + [this._search, this.SEARCH_CANNOT_BE_COMPLETED])); } - } } else {

1 0

r1088 - oipf/js/impl/model
by ygrego＠users.nuiton.org 07 Apr '15

07 Apr '15

Author: ygrego Date: 2015-04-07 12:59:18 +0000 (Tue, 07 Apr 2015) New Revision: 1088 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1088 Log: A verification have been added in "getResults" concerning the validity of query. Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-04-07 11:01:36 UTC (rev 1087) +++ oipf/js/impl/model/SearchResults.js 2015-04-07 12:59:18 UTC (rev 1088) @@ -117,51 +117,58 @@ .then(getResultFromInterval.bind(null, count)); } else { - var startTime = this._currentQuery.startTime; - - for (var i = 0; i< programmes.length; i++) { - var programme = programmes[i]; - var currentDate = new Date(); - /* - * The user searches information on the current program, broadcasted on the current channel. - * In this case don't need start time of program, the search must be proceeded on current time. - */ - if (startTime == null) { - if (programme.duration) { - var stopTime = startTime + programme.duration; - if (currentDate.getTime() >= startTime && currentDate.getTime() <= stopTime) { - console.log("[INFO] Program found."); - // Usefull to retrieve severals programs when user wants more than one programmes information. - var currentProgramIndex = i; - break; + + if (this.isValidField(this._search._currentQuery.field) && + this.isValidComparator( + this._search._currentQuery.comparison)) { + + var startTime = this._currentQuery.startTime; + + for (var i = 0; i< programmes.length; i++) { + var programme = programmes[i]; + var date = new Date(); + /* + * The user searches information on the current program, broadcasted on the current channel. + * In this case don't need start time of program, the search must be proceeded on current time. + */ + if (startTime == null) { + if (programme.duration) { + var stopTime = startTime + programme.duration; + if (date.getTime() >= startTime && date.getTime() <= stopTime) { + console.log("[INFO] Program found."); + // Usefull to retrieve severals programs when user wants more than one programmes information. + var currentProgramIndex = i; + break; + } } - } - } else { //The search use the start time like a filter to retrieve the required program information. + } else { //The search use the start time like a filter to retrieve the required program information. - if (currentDate.getTime() == startTime) { - currentProgramIndex = i; - break; + if (date.getTime() == startTime) { + currentProgramIndex = i; + break; + } } + console.log("[INFO] Program not yet found."); } - console.log("[INFO] Program not yet found."); - } - var self = this; - setTimeout(function() { - console.log("<<<<<<<<<<<<<<", new Date(), ">>>>>>>>>>>>>>>>", currentProgramIndex); - //When user want more than one result into his search. - if (currentProgramIndex != undefined) { - for (var i = 0; i < count; i++) { - self.push(programmes[currentProgramIndex]); - currentProgramIndex++; + var self = this; + setTimeout(function() { + console.log("<<<<<<<<<<<<<<", new Date(), ">>>>>>>>>>>>>>>>", currentProgramIndex); + //When user want more than one result into his search. + if (currentProgramIndex != undefined) { + for (var i = 0; i < count; i++) { + self.push(programmes[currentProgramIndex]); + currentProgramIndex++; + } + self._search._searchManager.onMetadataSearch && self._search._searchManager.onMetadataSearch(self._search, 0); + } else { + self._search._searchManager.onMetadataSearch && self._search._searchManager.onMetadataSearch(self._search, 4); } - self._search._searchManager.onMetadataSearch && self._search._searchManager.onMetadataSearch(self._search, 0); - } else { - self._search._searchManager.onMetadataSearch && self._search._searchManager.onMetadataSearch(self._search, 4); - } - }, 0); + }, 0); + } + } } else { @@ -198,6 +205,30 @@ */ item: function(index) { return this[index]; + }, + + isValidField: function(field) { + var fieldMap = { + startTime: true, + name: true, + duration: true, + description: true, + episode: true + }; + return fieldMap[field]; + }, + + isValidComparator: function(comparator) { + var comparatorMap = { + 0: true, + 1: true, + 2: true, + 3: true, + 4: true, + 5: true, + 6: true + }; + return comparatorMap[comparator]; } }); \ No newline at end of file

1 0

r1087 - oipf/js/impl/model
by ygrego＠users.nuiton.org 07 Apr '15

07 Apr '15

Author: ygrego Date: 2015-04-07 11:01:36 +0000 (Tue, 07 Apr 2015) New Revision: 1087 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1087 Log: A "if" condition block has been added in method "getResults" in order to manage subsequent calls to this one when all results have been found, this method must use the previously cached results. Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-04-07 09:46:45 UTC (rev 1086) +++ oipf/js/impl/model/SearchResults.js 2015-04-07 11:01:36 UTC (rev 1087) @@ -84,52 +84,85 @@ var programmes = this._search._searchManager._metadata; + /* + * Verify some conditions before beginning of + * search. + */ if (this._currentQuery && programmes && offset && count) { - var startTime = this._currentQuery.startTime; - for (var i = 0; i< programmes.length; i++) { - var programme = programmes[i]; - var currentDate = new Date(); - /* - * The user searches information on the current program, broadcasted on the current channel. - * In this case don't need start time of program, the search must be proceeded on current time. - */ - if (startTime == null) { - if (programme.duration) { - var stopTime = startTime + programme.duration; - if (currentDate.getTime() >= startTime && currentDate.getTime() <= stopTime) { - console.log("[INFO] Program found."); - // Usefull to retrieve severals programs when user wants more than one programmes information. - var currentProgramIndex = i; - break; + /* + * A verification must be done on the presence of cached results + * in order to not restart a complete search when + * that's not necessary. + */ + if (this._cachedResults) { + + var getResultFromInterval = function(count) { + this.length = 0; + + for (var i = this.offset, l = count; i < l; i++) { + var programme = this._cachedResults[i]; + if (programme) { + this.push(programme); + } else { + this.fireEvent(createCustomEvent("MetadataSearch", + [this._search, + this.SEARCH_CANNOT_BE_COMPLETED])); + break; } } + }; + + this._timeout + .then(getResultFromInterval.bind(null, count)); + + } else { + var startTime = this._currentQuery.startTime; + + for (var i = 0; i< programmes.length; i++) { + var programme = programmes[i]; + var currentDate = new Date(); + /* + * The user searches information on the current program, broadcasted on the current channel. + * In this case don't need start time of program, the search must be proceeded on current time. + */ + if (startTime == null) { + if (programme.duration) { + var stopTime = startTime + programme.duration; + if (currentDate.getTime() >= startTime && currentDate.getTime() <= stopTime) { + console.log("[INFO] Program found."); + // Usefull to retrieve severals programs when user wants more than one programmes information. + var currentProgramIndex = i; + break; + } + } - } else { //The search use the start time like a filter to retrieve the required program information. + } else { //The search use the start time like a filter to retrieve the required program information. - if (currentDate.getTime() == startTime) { - currentProgramIndex = i; - break; + if (currentDate.getTime() == startTime) { + currentProgramIndex = i; + break; + } } + console.log("[INFO] Program not yet found."); } - console.log("[INFO] Program not yet found."); - } - var self = this; - setTimeout(function() { - console.log("<<<<<<<<<<<<<<", new Date(), ">>>>>>>>>>>>>>>>", currentProgramIndex); - //When user want more than one result into his search. - if (currentProgramIndex != undefined) { - for (var i = 0; i < count; i++) { - self.push(programmes[currentProgramIndex]); - currentProgramIndex++; + var self = this; + setTimeout(function() { + console.log("<<<<<<<<<<<<<<", new Date(), ">>>>>>>>>>>>>>>>", currentProgramIndex); + //When user want more than one result into his search. + if (currentProgramIndex != undefined) { + for (var i = 0; i < count; i++) { + self.push(programmes[currentProgramIndex]); + currentProgramIndex++; + } + self._search._searchManager.onMetadataSearch && self._search._searchManager.onMetadataSearch(self._search, 0); + } else { + self._search._searchManager.onMetadataSearch && self._search._searchManager.onMetadataSearch(self._search, 4); } - self._search._searchManager.onMetadataSearch && self._search._searchManager.onMetadataSearch(self._search, 0); - } else { - self._search._searchManager.onMetadataSearch && self._search._searchManager.onMetadataSearch(self._search, 4); - } - }, 0); + }, 0); + } } else { this._fireEvent(createCustomEvent("MetadataSearch",

1 0

r1086 - oipf/js/impl/model
by ygrego＠users.nuiton.org 07 Apr '15

07 Apr '15

Author: ygrego Date: 2015-04-07 09:46:45 +0000 (Tue, 07 Apr 2015) New Revision: 1086 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1086 Log: A new property: "_cachedResults". Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-04-07 09:16:32 UTC (rev 1085) +++ oipf/js/impl/model/SearchResults.js 2015-04-07 09:46:45 UTC (rev 1086) @@ -51,6 +51,8 @@ */ totalSize: null, + _cachedResults: null, + _search: null, init: function(search) { @@ -82,7 +84,7 @@ var programmes = this._search._searchManager._metadata; - if (this._currentQuery && programmes) { + if (this._currentQuery && programmes && offset && count) { var startTime = this._currentQuery.startTime; for (var i = 0; i< programmes.length; i++) {

1 0

r1085 - oipf/data
by ygrego＠users.nuiton.org 07 Apr '15

07 Apr '15

Author: ygrego Date: 2015-04-07 09:16:32 +0000 (Tue, 07 Apr 2015) New Revision: 1085 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1085 Log: In method "createProgramme", the object "programme" can be modified whichever the value of variable "key". Modified: oipf/data/XmlTvData.js Modified: oipf/data/XmlTvData.js =================================================================== --- oipf/data/XmlTvData.js 2015-04-07 09:07:13 UTC (rev 1084) +++ oipf/data/XmlTvData.js 2015-04-07 09:16:32 UTC (rev 1085) @@ -68,12 +68,11 @@ if (key == "length#text") { element = self.minutesToSeconds(element); } - } else { - var mapping = self.map[key]; - if (mapping) { - programme[mapping] = element; - } } + var mapping = self.map[key]; + if (mapping) { + programme[mapping] = element; + } } } };

1 0

r1084 - oipf/data
by ygrego＠users.nuiton.org 07 Apr '15

07 Apr '15

Author: ygrego Date: 2015-04-07 09:07:13 +0000 (Tue, 07 Apr 2015) New Revision: 1084 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1084 Log: Addition of a "if" condition in method "createProgramme" in order to convert a time in seconds. Modified: oipf/data/XmlTvData.js Modified: oipf/data/XmlTvData.js =================================================================== --- oipf/data/XmlTvData.js 2015-04-07 08:23:25 UTC (rev 1083) +++ oipf/data/XmlTvData.js 2015-04-07 09:07:13 UTC (rev 1084) @@ -65,6 +65,9 @@ } if (key == "#text") { key = parentKey+key; + if (key == "length#text") { + element = self.minutesToSeconds(element); + } } else { var mapping = self.map[key]; if (mapping) {

1 0