From 2cb8f069a4f9717bd94b14a06619f94219c9c4a6 Mon Sep 17 00:00:00 2001
From: hschang <chang@dev3>
Date: Thu, 28 Apr 2016 16:47:18 +0900
Subject: [PATCH] [RemoteStreamConvert] fix error : eServiceReference has no
 attribute 'isInvisible'.

---
 ...nigma2-plugin-extensions-remotestreamconvert.bb |  8 +++---
 .../files/check_has_isinvisible.patch              | 31 ++++++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 meta-openvuplus/recipes-vuplus/e2openplugins/files/check_has_isinvisible.patch

diff --git a/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-remotestreamconvert.bb b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-remotestreamconvert.bb
index 15f298b..b0f7280 100755
--- a/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-remotestreamconvert.bb
+++ b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-remotestreamconvert.bb
@@ -3,13 +3,13 @@ DESCRIPTION = "Fetch channels from remote bouquets and make them available local
 
 RDEPENDS_${PN} = "python-shell"
 
-PR="r0"
-
 inherit gitpkgv
 PV = "2.0+git${SRCPV}"
 PKGV = "2.0+git${GITPKGV}"
-PR = "r0"
+PR = "r1"
 
 require openplugins-distutils.inc
-
 require assume-gplv2.inc
+
+SRCREV_pn-${PN}="6f45040821703e0afc3c29451da53f0139cd1c33"
+SRC_URI += " file://check_has_isinvisible.patch"
diff --git a/meta-openvuplus/recipes-vuplus/e2openplugins/files/check_has_isinvisible.patch b/meta-openvuplus/recipes-vuplus/e2openplugins/files/check_has_isinvisible.patch
new file mode 100644
index 0000000..6ea3d1c
--- /dev/null
+++ b/meta-openvuplus/recipes-vuplus/e2openplugins/files/check_has_isinvisible.patch
@@ -0,0 +1,31 @@
+diff --git a/plugin/plugin.py b/plugin/plugin.py
+index 44e2838..5076d7b 100644
+--- a/plugin/plugin.py
++++ b/plugin/plugin.py
+@@ -275,15 +275,17 @@ class StreamingChannelFromServerScreen(Screen):
+ 			for line in lines:
+ 				if line.startswith('#SERVICE'):
+ 					line = line.replace('\n', '').replace('\r', '').split()
+-					if not int(line[1].split(":")[1]) & eServiceReference.isInvisible:
+-						if len(line) > 3 and line[2] == 'BOUQUET' and (line[3].find('.tv') != -1 or line[3].find('.radio')):
+-							tmp = line[3].replace('"', '')
+-							if len(tmp) > 1 and tmp not in list:
+-								list.append(tmp)
+-						elif line[1].find('0:0:0:0:0:0:0:'):
+-							tmp = line[1].split('0:0:0:0:0:0:0:')
+-							if tmp[1] not in list:
+-								list.append(tmp[1])
++					if hasattr(eServiceReference, 'isInvisible') and (int(line[1].split(":")[1]) & eServiceReference.isInvisible):
++						continue
++
++					if len(line) > 3 and line[2] == 'BOUQUET' and (line[3].find('.tv') != -1 or line[3].find('.radio')):
++						tmp = line[3].replace('"', '')
++						if len(tmp) > 1 and tmp not in list:
++							list.append(tmp)
++					elif line[1].find('0:0:0:0:0:0:0:'):
++						tmp = line[1].split('0:0:0:0:0:0:0:')
++						if tmp[1] not in list:
++							list.append(tmp[1])
+ 
+ 	def parseBouqets(self):
+ 		list = []
-- 
2.7.4