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

r1204 - oipf/js/test
by ygrego＠users.nuiton.org April 15, 2015

April 15, 2015

Author: ygrego Date: 2015-04-15 14:54:46 +0000 (Wed, 15 Apr 2015) New Revision: 1204 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1204 Log: New methods added. Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-15 14:53:48 UTC (rev 1203) +++ oipf/js/test/SearchManagerTest.js 2015-04-15 14:54:46 UTC (rev 1204) @@ -311,6 +311,120 @@ }, + testSetQueryWhileSearchWithoutConstraints: function(resolve, reject) { + var value = 3600; + var stat = "Pending"; + logTest("State: " + stat); + var metadataSearch = this.searchManagerObj. + createSearch(this.SCHEDULED_CONTENT); + + var query = metadataSearch.createQuery("duration", 4, value); + metadataSearch.setQuery(query); + + var offset = 0; + var count = 6; + metadataSearch.result.getResults(offset, count); +// //Must return undefined else wrong implementation of getResults method +// console.log(metadataSearch.result[0]); + metadataSearch.setQuery(query); + + if (this.assertEquals(metadataSearch.result.length, 0)) { + resolve(); + } else { + reject(); + } + + }, + + testFindProgrammesFromStreamWhileSearchWithoutConstraints: function(resolve, reject) { + var self = this; + + this.addTransition(this.UNREALIZED, this.CONNECTING); + + this.addTransition(this.CONNECTING, this.PRESENTING, function() { + + var stat = "Pending"; + logTest("State: " + stat); + var searchTarget = 1; + var metadataSearch = self.searchManagerObj.createSearch(searchTarget); + + var currentChannel = self.vidBroadObj.currentChannel; + var startTime = null; + metadataSearch.findProgrammesFromStream(currentChannel, startTime); + + var offset = 0; + var count = 1; + metadataSearch.result.getResults(offset, count); + + metadataSearch.findProgrammesFromStream(currentChannel, startTime); + + if (self.assertEquals(metadataSearch.result.length, 0)) { + resolve(); + } else { + reject(); + } + }); + this.vidBroadObj.bindToCurrentChannel(); + + }, + + testAddChannelConstraintWhileSearchWithoutConstraints: function(resolve, reject) { + var self = this; + + this.addTransition(this.UNREALIZED, this.CONNECTING); + + this.addTransition(this.CONNECTING, this.PRESENTING, function() { + + var stat = "Pending"; + logTest("State: " + stat); + var searchTarget = 1; + var metadataSearch = self.searchManagerObj + .createSearch(searchTarget); + + var currentChannel = self.vidBroadObj.currentChannel; + var startTime = null; + metadataSearch.findProgrammesFromStream(currentChannel, startTime); + + var offset = 0; + var count = 1; + metadataSearch.result.getResults(offset, count); + + metadataSearch.addChannelConstraint(currentChannel); + + if (self.assertEquals(metadataSearch.result.length, 0)) { + resolve(); + } else { + reject(); + } + }); + + this.vidBroadObj.bindToCurrentChannel(); + + }, + + testRemoveChannelConstraintWhileSearchWithoutConstraints: function(resolve, reject) { + var value = 3600; + var stat = "Pending"; + logTest("State: " + stat); + var metadataSearch = this.searchManagerObj. + createSearch(this.SCHEDULED_CONTENT); + + var query = metadataSearch.createQuery("duration", 4, value); + metadataSearch.setQuery(query); + + var offset = 0; + var count = 6; + metadataSearch.result.getResults(offset, count); + metadataSearch.addChannelConstraint(null); + + if (this.assertEquals(metadataSearch.result.length, 0)) { + resolve(); + } else { + reject(); + } + + }, + testGetCurrentProgrammeFromNullStream: function (resolve, reject) { var self = this;

1 0

r1203 - oipf/js/initObj
by ygrego＠users.nuiton.org April 15, 2015

April 15, 2015

Author: ygrego Date: 2015-04-15 14:53:48 +0000 (Wed, 15 Apr 2015) New Revision: 1203 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1203 Log: Save of the visual object into a variable. Modified: oipf/js/initObj/init.js Modified: oipf/js/initObj/init.js =================================================================== --- oipf/js/initObj/init.js 2015-04-15 14:49:15 UTC (rev 1202) +++ oipf/js/initObj/init.js 2015-04-15 14:53:48 UTC (rev 1203) @@ -1,7 +1,7 @@ // Used in the channelType property to indicate a TV channel. CHANNEL_CONSTANT = {"TYPE_TV": 0}; -document.registerElement('video-broadcast', { +var VideoBroadcastObject = document.registerElement('video-broadcast', { prototype: VideoBroadcastObject.prototype, extends: "object" }); @@ -52,8 +52,9 @@ "N/A" //reserved_future_use ]; +var metadata = data; + if (!oipfObjectFactory) { var oipfObjectFactory = new OipfObjectFactory(); } -var metadata = data;

1 0

r1202 - oipf/js/impl
by ygrego＠users.nuiton.org April 15, 2015

April 15, 2015

Author: ygrego Date: 2015-04-15 14:49:15 +0000 (Wed, 15 Apr 2015) New Revision: 1202 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1202 Log: The method "createdCallback" calls the "VideoBroadcastObject" constructor. Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-04-15 14:42:20 UTC (rev 1201) +++ oipf/js/impl/VideoBroadcastObject.js 2015-04-15 14:49:15 UTC (rev 1202) @@ -140,6 +140,7 @@ createdCallback: function() { console.log("[INFO] createdCallback called."); + this.init(); }, init: function () {

1 0

r1201 - oipf/js/impl
by ygrego＠users.nuiton.org April 15, 2015

April 15, 2015

Author: ygrego Date: 2015-04-15 14:42:20 +0000 (Wed, 15 Apr 2015) New Revision: 1201 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1201 Log: The VideoBroadcastObject constructor has no more of parameter. And "_channelService" receives directly a new instance of "ChannelService". Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-04-15 14:40:18 UTC (rev 1200) +++ oipf/js/impl/VideoBroadcastObject.js 2015-04-15 14:42:20 UTC (rev 1201) @@ -142,12 +142,12 @@ console.log("[INFO] createdCallback called."); }, - init: function (channelService) { + init: function () { console.log("[INFO] constructor of VideoBroadcast class called."); this.playState = 0; this._listeners = {}; this._callbacks = {}; - this._channelService = channelService; + this._channelService = new ChannelService(null); this._eventManager = new EventManager(); this._timerManager = new TimerManager();

1 0

r1200 - oipf/js/impl
by ygrego＠users.nuiton.org April 15, 2015

April 15, 2015

Author: ygrego Date: 2015-04-15 14:40:18 +0000 (Wed, 15 Apr 2015) New Revision: 1200 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1200 Log: The VideoBroadcastObject constructor called in "createVideoBroadcastObject" has no more of parameter. Modified: oipf/js/impl/OipfObjectFactory.js Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-04-15 14:25:19 UTC (rev 1199) +++ oipf/js/impl/OipfObjectFactory.js 2015-04-15 14:40:18 UTC (rev 1200) @@ -179,7 +179,7 @@ console.log("[INFO] createVideoBroadcastObject() of OipfObjectFactory class called."); if (this.isObjectSupported("video/broadcast")) { - return new VideoBroadcastObject(new ChannelService(null)); + return new VideoBroadcastObject(); } else { throw new TypeError("This object type is not supported."); }

1 0

r1199 - oipf/js/test
by ygrego＠users.nuiton.org April 15, 2015

April 15, 2015

Author: ygrego Date: 2015-04-15 14:25:19 +0000 (Wed, 15 Apr 2015) New Revision: 1199 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1199 Log: New test added in section "SearchManagerTest". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-04-15 13:59:16 UTC (rev 1198) +++ oipf/js/test/Test.js 2015-04-15 14:25:19 UTC (rev 1199) @@ -382,6 +382,22 @@ method: "testCreateQueryWithValueArgumentNull" }, { + label: "Modify query while search performing by calling 'setQuery'.", + method: "testSetQueryWhileSearchWithoutConstraints" + }, + { + label: "Call 'findProgrammesFromStream' while search performing.", + method: "testFindProgrammesFromStreamWhileSearchWithoutConstraints" + }, + { + label: "Call 'addChannelConstraint' while search performing.", + method: "testAddChannelConstraintWhileSearchWithoutConstraints" + }, + { + label: "Call 'removeChannelConstraint' while search performing.", + method: "testRemoveChannelConstraintWhileSearchWithoutConstraints" + }, + { label: "Abort a search.", method: "testAbortWhileProgrammesSearchWithoutConstraints" }

1 0

r1198 - wit/js
by jruchaud＠users.nuiton.org April 15, 2015

April 15, 2015

Author: jruchaud Date: 2015-04-15 13:59:16 +0000 (Wed, 15 Apr 2015) New Revision: 1198 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1198 Log: Add actions Modified: wit/js/main.js Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-04-15 13:58:45 UTC (rev 1197) +++ wit/js/main.js 2015-04-15 13:59:16 UTC (rev 1198) @@ -13,7 +13,7 @@ inputTagNode.parentNode.insertAdjacentHTML("beforebegin", templateTag.replace("{{value}}", this.value)); this.value = ""; - time = performance.now(); + time = null; } }

