Merge pull request #116 from paulhiggs/master

Improved handling of image object

Author: paulhiggs

frontend/android/js/channel.js

@@ -75,7 +75,7 @@ Channel.prototype.init = function (init_obj, channel_index) {
     var span1 = document.createElement("span");
     span1.classList.add("chicon", "pl-1", "order-3");
     var img = document.createElement("img");
-    img.src = this.getImageSrc(self.image);
+    img.src = getImageSrc(self.image);
     span1.appendChild(img);
     newTextbox.appendChild(span1);
     var span = document.createElement("span");
@@ -237,7 +237,9 @@ Channel.prototype.channelSelected = function () {
       $("#notification").removeClass();
       $("#notification").addClass("noservice");
       if (self.out_of_service_image) {
-        $("#notification").html('<img src="' + self.out_of_service_image.mediaUri + '" class="img-fluid position-relative"/>');
+        $("#notification").html(
+          '<img src="' + getImageSrc(self.out_of_service_image) + '" class="img-fluid position-relative"/>'
+        );
       } else {
         $("#notification").text("Service not available");
       }
@@ -366,9 +368,7 @@ Channel.prototype.updateChannelInfo = function () {
     cpsInstance;
   var channelInfo = $("#channel_info");
   channelInfo.empty();
-  channelInfo.append(
-    '<span class="menuitem_chicon d-inline-block"><img src="' + this.getImageSrc(self.image) + '"></span>'
-  );
+  channelInfo.append('<span class="menuitem_chicon d-inline-block"><img src="' + getImageSrc(self.image) + '"></span>');
   channelInfo.append(
     '<span class="menuitem_chnumber d-inline-block">' +
       self.lcn +
@@ -477,7 +477,7 @@ Channel.prototype.showEPG = function () {
     var header = document.createElement("div");
     header.addClass("epg_chinfo align-items-center sticky-top px-2");
     var logo = document.createElement("img");
-    logo.setAttribute("src", self?.image?.mediaUri || "./images/empty.png");
+    logo.setAttribute("src", getImageSrc(self?.image));
     logo.setAttribute("alt", "channel icon");
     logo.addClass("chicon img-fluid d-block");
     header.appendChild(logo);

frontend/android/js/dvbi-mobile.js

@@ -337,7 +337,7 @@ function loadServicelist(list) {
 function serviceListSelected() {
   $("#servicelist_registry").hide();
   $("#settings").hide();
-  $("#list_logo").attr("src", serviceList?.image?.mediaUri || "images/logo_dvbi_sofia.png");
+  $("#list_logo").attr("src", getImageSrc(serviceList.image, "images/logo_dvbi_sofia.png"));
   var channelIndex = 0;
   for (var i = 0; i < serviceList.services.length; i++) {
     var channel = new Channel();

frontend/android/js/program.js

@@ -86,7 +86,7 @@ function UseLocalisation(elems, language) {
 
 Program.prototype.populateProgramInfo = function () {
   var i;
-  $("#info_chicon").attr("src", this.channel?.image?.mediaUri || "./images/empty.png");
+  $("#info_chicon").attr("src", getImageSrc(this.channel?.image));
   $("#info_chnumber").text(this.channel.lcn);
   $(".chdrm_prginfo").remove();
   if (this.cpsIndex) {

frontend/channel-common.js

@@ -32,18 +32,6 @@ Channel.prototype.getGenre = function (genre) {
   return null;
 };
 
-Channel.prototype.getImageSrc = function (image, defaultImage = true) {
-  if (image && image.mediaUri) {
-    return image.mediaUri;
-  } else if (image && image.mediaData64) {
-    return "data:" + image.type + ";base64," + image.mediaData64;
-  } else if (defaultImage) {
-    return "./images/empty.png";
-  } else {
-    return null;
-  }
-};
-
 Channel.prototype.parseSchedule = function (data) {
   var newPrograms = [];
   var parser = new DOMParser();

frontend/dvbi-common.js

@@ -1162,6 +1162,18 @@ function getMedia(element) {
   }
 }
 
+function getImageSrc(image, defaultImage = "./images/empty.png") {
+  if (image && image.mediaUri) {
+    return image.mediaUri;
+  } else if (image && image.mediaData64) {
+    return "data:" + image.type + ";base64," + image.mediaData64;
+  } else if (defaultImage) {
+    return defaultImage;
+  } else {
+    return null;
+  }
+}
+
 getParentalRating = function (href) {
   if (href == "urn:fvc:metadata:cs:ContentRatingCS:2014-07:no_parental_controls") {
     return "None";

frontend/hbbtv/epg/channel.js

@@ -21,7 +21,7 @@ EPGChannel.prototype.getSchedule = function (start, end, callback, earlier) {
           for (var i = 0; i < programData.length; i++) {
             var program2 = new EPGProgram(programData[i], self.element_id + "_program_" + i, self);
             program2.bilingual = self.bilingual;
-            program2.channelimage = self.getImageSrc(self.image);
+            program2.channelimage = getImageSrc(self.image);
             program2.channel_streamurl = self.streamurl;
             newPrograms.push(program2);
           }

frontend/hbbtv/epg/gridepg.js

@@ -313,7 +313,7 @@ GridEPG.prototype.populate = function (callback) {
       channelElement.setAttribute("id", "channel_" + i);
       channelElement.addClass("channel");
       if (img) {
-        channelElement.innerHTML = '<img src="' + channel.getImageSrc(img).replace(/&/g, "&amp;") + '" alt="" />';
+        channelElement.innerHTML = '<img src="' + getImageSrc(img).replace(/&/g, "&amp;") + '" alt="" />';
       } else {
         channelElement.innerHTML = "<span>" + channel.title + "</span>";
       }

frontend/hbbtv/launcher/channel.js

@@ -246,7 +246,7 @@ Channel.prototype.init = function (init_obj, element_id) {
     // Menuitem title
     var menuitem_title = document.createElement("div");
     var innerHtml = "";
-    var src = this.getImageSrc(self.image);
+    var src = getImageSrc(self.image);
     if (src) {
       innerHtml = '<span class="menuitem_chicon"><img src="' + src.replace(/&/g, "&amp;") + '"></img></span>';
     }

frontend/hbbtv/launcher/navigation.js

@@ -1039,7 +1039,7 @@ function doServiceSelection() {
         } catch (e) {}
       }
       if (selectedService.out_of_service_image) {
-        showInfo('<img src="' + selectedService.out_of_service_image + '"/>', 60, "noservice");
+        showInfo('<img src="' + getImageSrc(selectedService.out_of_service_image) + '"/>', 60, "noservice");
       } else {
         showInfo("Service not available", 60, "noservice");
       }