From 1e07b9e0295286a56773f9626338c3bc716f2957 Mon Sep 17 00:00:00 2001 From: greko17 Date: Thu, 19 Sep 2019 10:49:43 +0200 Subject: [PATCH] extra: riorganizzazione canali spostati i canali per adulti in cartella separata --- channels.json | 1 - channels/{ => porn}/LIKUOO.json | 0 channels/{ => porn}/LIKUOO.py | 0 channels/{ => porn}/TXXX.json | 0 channels/{ => porn}/TXXX.py | 0 channels/porn/__init__.py | 12 +++++++ channels/{ => porn}/absoluporn.json | 0 channels/{ => porn}/absoluporn.py | 0 channels/{ => porn}/alsoporn.json | 0 channels/{ => porn}/alsoporn.py | 0 channels/{ => porn}/analdin.json | 0 channels/{ => porn}/analdin.py | 0 channels/{ => porn}/beeg.json | 0 channels/{ => porn}/beeg.py | 0 channels/{ => porn}/bravoporn.json | 0 channels/{ => porn}/bravoporn.py | 0 channels/{ => porn}/camwhoresbay.json | 0 channels/{ => porn}/camwhoresbay.py | 0 channels/{ => porn}/canalporno.json | 0 channels/{ => porn}/canalporno.py | 0 channels/{ => porn}/cat3plus.json | 0 channels/{ => porn}/cat3plus.py | 0 channels/{ => porn}/cinetemagay.json | 0 channels/{ => porn}/cinetemagay.py | 0 channels/{ => porn}/cliphunter.json | 0 channels/{ => porn}/cliphunter.py | 0 channels/{ => porn}/coomelonitas.json | 0 channels/{ => porn}/coomelonitas.py | 0 channels/{ => porn}/cumlouder.json | 0 channels/{ => porn}/cumlouder.py | 0 channels/{ => porn}/czechvideo.json | 0 channels/{ => porn}/czechvideo.py | 0 channels/{ => porn}/datoporn.json | 0 channels/{ => porn}/datoporn.py | 0 channels/{ => porn}/elreyx.json | 0 channels/{ => porn}/elreyx.py | 0 channels/{ => porn}/eporner.json | 0 channels/{ => porn}/eporner.py | 0 channels/{ => porn}/eroticage.json | 0 channels/{ => porn}/eroticage.py | 0 channels/{ => porn}/eroticasonlinetv.json | 0 channels/{ => porn}/eroticasonlinetv.py | 0 channels/{ => porn}/erotik.json | 0 channels/{ => porn}/erotik.py | 0 channels/{ => porn}/fapality.json | 0 channels/{ => porn}/fapality.py | 0 channels/{ => porn}/fetishshrine.json | 0 channels/{ => porn}/fetishshrine.py | 0 channels/{ => porn}/filmoviXXX.json | 0 channels/{ => porn}/filmoviXXX.py | 0 channels/{ => porn}/filmpornoita.json | 0 channels/{ => porn}/filmpornoita.py | 0 channels/{ => porn}/foxtube.json | 0 channels/{ => porn}/foxtube.py | 0 channels/{ => porn}/freeporn.json | 0 channels/{ => porn}/freeporn.py | 0 channels/{ => porn}/freepornstreams.json | 0 channels/{ => porn}/freepornstreams.py | 0 channels/{ => porn}/gotporn.json | 0 channels/{ => porn}/gotporn.py | 0 channels/{ => porn}/hclips.json | 0 channels/{ => porn}/hclips.py | 0 channels/{ => porn}/hdzog.json | 0 channels/{ => porn}/hdzog.py | 0 channels/{ => porn}/hellporno.json | 0 channels/{ => porn}/hellporno.py | 0 channels/{ => porn}/hentaiid.json | 0 channels/{ => porn}/hentaiid.py | 0 channels/{ => porn}/hotmovs.json | 0 channels/{ => porn}/hotmovs.py | 0 channels/{ => porn}/javlin.json | 0 channels/{ => porn}/javlin.py | 0 channels/{ => porn}/javtasty.json | 0 channels/{ => porn}/javtasty.py | 0 channels/{ => porn}/javus.json | 0 channels/{ => porn}/javus.py | 0 channels/{ => porn}/javwhores.json | 0 channels/{ => porn}/javwhores.py | 0 channels/{ => porn}/jizzbunker.json | 0 channels/{ => porn}/jizzbunker.py | 0 channels/{ => porn}/justporn.json | 0 channels/{ => porn}/justporn.py | 0 channels/{ => porn}/kingsizetits.json | 0 channels/{ => porn}/kingsizetits.py | 0 channels/{ => porn}/mangovideo.json | 0 channels/{ => porn}/mangovideo.py | 0 channels/{ => porn}/mporno.json | 0 channels/{ => porn}/mporno.py | 0 channels/{ => porn}/muchoporno.json | 0 channels/{ => porn}/muchoporno.py | 0 channels/{ => porn}/nuvid.json | 0 channels/{ => porn}/nuvid.py | 0 channels/{ => porn}/pandamovie.json | 0 channels/{ => porn}/pandamovie.py | 0 channels/{ => porn}/peliculaseroticas.json | 0 channels/{ => porn}/peliculaseroticas.py | 0 channels/{ => porn}/pelisxporno.json | 0 channels/{ => porn}/pelisxporno.py | 0 channels/{ => porn}/perfectgirls.json | 0 channels/{ => porn}/perfectgirls.py | 0 channels/{ => porn}/playpornx.json | 0 channels/{ => porn}/playpornx.py | 0 channels/{ => porn}/porn300.json | 0 channels/{ => porn}/porn300.py | 0 channels/{ => porn}/pornboss.json | 0 channels/{ => porn}/pornboss.py | 0 channels/{ => porn}/porndish.json | 0 channels/{ => porn}/porndish.py | 0 channels/{ => porn}/porneq.json | 0 channels/{ => porn}/porneq.py | 0 channels/{ => porn}/pornhive.json | 0 channels/{ => porn}/pornhive.py | 0 channels/{ => porn}/pornhub.json | 0 channels/{ => porn}/pornhub.py | 0 channels/{ => porn}/pornohdmega.json | 0 channels/{ => porn}/pornohdmega.py | 0 channels/{ => porn}/pornrewind.json | 0 channels/{ => porn}/pornrewind.py | 0 channels/{ => porn}/porntrex.json | 0 channels/{ => porn}/porntrex.py | 0 channels/{ => porn}/porntv.json | 0 channels/{ => porn}/porntv.py | 0 channels/{ => porn}/qwertty.json | 0 channels/{ => porn}/qwertty.py | 0 channels/{ => porn}/redtube.json | 0 channels/{ => porn}/redtube.py | 0 channels/{ => porn}/serviporno.json | 0 channels/{ => porn}/serviporno.py | 0 channels/{ => porn}/sexgalaxy.json | 0 channels/{ => porn}/sexgalaxy.py | 0 channels/{ => porn}/sexkino.json | 0 channels/{ => porn}/sexkino.py | 0 channels/{ => porn}/sexofilm.json | 0 channels/{ => porn}/sexofilm.py | 0 channels/{ => porn}/shameless.json | 0 channels/{ => porn}/shameless.py | 0 channels/{ => porn}/siska.json | 0 channels/{ => porn}/siska.py | 0 channels/{ => porn}/sleazemovies.json | 0 channels/{ => porn}/sleazemovies.py | 0 channels/{ => porn}/spankbang.json | 0 channels/{ => porn}/spankbang.py | 0 channels/{ => porn}/spankwire.json | 0 channels/{ => porn}/spankwire.py | 0 channels/{ => porn}/streamingporn.json | 0 channels/{ => porn}/streamingporn.py | 0 channels/{ => porn}/streamporno.json | 0 channels/{ => porn}/streamporno.py | 0 channels/{ => porn}/submityouflicks.json | 0 channels/{ => porn}/submityouflicks.py | 0 channels/{ => porn}/sunporno.json | 0 channels/{ => porn}/sunporno.py | 0 channels/{ => porn}/sxyprn.json | 0 channels/{ => porn}/sxyprn.py | 0 channels/{ => porn}/tabooshare.json | 0 channels/{ => porn}/tabooshare.py | 0 channels/{ => porn}/thumbzilla.json | 0 channels/{ => porn}/thumbzilla.py | 0 channels/{ => porn}/titsbox.json | 0 channels/{ => porn}/titsbox.py | 0 channels/{ => porn}/tnaflix.json | 0 channels/{ => porn}/tnaflix.py | 0 channels/{ => porn}/tryboobs.json | 0 channels/{ => porn}/tryboobs.py | 0 channels/{ => porn}/tubedupe.json | 0 channels/{ => porn}/tubedupe.py | 0 channels/{ => porn}/tubehentai.json | 0 channels/{ => porn}/tubehentai.py | 0 channels/{ => porn}/videosXYZ.json | 0 channels/{ => porn}/videosXYZ.py | 0 channels/{ => porn}/vidz7.json | 0 channels/{ => porn}/vidz7.py | 0 channels/{ => porn}/vintagetube.json | 0 channels/{ => porn}/vintagetube.py | 0 channels/{ => porn}/vintagexxxsex.json | 0 channels/{ => porn}/vintagexxxsex.py | 0 channels/{ => porn}/vivud.json | 0 channels/{ => porn}/vivud.py | 0 channels/{ => porn}/vporn.json | 0 channels/{ => porn}/vporn.py | 0 channels/{ => porn}/watchpornfree.json | 0 channels/{ => porn}/watchpornfree.py | 0 channels/{ => porn}/webpeliculasporno.json | 0 channels/{ => porn}/webpeliculasporno.py | 0 channels/{ => porn}/woodrocket.json | 0 channels/{ => porn}/woodrocket.py | 0 channels/{ => porn}/x18hentai.json | 0 channels/{ => porn}/x18hentai.py | 0 channels/{ => porn}/xhamster.json | 0 channels/{ => porn}/xhamster.py | 0 channels/{ => porn}/xms.json | 0 channels/{ => porn}/xms.py | 0 channels/{ => porn}/xozilla.json | 0 channels/{ => porn}/xozilla.py | 0 channels/{ => porn}/xtapes.json | 0 channels/{ => porn}/xtapes.py | 0 channels/{ => porn}/xvideos.json | 0 channels/{ => porn}/xvideos.py | 0 channels/{ => porn}/xxxdan.json | 0 channels/{ => porn}/xxxdan.py | 0 channels/{ => porn}/xxxfreeinhd.json | 0 channels/{ => porn}/xxxfreeinhd.py | 0 channels/{ => porn}/xxxparodyhd.json | 0 channels/{ => porn}/xxxparodyhd.py | 0 channels/{ => porn}/xxxstreams.json | 0 channels/{ => porn}/xxxstreams.py | 0 channels/{ => porn}/yespornplease.json | 0 channels/{ => porn}/yespornplease.py | 0 channels/{ => porn}/youjizz.json | 0 channels/{ => porn}/youjizz.py | 0 channels/{ => porn}/youporn.json | 0 channels/{ => porn}/youporn.py | 0 channels/{ => porn}/yuuk.json | 0 channels/{ => porn}/yuuk.py | 0 channels/zmovs.json | 15 --------- channelselector.py | 37 ++++++++++++---------- core/channeltools.py | 18 ++++++++--- platformcode/launcher.py | 21 ++++++++---- 218 files changed, 59 insertions(+), 45 deletions(-) rename channels/{ => porn}/LIKUOO.json (100%) rename channels/{ => porn}/LIKUOO.py (100%) rename channels/{ => porn}/TXXX.json (100%) rename channels/{ => porn}/TXXX.py (100%) create mode 100644 channels/porn/__init__.py rename channels/{ => porn}/absoluporn.json (100%) rename channels/{ => porn}/absoluporn.py (100%) rename channels/{ => porn}/alsoporn.json (100%) rename channels/{ => porn}/alsoporn.py (100%) rename channels/{ => porn}/analdin.json (100%) rename channels/{ => porn}/analdin.py (100%) rename channels/{ => porn}/beeg.json (100%) rename channels/{ => porn}/beeg.py (100%) rename channels/{ => porn}/bravoporn.json (100%) rename channels/{ => porn}/bravoporn.py (100%) rename channels/{ => porn}/camwhoresbay.json (100%) rename channels/{ => porn}/camwhoresbay.py (100%) rename channels/{ => porn}/canalporno.json (100%) rename channels/{ => porn}/canalporno.py (100%) rename channels/{ => porn}/cat3plus.json (100%) rename channels/{ => porn}/cat3plus.py (100%) rename channels/{ => porn}/cinetemagay.json (100%) rename channels/{ => porn}/cinetemagay.py (100%) rename channels/{ => porn}/cliphunter.json (100%) rename channels/{ => porn}/cliphunter.py (100%) rename channels/{ => porn}/coomelonitas.json (100%) rename channels/{ => porn}/coomelonitas.py (100%) rename channels/{ => porn}/cumlouder.json (100%) rename channels/{ => porn}/cumlouder.py (100%) rename channels/{ => porn}/czechvideo.json (100%) rename channels/{ => porn}/czechvideo.py (100%) rename channels/{ => porn}/datoporn.json (100%) rename channels/{ => porn}/datoporn.py (100%) rename channels/{ => porn}/elreyx.json (100%) rename channels/{ => porn}/elreyx.py (100%) rename channels/{ => porn}/eporner.json (100%) rename channels/{ => porn}/eporner.py (100%) rename channels/{ => porn}/eroticage.json (100%) rename channels/{ => porn}/eroticage.py (100%) rename channels/{ => porn}/eroticasonlinetv.json (100%) rename channels/{ => porn}/eroticasonlinetv.py (100%) rename channels/{ => porn}/erotik.json (100%) rename channels/{ => porn}/erotik.py (100%) rename channels/{ => porn}/fapality.json (100%) rename channels/{ => porn}/fapality.py (100%) rename channels/{ => porn}/fetishshrine.json (100%) rename channels/{ => porn}/fetishshrine.py (100%) rename channels/{ => porn}/filmoviXXX.json (100%) rename channels/{ => porn}/filmoviXXX.py (100%) rename channels/{ => porn}/filmpornoita.json (100%) rename channels/{ => porn}/filmpornoita.py (100%) rename channels/{ => porn}/foxtube.json (100%) rename channels/{ => porn}/foxtube.py (100%) rename channels/{ => porn}/freeporn.json (100%) rename channels/{ => porn}/freeporn.py (100%) rename channels/{ => porn}/freepornstreams.json (100%) rename channels/{ => porn}/freepornstreams.py (100%) rename channels/{ => porn}/gotporn.json (100%) rename channels/{ => porn}/gotporn.py (100%) rename channels/{ => porn}/hclips.json (100%) rename channels/{ => porn}/hclips.py (100%) rename channels/{ => porn}/hdzog.json (100%) rename channels/{ => porn}/hdzog.py (100%) rename channels/{ => porn}/hellporno.json (100%) rename channels/{ => porn}/hellporno.py (100%) rename channels/{ => porn}/hentaiid.json (100%) rename channels/{ => porn}/hentaiid.py (100%) rename channels/{ => porn}/hotmovs.json (100%) rename channels/{ => porn}/hotmovs.py (100%) rename channels/{ => porn}/javlin.json (100%) rename channels/{ => porn}/javlin.py (100%) rename channels/{ => porn}/javtasty.json (100%) rename channels/{ => porn}/javtasty.py (100%) rename channels/{ => porn}/javus.json (100%) rename channels/{ => porn}/javus.py (100%) rename channels/{ => porn}/javwhores.json (100%) rename channels/{ => porn}/javwhores.py (100%) rename channels/{ => porn}/jizzbunker.json (100%) rename channels/{ => porn}/jizzbunker.py (100%) rename channels/{ => porn}/justporn.json (100%) rename channels/{ => porn}/justporn.py (100%) rename channels/{ => porn}/kingsizetits.json (100%) rename channels/{ => porn}/kingsizetits.py (100%) rename channels/{ => porn}/mangovideo.json (100%) rename channels/{ => porn}/mangovideo.py (100%) rename channels/{ => porn}/mporno.json (100%) rename channels/{ => porn}/mporno.py (100%) rename channels/{ => porn}/muchoporno.json (100%) rename channels/{ => porn}/muchoporno.py (100%) rename channels/{ => porn}/nuvid.json (100%) rename channels/{ => porn}/nuvid.py (100%) rename channels/{ => porn}/pandamovie.json (100%) rename channels/{ => porn}/pandamovie.py (100%) rename channels/{ => porn}/peliculaseroticas.json (100%) rename channels/{ => porn}/peliculaseroticas.py (100%) rename channels/{ => porn}/pelisxporno.json (100%) rename channels/{ => porn}/pelisxporno.py (100%) rename channels/{ => porn}/perfectgirls.json (100%) rename channels/{ => porn}/perfectgirls.py (100%) rename channels/{ => porn}/playpornx.json (100%) rename channels/{ => porn}/playpornx.py (100%) rename channels/{ => porn}/porn300.json (100%) rename channels/{ => porn}/porn300.py (100%) rename channels/{ => porn}/pornboss.json (100%) rename channels/{ => porn}/pornboss.py (100%) rename channels/{ => porn}/porndish.json (100%) rename channels/{ => porn}/porndish.py (100%) rename channels/{ => porn}/porneq.json (100%) rename channels/{ => porn}/porneq.py (100%) rename channels/{ => porn}/pornhive.json (100%) rename channels/{ => porn}/pornhive.py (100%) rename channels/{ => porn}/pornhub.json (100%) rename channels/{ => porn}/pornhub.py (100%) rename channels/{ => porn}/pornohdmega.json (100%) rename channels/{ => porn}/pornohdmega.py (100%) rename channels/{ => porn}/pornrewind.json (100%) rename channels/{ => porn}/pornrewind.py (100%) rename channels/{ => porn}/porntrex.json (100%) rename channels/{ => porn}/porntrex.py (100%) rename channels/{ => porn}/porntv.json (100%) rename channels/{ => porn}/porntv.py (100%) rename channels/{ => porn}/qwertty.json (100%) rename channels/{ => porn}/qwertty.py (100%) rename channels/{ => porn}/redtube.json (100%) rename channels/{ => porn}/redtube.py (100%) rename channels/{ => porn}/serviporno.json (100%) rename channels/{ => porn}/serviporno.py (100%) rename channels/{ => porn}/sexgalaxy.json (100%) rename channels/{ => porn}/sexgalaxy.py (100%) rename channels/{ => porn}/sexkino.json (100%) rename channels/{ => porn}/sexkino.py (100%) rename channels/{ => porn}/sexofilm.json (100%) rename channels/{ => porn}/sexofilm.py (100%) rename channels/{ => porn}/shameless.json (100%) rename channels/{ => porn}/shameless.py (100%) rename channels/{ => porn}/siska.json (100%) rename channels/{ => porn}/siska.py (100%) rename channels/{ => porn}/sleazemovies.json (100%) rename channels/{ => porn}/sleazemovies.py (100%) rename channels/{ => porn}/spankbang.json (100%) rename channels/{ => porn}/spankbang.py (100%) rename channels/{ => porn}/spankwire.json (100%) rename channels/{ => porn}/spankwire.py (100%) rename channels/{ => porn}/streamingporn.json (100%) rename channels/{ => porn}/streamingporn.py (100%) rename channels/{ => porn}/streamporno.json (100%) rename channels/{ => porn}/streamporno.py (100%) rename channels/{ => porn}/submityouflicks.json (100%) rename channels/{ => porn}/submityouflicks.py (100%) rename channels/{ => porn}/sunporno.json (100%) rename channels/{ => porn}/sunporno.py (100%) rename channels/{ => porn}/sxyprn.json (100%) rename channels/{ => porn}/sxyprn.py (100%) rename channels/{ => porn}/tabooshare.json (100%) rename channels/{ => porn}/tabooshare.py (100%) rename channels/{ => porn}/thumbzilla.json (100%) rename channels/{ => porn}/thumbzilla.py (100%) rename channels/{ => porn}/titsbox.json (100%) rename channels/{ => porn}/titsbox.py (100%) rename channels/{ => porn}/tnaflix.json (100%) rename channels/{ => porn}/tnaflix.py (100%) rename channels/{ => porn}/tryboobs.json (100%) rename channels/{ => porn}/tryboobs.py (100%) rename channels/{ => porn}/tubedupe.json (100%) rename channels/{ => porn}/tubedupe.py (100%) rename channels/{ => porn}/tubehentai.json (100%) rename channels/{ => porn}/tubehentai.py (100%) rename channels/{ => porn}/videosXYZ.json (100%) rename channels/{ => porn}/videosXYZ.py (100%) rename channels/{ => porn}/vidz7.json (100%) rename channels/{ => porn}/vidz7.py (100%) rename channels/{ => porn}/vintagetube.json (100%) rename channels/{ => porn}/vintagetube.py (100%) rename channels/{ => porn}/vintagexxxsex.json (100%) rename channels/{ => porn}/vintagexxxsex.py (100%) rename channels/{ => porn}/vivud.json (100%) rename channels/{ => porn}/vivud.py (100%) rename channels/{ => porn}/vporn.json (100%) rename channels/{ => porn}/vporn.py (100%) rename channels/{ => porn}/watchpornfree.json (100%) rename channels/{ => porn}/watchpornfree.py (100%) rename channels/{ => porn}/webpeliculasporno.json (100%) rename channels/{ => porn}/webpeliculasporno.py (100%) rename channels/{ => porn}/woodrocket.json (100%) rename channels/{ => porn}/woodrocket.py (100%) rename channels/{ => porn}/x18hentai.json (100%) rename channels/{ => porn}/x18hentai.py (100%) rename channels/{ => porn}/xhamster.json (100%) rename channels/{ => porn}/xhamster.py (100%) rename channels/{ => porn}/xms.json (100%) rename channels/{ => porn}/xms.py (100%) rename channels/{ => porn}/xozilla.json (100%) rename channels/{ => porn}/xozilla.py (100%) rename channels/{ => porn}/xtapes.json (100%) rename channels/{ => porn}/xtapes.py (100%) rename channels/{ => porn}/xvideos.json (100%) rename channels/{ => porn}/xvideos.py (100%) rename channels/{ => porn}/xxxdan.json (100%) rename channels/{ => porn}/xxxdan.py (100%) rename channels/{ => porn}/xxxfreeinhd.json (100%) rename channels/{ => porn}/xxxfreeinhd.py (100%) rename channels/{ => porn}/xxxparodyhd.json (100%) rename channels/{ => porn}/xxxparodyhd.py (100%) rename channels/{ => porn}/xxxstreams.json (100%) rename channels/{ => porn}/xxxstreams.py (100%) rename channels/{ => porn}/yespornplease.json (100%) rename channels/{ => porn}/yespornplease.py (100%) rename channels/{ => porn}/youjizz.json (100%) rename channels/{ => porn}/youjizz.py (100%) rename channels/{ => porn}/youporn.json (100%) rename channels/{ => porn}/youporn.py (100%) rename channels/{ => porn}/yuuk.json (100%) rename channels/{ => porn}/yuuk.py (100%) delete mode 100755 channels/zmovs.json diff --git a/channels.json b/channels.json index 8012008b..6eb34c37 100644 --- a/channels.json +++ b/channels.json @@ -21,7 +21,6 @@ "fastsubita": "http://fastsubita.com", "filmgratis": "https://www.filmaltadefinizione.net", "filmigratis": "https://filmigratis.org", - "filmontv": "https://www.comingsoon.it", "filmpertutti": "https://www.filmpertutti.pub", "filmsenzalimiti": "https://filmsenzalimiti.best", "filmsenzalimiticc": "https://www.filmsenzalimiti.press", diff --git a/channels/LIKUOO.json b/channels/porn/LIKUOO.json similarity index 100% rename from channels/LIKUOO.json rename to channels/porn/LIKUOO.json diff --git a/channels/LIKUOO.py b/channels/porn/LIKUOO.py similarity index 100% rename from channels/LIKUOO.py rename to channels/porn/LIKUOO.py diff --git a/channels/TXXX.json b/channels/porn/TXXX.json similarity index 100% rename from channels/TXXX.json rename to channels/porn/TXXX.json diff --git a/channels/TXXX.py b/channels/porn/TXXX.py similarity index 100% rename from channels/TXXX.py rename to channels/porn/TXXX.py diff --git a/channels/porn/__init__.py b/channels/porn/__init__.py new file mode 100644 index 00000000..0b95a268 --- /dev/null +++ b/channels/porn/__init__.py @@ -0,0 +1,12 @@ +# -*- coding: utf-8 -*- + +import os +import sys + +# Appends the main plugin dir to the PYTHONPATH if an internal package cannot be imported. +# Examples: In Plex Media Server all modules are under "Code.*" package, and in Enigma2 under "Plugins.Extensions.*" +try: + # from core import logger + import core +except: + sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), os.path.pardir))) diff --git a/channels/absoluporn.json b/channels/porn/absoluporn.json similarity index 100% rename from channels/absoluporn.json rename to channels/porn/absoluporn.json diff --git a/channels/absoluporn.py b/channels/porn/absoluporn.py similarity index 100% rename from channels/absoluporn.py rename to channels/porn/absoluporn.py diff --git a/channels/alsoporn.json b/channels/porn/alsoporn.json similarity index 100% rename from channels/alsoporn.json rename to channels/porn/alsoporn.json diff --git a/channels/alsoporn.py b/channels/porn/alsoporn.py similarity index 100% rename from channels/alsoporn.py rename to channels/porn/alsoporn.py diff --git a/channels/analdin.json b/channels/porn/analdin.json similarity index 100% rename from channels/analdin.json rename to channels/porn/analdin.json diff --git a/channels/analdin.py b/channels/porn/analdin.py similarity index 100% rename from channels/analdin.py rename to channels/porn/analdin.py diff --git a/channels/beeg.json b/channels/porn/beeg.json similarity index 100% rename from channels/beeg.json rename to channels/porn/beeg.json diff --git a/channels/beeg.py b/channels/porn/beeg.py similarity index 100% rename from channels/beeg.py rename to channels/porn/beeg.py diff --git a/channels/bravoporn.json b/channels/porn/bravoporn.json similarity index 100% rename from channels/bravoporn.json rename to channels/porn/bravoporn.json diff --git a/channels/bravoporn.py b/channels/porn/bravoporn.py similarity index 100% rename from channels/bravoporn.py rename to channels/porn/bravoporn.py diff --git a/channels/camwhoresbay.json b/channels/porn/camwhoresbay.json similarity index 100% rename from channels/camwhoresbay.json rename to channels/porn/camwhoresbay.json diff --git a/channels/camwhoresbay.py b/channels/porn/camwhoresbay.py similarity index 100% rename from channels/camwhoresbay.py rename to channels/porn/camwhoresbay.py diff --git a/channels/canalporno.json b/channels/porn/canalporno.json similarity index 100% rename from channels/canalporno.json rename to channels/porn/canalporno.json diff --git a/channels/canalporno.py b/channels/porn/canalporno.py similarity index 100% rename from channels/canalporno.py rename to channels/porn/canalporno.py diff --git a/channels/cat3plus.json b/channels/porn/cat3plus.json similarity index 100% rename from channels/cat3plus.json rename to channels/porn/cat3plus.json diff --git a/channels/cat3plus.py b/channels/porn/cat3plus.py similarity index 100% rename from channels/cat3plus.py rename to channels/porn/cat3plus.py diff --git a/channels/cinetemagay.json b/channels/porn/cinetemagay.json similarity index 100% rename from channels/cinetemagay.json rename to channels/porn/cinetemagay.json diff --git a/channels/cinetemagay.py b/channels/porn/cinetemagay.py similarity index 100% rename from channels/cinetemagay.py rename to channels/porn/cinetemagay.py diff --git a/channels/cliphunter.json b/channels/porn/cliphunter.json similarity index 100% rename from channels/cliphunter.json rename to channels/porn/cliphunter.json diff --git a/channels/cliphunter.py b/channels/porn/cliphunter.py similarity index 100% rename from channels/cliphunter.py rename to channels/porn/cliphunter.py diff --git a/channels/coomelonitas.json b/channels/porn/coomelonitas.json similarity index 100% rename from channels/coomelonitas.json rename to channels/porn/coomelonitas.json diff --git a/channels/coomelonitas.py b/channels/porn/coomelonitas.py similarity index 100% rename from channels/coomelonitas.py rename to channels/porn/coomelonitas.py diff --git a/channels/cumlouder.json b/channels/porn/cumlouder.json similarity index 100% rename from channels/cumlouder.json rename to channels/porn/cumlouder.json diff --git a/channels/cumlouder.py b/channels/porn/cumlouder.py similarity index 100% rename from channels/cumlouder.py rename to channels/porn/cumlouder.py diff --git a/channels/czechvideo.json b/channels/porn/czechvideo.json similarity index 100% rename from channels/czechvideo.json rename to channels/porn/czechvideo.json diff --git a/channels/czechvideo.py b/channels/porn/czechvideo.py similarity index 100% rename from channels/czechvideo.py rename to channels/porn/czechvideo.py diff --git a/channels/datoporn.json b/channels/porn/datoporn.json similarity index 100% rename from channels/datoporn.json rename to channels/porn/datoporn.json diff --git a/channels/datoporn.py b/channels/porn/datoporn.py similarity index 100% rename from channels/datoporn.py rename to channels/porn/datoporn.py diff --git a/channels/elreyx.json b/channels/porn/elreyx.json similarity index 100% rename from channels/elreyx.json rename to channels/porn/elreyx.json diff --git a/channels/elreyx.py b/channels/porn/elreyx.py similarity index 100% rename from channels/elreyx.py rename to channels/porn/elreyx.py diff --git a/channels/eporner.json b/channels/porn/eporner.json similarity index 100% rename from channels/eporner.json rename to channels/porn/eporner.json diff --git a/channels/eporner.py b/channels/porn/eporner.py similarity index 100% rename from channels/eporner.py rename to channels/porn/eporner.py diff --git a/channels/eroticage.json b/channels/porn/eroticage.json similarity index 100% rename from channels/eroticage.json rename to channels/porn/eroticage.json diff --git a/channels/eroticage.py b/channels/porn/eroticage.py similarity index 100% rename from channels/eroticage.py rename to channels/porn/eroticage.py diff --git a/channels/eroticasonlinetv.json b/channels/porn/eroticasonlinetv.json similarity index 100% rename from channels/eroticasonlinetv.json rename to channels/porn/eroticasonlinetv.json diff --git a/channels/eroticasonlinetv.py b/channels/porn/eroticasonlinetv.py similarity index 100% rename from channels/eroticasonlinetv.py rename to channels/porn/eroticasonlinetv.py diff --git a/channels/erotik.json b/channels/porn/erotik.json similarity index 100% rename from channels/erotik.json rename to channels/porn/erotik.json diff --git a/channels/erotik.py b/channels/porn/erotik.py similarity index 100% rename from channels/erotik.py rename to channels/porn/erotik.py diff --git a/channels/fapality.json b/channels/porn/fapality.json similarity index 100% rename from channels/fapality.json rename to channels/porn/fapality.json diff --git a/channels/fapality.py b/channels/porn/fapality.py similarity index 100% rename from channels/fapality.py rename to channels/porn/fapality.py diff --git a/channels/fetishshrine.json b/channels/porn/fetishshrine.json similarity index 100% rename from channels/fetishshrine.json rename to channels/porn/fetishshrine.json diff --git a/channels/fetishshrine.py b/channels/porn/fetishshrine.py similarity index 100% rename from channels/fetishshrine.py rename to channels/porn/fetishshrine.py diff --git a/channels/filmoviXXX.json b/channels/porn/filmoviXXX.json similarity index 100% rename from channels/filmoviXXX.json rename to channels/porn/filmoviXXX.json diff --git a/channels/filmoviXXX.py b/channels/porn/filmoviXXX.py similarity index 100% rename from channels/filmoviXXX.py rename to channels/porn/filmoviXXX.py diff --git a/channels/filmpornoita.json b/channels/porn/filmpornoita.json similarity index 100% rename from channels/filmpornoita.json rename to channels/porn/filmpornoita.json diff --git a/channels/filmpornoita.py b/channels/porn/filmpornoita.py similarity index 100% rename from channels/filmpornoita.py rename to channels/porn/filmpornoita.py diff --git a/channels/foxtube.json b/channels/porn/foxtube.json similarity index 100% rename from channels/foxtube.json rename to channels/porn/foxtube.json diff --git a/channels/foxtube.py b/channels/porn/foxtube.py similarity index 100% rename from channels/foxtube.py rename to channels/porn/foxtube.py diff --git a/channels/freeporn.json b/channels/porn/freeporn.json similarity index 100% rename from channels/freeporn.json rename to channels/porn/freeporn.json diff --git a/channels/freeporn.py b/channels/porn/freeporn.py similarity index 100% rename from channels/freeporn.py rename to channels/porn/freeporn.py diff --git a/channels/freepornstreams.json b/channels/porn/freepornstreams.json similarity index 100% rename from channels/freepornstreams.json rename to channels/porn/freepornstreams.json diff --git a/channels/freepornstreams.py b/channels/porn/freepornstreams.py similarity index 100% rename from channels/freepornstreams.py rename to channels/porn/freepornstreams.py diff --git a/channels/gotporn.json b/channels/porn/gotporn.json similarity index 100% rename from channels/gotporn.json rename to channels/porn/gotporn.json diff --git a/channels/gotporn.py b/channels/porn/gotporn.py similarity index 100% rename from channels/gotporn.py rename to channels/porn/gotporn.py diff --git a/channels/hclips.json b/channels/porn/hclips.json similarity index 100% rename from channels/hclips.json rename to channels/porn/hclips.json diff --git a/channels/hclips.py b/channels/porn/hclips.py similarity index 100% rename from channels/hclips.py rename to channels/porn/hclips.py diff --git a/channels/hdzog.json b/channels/porn/hdzog.json similarity index 100% rename from channels/hdzog.json rename to channels/porn/hdzog.json diff --git a/channels/hdzog.py b/channels/porn/hdzog.py similarity index 100% rename from channels/hdzog.py rename to channels/porn/hdzog.py diff --git a/channels/hellporno.json b/channels/porn/hellporno.json similarity index 100% rename from channels/hellporno.json rename to channels/porn/hellporno.json diff --git a/channels/hellporno.py b/channels/porn/hellporno.py similarity index 100% rename from channels/hellporno.py rename to channels/porn/hellporno.py diff --git a/channels/hentaiid.json b/channels/porn/hentaiid.json similarity index 100% rename from channels/hentaiid.json rename to channels/porn/hentaiid.json diff --git a/channels/hentaiid.py b/channels/porn/hentaiid.py similarity index 100% rename from channels/hentaiid.py rename to channels/porn/hentaiid.py diff --git a/channels/hotmovs.json b/channels/porn/hotmovs.json similarity index 100% rename from channels/hotmovs.json rename to channels/porn/hotmovs.json diff --git a/channels/hotmovs.py b/channels/porn/hotmovs.py similarity index 100% rename from channels/hotmovs.py rename to channels/porn/hotmovs.py diff --git a/channels/javlin.json b/channels/porn/javlin.json similarity index 100% rename from channels/javlin.json rename to channels/porn/javlin.json diff --git a/channels/javlin.py b/channels/porn/javlin.py similarity index 100% rename from channels/javlin.py rename to channels/porn/javlin.py diff --git a/channels/javtasty.json b/channels/porn/javtasty.json similarity index 100% rename from channels/javtasty.json rename to channels/porn/javtasty.json diff --git a/channels/javtasty.py b/channels/porn/javtasty.py similarity index 100% rename from channels/javtasty.py rename to channels/porn/javtasty.py diff --git a/channels/javus.json b/channels/porn/javus.json similarity index 100% rename from channels/javus.json rename to channels/porn/javus.json diff --git a/channels/javus.py b/channels/porn/javus.py similarity index 100% rename from channels/javus.py rename to channels/porn/javus.py diff --git a/channels/javwhores.json b/channels/porn/javwhores.json similarity index 100% rename from channels/javwhores.json rename to channels/porn/javwhores.json diff --git a/channels/javwhores.py b/channels/porn/javwhores.py similarity index 100% rename from channels/javwhores.py rename to channels/porn/javwhores.py diff --git a/channels/jizzbunker.json b/channels/porn/jizzbunker.json similarity index 100% rename from channels/jizzbunker.json rename to channels/porn/jizzbunker.json diff --git a/channels/jizzbunker.py b/channels/porn/jizzbunker.py similarity index 100% rename from channels/jizzbunker.py rename to channels/porn/jizzbunker.py diff --git a/channels/justporn.json b/channels/porn/justporn.json similarity index 100% rename from channels/justporn.json rename to channels/porn/justporn.json diff --git a/channels/justporn.py b/channels/porn/justporn.py similarity index 100% rename from channels/justporn.py rename to channels/porn/justporn.py diff --git a/channels/kingsizetits.json b/channels/porn/kingsizetits.json similarity index 100% rename from channels/kingsizetits.json rename to channels/porn/kingsizetits.json diff --git a/channels/kingsizetits.py b/channels/porn/kingsizetits.py similarity index 100% rename from channels/kingsizetits.py rename to channels/porn/kingsizetits.py diff --git a/channels/mangovideo.json b/channels/porn/mangovideo.json similarity index 100% rename from channels/mangovideo.json rename to channels/porn/mangovideo.json diff --git a/channels/mangovideo.py b/channels/porn/mangovideo.py similarity index 100% rename from channels/mangovideo.py rename to channels/porn/mangovideo.py diff --git a/channels/mporno.json b/channels/porn/mporno.json similarity index 100% rename from channels/mporno.json rename to channels/porn/mporno.json diff --git a/channels/mporno.py b/channels/porn/mporno.py similarity index 100% rename from channels/mporno.py rename to channels/porn/mporno.py diff --git a/channels/muchoporno.json b/channels/porn/muchoporno.json similarity index 100% rename from channels/muchoporno.json rename to channels/porn/muchoporno.json diff --git a/channels/muchoporno.py b/channels/porn/muchoporno.py similarity index 100% rename from channels/muchoporno.py rename to channels/porn/muchoporno.py diff --git a/channels/nuvid.json b/channels/porn/nuvid.json similarity index 100% rename from channels/nuvid.json rename to channels/porn/nuvid.json diff --git a/channels/nuvid.py b/channels/porn/nuvid.py similarity index 100% rename from channels/nuvid.py rename to channels/porn/nuvid.py diff --git a/channels/pandamovie.json b/channels/porn/pandamovie.json similarity index 100% rename from channels/pandamovie.json rename to channels/porn/pandamovie.json diff --git a/channels/pandamovie.py b/channels/porn/pandamovie.py similarity index 100% rename from channels/pandamovie.py rename to channels/porn/pandamovie.py diff --git a/channels/peliculaseroticas.json b/channels/porn/peliculaseroticas.json similarity index 100% rename from channels/peliculaseroticas.json rename to channels/porn/peliculaseroticas.json diff --git a/channels/peliculaseroticas.py b/channels/porn/peliculaseroticas.py similarity index 100% rename from channels/peliculaseroticas.py rename to channels/porn/peliculaseroticas.py diff --git a/channels/pelisxporno.json b/channels/porn/pelisxporno.json similarity index 100% rename from channels/pelisxporno.json rename to channels/porn/pelisxporno.json diff --git a/channels/pelisxporno.py b/channels/porn/pelisxporno.py similarity index 100% rename from channels/pelisxporno.py rename to channels/porn/pelisxporno.py diff --git a/channels/perfectgirls.json b/channels/porn/perfectgirls.json similarity index 100% rename from channels/perfectgirls.json rename to channels/porn/perfectgirls.json diff --git a/channels/perfectgirls.py b/channels/porn/perfectgirls.py similarity index 100% rename from channels/perfectgirls.py rename to channels/porn/perfectgirls.py diff --git a/channels/playpornx.json b/channels/porn/playpornx.json similarity index 100% rename from channels/playpornx.json rename to channels/porn/playpornx.json diff --git a/channels/playpornx.py b/channels/porn/playpornx.py similarity index 100% rename from channels/playpornx.py rename to channels/porn/playpornx.py diff --git a/channels/porn300.json b/channels/porn/porn300.json similarity index 100% rename from channels/porn300.json rename to channels/porn/porn300.json diff --git a/channels/porn300.py b/channels/porn/porn300.py similarity index 100% rename from channels/porn300.py rename to channels/porn/porn300.py diff --git a/channels/pornboss.json b/channels/porn/pornboss.json similarity index 100% rename from channels/pornboss.json rename to channels/porn/pornboss.json diff --git a/channels/pornboss.py b/channels/porn/pornboss.py similarity index 100% rename from channels/pornboss.py rename to channels/porn/pornboss.py diff --git a/channels/porndish.json b/channels/porn/porndish.json similarity index 100% rename from channels/porndish.json rename to channels/porn/porndish.json diff --git a/channels/porndish.py b/channels/porn/porndish.py similarity index 100% rename from channels/porndish.py rename to channels/porn/porndish.py diff --git a/channels/porneq.json b/channels/porn/porneq.json similarity index 100% rename from channels/porneq.json rename to channels/porn/porneq.json diff --git a/channels/porneq.py b/channels/porn/porneq.py similarity index 100% rename from channels/porneq.py rename to channels/porn/porneq.py diff --git a/channels/pornhive.json b/channels/porn/pornhive.json similarity index 100% rename from channels/pornhive.json rename to channels/porn/pornhive.json diff --git a/channels/pornhive.py b/channels/porn/pornhive.py similarity index 100% rename from channels/pornhive.py rename to channels/porn/pornhive.py diff --git a/channels/pornhub.json b/channels/porn/pornhub.json similarity index 100% rename from channels/pornhub.json rename to channels/porn/pornhub.json diff --git a/channels/pornhub.py b/channels/porn/pornhub.py similarity index 100% rename from channels/pornhub.py rename to channels/porn/pornhub.py diff --git a/channels/pornohdmega.json b/channels/porn/pornohdmega.json similarity index 100% rename from channels/pornohdmega.json rename to channels/porn/pornohdmega.json diff --git a/channels/pornohdmega.py b/channels/porn/pornohdmega.py similarity index 100% rename from channels/pornohdmega.py rename to channels/porn/pornohdmega.py diff --git a/channels/pornrewind.json b/channels/porn/pornrewind.json similarity index 100% rename from channels/pornrewind.json rename to channels/porn/pornrewind.json diff --git a/channels/pornrewind.py b/channels/porn/pornrewind.py similarity index 100% rename from channels/pornrewind.py rename to channels/porn/pornrewind.py diff --git a/channels/porntrex.json b/channels/porn/porntrex.json similarity index 100% rename from channels/porntrex.json rename to channels/porn/porntrex.json diff --git a/channels/porntrex.py b/channels/porn/porntrex.py similarity index 100% rename from channels/porntrex.py rename to channels/porn/porntrex.py diff --git a/channels/porntv.json b/channels/porn/porntv.json similarity index 100% rename from channels/porntv.json rename to channels/porn/porntv.json diff --git a/channels/porntv.py b/channels/porn/porntv.py similarity index 100% rename from channels/porntv.py rename to channels/porn/porntv.py diff --git a/channels/qwertty.json b/channels/porn/qwertty.json similarity index 100% rename from channels/qwertty.json rename to channels/porn/qwertty.json diff --git a/channels/qwertty.py b/channels/porn/qwertty.py similarity index 100% rename from channels/qwertty.py rename to channels/porn/qwertty.py diff --git a/channels/redtube.json b/channels/porn/redtube.json similarity index 100% rename from channels/redtube.json rename to channels/porn/redtube.json diff --git a/channels/redtube.py b/channels/porn/redtube.py similarity index 100% rename from channels/redtube.py rename to channels/porn/redtube.py diff --git a/channels/serviporno.json b/channels/porn/serviporno.json similarity index 100% rename from channels/serviporno.json rename to channels/porn/serviporno.json diff --git a/channels/serviporno.py b/channels/porn/serviporno.py similarity index 100% rename from channels/serviporno.py rename to channels/porn/serviporno.py diff --git a/channels/sexgalaxy.json b/channels/porn/sexgalaxy.json similarity index 100% rename from channels/sexgalaxy.json rename to channels/porn/sexgalaxy.json diff --git a/channels/sexgalaxy.py b/channels/porn/sexgalaxy.py similarity index 100% rename from channels/sexgalaxy.py rename to channels/porn/sexgalaxy.py diff --git a/channels/sexkino.json b/channels/porn/sexkino.json similarity index 100% rename from channels/sexkino.json rename to channels/porn/sexkino.json diff --git a/channels/sexkino.py b/channels/porn/sexkino.py similarity index 100% rename from channels/sexkino.py rename to channels/porn/sexkino.py diff --git a/channels/sexofilm.json b/channels/porn/sexofilm.json similarity index 100% rename from channels/sexofilm.json rename to channels/porn/sexofilm.json diff --git a/channels/sexofilm.py b/channels/porn/sexofilm.py similarity index 100% rename from channels/sexofilm.py rename to channels/porn/sexofilm.py diff --git a/channels/shameless.json b/channels/porn/shameless.json similarity index 100% rename from channels/shameless.json rename to channels/porn/shameless.json diff --git a/channels/shameless.py b/channels/porn/shameless.py similarity index 100% rename from channels/shameless.py rename to channels/porn/shameless.py diff --git a/channels/siska.json b/channels/porn/siska.json similarity index 100% rename from channels/siska.json rename to channels/porn/siska.json diff --git a/channels/siska.py b/channels/porn/siska.py similarity index 100% rename from channels/siska.py rename to channels/porn/siska.py diff --git a/channels/sleazemovies.json b/channels/porn/sleazemovies.json similarity index 100% rename from channels/sleazemovies.json rename to channels/porn/sleazemovies.json diff --git a/channels/sleazemovies.py b/channels/porn/sleazemovies.py similarity index 100% rename from channels/sleazemovies.py rename to channels/porn/sleazemovies.py diff --git a/channels/spankbang.json b/channels/porn/spankbang.json similarity index 100% rename from channels/spankbang.json rename to channels/porn/spankbang.json diff --git a/channels/spankbang.py b/channels/porn/spankbang.py similarity index 100% rename from channels/spankbang.py rename to channels/porn/spankbang.py diff --git a/channels/spankwire.json b/channels/porn/spankwire.json similarity index 100% rename from channels/spankwire.json rename to channels/porn/spankwire.json diff --git a/channels/spankwire.py b/channels/porn/spankwire.py similarity index 100% rename from channels/spankwire.py rename to channels/porn/spankwire.py diff --git a/channels/streamingporn.json b/channels/porn/streamingporn.json similarity index 100% rename from channels/streamingporn.json rename to channels/porn/streamingporn.json diff --git a/channels/streamingporn.py b/channels/porn/streamingporn.py similarity index 100% rename from channels/streamingporn.py rename to channels/porn/streamingporn.py diff --git a/channels/streamporno.json b/channels/porn/streamporno.json similarity index 100% rename from channels/streamporno.json rename to channels/porn/streamporno.json diff --git a/channels/streamporno.py b/channels/porn/streamporno.py similarity index 100% rename from channels/streamporno.py rename to channels/porn/streamporno.py diff --git a/channels/submityouflicks.json b/channels/porn/submityouflicks.json similarity index 100% rename from channels/submityouflicks.json rename to channels/porn/submityouflicks.json diff --git a/channels/submityouflicks.py b/channels/porn/submityouflicks.py similarity index 100% rename from channels/submityouflicks.py rename to channels/porn/submityouflicks.py diff --git a/channels/sunporno.json b/channels/porn/sunporno.json similarity index 100% rename from channels/sunporno.json rename to channels/porn/sunporno.json diff --git a/channels/sunporno.py b/channels/porn/sunporno.py similarity index 100% rename from channels/sunporno.py rename to channels/porn/sunporno.py diff --git a/channels/sxyprn.json b/channels/porn/sxyprn.json similarity index 100% rename from channels/sxyprn.json rename to channels/porn/sxyprn.json diff --git a/channels/sxyprn.py b/channels/porn/sxyprn.py similarity index 100% rename from channels/sxyprn.py rename to channels/porn/sxyprn.py diff --git a/channels/tabooshare.json b/channels/porn/tabooshare.json similarity index 100% rename from channels/tabooshare.json rename to channels/porn/tabooshare.json diff --git a/channels/tabooshare.py b/channels/porn/tabooshare.py similarity index 100% rename from channels/tabooshare.py rename to channels/porn/tabooshare.py diff --git a/channels/thumbzilla.json b/channels/porn/thumbzilla.json similarity index 100% rename from channels/thumbzilla.json rename to channels/porn/thumbzilla.json diff --git a/channels/thumbzilla.py b/channels/porn/thumbzilla.py similarity index 100% rename from channels/thumbzilla.py rename to channels/porn/thumbzilla.py diff --git a/channels/titsbox.json b/channels/porn/titsbox.json similarity index 100% rename from channels/titsbox.json rename to channels/porn/titsbox.json diff --git a/channels/titsbox.py b/channels/porn/titsbox.py similarity index 100% rename from channels/titsbox.py rename to channels/porn/titsbox.py diff --git a/channels/tnaflix.json b/channels/porn/tnaflix.json similarity index 100% rename from channels/tnaflix.json rename to channels/porn/tnaflix.json diff --git a/channels/tnaflix.py b/channels/porn/tnaflix.py similarity index 100% rename from channels/tnaflix.py rename to channels/porn/tnaflix.py diff --git a/channels/tryboobs.json b/channels/porn/tryboobs.json similarity index 100% rename from channels/tryboobs.json rename to channels/porn/tryboobs.json diff --git a/channels/tryboobs.py b/channels/porn/tryboobs.py similarity index 100% rename from channels/tryboobs.py rename to channels/porn/tryboobs.py diff --git a/channels/tubedupe.json b/channels/porn/tubedupe.json similarity index 100% rename from channels/tubedupe.json rename to channels/porn/tubedupe.json diff --git a/channels/tubedupe.py b/channels/porn/tubedupe.py similarity index 100% rename from channels/tubedupe.py rename to channels/porn/tubedupe.py diff --git a/channels/tubehentai.json b/channels/porn/tubehentai.json similarity index 100% rename from channels/tubehentai.json rename to channels/porn/tubehentai.json diff --git a/channels/tubehentai.py b/channels/porn/tubehentai.py similarity index 100% rename from channels/tubehentai.py rename to channels/porn/tubehentai.py diff --git a/channels/videosXYZ.json b/channels/porn/videosXYZ.json similarity index 100% rename from channels/videosXYZ.json rename to channels/porn/videosXYZ.json diff --git a/channels/videosXYZ.py b/channels/porn/videosXYZ.py similarity index 100% rename from channels/videosXYZ.py rename to channels/porn/videosXYZ.py diff --git a/channels/vidz7.json b/channels/porn/vidz7.json similarity index 100% rename from channels/vidz7.json rename to channels/porn/vidz7.json diff --git a/channels/vidz7.py b/channels/porn/vidz7.py similarity index 100% rename from channels/vidz7.py rename to channels/porn/vidz7.py diff --git a/channels/vintagetube.json b/channels/porn/vintagetube.json similarity index 100% rename from channels/vintagetube.json rename to channels/porn/vintagetube.json diff --git a/channels/vintagetube.py b/channels/porn/vintagetube.py similarity index 100% rename from channels/vintagetube.py rename to channels/porn/vintagetube.py diff --git a/channels/vintagexxxsex.json b/channels/porn/vintagexxxsex.json similarity index 100% rename from channels/vintagexxxsex.json rename to channels/porn/vintagexxxsex.json diff --git a/channels/vintagexxxsex.py b/channels/porn/vintagexxxsex.py similarity index 100% rename from channels/vintagexxxsex.py rename to channels/porn/vintagexxxsex.py diff --git a/channels/vivud.json b/channels/porn/vivud.json similarity index 100% rename from channels/vivud.json rename to channels/porn/vivud.json diff --git a/channels/vivud.py b/channels/porn/vivud.py similarity index 100% rename from channels/vivud.py rename to channels/porn/vivud.py diff --git a/channels/vporn.json b/channels/porn/vporn.json similarity index 100% rename from channels/vporn.json rename to channels/porn/vporn.json diff --git a/channels/vporn.py b/channels/porn/vporn.py similarity index 100% rename from channels/vporn.py rename to channels/porn/vporn.py diff --git a/channels/watchpornfree.json b/channels/porn/watchpornfree.json similarity index 100% rename from channels/watchpornfree.json rename to channels/porn/watchpornfree.json diff --git a/channels/watchpornfree.py b/channels/porn/watchpornfree.py similarity index 100% rename from channels/watchpornfree.py rename to channels/porn/watchpornfree.py diff --git a/channels/webpeliculasporno.json b/channels/porn/webpeliculasporno.json similarity index 100% rename from channels/webpeliculasporno.json rename to channels/porn/webpeliculasporno.json diff --git a/channels/webpeliculasporno.py b/channels/porn/webpeliculasporno.py similarity index 100% rename from channels/webpeliculasporno.py rename to channels/porn/webpeliculasporno.py diff --git a/channels/woodrocket.json b/channels/porn/woodrocket.json similarity index 100% rename from channels/woodrocket.json rename to channels/porn/woodrocket.json diff --git a/channels/woodrocket.py b/channels/porn/woodrocket.py similarity index 100% rename from channels/woodrocket.py rename to channels/porn/woodrocket.py diff --git a/channels/x18hentai.json b/channels/porn/x18hentai.json similarity index 100% rename from channels/x18hentai.json rename to channels/porn/x18hentai.json diff --git a/channels/x18hentai.py b/channels/porn/x18hentai.py similarity index 100% rename from channels/x18hentai.py rename to channels/porn/x18hentai.py diff --git a/channels/xhamster.json b/channels/porn/xhamster.json similarity index 100% rename from channels/xhamster.json rename to channels/porn/xhamster.json diff --git a/channels/xhamster.py b/channels/porn/xhamster.py similarity index 100% rename from channels/xhamster.py rename to channels/porn/xhamster.py diff --git a/channels/xms.json b/channels/porn/xms.json similarity index 100% rename from channels/xms.json rename to channels/porn/xms.json diff --git a/channels/xms.py b/channels/porn/xms.py similarity index 100% rename from channels/xms.py rename to channels/porn/xms.py diff --git a/channels/xozilla.json b/channels/porn/xozilla.json similarity index 100% rename from channels/xozilla.json rename to channels/porn/xozilla.json diff --git a/channels/xozilla.py b/channels/porn/xozilla.py similarity index 100% rename from channels/xozilla.py rename to channels/porn/xozilla.py diff --git a/channels/xtapes.json b/channels/porn/xtapes.json similarity index 100% rename from channels/xtapes.json rename to channels/porn/xtapes.json diff --git a/channels/xtapes.py b/channels/porn/xtapes.py similarity index 100% rename from channels/xtapes.py rename to channels/porn/xtapes.py diff --git a/channels/xvideos.json b/channels/porn/xvideos.json similarity index 100% rename from channels/xvideos.json rename to channels/porn/xvideos.json diff --git a/channels/xvideos.py b/channels/porn/xvideos.py similarity index 100% rename from channels/xvideos.py rename to channels/porn/xvideos.py diff --git a/channels/xxxdan.json b/channels/porn/xxxdan.json similarity index 100% rename from channels/xxxdan.json rename to channels/porn/xxxdan.json diff --git a/channels/xxxdan.py b/channels/porn/xxxdan.py similarity index 100% rename from channels/xxxdan.py rename to channels/porn/xxxdan.py diff --git a/channels/xxxfreeinhd.json b/channels/porn/xxxfreeinhd.json similarity index 100% rename from channels/xxxfreeinhd.json rename to channels/porn/xxxfreeinhd.json diff --git a/channels/xxxfreeinhd.py b/channels/porn/xxxfreeinhd.py similarity index 100% rename from channels/xxxfreeinhd.py rename to channels/porn/xxxfreeinhd.py diff --git a/channels/xxxparodyhd.json b/channels/porn/xxxparodyhd.json similarity index 100% rename from channels/xxxparodyhd.json rename to channels/porn/xxxparodyhd.json diff --git a/channels/xxxparodyhd.py b/channels/porn/xxxparodyhd.py similarity index 100% rename from channels/xxxparodyhd.py rename to channels/porn/xxxparodyhd.py diff --git a/channels/xxxstreams.json b/channels/porn/xxxstreams.json similarity index 100% rename from channels/xxxstreams.json rename to channels/porn/xxxstreams.json diff --git a/channels/xxxstreams.py b/channels/porn/xxxstreams.py similarity index 100% rename from channels/xxxstreams.py rename to channels/porn/xxxstreams.py diff --git a/channels/yespornplease.json b/channels/porn/yespornplease.json similarity index 100% rename from channels/yespornplease.json rename to channels/porn/yespornplease.json diff --git a/channels/yespornplease.py b/channels/porn/yespornplease.py similarity index 100% rename from channels/yespornplease.py rename to channels/porn/yespornplease.py diff --git a/channels/youjizz.json b/channels/porn/youjizz.json similarity index 100% rename from channels/youjizz.json rename to channels/porn/youjizz.json diff --git a/channels/youjizz.py b/channels/porn/youjizz.py similarity index 100% rename from channels/youjizz.py rename to channels/porn/youjizz.py diff --git a/channels/youporn.json b/channels/porn/youporn.json similarity index 100% rename from channels/youporn.json rename to channels/porn/youporn.json diff --git a/channels/youporn.py b/channels/porn/youporn.py similarity index 100% rename from channels/youporn.py rename to channels/porn/youporn.py diff --git a/channels/yuuk.json b/channels/porn/yuuk.json similarity index 100% rename from channels/yuuk.json rename to channels/porn/yuuk.json diff --git a/channels/yuuk.py b/channels/porn/yuuk.py similarity index 100% rename from channels/yuuk.py rename to channels/porn/yuuk.py diff --git a/channels/zmovs.json b/channels/zmovs.json deleted file mode 100755 index 928b5a0f..00000000 --- a/channels/zmovs.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "id": "zmovs", - "name": "zmovs", - "active": true, - "adult": true, - "language": ["*"], - "thumbnail": "https://zmovs.com/favicon-96x96.png", - "banner": "", - "categories": [ - "adult" - ], - "settings": [ - ] -} - diff --git a/channelselector.py b/channelselector.py index 5cd94b8f..f9efbd89 100644 --- a/channelselector.py +++ b/channelselector.py @@ -42,7 +42,7 @@ def getmainlist(view="thumb_"): if addon.getSetting('enable_onair_menu') == "true": itemlist.append(Item(channel="filmontv", action="mainlist", title=config.get_localized_string(50001), - thumbnail=get_thumb("on_the_air.png"), viewmode="thumbnails")) + thumbnail=get_thumb("on_the_air.png"), viewmode="thumbnails")) if addon.getSetting('enable_link_menu') == "true": itemlist.append(Item(title=config.get_localized_string(70527), channel="kodfavorites", action="mainlist", @@ -106,7 +106,7 @@ def getchanneltypes(view="thumb_"): # itemlist.append(Item(title='Oggi in TV', channel="filmontv", action="mainlist", view=view, # category=title, channel_type="all", thumbnail=get_thumb("on_the_air.png", view), - # viewmode="thumbnails")) + # viewmode="thumbnails")) @@ -117,7 +117,7 @@ def getchanneltypes(view="thumb_"): def filterchannels(category, view="thumb_"): - logger.info() + logger.info('Filterchannl'+category) channelslist = [] @@ -128,8 +128,11 @@ def filterchannels(category, view="thumb_"): appenddisabledchannels = True # Lee la lista de canales - channel_path = os.path.join(config.get_runtime_path(), "channels", '*.json') - logger.info("channel_path=%s" % channel_path) + if category != 'adult': + channel_path = os.path.join(config.get_runtime_path(), 'channels', '*.json') + else: + channel_path = os.path.join(config.get_runtime_path(), 'channels', 'porn', '*.json') + logger.info("channel_path = %s" % channel_path) channel_files = glob.glob(channel_path) logger.info("channel_files encontrados %s" % (len(channel_files))) @@ -139,7 +142,7 @@ def filterchannels(category, view="thumb_"): logger.info("channel_language=%s" % channel_language) for channel_path in channel_files: - logger.info("channel=%s" % channel_path) + logger.info("channel in for = %s" % channel_path) channel = os.path.basename(channel_path).replace(".json", "") @@ -252,12 +255,12 @@ def get_thumb(thumb_name, view="thumb_", auto=False): thumbnail = '' thumb_name = unify.set_genre(unify.simplify(thumb_name)) - + if thumb_name in thumb_dict: thumbnail = thumb_dict[thumb_name] return thumbnail - + else: icon_pack_name = config.get_setting('icon_set', default="default") resource_path = os.path.join(config.get_runtime_path(), "resources", "media", "themes") @@ -315,12 +318,12 @@ def auto_filter(auto_lang=False): lang = 'all' lang_dict = {'ita':'it'} - + if config.get_setting("channel_language") == 'auto' or auto_lang == True: for langs, variant in lang_dict.items(): if def_lang in variant: lang = langs - + else: lang = config.get_setting("channel_language", default="all") @@ -330,7 +333,7 @@ def auto_filter(auto_lang=False): def thumb(itemlist=[], genre=False): if itemlist: import re - + icon_dict = {'channels_movie':['film'], 'channels_tvshow':['serie','tv','episodi','episodio'], 'channels_documentary':['documentari','documentario'], @@ -341,7 +344,7 @@ def thumb(itemlist=[], genre=False): 'genres':['genere', 'generi', 'categorie', 'categoria'], 'channels_animation': ['animazione', 'cartoni', 'cartoon'], 'channels_action':['azione', 'arti marziali'], - 'channels_adventure': ['avventura'], + 'channels_adventure': ['avventura'], 'channels_biographical':['biografico'], 'channels_comedy':['comico','commedia', 'demenziale'], 'channels_adult':['erotico', 'hentai'], @@ -353,7 +356,7 @@ def thumb(itemlist=[], genre=False): 'channels_war':['guerra'], 'channels_children':['bambini'], 'horror':['horror'], - 'lucky': ['fortunato'], + 'lucky': ['fortunato'], 'channels_musical':['musical', 'musica'], 'channels_mistery':['mistero', 'giallo'], 'channels_noir':['noir'], @@ -367,7 +370,7 @@ def thumb(itemlist=[], genre=False): 'channels_family':['famiglia','famiglie'], 'channels_historical':['storico'], 'autoplay':[config.get_localized_string(60071)] - } + } suffix_dict = {'_hd':['hd','altadefinizione','alta definizione'], '_4k':['4K'], @@ -381,14 +384,14 @@ def thumb(itemlist=[], genre=False): '_tvshow':['serie','tv']} for item in itemlist: - + if genre == False: for thumb, titles in icon_dict.items(): if any( word in item.title.lower() for word in search): thumb = 'search' for suffix, titles in search_suffix.items(): - if any( word in item.title.lower() for word in titles ): + if any( word in item.title.lower() for word in titles ): thumb = thumb + suffix item.thumbnail = get_thumb(thumb + '.png') elif any( word in item.title.lower() for word in titles ): @@ -408,7 +411,7 @@ def thumb(itemlist=[], genre=False): else: thumb = item.thumbnails - + item.title = re.sub(r'\s*\{[^\}]+\}','',item.title) return itemlist else: diff --git a/core/channeltools.py b/core/channeltools.py index c6fc2135..64396b91 100644 --- a/core/channeltools.py +++ b/core/channeltools.py @@ -38,9 +38,14 @@ def get_channel_parameters(channel_name): channel_parameters["channel"] = channel_parameters.pop("id") # si no existe el key se declaran valor por defecto para que no de fallos en las funciones que lo llaman - channel_parameters["update_url"] = channel_parameters.get("update_url", DEFAULT_UPDATE_URL) - channel_parameters["language"] = channel_parameters.get("language", ["all"]) channel_parameters["adult"] = channel_parameters.get("adult", False) + logger.info(channel_parameters["adult"]) + if channel_parameters["adult"]: + channel_parameters["update_url"] = channel_parameters.get("update_url", DEFAULT_UPDATE_URL+'porn/') + else: + channel_parameters["update_url"] = channel_parameters.get("update_url", DEFAULT_UPDATE_URL) + channel_parameters["language"] = channel_parameters.get("language", ["all"]) +## channel_parameters["adult"] = channel_parameters.get("adult", False) channel_parameters["active"] = channel_parameters.get("active", False) channel_parameters["include_in_global_search"] = channel_parameters.get("include_in_global_search", False) channel_parameters["categories"] = channel_parameters.get("categories", list()) @@ -133,11 +138,14 @@ def get_channel_json(channel_name): try: channel_path = filetools.join(config.get_runtime_path(), "channels", channel_name + ".json") if not os.path.isfile(channel_path): - channel_path = filetools.join(config.get_runtime_path(), "specials", channel_name + ".json") + channel_path = filetools.join(config.get_runtime_path(), 'channels', "porn", channel_name + ".json") if not os.path.isfile(channel_path): - channel_path = filetools.join(config.get_runtime_path(), "servers", channel_name + ".json") + channel_path = filetools.join(config.get_runtime_path(), "specials", channel_name + ".json") if not os.path.isfile(channel_path): - channel_path = filetools.join(config.get_runtime_path(), "servers", "debriders", channel_name + ".json") + channel_path = filetools.join(config.get_runtime_path(), "servers", channel_name + ".json") + if not os.path.isfile(channel_path): + channel_path = filetools.join(config.get_runtime_path(), "servers", "debriders", channel_name + ".json") + if filetools.isfile(channel_path): # logger.info("channel_data=" + channel_path) channel_json = jsontools.load(filetools.read(channel_path)) diff --git a/platformcode/launcher.py b/platformcode/launcher.py index 5ac8597f..059d276e 100644 --- a/platformcode/launcher.py +++ b/platformcode/launcher.py @@ -40,7 +40,7 @@ def start(): # check_adsl = test_conn(is_exit = True, check_dns = True, view_msg = True, # lst_urls = [], lst_site_check_dns = [], in_addon = True) - + def run(item=None): logger.info() if not item: @@ -157,11 +157,17 @@ def run(item=None): # Checks if channel exists if os.path.isfile(os.path.join(config.get_runtime_path(), 'channels', item.channel + ".py")): CHANNELS = 'channels' + elif os.path.isfile(os.path.join(config.get_runtime_path(), 'channels', 'porn', item.channel + ".py")): + CHANNELS = 'channels.porn' else: CHANNELS ='specials' - channel_file = os.path.join(config.get_runtime_path(), CHANNELS, item.channel + ".py") - - logger.info("channel_file= " + channel_file) + + if CHANNELS != 'channels.porn': + channel_file = os.path.join(config.get_runtime_path(), CHANNELS, item.channel + ".py") + else: + channel_file = os.path.join(config.get_runtime_path(), 'channels', 'porn', item.channel + ".py") + + logger.info("channel_file= " + channel_file + ' - ' + CHANNELS +' - ' + item.channel) channel = None @@ -169,7 +175,8 @@ def run(item=None): try: channel = __import__(CHANNELS + item.channel, None, None, [CHANNELS + item.channel]) except ImportError: - importer = "import " + CHANNELS + "." + item.channel + " as channel" + importer = "import " + CHANNELS + "." + item.channel + " as channel " + exec(importer) logger.info("Running channel %s | %s" % (channel.__name__, channel.__file__)) @@ -276,7 +283,7 @@ def run(item=None): platformtools.render_items(itemlist, item) - # For all other actions + # For all other actions else: # import web_pdb; web_pdb.set_trace() logger.info("Executing channel '%s' method" % item.action) @@ -430,7 +437,7 @@ def play_from_library(item): import xbmcplugin import xbmc from time import sleep - + # Intentamos reproducir una imagen (esto no hace nada y ademas no da error) xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, xbmcgui.ListItem(