From a9deda4f31570d0cd83687b03f93dbb7f1906c8e Mon Sep 17 00:00:00 2001
From: mac12m99 <m.toma99@gmail.com>
Date: Wed, 4 Sep 2019 21:08:12 +0200
Subject: [PATCH] fix cineblog01

---
 channels/cineblog01.py | 22 ++++++++++++++--------
 core/support.py        |  2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/channels/cineblog01.py b/channels/cineblog01.py
index ee68ba49..605e6c43 100644
--- a/channels/cineblog01.py
+++ b/channels/cineblog01.py
@@ -41,7 +41,8 @@ def mainlist(item):
     film = [
         ('HD', ['', 'menu', 'Film HD Streaming']),
         ('Generi', ['', 'menu', 'Film per Genere']),
-        ('Anni', ['', 'menu', 'Film per Anno'])
+        ('Anni', ['', 'menu', 'Film per Anno']),
+        ('Ultimi aggiornati', ['/lista-film-ultimi-100-film-aggiornati/', 'newest', 'aggiornati'])
     ]
     tvshow = ['/serietv/',
         ('Per Lettera', ['/serietv/', 'menu', 'Serie-Tv per Lettera']),
@@ -65,12 +66,16 @@ def menu(item):
 @support.scrape
 def newest(categoria):
     findhost()
-    debug = True
-    item = Item()
-    item.contentType = 'movie'
-    item.url = host + '/lista-film-ultimi-100-film-aggiunti/'
-    patron = "<a href=(?P<url>[^>]+)>(?P<title>[^<([]+)(?:\[(?P<quality>[A-Z]+)\])?\s\((?P<year>[0-9]{4})\)<\/a>"
-    patronBlock = r'Ultimi 100 film aggiunti:.*?<\/td>'
+    if type(categoria) != Item:
+        item = Item()
+        item.contentType = 'movie'
+        item.url = host + '/lista-film-ultimi-100-film-aggiunti/'
+        patronBlock = r'Ultimi 100 film aggiunti:(?P<block>.*?)<\/td>'
+    else:
+        patronBlock = r'Ultimi 100 film Aggiornati:(?P<block>.*?)<\/td>'
+        item = categoria
+    patron = "<a href=(?P<url>[^>]+)>(?P<title>[^<([]+)(?:\[(?P<lang>Sub-ITA|B/N)\])?\s?(?:\[(?P<quality>HD|SD|HD/3D)\])?\s?\((?P<year>[0-9]{4})\)<\/a>"
+    pagination = 20
 
     return locals()
 
@@ -93,11 +98,12 @@ def search(item, text):
 @support.scrape
 def peliculas(item):
     if '/serietv/' not in item.url:
-        patron = r'<div class="?card-image"?>.*?<img src="?(?P<thumb>[^" ]+)"? alt.*?<a href="?(?P<url>[^" >]+)(?:\/|")>(?P<title>[^<[(]+)(?:\[(?P<quality>[A-Za-z0-9/-]+)])? (?:\((?P<year>[0-9]{4})\))?.*?<strong>(?P<genre>[^<>&]+).*?DURATA (?P<duration>[0-9]+).*?<br(?: /)?>(?P<plot>[^<>]+)'
+        patron = r'<div class="?card-image"?>.*?<img src="?(?P<thumb>[^" ]+)"? alt.*?<a href="?(?P<url>[^" >]+)(?:\/|")>(?P<title>[^<[(]+)(?:\[(?P<quality>[A-Za-z0-9/-]+)])? (?:\((?P<year>[0-9]{4})\))?.*?<strong>(?P<genre>[^<>&–]+).*?DURATA (?P<duration>[0-9]+).*?<br(?: /)?>(?P<plot>[^<>]+)'
         action = 'findvideos'
     else:
         patron = r'div class="card-image">.*?<img src="(?P<thumb>[^ ]+)" alt.*?<a href="(?P<url>[^ >]+)">(?P<title>[^<[(]+)<\/a>.*?<strong><span style="[^"]+">(?P<genre>[^<>0-9(]+)\((?P<year>[0-9]{4}).*?</(?:p|div)>(?P<plot>.*?)</div'
         action = 'episodios'
+        item.contentType = 'tvshow'
 
     # patronBlock=[r'<div class="?sequex-page-left"?>(?P<block>.*?)<aside class="?sequex-page-right"?>',
     #                                           '<div class="?card-image"?>.*?(?=<div class="?card-image"?>|<div class="?rating"?>)']
diff --git a/core/support.py b/core/support.py
index 02994a6c..882c9fc2 100644
--- a/core/support.py
+++ b/core/support.py
@@ -133,7 +133,7 @@ def regexDbg(item, patron, headers, data=''):
         'delimiter': '"""',
         'flavor': 'python'
     }
-    r = urllib2.Request(url + '/api/regex', json.dumps(data), headers=headers)
+    r = urllib2.Request(url + '/api/regex', json.dumps(data, encoding='latin1'), headers=headers)
     r = urllib2.urlopen(r).read()
     permaLink = json.loads(r)['permalinkFragment']
     webbrowser.open(url + "/r/" + permaLink)