[Sandbox-commits] r1801 - in oipf/lib/js: impl/model utils

10 Jul 2015

Author: ygrego
Date: 2015-07-10 18:33:20 +0200 (Fri, 10 Jul 2015)
New Revision: 1801

Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1801

Log:
General refactoring about access of programme data into emulator application.

Modified:
   oipf/lib/js/impl/model/ParentalRatingScheme.js
   oipf/lib/js/utils/ChannelService.js
   oipf/lib/js/utils/ProgrammeHelper.js

Modified: oipf/lib/js/impl/model/ParentalRatingScheme.js
===================================================================

--- oipf/lib/js/impl/model/ParentalRatingScheme.js	2015-07-10 16:28:35 UTC (rev 1800)
+++ oipf/lib/js/impl/model/ParentalRatingScheme.js	2015-07-10 16:33:20 UTC (rev 1801)
@@ -25,6 +25,7 @@
      * when name unequal to "dvb-si" but i don't know with what values.
      */
     constructor(name, values) {
+        super();
         this._iconUri = [];
         this.name = name;
         this.threshold = null;

Modified: oipf/lib/js/utils/ChannelService.js
===================================================================
--- oipf/lib/js/utils/ChannelService.js	2015-07-10 16:28:35 UTC (rev 1800)
+++ oipf/lib/js/utils/ChannelService.js	2015-07-10 16:33:20 UTC (rev 1801)
@@ -9,22 +9,21 @@
     constructor(currentChannel, channelNumber, channelOrigin, channelList) {
         this.channelNumber = channelNumber;
         this.channelOrigin = channelOrigin;
-        this.channelListArray = channelList;
 
         this.getNumber = OipfUtils.generateFourDigit.bind(null);
 
         this.channelList = new ChannelList();
-        this.createChannelList();
+        this.createChannelList(channelList);
         this.favouriteLists = new FavouriteListCollection();
         this.currentFavouriteList = new FavouriteList();
         this.setCurrentChannel(currentChannel);
     }
 
-    createChannelList() {
+    createChannelList(channelList) {
         if (this.channelNumber > 0) {
 
-            for (var i = 0, li = this.channelListArray.length; i < li; i++) {
-                var channel = this.channelListArray[i];
+            for (var i = 0, li = channelList.length; i < li; i++) {
+                var channel = channelList[i];
                 var newOipfChannel = new Channel(channel);
                 this.channelList && this.channelList.push(newOipfChannel);
 
@@ -87,4 +86,10 @@
         }
     }
 
+    addChannel(channel) {
+        if (channel && this.channelList) {
+            this.channelList.push(channel);
+        }
+    }
+
 }

Modified: oipf/lib/js/utils/ProgrammeHelper.js
===================================================================
--- oipf/lib/js/utils/ProgrammeHelper.js	2015-07-10 16:28:35 UTC (rev 1800)
+++ oipf/lib/js/utils/ProgrammeHelper.js	2015-07-10 16:33:20 UTC (rev 1801)
@@ -13,21 +13,31 @@
             stop: "duration",
             "desc#text": "description",
             "episode-num#text": "episode",
-            "title#text": "name"
+            "title#text": "name",
+            value: "parentalRatings",
+            src: "_picture"
         };
 
         this.transformationData = {
             start: {
                 methodTransformName: "millsecondsSinceJanuary1970",
-                necessaryData: ["value"]
+                necessaryData: ["content"]
             },
             stop: {
                 methodTransformName: "millsecondsSinceJanuary1970",
-                necessaryData: ["value"]
+                necessaryData: ["content"]
             },
             category: {
                 methodTransformName: "setCategory",
-                necessaryData: ["value"]
+                necessaryData: ["content"]
+            },
+            value: {
+                methodTransformName: "setParentalRating",
+                necessaryData: ["content"]
+            },
+            src: {
+                methodTransformName: "setProgrammePicture",
+                necessaryData: ["content"]
             }
         }
 
@@ -68,7 +78,7 @@
                     if (element instanceof Object && !(element instanceof Array)) {
                         createProgramme(element, programme, key);
                     } else {
-                       self.setProgrammeProperty(element, key, parentKey, programme, channelName);
+                        self.setProgrammeProperty(element, key, parentKey, programme, channelName);
                     }
                 }
 
@@ -80,10 +90,15 @@
 
             if (realChannelName) {
                 var channel = this.channelService.getChannelSimplyByName(realChannelName);
+
                 if (!channel) {
                     channel = this.initChannel(realChannelName);
+
+                    if (channel) {
+                        this.channelService.addChannel(channel);
+                    }
                 }
-                channel.logoUrl = channelLogoUrl;
+
                 programme.channel = channel;
             }
 
@@ -111,7 +126,7 @@
             element = self.transformInSecondSince01011970(element);
         }*/
         var data = {
-            value: element,
+            content: element,
             key: key
         };
 
@@ -176,7 +191,7 @@
             return this[methodTransformationName].apply(this, methodTransformationParams);
         }
 
-        return data.value;
+        return data.content;
     }
 
     getMethodTransformationParameter(data, infoList) {
@@ -202,7 +217,7 @@
             categoryItem && category.push(categoryItem);
         }
 
-        return category
+        return category;
     }
 
     millsecondsSinceJanuary1970(date) {
@@ -211,5 +226,21 @@
         return date;
     }
 
+    setParentalRating(rating) {
+        var parentalRating = new ParentalRating("dvb-si", rating, "", "0", "");
+
+        var parentalRatingCollection = new ParentalRatingCollection(parentalRating);
+
+        if (parentalRating && parentalRatingCollection) {
+            return parentalRatingCollection;
+        }
+
+        return undefined;
+    }
+
+    setProgrammePicture(url) {
+        return url;
+    }
+
 }

    

[Sandbox-commits] r1801 - in oipf/lib/js: impl/model utils

ygrego＠users.nuiton.org