Merge branch 'master' of https://github.com/kodiondemand/addon

channels/cinemalibero.py

@@ -97,8 +97,8 @@ def episodios(item):
         item.contentType = 'tvshow'
     else:# item.extra == 'serie':
         support.log("Serie :", item)
-        patron = r'(?P<episode>\d+(?:&#215;|×)?\d+\-\d+|\d+(?:&#215;|×)\d+)[;]?[ ]?(?:(?P<title>[^<]+)(?P<url>.*?)|(\2[ ])(?:<(\3.*?)))(?:</a><br />|</a></p>|$)'
-        patronBlock = r'<p><strong>(?:.+?[Ss]tagione\s)?(?:(?P<lang>iTA|ITA|Sub-ITA|Sub-iTA))?.*?</strong>(?P<block>.+?)(?:</span|</p)'
+        patron = r'(?:>| )(?P<episode>\d+(?:x|×|&#215;)\d+)[;]?[ ]?(?:(?P<title>[^<–-]+)(?P<url>.*?)|(\2[ ])(?:<(\3.*?)))(?:</a><br />|</a></p>|$)'
+        patronBlock = r'>(?:[^<]+[Ss]tagione\s|[Ss]tagione [Uu]nica)(?:(?P<lang>iTA|ITA|Sub-ITA|Sub-iTA))?.*?</strong>(?P<block>.+?)(?:<strong|<div class="at-below)'
         item.contentType = 'tvshow'
     def itemHook(item):
         if not scrapertools.find_single_match(item.title, r'(\d+x\d+)'):

core/support.py

@@ -125,9 +125,9 @@ def regexDbg(item, patron, headers, data=''):
             html = data
         headers = {'content-type': 'application/json'}
         data = {
-            'regex': patron,
+            'regex': patron.decode('utf-8'),
             'flags': 'gm',
-            'testString': html,
+            'testString': html.decode('utf-8'),
             'delimiter': '"""',
             'flavor': 'python'
         }