merged from develop

This commit is contained in:
alfa_addon_10
2017-08-13 17:07:36 +02:00
parent ebda6babdd
commit ed553f5cae
398 changed files with 10399 additions and 2029 deletions
+2 -3
View File
@@ -9,11 +9,10 @@ import re
import time
import urlparse
from core import config
from core import httptools
from core import jsontools
from core import logger
from core.item import Item
from platformcode import config, logger
from platformcode import platformtools
dict_servers_parameters = {}
@@ -260,7 +259,7 @@ def resolve_video_urls_for_playing(server, url, video_password="", muestra_dialo
["free"] + [server] + [premium for premium in server_parameters["premium"] if not premium == server],
[server] + [premium for premium in server_parameters["premium"] if not premium == server] + ["free"],
[premium for premium in server_parameters["premium"] if not premium == server] + [server] + ["free"]
]
]
if server_parameters["free"] == True:
opciones.append("free")