diff --git a/core/channeltools.py b/core/channeltools.py index 359dd5c7..99ceae65 100644 --- a/core/channeltools.py +++ b/core/channeltools.py @@ -12,6 +12,8 @@ from platformcode import config, logger DEFAULT_UPDATE_URL = "/channels/" dict_channels_parameters = dict() +remote_path = 'https://raw.githubusercontent.com/kodiondemand/media/master/' + def is_adult(channel_name): logger.info("channel_name=" + channel_name) @@ -56,14 +58,11 @@ def get_channel_parameters(channel_name): # Imagenes: se admiten url y archivos locales dentro de "resources/images" if channel_parameters.get("thumbnail") and "://" not in channel_parameters["thumbnail"]: - channel_parameters["thumbnail"] = os.path.join(config.get_runtime_path(), "resources", "media", - "channels", "thumb", channel_parameters["thumbnail"]) + channel_parameters["thumbnail"] = os.path.join(remote_path, 'resources', "thumb", channel_parameters["thumbnail"]) if channel_parameters.get("banner") and "://" not in channel_parameters["banner"]: - channel_parameters["banner"] = os.path.join(config.get_runtime_path(), "resources", "media", - "channels", "banner", channel_parameters["banner"]) + channel_parameters["banner"] = os.path.join(remote_path, 'resources', "banner", channel_parameters["banner"]) if channel_parameters.get("fanart") and "://" not in channel_parameters["fanart"]: - channel_parameters["fanart"] = os.path.join(config.get_runtime_path(), "resources", "media", - "channels", "fanart", channel_parameters["fanart"]) + channel_parameters["fanart"] = os.path.join(remote_path, 'resources', "fanart", channel_parameters["fanart"]) # Obtenemos si el canal tiene opciones de configuración channel_parameters["has_settings"] = False diff --git a/core/servertools.py b/core/servertools.py index 1b2b3d12..2052326c 100644 --- a/core/servertools.py +++ b/core/servertools.py @@ -458,8 +458,7 @@ def get_server_parameters(server): # Imagenes: se admiten url y archivos locales dentro de "resources/images" if dict_server.get("thumbnail") and "://" not in dict_server["thumbnail"]: - dict_server["thumbnail"] = os.path.join(config.get_runtime_path(), "resources", "media", - "servers", dict_server["thumbnail"]) + dict_server["thumbnail"] = os.path.join("https://raw.githubusercontent.com/kodiondemand/media/master/resources/servers", dict_server["thumbnail"]) for k in ['premium', 'id']: dict_server[k] = dict_server.get(k, list()) diff --git a/resources/media/channels/banner/altadefinizione01_L.png b/resources/media/channels/banner/altadefinizione01_L.png deleted file mode 100644 index aba74bde..00000000 Binary files a/resources/media/channels/banner/altadefinizione01_L.png and /dev/null differ diff --git a/resources/media/channels/banner/animeforce.png b/resources/media/channels/banner/animeforce.png deleted file mode 100644 index 0a6c312f..00000000 Binary files a/resources/media/channels/banner/animeforce.png and /dev/null differ diff --git a/resources/media/channels/banner/animepertutti.png b/resources/media/channels/banner/animepertutti.png deleted file mode 100644 index 85725705..00000000 Binary files a/resources/media/channels/banner/animepertutti.png and /dev/null differ diff --git a/resources/media/channels/banner/animesaturn.png b/resources/media/channels/banner/animesaturn.png deleted file mode 100644 index 4b3018b2..00000000 Binary files a/resources/media/channels/banner/animesaturn.png and /dev/null differ diff --git a/resources/media/channels/banner/animesubita.png b/resources/media/channels/banner/animesubita.png deleted file mode 100644 index b62bf2bf..00000000 Binary files a/resources/media/channels/banner/animesubita.png and /dev/null differ diff --git a/resources/media/channels/banner/animeworld.png b/resources/media/channels/banner/animeworld.png deleted file mode 100644 index 7f727b4f..00000000 Binary files a/resources/media/channels/banner/animeworld.png and /dev/null differ diff --git a/resources/media/channels/banner/canalporno.png b/resources/media/channels/banner/canalporno.png deleted file mode 100644 index ccc56c91..00000000 Binary files a/resources/media/channels/banner/canalporno.png and /dev/null differ diff --git a/resources/media/channels/banner/cb01anime.png b/resources/media/channels/banner/cb01anime.png deleted file mode 100644 index a7fffed2..00000000 Binary files a/resources/media/channels/banner/cb01anime.png and /dev/null differ diff --git a/resources/media/channels/banner/cinetemagay.png b/resources/media/channels/banner/cinetemagay.png deleted file mode 100644 index 3ac1a9f5..00000000 Binary files a/resources/media/channels/banner/cinetemagay.png and /dev/null differ diff --git a/resources/media/channels/banner/cumlouder.png b/resources/media/channels/banner/cumlouder.png deleted file mode 100644 index cd2805e1..00000000 Binary files a/resources/media/channels/banner/cumlouder.png and /dev/null differ diff --git a/resources/media/channels/banner/datoporn.png b/resources/media/channels/banner/datoporn.png deleted file mode 100644 index 1d3100f7..00000000 Binary files a/resources/media/channels/banner/datoporn.png and /dev/null differ diff --git a/resources/media/channels/banner/dreamsub.png b/resources/media/channels/banner/dreamsub.png deleted file mode 100644 index 23f021c5..00000000 Binary files a/resources/media/channels/banner/dreamsub.png and /dev/null differ diff --git a/resources/media/channels/banner/eporner.png b/resources/media/channels/banner/eporner.png deleted file mode 100644 index 55e44183..00000000 Binary files a/resources/media/channels/banner/eporner.png and /dev/null differ diff --git a/resources/media/channels/banner/eurostreaming.png b/resources/media/channels/banner/eurostreaming.png deleted file mode 100644 index 0e4fdf0b..00000000 Binary files a/resources/media/channels/banner/eurostreaming.png and /dev/null differ diff --git a/resources/media/channels/banner/fastsubita.png b/resources/media/channels/banner/fastsubita.png deleted file mode 100644 index 2d226718..00000000 Binary files a/resources/media/channels/banner/fastsubita.png and /dev/null differ diff --git a/resources/media/channels/banner/guardaserieclick.png b/resources/media/channels/banner/guardaserieclick.png deleted file mode 100644 index 027c3c32..00000000 Binary files a/resources/media/channels/banner/guardaserieclick.png and /dev/null differ diff --git a/resources/media/channels/banner/pelisxporno.png b/resources/media/channels/banner/pelisxporno.png deleted file mode 100644 index 1436a2f9..00000000 Binary files a/resources/media/channels/banner/pelisxporno.png and /dev/null differ diff --git a/resources/media/channels/banner/polpotv.png b/resources/media/channels/banner/polpotv.png deleted file mode 100644 index c5a153df..00000000 Binary files a/resources/media/channels/banner/polpotv.png and /dev/null differ diff --git a/resources/media/channels/banner/pornhub.png b/resources/media/channels/banner/pornhub.png deleted file mode 100644 index bc8d7cb8..00000000 Binary files a/resources/media/channels/banner/pornhub.png and /dev/null differ diff --git a/resources/media/channels/banner/seriehd.png b/resources/media/channels/banner/seriehd.png deleted file mode 100644 index 027c0a15..00000000 Binary files a/resources/media/channels/banner/seriehd.png and /dev/null differ diff --git a/resources/media/channels/banner/serietvsubita.png b/resources/media/channels/banner/serietvsubita.png deleted file mode 100644 index 62f21d1c..00000000 Binary files a/resources/media/channels/banner/serietvsubita.png and /dev/null differ diff --git a/resources/media/channels/banner/serietvu.png b/resources/media/channels/banner/serietvu.png deleted file mode 100644 index 9e1c0929..00000000 Binary files a/resources/media/channels/banner/serietvu.png and /dev/null differ diff --git a/resources/media/channels/banner/serviporno.png b/resources/media/channels/banner/serviporno.png deleted file mode 100644 index dc401ada..00000000 Binary files a/resources/media/channels/banner/serviporno.png and /dev/null differ diff --git a/resources/media/channels/banner/submityouflicks.png b/resources/media/channels/banner/submityouflicks.png deleted file mode 100644 index 590cc6c2..00000000 Binary files a/resources/media/channels/banner/submityouflicks.png and /dev/null differ diff --git a/resources/media/channels/banner/tubehentai.png b/resources/media/channels/banner/tubehentai.png deleted file mode 100644 index 0a12cc29..00000000 Binary files a/resources/media/channels/banner/tubehentai.png and /dev/null differ diff --git a/resources/media/channels/banner/vvvvid.png b/resources/media/channels/banner/vvvvid.png deleted file mode 100644 index 5dcad186..00000000 Binary files a/resources/media/channels/banner/vvvvid.png and /dev/null differ diff --git a/resources/media/channels/banner/xhamster.png b/resources/media/channels/banner/xhamster.png deleted file mode 100644 index e9b137f7..00000000 Binary files a/resources/media/channels/banner/xhamster.png and /dev/null differ diff --git a/resources/media/channels/banner/yespornplease.png b/resources/media/channels/banner/yespornplease.png deleted file mode 100644 index 07084bd7..00000000 Binary files a/resources/media/channels/banner/yespornplease.png and /dev/null differ diff --git a/resources/media/channels/thumb/altadefinizione01_L.png b/resources/media/channels/thumb/altadefinizione01_L.png deleted file mode 100644 index 8c3a276e..00000000 Binary files a/resources/media/channels/thumb/altadefinizione01_L.png and /dev/null differ diff --git a/resources/media/channels/thumb/animeforce.png b/resources/media/channels/thumb/animeforce.png deleted file mode 100644 index 5016d5bc..00000000 Binary files a/resources/media/channels/thumb/animeforce.png and /dev/null differ diff --git a/resources/media/channels/thumb/animepertutti.png b/resources/media/channels/thumb/animepertutti.png deleted file mode 100644 index 7e53be26..00000000 Binary files a/resources/media/channels/thumb/animepertutti.png and /dev/null differ diff --git a/resources/media/channels/thumb/animesaturn.png b/resources/media/channels/thumb/animesaturn.png deleted file mode 100644 index 06698c62..00000000 Binary files a/resources/media/channels/thumb/animesaturn.png and /dev/null differ diff --git a/resources/media/channels/thumb/animesubita.png b/resources/media/channels/thumb/animesubita.png deleted file mode 100644 index 63115262..00000000 Binary files a/resources/media/channels/thumb/animesubita.png and /dev/null differ diff --git a/resources/media/channels/thumb/animeworld.png b/resources/media/channels/thumb/animeworld.png deleted file mode 100644 index d0b57098..00000000 Binary files a/resources/media/channels/thumb/animeworld.png and /dev/null differ diff --git a/resources/media/channels/thumb/cb01.png b/resources/media/channels/thumb/cb01.png deleted file mode 100644 index 6acba322..00000000 Binary files a/resources/media/channels/thumb/cb01.png and /dev/null differ diff --git a/resources/media/channels/thumb/cb01anime.png b/resources/media/channels/thumb/cb01anime.png deleted file mode 100644 index c2f64cac..00000000 Binary files a/resources/media/channels/thumb/cb01anime.png and /dev/null differ diff --git a/resources/media/channels/thumb/cinetemagay.png b/resources/media/channels/thumb/cinetemagay.png deleted file mode 100644 index 584dd8bd..00000000 Binary files a/resources/media/channels/thumb/cinetemagay.png and /dev/null differ diff --git a/resources/media/channels/thumb/cumlouder.png b/resources/media/channels/thumb/cumlouder.png deleted file mode 100644 index fa685d5e..00000000 Binary files a/resources/media/channels/thumb/cumlouder.png and /dev/null differ diff --git a/resources/media/channels/thumb/documentaristreamingda.png b/resources/media/channels/thumb/documentaristreamingda.png deleted file mode 100644 index c9342c90..00000000 Binary files a/resources/media/channels/thumb/documentaristreamingda.png and /dev/null differ diff --git a/resources/media/channels/thumb/dreamsub.png b/resources/media/channels/thumb/dreamsub.png deleted file mode 100644 index 52079bbd..00000000 Binary files a/resources/media/channels/thumb/dreamsub.png and /dev/null differ diff --git a/resources/media/channels/thumb/eporner.png b/resources/media/channels/thumb/eporner.png deleted file mode 100644 index d63d7748..00000000 Binary files a/resources/media/channels/thumb/eporner.png and /dev/null differ diff --git a/resources/media/channels/thumb/eurostreaming.png b/resources/media/channels/thumb/eurostreaming.png deleted file mode 100644 index e9622737..00000000 Binary files a/resources/media/channels/thumb/eurostreaming.png and /dev/null differ diff --git a/resources/media/channels/thumb/fastsubita.png b/resources/media/channels/thumb/fastsubita.png deleted file mode 100644 index d1d7be10..00000000 Binary files a/resources/media/channels/thumb/fastsubita.png and /dev/null differ diff --git a/resources/media/channels/thumb/filmigratis.png b/resources/media/channels/thumb/filmigratis.png deleted file mode 100644 index d623d0b6..00000000 Binary files a/resources/media/channels/thumb/filmigratis.png and /dev/null differ diff --git a/resources/media/channels/thumb/guardaserieclick.png b/resources/media/channels/thumb/guardaserieclick.png deleted file mode 100644 index 58ae6dca..00000000 Binary files a/resources/media/channels/thumb/guardaserieclick.png and /dev/null differ diff --git a/resources/media/channels/thumb/mondolunatico2.png b/resources/media/channels/thumb/mondolunatico2.png deleted file mode 100644 index 02040801..00000000 Binary files a/resources/media/channels/thumb/mondolunatico2.png and /dev/null differ diff --git a/resources/media/channels/thumb/polpotv.png b/resources/media/channels/thumb/polpotv.png deleted file mode 100644 index 8b4d3943..00000000 Binary files a/resources/media/channels/thumb/polpotv.png and /dev/null differ diff --git a/resources/media/channels/thumb/seriehd.png b/resources/media/channels/thumb/seriehd.png deleted file mode 100644 index e310b89f..00000000 Binary files a/resources/media/channels/thumb/seriehd.png and /dev/null differ diff --git a/resources/media/channels/thumb/serietvsubita.png b/resources/media/channels/thumb/serietvsubita.png deleted file mode 100644 index 38709e2a..00000000 Binary files a/resources/media/channels/thumb/serietvsubita.png and /dev/null differ diff --git a/resources/media/channels/thumb/serietvu.png b/resources/media/channels/thumb/serietvu.png deleted file mode 100644 index 3835135f..00000000 Binary files a/resources/media/channels/thumb/serietvu.png and /dev/null differ diff --git a/resources/media/channels/thumb/serviporno.png b/resources/media/channels/thumb/serviporno.png deleted file mode 100644 index a9b2eec6..00000000 Binary files a/resources/media/channels/thumb/serviporno.png and /dev/null differ diff --git a/resources/media/channels/thumb/submityouflicks.png b/resources/media/channels/thumb/submityouflicks.png deleted file mode 100644 index ae42cce2..00000000 Binary files a/resources/media/channels/thumb/submityouflicks.png and /dev/null differ diff --git a/resources/media/channels/thumb/thumb_intervenido_gc.png b/resources/media/channels/thumb/thumb_intervenido_gc.png deleted file mode 100644 index eb0dcf4f..00000000 Binary files a/resources/media/channels/thumb/thumb_intervenido_gc.png and /dev/null differ diff --git a/resources/media/channels/thumb/thumb_intervenido_pn.jpeg b/resources/media/channels/thumb/thumb_intervenido_pn.jpeg deleted file mode 100644 index f9a87e4a..00000000 Binary files a/resources/media/channels/thumb/thumb_intervenido_pn.jpeg and /dev/null differ diff --git a/resources/media/channels/thumb/thumb_intervenido_sucuri.png b/resources/media/channels/thumb/thumb_intervenido_sucuri.png deleted file mode 100644 index 7c7f08ee..00000000 Binary files a/resources/media/channels/thumb/thumb_intervenido_sucuri.png and /dev/null differ diff --git a/resources/media/channels/thumb/toonitalia.png b/resources/media/channels/thumb/toonitalia.png deleted file mode 100644 index 15c31ab6..00000000 Binary files a/resources/media/channels/thumb/toonitalia.png and /dev/null differ diff --git a/resources/media/channels/thumb/tubehentai.png b/resources/media/channels/thumb/tubehentai.png deleted file mode 100644 index 3b186812..00000000 Binary files a/resources/media/channels/thumb/tubehentai.png and /dev/null differ diff --git a/resources/media/channels/thumb/tupornotv.png b/resources/media/channels/thumb/tupornotv.png deleted file mode 100644 index 49a77d3a..00000000 Binary files a/resources/media/channels/thumb/tupornotv.png and /dev/null differ diff --git a/resources/media/channels/thumb/url.png b/resources/media/channels/thumb/url.png deleted file mode 100644 index 2ed901f7..00000000 Binary files a/resources/media/channels/thumb/url.png and /dev/null differ diff --git a/resources/media/channels/thumb/vvvvid.png b/resources/media/channels/thumb/vvvvid.png deleted file mode 100644 index 63d3406f..00000000 Binary files a/resources/media/channels/thumb/vvvvid.png and /dev/null differ diff --git a/resources/media/channels/thumb/xhamster.png b/resources/media/channels/thumb/xhamster.png deleted file mode 100644 index bcc48d7d..00000000 Binary files a/resources/media/channels/thumb/xhamster.png and /dev/null differ diff --git a/resources/media/channels/thumb/yespornplease.png b/resources/media/channels/thumb/yespornplease.png deleted file mode 100644 index 20c30eec..00000000 Binary files a/resources/media/channels/thumb/yespornplease.png and /dev/null differ diff --git a/resources/media/servers/server_filefactory.png b/resources/media/servers/server_filefactory.png deleted file mode 100644 index 17d561c4..00000000 Binary files a/resources/media/servers/server_filefactory.png and /dev/null differ diff --git a/resources/media/servers/server_flashx.png b/resources/media/servers/server_flashx.png deleted file mode 100644 index 0bd65fae..00000000 Binary files a/resources/media/servers/server_flashx.png and /dev/null differ diff --git a/resources/media/servers/server_gamovideo.png b/resources/media/servers/server_gamovideo.png deleted file mode 100644 index 08bf9194..00000000 Binary files a/resources/media/servers/server_gamovideo.png and /dev/null differ diff --git a/resources/media/servers/server_hugefiles.png b/resources/media/servers/server_hugefiles.png deleted file mode 100644 index dc7d7993..00000000 Binary files a/resources/media/servers/server_hugefiles.png and /dev/null differ diff --git a/resources/media/servers/server_mega.png b/resources/media/servers/server_mega.png deleted file mode 100644 index 837da85f..00000000 Binary files a/resources/media/servers/server_mega.png and /dev/null differ diff --git a/resources/media/servers/server_netutv.png b/resources/media/servers/server_netutv.png deleted file mode 100644 index 800afc12..00000000 Binary files a/resources/media/servers/server_netutv.png and /dev/null differ diff --git a/resources/media/servers/server_okru.png b/resources/media/servers/server_okru.png deleted file mode 100644 index 22772ef1..00000000 Binary files a/resources/media/servers/server_okru.png and /dev/null differ diff --git a/resources/media/servers/server_onefichier.png b/resources/media/servers/server_onefichier.png deleted file mode 100644 index 97a4326e..00000000 Binary files a/resources/media/servers/server_onefichier.png and /dev/null differ diff --git a/resources/media/servers/server_openload.png b/resources/media/servers/server_openload.png deleted file mode 100644 index 80cf4b1e..00000000 Binary files a/resources/media/servers/server_openload.png and /dev/null differ diff --git a/resources/media/servers/server_powvideo.png b/resources/media/servers/server_powvideo.png deleted file mode 100644 index 29552b26..00000000 Binary files a/resources/media/servers/server_powvideo.png and /dev/null differ diff --git a/resources/media/servers/server_rapidgator.png b/resources/media/servers/server_rapidgator.png deleted file mode 100644 index ef2e9c6b..00000000 Binary files a/resources/media/servers/server_rapidgator.png and /dev/null differ diff --git a/resources/media/servers/server_rutube.png b/resources/media/servers/server_rutube.png deleted file mode 100644 index 9465e91b..00000000 Binary files a/resources/media/servers/server_rutube.png and /dev/null differ diff --git a/resources/media/servers/server_streamcloud.png b/resources/media/servers/server_streamcloud.png deleted file mode 100644 index d5d83b8a..00000000 Binary files a/resources/media/servers/server_streamcloud.png and /dev/null differ diff --git a/resources/media/servers/server_turbobit.png b/resources/media/servers/server_turbobit.png deleted file mode 100644 index 04979bf0..00000000 Binary files a/resources/media/servers/server_turbobit.png and /dev/null differ diff --git a/resources/media/servers/server_uploadedto.png b/resources/media/servers/server_uploadedto.png deleted file mode 100644 index 51f9079b..00000000 Binary files a/resources/media/servers/server_uploadedto.png and /dev/null differ diff --git a/resources/media/servers/server_uptobox.png b/resources/media/servers/server_uptobox.png deleted file mode 100644 index 8ffe1cc0..00000000 Binary files a/resources/media/servers/server_uptobox.png and /dev/null differ diff --git a/resources/media/servers/server_vimpleru.png b/resources/media/servers/server_vimpleru.png deleted file mode 100644 index 7f64a7c4..00000000 Binary files a/resources/media/servers/server_vimpleru.png and /dev/null differ diff --git a/resources/media/servers/server_vk.png b/resources/media/servers/server_vk.png deleted file mode 100644 index 65bdaa66..00000000 Binary files a/resources/media/servers/server_vk.png and /dev/null differ diff --git a/resources/media/servers/server_vshare.png b/resources/media/servers/server_vshare.png deleted file mode 100644 index 769a9a11..00000000 Binary files a/resources/media/servers/server_vshare.png and /dev/null differ diff --git a/resources/media/servers/server_youtube.png b/resources/media/servers/server_youtube.png deleted file mode 100644 index 6f2cb995..00000000 Binary files a/resources/media/servers/server_youtube.png and /dev/null differ