BUMP releaseBB to 1.8.4

- add cfscrape17.py to support kodi 17.6 users
bugatsinho · Aug 30, 2019 · 15878df · 15878df
1 parent a944b06
commit 15878df
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 8 deletions.
diff --git a/_zips/plugin.video.releaseBB/plugin.video.releaseBB-1.8.4.zip b/_zips/plugin.video.releaseBB/plugin.video.releaseBB-1.8.4.zip
diff --git a/addons.xml b/addons.xml
@@ -114,7 +114,7 @@
 	</addon>
 
 
-	<addon id="plugin.video.releaseBB" version="1.8.3" name="Release[COLOR orange][B]BB[/B][/COLOR]" provider-name="Bugatsinho">
+	<addon id="plugin.video.releaseBB" version="1.8.4" name="Release[COLOR orange][B]BB[/B][/COLOR]" provider-name="Bugatsinho">
 	  <requires>
 	    <import addon="xbmc.python" version="2.1.0"/>
 	    <import addon="script.module.t0mm0.common" version="2.1.1"/>

diff --git a/addons.xml.md5 b/addons.xml.md5
@@ -1 +1 @@
-ff46228133e058800b829492053b9f10
+b56559526bd5cbd87c9535919f120229
diff --git a/plugin.video.releaseBB/addon.xml b/plugin.video.releaseBB/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.releaseBB" version="1.8.3" name="Release[COLOR orange][B]BB[/B][/COLOR]" provider-name="Bugatsinho">
+<addon id="plugin.video.releaseBB" version="1.8.4" name="Release[COLOR orange][B]BB[/B][/COLOR]" provider-name="Bugatsinho">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.t0mm0.common" version="2.1.1"/>
@@ -23,8 +23,8 @@
     <twitter>https://twitter.com/bugatsinho</twitter>
     <repo>https://bugatsinho.github.io/repo/</repo>
     <email>bugatsinho@protonmail.com</email>
-    <news>+ [B][COLOR lime]1.8.3[/B][/COLOR] [COLOR gold](20-08-2019)[/COLOR]
-- Fix Recommended movies issue</news>
+    <news>+ [B][COLOR lime]1.8.4[/B][/COLOR] [COLOR gold](30-08-2019)[/COLOR]
+- add cfscrape17.py to support  kodi 17.6 users</news>
     <assets>
         <icon>icon.png</icon>
         <fanart>fanart.jpg</fanart>

diff --git a/plugin.video.releaseBB/changelog.txt b/plugin.video.releaseBB/changelog.txt
@@ -1,3 +1,6 @@
++ [B][COLOR lime]1.8.4[/B][/COLOR] [COLOR gold](30-08-2019)[/COLOR]
+- add cfscrape17.py to support  kodi 17.6 users
+
 + [B][COLOR lime]1.8.3[/B][/COLOR] [COLOR gold](20-08-2019)[/COLOR]
 - Fix Recommended movies issue
 

diff --git a/plugin.video.releaseBB/default.py b/plugin.video.releaseBB/default.py
@@ -470,7 +470,12 @@ def GetLinks(section, url, img, plot):  # Get Links
 
 
 def cloudflare_mode(url):
-    from resources.lib.modules import cfscrape
+    kodi_ver = float(xbmc.getInfoLabel("System.BuildVersion")[:4])
+    if kodi_ver >= 18:
+        from resources.lib.modules import cfscrape as cfscrape
+    else:
+        from resources.lib.modules import cfscrape17 as cfscrape
+
     scraper = cfscrape.create_scraper()
     result = scraper.get(url).text
     # xbmc.log('RESULTTTTT: %s' % result)

diff --git a/plugin.video.releaseBB/resources/lib/modules/search.py b/plugin.video.releaseBB/resources/lib/modules/search.py
@@ -48,7 +48,11 @@
 
 
 def Search_bb(url):
-    from resources.lib.modules import cfscrape
+    kodi_ver = float(xbmc.getInfoLabel("System.BuildVersion")[:4])
+    if kodi_ver >= 18:
+        from resources.lib.modules import cfscrape as cfscrape
+    else:
+        from resources.lib.modules import cfscrape17 as cfscrape
     scraper = cfscrape.create_scraper()
     if 'new' == url:
         keyboard = xbmc.Keyboard()
@@ -236,7 +240,7 @@ def Search_bb(url):
 
     control.content(int(sys.argv[1]), 'videos')
     control.directory(int(sys.argv[1]))
-    view.setView('videos', {'skin.estuary': 55, 'skin.confluence': 500, 'skin.xonfluence': 500})
+    view.setView('videos', {'skin.estuary': 55, 'skin.confluence': 500})
 
 
 def del_search(query):