up

channels/cinemalibero.py

@@ -23,20 +23,9 @@ list_quality = ['default']
 checklinks = config.get_setting('checklinks', 'cinemalibero')
 checklinks_number = config.get_setting('checklinks_number', 'cinemalibero')
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-#host = 'https://www.cinemalibero.fun/'
-=======
-__channel__ = "cinemalibero"
-host = config.get_channel_url(__channel__)
->>>>>>> kodiondemand-master
-
-host = config.get_setting("channel_host", __channel__)
-=======
 __channel__ = "cinemalibero"
 host = config.get_channel_url(__channel__)
 
->>>>>>> e5c926a6784a44ffd5486b4d34bb7ae92408622e
 headers = [['Referer', host]]
 
 def mainlist(item):
@@ -56,18 +45,7 @@ def mainlist(item):
 
     autoplay.show_option(item.channel, itemlist) # Necessario per Autoplay (Menu Configurazione)
 
-<<<<<<< HEAD
-    itemlist.append(
-        Item(channel='setting',
-             action="channel_config",
-             title=support.typo("Configurazione Canale color lime"),
-             config=item.channel,
-             folder=False,
-             thumbnail=channelselector.get_thumb('setting_0.png'))
-    )
-=======
     support.channel_config(item, itemlist)
->>>>>>> kodiondemand-master
     
     return itemlist
 

channels/eurostreaming.py

@@ -24,17 +24,7 @@ from core.item import Item
 from platformcode import logger, config
 
 __channel__ = "eurostreaming"
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-#host = "https://eurostreaming.cafe/"
-host = config.get_setting("channel_host", __channel__)
-=======
 host = config.get_channel_url(__channel__)
->>>>>>> kodiondemand-master
-=======
-host = config.get_channel_url(__channel__)
->>>>>>> e5c926a6784a44ffd5486b4d34bb7ae92408622e
 headers = ['Referer', host]
 
 list_servers = ['verystream', 'wstream', 'speedvideo', 'flashx', 'nowvideo', 'streamango', 'deltabit', 'openload']
@@ -51,35 +41,18 @@ def mainlist(item):
     support.log()    
     itemlist = []
     
-    support.menu(itemlist, 'Serie TV', 'serietv', host, contentType = 'episode') # mettere sempre episode per serietv, anime!!
+    support.menu(itemlist, 'Serie TV', 'serietv', host, contentType = 'tvshow') # mettere sempre episode per serietv, anime!!
-<<<<<<< HEAD
+    support.menu(itemlist, 'Serie TV Archivio submenu', 'serietv', host + "/category/serie-tv-archive/", contentType = 'tvshow')
-    support.menu(itemlist, 'Serie TV Archivio submenu', 'serietv', host + "category/serie-tv-archive/", contentType = 'episode')
+    support.menu(itemlist, 'Ultimi Aggiornamenti submenu', 'serietv', host + '/aggiornamento-episodi/', args='True', contentType = 'tvshow')
-    support.menu(itemlist, 'Ultimi Aggiornamenti submenu', 'serietv', host + 'aggiornamento-episodi/', args='True', contentType = 'episode')
+    support.menu(itemlist, 'Anime / Cartoni', 'serietv', host + '/category/anime-cartoni-animati/', contentType = 'tvshow')
-    support.menu(itemlist, 'Anime / Cartoni', 'serietv', host + 'category/anime-cartoni-animati/', contentType = 'episode')
+    support.menu(itemlist, 'Cerca...', 'search', host, contentType = 'tvshow')
-=======
-    support.menu(itemlist, 'Serie TV Archivio submenu', 'serietv', host + "/category/serie-tv-archive/", contentType = 'episode')
-    support.menu(itemlist, 'Ultimi Aggiornamenti submenu', 'serietv', host + '/aggiornamento-episodi/', args='True', contentType = 'episode')
-    support.menu(itemlist, 'Anime / Cartoni', 'serietv', host + '/category/anime-cartoni-animati/', contentType = 'episode')
->>>>>>> kodiondemand-master
-    support.menu(itemlist, 'Cerca...', 'search', host, contentType = 'episode')
 
 ##    itemlist = filtertools.show_option(itemlist, item.channel, list_language, list_quality)
     # richiesto per autoplay
     autoplay.init(item.channel, list_servers, list_quality)
     autoplay.show_option(item.channel, itemlist)
 