1 0

r1197 - wit/js
by smaisonneuve＠users.nuiton.org April 15, 2015

April 15, 2015

Author: smaisonneuve Date: 2015-04-15 13:58:45 +0000 (Wed, 15 Apr 2015) New Revision: 1197 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1197 Log: [DB] Create database Added: wit/js/database.js Added: wit/js/database.js =================================================================== --- wit/js/database.js (rev 0) +++ wit/js/database.js 2015-04-15 13:58:45 UTC (rev 1197) @@ -0,0 +1,2 @@ +var Datastore = require('nedb'); +var db = new Datastore(); \ No newline at end of file

1 0

r1196 - in wit: . css js
by jruchaud＠users.nuiton.org April 15, 2015

April 15, 2015

Author: jruchaud Date: 2015-04-15 13:57:22 +0000 (Wed, 15 Apr 2015) New Revision: 1196 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1196 Log: Add actions Added: wit/css/actions.css wit/css/select.css Modified: wit/css/style.css wit/index.html wit/js/main.js wit/package.json Added: wit/css/actions.css =================================================================== --- wit/css/actions.css (rev 0) +++ wit/css/actions.css 2015-04-15 13:57:22 UTC (rev 1196) @@ -0,0 +1,36 @@ +.actions { + display: flex; + justify-content: center; +} + +.actions div { + height: 50px; + width: 50px; + background-color: #ccc; + margin: 5px; + + display: flex; + justify-content: center; + align-items: center; +} + +#play .icon { + border-top: transparent 20px solid; + /* border-right: transparent 20px solid; */ + border-bottom: transparent 20px solid; + border-left: black 20px solid; + + height: 0px; + width: 0px; + background-color: transparent; +} + +#stop .icon { + height: 30px; + width: 30px; + background-color: black; +} + +#time { + text-align: center; +} \ No newline at end of file Added: wit/css/select.css =================================================================== --- wit/css/select.css (rev 0) +++ wit/css/select.css 2015-04-15 13:57:22 UTC (rev 1196) @@ -0,0 +1,54 @@ +.selection { + background-color: #FFF; + border: 1px solid #AAA; + border-radius: 4px; + cursor: text; + min-height: 32px; + + -webkit-user-select: none; +} + +.selection ul { + list-style: outside none none; + margin: 0px; + padding: 0px 5px; + width: 100%; + + display: inline-block; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.selection li.tag { + background-color: #E4E4E4; + border: 1px solid #AAA; + border-radius: 4px; + cursor: default; + float: left; + margin-right: 5px; + margin-top: 5px; + padding: 0px 5px; +} + +.selection .remove { + color: #999; + cursor: pointer; + display: inline-block; + font-weight: bold; + margin-right: 2px; +} + +.selection li.input { + float: left; +} + +.selection li input { + width: 6em; + background: none repeat scroll 0% 0% transparent; + border: medium none; + outline: 0px none; + + font-size: 100%; + margin-top: 5px; +} \ No newline at end of file Modified: wit/css/style.css =================================================================== --- wit/css/style.css 2015-04-15 13:14:26 UTC (rev 1195) +++ wit/css/style.css 2015-04-15 13:57:22 UTC (rev 1196) @@ -1,58 +1,3 @@ * { box-sizing: border-box; } - -.selection { - background-color: #FFF; - border: 1px solid #AAA; - border-radius: 4px; - cursor: text; - min-height: 32px; - - -webkit-user-select: none; -} - -.selection ul { - list-style: outside none none; - margin: 0px; - padding: 0px 5px; - width: 100%; - - display: inline-block; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} - -.selection li.tag { - background-color: #E4E4E4; - border: 1px solid #AAA; - border-radius: 4px; - cursor: default; - float: left; - margin-right: 5px; - margin-top: 5px; - padding: 0px 5px; -} - -.selection .remove { - color: #999; - cursor: pointer; - display: inline-block; - font-weight: bold; - margin-right: 2px; -} - -.selection li.input { - float: left; -} - -.selection li input { - width: 6em; - background: none repeat scroll 0% 0% transparent; - border: medium none; - outline: 0px none; - - font-size: 100%; - margin-top: 5px; -} \ No newline at end of file Modified: wit/index.html =================================================================== --- wit/index.html 2015-04-15 13:14:26 UTC (rev 1195) +++ wit/index.html 2015-04-15 13:57:22 UTC (rev 1196) @@ -3,6 +3,8 @@ <head> <title>WIT</title> <link type="text/css" href="css/style.css" rel="stylesheet"/> + <link type="text/css" href="css/select.css" rel="stylesheet"/> + <link type="text/css" href="css/actions.css" rel="stylesheet"/> </head> <body> <div class="selection"> @@ -14,6 +16,17 @@ </ul> </div> + <div class="actions"> + <div id="play"> + <div class="icon"></div> + </div> + <div id="stop"> + <div class="icon"></div> + </div> + </div> + + <div id="time"></div> + <script type="application/javascript" src="js/main.js"></script> <script type="application/javascript" src="js/database.js"></script> </body> Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-04-15 13:14:26 UTC (rev 1195) +++ wit/js/main.js 2015-04-15 13:57:22 UTC (rev 1196) @@ -1,5 +1,10 @@ +var moment = require('moment'); + var tagsNode = document.getElementById("tags"); var inputTagNode = document.getElementById("inputTag"); +var playNode = document.getElementById("play"); +var stopNode = document.getElementById("stop"); +var timeNode = document.getElementById("time"); var templateTag = "<li class=\"tag\"><span class=\"remove\">x</span>{{value}}</li>"; @@ -7,6 +12,8 @@ if (e.keyCode == 13 && this.value != "") { // On enter inputTagNode.parentNode.insertAdjacentHTML("beforebegin", templateTag.replace("{{value}}", this.value)); this.value = ""; + + time = performance.now(); } } @@ -18,3 +25,25 @@ inputTagNode.focus(); } } + +var time = null; + +playNode.onclick = function(e) { + time = new Date(); +} + +stopNode.onclick = function(e) { + //console.log("time", performance.now() - time); + time = null; +} + +var updateTime = function() { + if (time) { + var diff = moment(moment().diff(time)).utcOffset(0); + timeNode.textContent = diff.format("HH:mm:ss"); + } else { + timeNode.textContent = "Not started"; + } + setTimeout(updateTime.bind(), 1000); +} +updateTime(); Modified: wit/package.json =================================================================== --- wit/package.json 2015-04-15 13:14:26 UTC (rev 1195) +++ wit/package.json 2015-04-15 13:57:22 UTC (rev 1196) @@ -7,7 +7,8 @@ "height": 300 }, "dependencies": { - "nedb": "^1.1.2" + "nedb": "^1.1.2", + "moment": "^2.10.2" }, "devDependencies": { "grunt": "^0.4.5",

1 0

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

April 15, 2015

Author: ygrego Date: 2015-04-15 13:14:26 +0000 (Wed, 15 Apr 2015) New Revision: 1195 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1195 Log: New methods added and call of method "_evaluateQuery" into method "_getAnyProgramme". Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-04-15 13:11:52 UTC (rev 1194) +++ oipf/js/impl/model/SearchResults.js 2015-04-15 13:14:26 UTC (rev 1195) @@ -197,8 +197,7 @@ for (var i = 0, l = programmes.length; i < l; i++) { var programme = programmes[i]; - if (programme[field] && methodName && - oipf.utils[methodName].call(null, programme[field], value)) { + if (this._evaluateQuery(this._search._currentQuery, programme)) { var constraints = this._search. _constraints.channels; @@ -259,6 +258,53 @@ */ item: function(index) { return this[index]; + }, + + _evaluateQuery: function(query, programme) { + var field = this._getPropertyName(this._search._currentQuery._field); + var comparison = this._search._currentQuery._comparison; + var value = this._search._currentQuery._value; + var methodName = this._methodToCall[comparison]; + + if (query._and.length > 0 && query._or.length > 0) { + + return + (oipf.utils[methodName].call(null, programme[field], value) && + this._evaluateQueryLoop(query._and, programme)) || + (oipf.utils[methodName].call(null, programme[field], value) || + this._evaluateQueryLoop(query._and, programme)); + + } else if (query._and.length > 0 && query._or.length == 0) { + + return + (oipf.utils[methodName].call(null, programme[field], value) && + this._evaluateQueryLoop(query._and, programme)); + + } else if (query._or.length > 0 && query._and.length == 0) { + + return + (oipf.utils[methodName].call(null, programme[field], value) && + this._evaluateQueryLoop(query._or, programme)); + + } else if (query._and.length == 0 && query._or.length == 0) { + return (oipf.utils[methodName].call(null, programme[field], value)); + } + + }, + + _evaluateQueryLoop: function(query, programme) { + for (var i = 0, l = query; i < l; i++) { + if (!this._evaluateQuery(query, programme)) { + return false; + } + } + }, + + _getPropertyName: function(field) { + var pattern = /\w+.(\w+)/; + var propertyName = pattern.exec(field); + + return propertyName[1]; } - + }); \ No newline at end of file

1 0