up

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