-<<<<<<< HEAD
-    itemlist.append(
-        Item(channel='setting',
-             action="channel_config",
-             title=support.typo("Configurazione Canale color lime"),
-             config=item.channel,
-             folder=False,
-             thumbnail=channelselector.get_thumb('setting_0.png'))
-    )
-=======
     support.channel_config(item, itemlist)
->>>>>>> kodiondemand-master
     
     return itemlist
 
@@ -156,17 +129,10 @@ def episodios(item):
 def findvideos(item):
     support.log()
     itemlist =[]
-<<<<<<< HEAD
 
     # Requerido para FilterTools
 ##    itemlist = filtertools.get_links(itemlist, item, list_language)
 
-=======
-
-    # Requerido para FilterTools
-##    itemlist = filtertools.get_links(itemlist, item, list_language)
-
->>>>>>> kodiondemand-master
     itemlist = support.server(item, item.url)
 ##    support.videolibrary(itemlist, item)
     

servers/deltabit.py

@@ -7,41 +7,3 @@ def test_video_exists(page_url):
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
     return turbovid.get_video_url(page_url, premium, user, password, video_password, 'deltabit')
-<<<<<<< HEAD
-
-##import time
-##import urllib
-##
-##from core import httptools
-##from core import scrapertools
-##from platformcode import logger
-##
-##
-##def test_video_exists(page_url):
-##    logger.info("(page_url='%s')" % page_url)
-##    data = httptools.downloadpage(page_url).data
-##    if "Not Found" in data or "File Does not Exist" in data:
-##        return False, "[deltabit] El fichero no existe o ha sido borrado"
-##    return True, ""
-##
-##
-##def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-####    logger.info("(deltabit page_url='%s')" % page_url)
-##    video_urls = []
-##    data = httptools.downloadpage(page_url).data
-##    data = data.replace('"', "'")
-##    page_url_post = scrapertools.find_single_match(data, "<Form method='POST' action='([^']+)'>")
-##    imhuman = "&imhuman=" + scrapertools.find_single_match(data, "name='imhuman' value='([^']+)'").replace(" ", "+")
-##    post = urllib.urlencode({k: v for k, v in scrapertools.find_multiple_matches(data, "name='([^']+)' value='([^']*)'")}) + imhuman
-##    time.sleep(6)
-##    data = httptools.downloadpage(page_url_post, post=post).data
-####    logger.info("(data page_url='%s')" % data)
-##    sources = scrapertools.find_single_match(data, 'sources: \[([^\]]+)\]')
-##    
-##    for media_url in scrapertools.find_multiple_matches(sources, '"([^"]+)"'):
-##        media_url = media_url.replace('https:', 'http:')
-##        ext = scrapertools.get_filename_from_url(media_url)[-4:]
-##        video_urls.append(["%s [deltabit]" % (ext), media_url])    
-##    return video_urls
-=======
->>>>>>> kodiondemand-master

servers/speedvideo.json

@@ -5,23 +5,12 @@
     "patterns": [
       {
         "pattern": "speedvideo.net/(?:embed-|)([A-Z0-9a-z]+)",
-<<<<<<< HEAD
-<<<<<<< HEAD
-        "url": "https:\/\/speedvideo.net\/embed-\\1.html"
-      }  
-=======
-=======
->>>>>>> e5c926a6784a44ffd5486b4d34bb7ae92408622e
         "url": "http://speedvideo.net/embed-\\1.html"
       },
       {
         "pattern": "speedvideo.net/(?:embed-|)([A-Z0-9a-z]+)",
         "url": "https://speedvideo.net/embed-\\1.html"
       }
-<<<<<<< HEAD
->>>>>>> kodiondemand-master
-=======
->>>>>>> e5c926a6784a44ffd5486b4d34bb7ae92408622e
     ]
   },
   "free": true,

servers/turbovid.py

@@ -33,9 +33,5 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     for media_url in scrapertools.find_multiple_matches(sources, '"([^"]+)"'):
         media_url = media_url.replace('https:', 'http:')
         ext = scrapertools.get_filename_from_url(media_url)[-4:]
-<<<<<<< HEAD
-        video_urls.append(["%s [turbovid]" % (ext), media_url])    
-=======
         video_urls.append(["%s [%s]" % (ext, server), media_url])
->>>>>>> kodiondemand-master
     return video_urls