[RemoteStreamConvert] fix error : eServiceReference has no attribute 'isInvisible'.
authorhschang <chang@dev3>
Thu, 28 Apr 2016 07:47:18 +0000 (16:47 +0900)
committerhschang <chang@dev3>
Thu, 28 Apr 2016 07:47:18 +0000 (16:47 +0900)
meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-remotestreamconvert.bb
meta-openvuplus/recipes-vuplus/e2openplugins/files/check_has_isinvisible.patch [new file with mode: 0644]

index 15f298b..b0f7280 100755 (executable)
@@ -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 (file)
index 0000000..6ea3d1c
--- /dev/null
@@ -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 = []