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

channels/altadefinizione01.json

@@ -4,8 +4,8 @@
     "language": ["ita", "sub-ita"],
     "active": true,
     "adult": false,
-    "thumbnail": "https://raw.githubusercontent.com/Zanzibar82/images/master/posters/altadefinizione01.png",
+    "thumbnail": "altadefinizione01.png",
-    "banner": "https://raw.githubusercontent.com/Zanzibar82/images/master/posters/altadefinizione01.png",
+    "banner": "altadefinizione01.png",
     "categories": ["movie", "vos"],
     "settings": []
 }

channels/altadefinizioneclick.json

@@ -4,8 +4,8 @@
     "active": true,
     "adult": false,
     "language": ["ita","sub-ita"],
-    "thumbnail": "https:\/\/raw.githubusercontent.com\/Zanzibar82\/images\/master\/posters\/altadefinizioneclick.png",
+    "thumbnail": "altadefinizioneclick.png",
-    "bannermenu": "https:\/\/raw.githubusercontent.com\/Zanzibar82\/images\/master\/posters\/altadefinizioneciclk.png",
+    "bannermenu": "altadefinizioneciclk.png",
     "categories": ["movie","vos"],
     "settings": []
 }

channels/animeleggendari.py

@@ -74,10 +74,10 @@ def peliculas(item):
 
 @support.scrape
 def episodios(item):
-    data = support.match(item, headers=headers).data
+    data = support.match(item, headers=headers, patronBlock=r'entry-content clearfix">(.*?)class="mh-widget mh-posts-2 widget_text').block
-    if not any(x in data for x in ['Lista Episodi', 'Movie Parte']):
+    if not 'pagination clearfix' in data:
         support.log('NOT IN DATA')
-        patron = r'(?:iframe src|str)="(?P<url>[^"]+)"'
+        patron = r'<iframe.*?src="(?P<url>[^"]+)"'
         title = item.title
         def fullItemlistHook(itemlist):
             url = ''
@@ -120,7 +120,7 @@ def findvideos(item):
     if item.data:
         data = item.data
     else:
-        matches = support.match(item, patron=r'(?:str="([^"]+)"|iframe src="([^"]+)")').matches
+        matches = support.match(item, patron=r'<iframe.*?src="(?P<url>[^"]+)"').matches
         data = ''
         if matches:
             for match in matches:

channels/animeunity.py

@@ -86,10 +86,11 @@ def peliculas(item):
 
 @support.scrape
 def episodios(item):
+    # debug = True
     data = item.data
     anime = True
     pagination = 50
-    patron = r'<a href="([^"]+)" class="\D+ep-button">(?P<episode>\d+)'
+    patron = r'<a href="(?P<url>[^"]+)" class="\D+ep-button">(?P<episode>\d+)'
     def itemHook(item):
         item.title = item.title + support.typo(item.fulltitle,'-- bold')
         return item
@@ -99,14 +100,14 @@ def episodios(item):
 def findvideos(item):
     support.log()
     html = support.match(item, patron=r'TIPO:\s*</b>\s*([A-Za-z]+)')
-    if html.match == 'TV':
+    if html.match == 'TV' and item.contentType != 'episode':
         item.contentType = 'tvshow'
         item.data = html.data
         return episodios(item)
     else:
         itemlist = []
+        if item.contentType != 'episode': item.contentType = 'movie'
         video = support.match(html.data, patron=r'<source src="([^"]+)"').match
-        item.contentType = 'movie'
         itemlist.append(
             support.Item(
                 channel=item.channel,

channels/italiaserie.json

@@ -4,8 +4,8 @@
     "active": true,
     "adult": false,
     "language": ["ita","sub-ita"],
-    "thumbnail": "https:\/\/raw.githubusercontent.com\/Zanzibar82\/images\/master\/posters\/italiaserie.png",
+    "thumbnail": "italiaserie.png",
-    "bannermenu": "https:\/\/raw.githubusercontent.com\/Zanzibar82\/images\/master\/posters\/italiaserie.png",
+    "bannermenu": "italiaserie.png",
     "categories": ["tvshow", "vos"],
     "not_active": ["include_in_newest_peliculas", "include_in_newest_anime"],
     "settings": []

channels/vedohd.json

@@ -4,33 +4,8 @@
 	"language": ["ita"],
 	"active": true,
 	"adult": false,
-	"thumbnail": "https://vedohd.pw/wp-content/uploads/2018/12/imgpsh_fullsize.png",
+	"thumbnail": "vedohd.png",
-	"banner": "https://vedohd.pw/wp-content/uploads/2018/12/imgpsh_fullsize.png",
+	"banner": "vedohd.png",
 	"categories": ["movie"],
-	"settings": [
+	"settings": []
-		{
-		  "id": "include_in_global_search",
-		  "type": "bool",
-		  "label": "Includi in Ricerca Globale",
-		  "default": true,
-		  "enabled": true,
-		  "visible": true
-		},
-		{
-          "id": "include_in_newest_peliculas",
-          "type": "bool",
-          "label": "Includi in Novità - Film",
-          "default": true,
-          "enabled": true,
-          "visible": true
-        },
-        {
-          "id": "include_in_newest_italiano",
-          "type": "bool",
-          "label": "Includi in Novità - Italiano",
-          "default": true,
-          "enabled": true,
-          "visible": true
-        }
-	  ]
 }

core/support.py

@@ -638,8 +638,9 @@ def menu(func):
 
         item = args['item']
         host = func.__globals__['host']
-        list_servers = func.__globals__['list_servers'] if 'list_servers' in func.__globals__ else 'directo'
+        list_servers = func.__globals__['list_servers'] if 'list_servers' in func.__globals__ else ['directo']
-        list_quality = func.__globals__['list_quality'] if 'list_quality' in func.__globals__ else 'default'
+        list_quality = func.__globals__['list_quality'] if 'list_quality' in func.__globals__ else ['default']
+        log('LIST QUALITY', list_quality)
         filename = func.__module__.split('.')[1]
         global_search = False
         # listUrls = ['film', 'filmSub', 'tvshow', 'tvshowSub', 'anime', 'animeSub', 'search', 'top', 'topSub']

servers/akstream.py

@@ -37,7 +37,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     i = 0
     for media_url in matches:
         # URL del vídeo
-        video_urls.append([vres[i] + " mp4 [Akvideo] ", media_url + '|' + _headers])
+        video_urls.append([vres[i] + " mp4 [Akvideo] ", media_url.replace('https://', 'http://') + '|' + _headers])
         i = i + 1
 
     for video_url in video_urls:

servers/mixdrop.json

@@ -4,7 +4,7 @@
     "ignore_urls": [],
     "patterns": [
       {
-        "pattern": "mixdrop.co/(?:f|e)/([a-z0-9]+)",
+        "pattern": "mixdrop.[^/]+/(?:f|e)/([a-z0-9]+)",
         "url": "https://mixdrop.co/e/\\1"
       }
     ]