From dc84e16b8144b9cd1dce6c2cb49095d2b90d91e0 Mon Sep 17 00:00:00 2001 From: alfa_addon_10 Date: Tue, 26 Sep 2017 20:34:04 +0200 Subject: [PATCH] removed servers, channels, new feature from settings, language channel can be splited "castellano" and "latino" channels --- mediaserver/resources/settings.xml | 2 +- plugin.video.alfa/channels/allcalidad.json | 5 +- plugin.video.alfa/channels/allpeliculas.json | 3 +- plugin.video.alfa/channels/alltorrent.json | 2 +- plugin.video.alfa/channels/animeflv.json | 2 +- plugin.video.alfa/channels/animeflv_me.json | 2 +- plugin.video.alfa/channels/animeflv_ru.json | 5 +- plugin.video.alfa/channels/animeid.json | 2 +- plugin.video.alfa/channels/animeshd.json | 3 +- plugin.video.alfa/channels/anitoonstv.json | 3 +- .../channels/areadocumental.json | 2 +- plugin.video.alfa/channels/bajui2.json | 2 +- plugin.video.alfa/channels/beeg.json | 2 +- plugin.video.alfa/channels/bityouth.json | 2 +- .../channels/borrachodetorrent.json | 2 +- plugin.video.alfa/channels/bricocine.json | 2 +- plugin.video.alfa/channels/canalpelis.json | 3 +- plugin.video.alfa/channels/canalporno.json | 2 +- plugin.video.alfa/channels/cartoonlatino.json | 5 +- .../channels/ciberdocumentales.json | 2 +- .../channels/cineasiaenlinea.json | 2 +- plugin.video.alfa/channels/cinecalidad.json | 6 +- plugin.video.alfa/channels/cinefox.json | 3 +- plugin.video.alfa/channels/cinefoxtv.json | 3 +- plugin.video.alfa/channels/cinehindi.json | 2 +- plugin.video.alfa/channels/cinetemagay.json | 2 +- plugin.video.alfa/channels/cinetux.json | 3 +- plugin.video.alfa/channels/clasicofilm.json | 2 +- plugin.video.alfa/channels/copiapop.json | 2 +- plugin.video.alfa/channels/crimenes.json | 2 +- plugin.video.alfa/channels/crunchyroll.json | 2 +- plugin.video.alfa/channels/cuelgame.json | 2 +- plugin.video.alfa/channels/cumlouder.json | 2 +- plugin.video.alfa/channels/datoporn.json | 2 +- .../channels/descargacineclasico.json | 2 +- plugin.video.alfa/channels/descargasmix.json | 3 +- plugin.video.alfa/channels/discoverymx.json | 3 +- plugin.video.alfa/channels/divxatope.json | 2 +- plugin.video.alfa/channels/divxtotal.json | 2 +- plugin.video.alfa/channels/documaniatv.json | 2 +- .../channels/documentalesonline.json | 2 +- plugin.video.alfa/channels/doomtv.json | 6 +- plugin.video.alfa/channels/doramastv.json | 2 +- plugin.video.alfa/channels/downloads.json | 2 +- .../channels/ecarteleratrailers.json | 2 +- plugin.video.alfa/channels/elitetorrent.json | 2 +- .../channels/elsenordelanillo.json | 3 +- plugin.video.alfa/channels/eporner.json | 2 +- plugin.video.alfa/channels/erotik.json | 2 +- plugin.video.alfa/channels/estadepelis.json | 6 +- plugin.video.alfa/channels/estrenosgo.json | 5 +- .../channels/filesmonster_catalogue.json | 2 +- plugin.video.alfa/channels/freecambay.json | 2 +- plugin.video.alfa/channels/gmobi.json | 2 +- plugin.video.alfa/channels/gmobi.py | 14 +- plugin.video.alfa/channels/gnula.json | 3 +- .../channels/guaridavalencianista.json | 2 +- plugin.video.alfa/channels/hdfull.json | 2 +- .../channels/hentaienespanol.json | 2 +- plugin.video.alfa/channels/hentaiid.json | 2 +- plugin.video.alfa/channels/idocumentales.json | 2 +- plugin.video.alfa/channels/inkapelis.json | 5 +- plugin.video.alfa/channels/javtasty.json | 2 +- plugin.video.alfa/channels/javus.json | 2 +- plugin.video.alfa/channels/jkanime.json | 2 +- plugin.video.alfa/channels/lacajita.json | 3 +- plugin.video.alfa/channels/locopelis.json | 6 +- plugin.video.alfa/channels/maxipelis.json | 2 +- plugin.video.alfa/channels/maxipelis.py | 9 +- plugin.video.alfa/channels/mejortorrent.json | 2 +- plugin.video.alfa/channels/metaserie.json | 6 +- plugin.video.alfa/channels/miltorrents.json | 2 +- plugin.video.alfa/channels/miradetodo.json | 3 +- plugin.video.alfa/channels/mundoflv.json | 6 +- plugin.video.alfa/channels/newpct.json | 2 +- plugin.video.alfa/channels/newpct1.json | 2 +- plugin.video.alfa/channels/news.json | 2 +- plugin.video.alfa/channels/news.py | 16 +- plugin.video.alfa/channels/nuvid.json | 2 +- plugin.video.alfa/channels/ohpelis.json | 6 +- .../channels/pasateatorrent.json | 2 +- plugin.video.alfa/channels/pedropolis.json | 3 +- .../channels/peliculasaudiolatino.json | 3 +- plugin.video.alfa/channels/peliculasdk.json | 2 +- .../channels/peliculaseroticas.json | 2 +- .../channels/peliculasgratis.json | 2 +- .../channels/peliculashindu.json | 2 +- plugin.video.alfa/channels/peliculasmx.json | 3 +- plugin.video.alfa/channels/peliculasnu.json | 5 +- plugin.video.alfa/channels/peliculasrey.json | 2 +- plugin.video.alfa/channels/pelis24.json | 52 -- plugin.video.alfa/channels/pelis24.py | 215 ----- plugin.video.alfa/channels/pelisadicto.json | 5 +- plugin.video.alfa/channels/peliscity.json | 3 +- plugin.video.alfa/channels/peliscon.json | 2 +- plugin.video.alfa/channels/pelisencasa.json | 3 +- plugin.video.alfa/channels/pelisfox.json | 3 +- plugin.video.alfa/channels/pelisgratis.json | 3 +- plugin.video.alfa/channels/pelisipad.json | 2 +- plugin.video.alfa/channels/pelismagnet.json | 2 +- plugin.video.alfa/channels/pelispedia.json | 2 +- plugin.video.alfa/channels/pelispekes.json | 2 +- plugin.video.alfa/channels/pelisplanet.json | 2 +- plugin.video.alfa/channels/pelisplus.json | 6 +- plugin.video.alfa/channels/pelisplusco.json | 2 +- plugin.video.alfa/channels/pelisxporno.json | 2 +- plugin.video.alfa/channels/pepecine.json | 2 +- plugin.video.alfa/channels/playmax.json | 2 +- plugin.video.alfa/channels/playmax.py | 3 +- plugin.video.alfa/channels/playpornx.json | 2 +- plugin.video.alfa/channels/plusdede.json | 2 +- plugin.video.alfa/channels/pordede.json | 2 +- plugin.video.alfa/channels/pornhub.json | 2 +- plugin.video.alfa/channels/porntrex.json | 2 +- plugin.video.alfa/channels/puyasubs.json | 2 +- plugin.video.alfa/channels/pymovie.json | 3 +- plugin.video.alfa/channels/qserie.json | 3 +- .../channels/quierodibujosanimados.json | 2 +- plugin.video.alfa/channels/repelis.json | 5 +- plugin.video.alfa/channels/search.json | 2 +- plugin.video.alfa/channels/search.py | 16 +- plugin.video.alfa/channels/seodiv.json | 5 +- plugin.video.alfa/channels/seriecanal.json | 2 +- plugin.video.alfa/channels/seriesadicto.json | 2 +- plugin.video.alfa/channels/seriesblanco.json | 5 +- plugin.video.alfa/channels/seriesdanko.json | 2 +- plugin.video.alfa/channels/serieslan.json | 5 +- plugin.video.alfa/channels/serieslatino.json | 6 +- plugin.video.alfa/channels/seriesmeme.json | 5 +- plugin.video.alfa/channels/seriespapaya.json | 2 +- plugin.video.alfa/channels/seriesyonkis.json | 2 +- plugin.video.alfa/channels/serviporno.json | 2 +- plugin.video.alfa/channels/sipeliculas.json | 3 +- .../channels/submityouflicks.json | 2 +- .../channels/teledocumentales.json | 2 +- plugin.video.alfa/channels/torrentlocura.json | 2 +- plugin.video.alfa/channels/tubehentai.json | 2 +- plugin.video.alfa/channels/tupornotv.json | 2 +- plugin.video.alfa/channels/tvmoviedb.json | 2 +- plugin.video.alfa/channels/tvseriesdk.json | 3 +- plugin.video.alfa/channels/tvvip.json | 35 - plugin.video.alfa/channels/tvvip.py | 805 ------------------ .../channels/ultrapeliculashd.json | 3 +- plugin.video.alfa/channels/unsoloclic.json | 2 +- plugin.video.alfa/channels/vepelis.json | 3 +- plugin.video.alfa/channels/ver-peliculas.json | 5 +- .../channels/vernovelasonline.json | 5 +- .../channels/verpeliculasnuevas.json | 6 +- plugin.video.alfa/channels/verpelis.json | 2 +- .../channels/verseriesonlinetv.json | 2 +- .../channels/verseriesynovelas.json | 89 -- .../channels/verseriesynovelas.py | 393 --------- .../channels/vertelenovelas.json | 2 +- plugin.video.alfa/channels/videolibrary.json | 2 +- plugin.video.alfa/channels/vidz7.json | 2 +- plugin.video.alfa/channels/vixto.json | 3 +- plugin.video.alfa/channels/vseries.json | 2 +- plugin.video.alfa/channels/wopelis.json | 2 +- plugin.video.alfa/channels/x18hentai.json | 2 +- plugin.video.alfa/channels/xdvideos.json | 5 +- plugin.video.alfa/channels/xhamster.json | 2 +- plugin.video.alfa/channels/xtheatre.json | 2 +- plugin.video.alfa/channels/yaske.json | 3 +- plugin.video.alfa/channels/yespornplease.json | 2 +- plugin.video.alfa/channels/zentorrents.json | 2 +- plugin.video.alfa/channels/zpeliculas.json | 2 +- plugin.video.alfa/channelselector.py | 36 +- plugin.video.alfa/core/channeltools.py | 2 +- .../resources/language/English/strings.po | 4 - .../language/Spanish (Argentina)/strings.po | 4 - .../language/Spanish (Mexico)/strings.po | 4 - .../resources/language/Spanish/strings.po | 4 - plugin.video.alfa/resources/settings.xml | 2 +- plugin.video.alfa/servers/fileserve.json | 48 -- plugin.video.alfa/servers/fileserve.py | 53 -- 175 files changed, 215 insertions(+), 2012 deletions(-) delete mode 100755 plugin.video.alfa/channels/pelis24.json delete mode 100644 plugin.video.alfa/channels/pelis24.py delete mode 100755 plugin.video.alfa/channels/tvvip.json delete mode 100755 plugin.video.alfa/channels/tvvip.py delete mode 100755 plugin.video.alfa/channels/verseriesynovelas.json delete mode 100755 plugin.video.alfa/channels/verseriesynovelas.py delete mode 100755 plugin.video.alfa/servers/fileserve.json delete mode 100755 plugin.video.alfa/servers/fileserve.py diff --git a/mediaserver/resources/settings.xml b/mediaserver/resources/settings.xml index 5607fedd..0eb273ce 100644 --- a/mediaserver/resources/settings.xml +++ b/mediaserver/resources/settings.xml @@ -7,7 +7,7 @@ - + diff --git a/plugin.video.alfa/channels/allcalidad.json b/plugin.video.alfa/channels/allcalidad.json index 42124f56..324278a5 100755 --- a/plugin.video.alfa/channels/allcalidad.json +++ b/plugin.video.alfa/channels/allcalidad.json @@ -3,7 +3,7 @@ "name": "Allcalidad", "active": true, "adult": false, - "language": "es", + "language": ["lat"], "thumbnail": "https://s22.postimg.org/irnlwuizh/allcalidad1.png", "banner": "https://s22.postimg.org/9y1athlep/allcalidad2.png", "version": 1, @@ -15,8 +15,7 @@ ], "categories": [ "movie", - "direct", - "latino" + "direct" ], "settings": [ { diff --git a/plugin.video.alfa/channels/allpeliculas.json b/plugin.video.alfa/channels/allpeliculas.json index f0078ef2..b9d5ca74 100755 --- a/plugin.video.alfa/channels/allpeliculas.json +++ b/plugin.video.alfa/channels/allpeliculas.json @@ -1,7 +1,7 @@ { "id": "allpeliculas", "name": "Allpeliculas", - "language": "es", + "language": ["lat"], "active": true, "adult": false, "version": 1, @@ -31,7 +31,6 @@ "banner": "allpeliculas.png", "categories": [ "movie", - "latino", "vos", "tvshow" ], diff --git a/plugin.video.alfa/channels/alltorrent.json b/plugin.video.alfa/channels/alltorrent.json index 18564066..4739bd8b 100755 --- a/plugin.video.alfa/channels/alltorrent.json +++ b/plugin.video.alfa/channels/alltorrent.json @@ -3,7 +3,7 @@ "name": "Alltorrent", "active": true, "adult": false, - "language": "es", + "language": ["cast"], "thumbnail": "http://imgur.com/sLaXHvp.png", "version": 1, "changes": [ diff --git a/plugin.video.alfa/channels/animeflv.json b/plugin.video.alfa/channels/animeflv.json index 01ed328b..6bf5a4d7 100755 --- a/plugin.video.alfa/channels/animeflv.json +++ b/plugin.video.alfa/channels/animeflv.json @@ -3,7 +3,7 @@ "name": "AnimeFLV", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "animeflv.png", "banner": "animeflv.png", "version": 1, diff --git a/plugin.video.alfa/channels/animeflv_me.json b/plugin.video.alfa/channels/animeflv_me.json index f8996058..b5ab4807 100755 --- a/plugin.video.alfa/channels/animeflv_me.json +++ b/plugin.video.alfa/channels/animeflv_me.json @@ -3,7 +3,7 @@ "name": "Animeflv.ME", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "http://i.imgur.com/x9AdvBx.png", "banner": "http://i.imgur.com/dTZwCPq.png", "version": 1, diff --git a/plugin.video.alfa/channels/animeflv_ru.json b/plugin.video.alfa/channels/animeflv_ru.json index 1bdaea73..a7831726 100755 --- a/plugin.video.alfa/channels/animeflv_ru.json +++ b/plugin.video.alfa/channels/animeflv_ru.json @@ -3,13 +3,12 @@ "name": "AnimeFLV.RU", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "http://i.imgur.com/5nRR9qq.png", "banner": "animeflv_ru.png", "version": 1, "compatible": { - "python": "2.7.9", - "addon_version": "4.2.1" + "python": "2.7.9" }, "changes": { "change": [ diff --git a/plugin.video.alfa/channels/animeid.json b/plugin.video.alfa/channels/animeid.json index bdad185b..220d8ec8 100755 --- a/plugin.video.alfa/channels/animeid.json +++ b/plugin.video.alfa/channels/animeid.json @@ -3,7 +3,7 @@ "name": "Animeid", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "animeid.png", "banner": "animeid.png", "version": 1, diff --git a/plugin.video.alfa/channels/animeshd.json b/plugin.video.alfa/channels/animeshd.json index fdf04e49..4de05b19 100755 --- a/plugin.video.alfa/channels/animeshd.json +++ b/plugin.video.alfa/channels/animeshd.json @@ -3,7 +3,7 @@ "name": "AnimesHD", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "https://s21.postimg.org/b43i3ljav/animeshd.png", "banner": "https://s4.postimg.org/lulxulmql/animeshd-banner.png", "version": 1, @@ -22,7 +22,6 @@ } ], "categories": [ - "latino", "anime" ] } diff --git a/plugin.video.alfa/channels/anitoonstv.json b/plugin.video.alfa/channels/anitoonstv.json index e7924e18..cb7cb7e0 100755 --- a/plugin.video.alfa/channels/anitoonstv.json +++ b/plugin.video.alfa/channels/anitoonstv.json @@ -3,7 +3,7 @@ "name": "AniToons TV", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "http://i.imgur.com/9Zu5NBc.png", "banner": "http://i.imgur.com/JQSXCaB.png", "version": 1, @@ -19,7 +19,6 @@ ], "categories": [ "tvshow", - "latino", "anime" ] } diff --git a/plugin.video.alfa/channels/areadocumental.json b/plugin.video.alfa/channels/areadocumental.json index c9ca5448..84941551 100755 --- a/plugin.video.alfa/channels/areadocumental.json +++ b/plugin.video.alfa/channels/areadocumental.json @@ -1,7 +1,7 @@ { "id": "areadocumental", "name": "Area-Documental", - "language": "es", + "language": ["cast", "lat"], "adult": false, "active": true, "version": 1, diff --git a/plugin.video.alfa/channels/bajui2.json b/plugin.video.alfa/channels/bajui2.json index 66c7b956..9a2e8fde 100755 --- a/plugin.video.alfa/channels/bajui2.json +++ b/plugin.video.alfa/channels/bajui2.json @@ -3,7 +3,7 @@ "name": "Bajui2", "active": true, "adult": false, - "language": "es", + "language": ["cast"], "thumbnail": "bajui.png", "banner": "bajui.png", "fanart": "bajui.png", diff --git a/plugin.video.alfa/channels/beeg.json b/plugin.video.alfa/channels/beeg.json index b90b31ae..3bd04c00 100755 --- a/plugin.video.alfa/channels/beeg.json +++ b/plugin.video.alfa/channels/beeg.json @@ -3,7 +3,7 @@ "name": "Beeg", "active": true, "adult": true, - "language": "es", + "language": ["*"], "thumbnail": "beeg.png", "banner": "beeg.png", "version": 1, diff --git a/plugin.video.alfa/channels/bityouth.json b/plugin.video.alfa/channels/bityouth.json index 401d7de6..68495232 100755 --- a/plugin.video.alfa/channels/bityouth.json +++ b/plugin.video.alfa/channels/bityouth.json @@ -3,7 +3,7 @@ "name": "Bityouth", "active": true, "adult": false, - "language": "es", + "language": ["cast"], "thumbnail": "http://s6.postimg.org/6ash180up/bityoulogo.png", "banner": "bityouth.png", "version": 1, diff --git a/plugin.video.alfa/channels/borrachodetorrent.json b/plugin.video.alfa/channels/borrachodetorrent.json index 47c9158a..af57aff1 100755 --- a/plugin.video.alfa/channels/borrachodetorrent.json +++ b/plugin.video.alfa/channels/borrachodetorrent.json @@ -3,7 +3,7 @@ "name": "BorrachodeTorrent", "active": true, "adult": false, - "language": "es", + "language": ["cast"], "thumbnail": "http://imgur.com/BePrYmy.png", "version": 1, "changes": [ diff --git a/plugin.video.alfa/channels/bricocine.json b/plugin.video.alfa/channels/bricocine.json index 70235fa1..f458203a 100755 --- a/plugin.video.alfa/channels/bricocine.json +++ b/plugin.video.alfa/channels/bricocine.json @@ -3,7 +3,7 @@ "name": "Bricocine", "active": true, "adult": false, - "language": "es", + "language": ["cast"], "thumbnail": "http://s6.postimg.org/9u8m1ep8x/bricocine.jpg", "banner": "bricocine.png", "version": 1, diff --git a/plugin.video.alfa/channels/canalpelis.json b/plugin.video.alfa/channels/canalpelis.json index e88d7a0a..7a38759a 100644 --- a/plugin.video.alfa/channels/canalpelis.json +++ b/plugin.video.alfa/channels/canalpelis.json @@ -3,7 +3,7 @@ "name": "CanalPelis", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "fanart": "https://raw.githubusercontent.com/Inter95/tvguia/master/thumbnails/canalpelisbg.jpg", "thumbnail": "http://www.canalpelis.com/wp-content/uploads/2016/11/logo_web.gif", "banner": "", @@ -15,7 +15,6 @@ } ], "categories": [ - "latino", "movie", "tvshow", "vos" diff --git a/plugin.video.alfa/channels/canalporno.json b/plugin.video.alfa/channels/canalporno.json index e4a4078d..80e1077b 100755 --- a/plugin.video.alfa/channels/canalporno.json +++ b/plugin.video.alfa/channels/canalporno.json @@ -3,7 +3,7 @@ "name": "Canalporno", "active": true, "adult": true, - "language": "es", + "language": ["*"], "thumbnail": "http://i.imgur.com/gAbPcvT.png?1", "banner": "canalporno.png", "version": 1, diff --git a/plugin.video.alfa/channels/cartoonlatino.json b/plugin.video.alfa/channels/cartoonlatino.json index 43fa8a91..e58fef6d 100755 --- a/plugin.video.alfa/channels/cartoonlatino.json +++ b/plugin.video.alfa/channels/cartoonlatino.json @@ -3,7 +3,7 @@ "name": "Cartoon-Latino", "active": true, "adult": false, - "language": "es", + "language": ["lat"], "thumbnail": "http://i.imgur.com/wk6fRDZ.png", "banner": "http://i.imgur.com/115c59F.png", "version": 1, @@ -14,7 +14,6 @@ } ], "categories": [ - "tvshow", - "latino" + "tvshow" ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/ciberdocumentales.json b/plugin.video.alfa/channels/ciberdocumentales.json index 816e6020..8925f5db 100755 --- a/plugin.video.alfa/channels/ciberdocumentales.json +++ b/plugin.video.alfa/channels/ciberdocumentales.json @@ -3,7 +3,7 @@ "name": "CiberDocumentales", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "https://s9.postimg.org/secdb5s8v/ciberdocumentales.png", "banner": "https://s1.postimg.org/sa486z0of/ciberdocumentales_banner.png", "version": 1, diff --git a/plugin.video.alfa/channels/cineasiaenlinea.json b/plugin.video.alfa/channels/cineasiaenlinea.json index df5f5c91..2ef9c1a6 100755 --- a/plugin.video.alfa/channels/cineasiaenlinea.json +++ b/plugin.video.alfa/channels/cineasiaenlinea.json @@ -3,7 +3,7 @@ "name": "CineAsiaEnLinea", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "http://i.imgur.com/5KOU8uy.png?3", "banner": "cineasiaenlinea.png", "version": 1, diff --git a/plugin.video.alfa/channels/cinecalidad.json b/plugin.video.alfa/channels/cinecalidad.json index 06fc11b7..e5d9f069 100755 --- a/plugin.video.alfa/channels/cinecalidad.json +++ b/plugin.video.alfa/channels/cinecalidad.json @@ -1,12 +1,9 @@ { "id": "cinecalidad", "name": "CineCalidad", - "compatible": { - "addon_version": "4.3" - }, "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "https://s31.postimg.org/puxmvsi7v/cinecalidad.png", "banner": "https://s32.postimg.org/kihkdpx1x/banner_cinecalidad.png", "version": 1, @@ -33,7 +30,6 @@ } ], "categories": [ - "latino", "movie" ], "settings": [ diff --git a/plugin.video.alfa/channels/cinefox.json b/plugin.video.alfa/channels/cinefox.json index 8a5c10bd..acbb8914 100755 --- a/plugin.video.alfa/channels/cinefox.json +++ b/plugin.video.alfa/channels/cinefox.json @@ -3,7 +3,7 @@ "name": "Cinefox", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "version": 1, "thumbnail": "cinefox.png", "banner": "cinefox.png", @@ -28,7 +28,6 @@ "categories": [ "movie", "tvshow", - "latino", "vos" ], "settings": [ diff --git a/plugin.video.alfa/channels/cinefoxtv.json b/plugin.video.alfa/channels/cinefoxtv.json index 659a00fd..8c127c57 100755 --- a/plugin.video.alfa/channels/cinefoxtv.json +++ b/plugin.video.alfa/channels/cinefoxtv.json @@ -3,7 +3,7 @@ "name": "CineFoxTV", "active": true, "adult": false, - "language": "es", + "language": ["lat"], "thumbnail": "https://s28.postimg.org/lytn2q1tp/cinefoxtv.png", "banner": "cinefoxtv.png", "version": 1, @@ -22,7 +22,6 @@ } ], "categories": [ - "latino", "movie" ], "settings": [ diff --git a/plugin.video.alfa/channels/cinehindi.json b/plugin.video.alfa/channels/cinehindi.json index ec7879d4..27959fe3 100755 --- a/plugin.video.alfa/channels/cinehindi.json +++ b/plugin.video.alfa/channels/cinehindi.json @@ -3,7 +3,7 @@ "name": "CineHindi", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "cinehindi.png", "banner": "http://i.imgur.com/cau9TVe.png", "version": 1, diff --git a/plugin.video.alfa/channels/cinetemagay.json b/plugin.video.alfa/channels/cinetemagay.json index ee01d7df..52651bfb 100755 --- a/plugin.video.alfa/channels/cinetemagay.json +++ b/plugin.video.alfa/channels/cinetemagay.json @@ -3,7 +3,7 @@ "name": "Cinetemagay", "active": true, "adult": true, - "language": "es", + "language": ["*"], "thumbnail": "cinetemagay.png", "banner": "cinetemagay.png", "version": 1, diff --git a/plugin.video.alfa/channels/cinetux.json b/plugin.video.alfa/channels/cinetux.json index 582184ab..6a7d3983 100755 --- a/plugin.video.alfa/channels/cinetux.json +++ b/plugin.video.alfa/channels/cinetux.json @@ -3,7 +3,7 @@ "name": "Cinetux", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "cinetux.png", "banner": "cinetux.png", "fanart": "cinetux.jpg", @@ -27,7 +27,6 @@ } ], "categories": [ - "latino", "direct", "movie" ], diff --git a/plugin.video.alfa/channels/clasicofilm.json b/plugin.video.alfa/channels/clasicofilm.json index 1c7cb4e2..d1104cb0 100755 --- a/plugin.video.alfa/channels/clasicofilm.json +++ b/plugin.video.alfa/channels/clasicofilm.json @@ -3,7 +3,7 @@ "name": "ClasicoFilm", "active": true, "adult": false, - "language": "es", + "language": ["cast"], "thumbnail": "http://i.imgur.com/F7sevVu.jpg?1", "banner": "clasicofilm.png", "version": 1, diff --git a/plugin.video.alfa/channels/copiapop.json b/plugin.video.alfa/channels/copiapop.json index e8d65d10..acdb4daf 100644 --- a/plugin.video.alfa/channels/copiapop.json +++ b/plugin.video.alfa/channels/copiapop.json @@ -1,7 +1,7 @@ { "id": "copiapop", "name": "Copiapop/Diskokosmiko", - "language": "es", + "language": ["cast", "lat"], "active": true, "adult": false, "version": 1, diff --git a/plugin.video.alfa/channels/crimenes.json b/plugin.video.alfa/channels/crimenes.json index 8b6d4342..500ac3a4 100755 --- a/plugin.video.alfa/channels/crimenes.json +++ b/plugin.video.alfa/channels/crimenes.json @@ -3,7 +3,7 @@ "name": "Crimenes Imperfectos", "active": true, "adult": false, - "language": "es", + "language": ["cast"], "banner": "crimenes.png", "thumbnail": "crimenes.png", "version": 1, diff --git a/plugin.video.alfa/channels/crunchyroll.json b/plugin.video.alfa/channels/crunchyroll.json index 5d53c4cc..95156d2c 100755 --- a/plugin.video.alfa/channels/crunchyroll.json +++ b/plugin.video.alfa/channels/crunchyroll.json @@ -1,7 +1,7 @@ { "id": "crunchyroll", "name": "Crunchyroll", - "language": "es", + "language": ["cast", "lat"], "active": true, "adult": false, "version": 1, diff --git a/plugin.video.alfa/channels/cuelgame.json b/plugin.video.alfa/channels/cuelgame.json index 805701b7..fe1e6a9a 100755 --- a/plugin.video.alfa/channels/cuelgame.json +++ b/plugin.video.alfa/channels/cuelgame.json @@ -3,7 +3,7 @@ "name": "Cuelgame", "active": true, "adult": false, - "language": "es", + "language": ["cast"], "version": 1, "changes": [ { diff --git a/plugin.video.alfa/channels/cumlouder.json b/plugin.video.alfa/channels/cumlouder.json index 8c41c900..d937eb45 100755 --- a/plugin.video.alfa/channels/cumlouder.json +++ b/plugin.video.alfa/channels/cumlouder.json @@ -3,7 +3,7 @@ "name": "Cumlouder", "active": true, "adult": true, - "language": "es", + "language": ["*"], "thumbnail": "cumlouder.png", "banner": "cumlouder.png", "version": 1, diff --git a/plugin.video.alfa/channels/datoporn.json b/plugin.video.alfa/channels/datoporn.json index ca5919ce..e346f95f 100755 --- a/plugin.video.alfa/channels/datoporn.json +++ b/plugin.video.alfa/channels/datoporn.json @@ -1,7 +1,7 @@ { "id": "datoporn", "name": "DatoPorn", - "language": "es", + "language": ["*"], "active": true, "adult": true, "changes": [ diff --git a/plugin.video.alfa/channels/descargacineclasico.json b/plugin.video.alfa/channels/descargacineclasico.json index 3bfc0e52..5b5f9b5b 100755 --- a/plugin.video.alfa/channels/descargacineclasico.json +++ b/plugin.video.alfa/channels/descargacineclasico.json @@ -1,7 +1,7 @@ { "id": "descargacineclasico", "name": "descargacineclasico", - "language": "es", + "language": ["cast"], "active": true, "adult": false, "version": 1, diff --git a/plugin.video.alfa/channels/descargasmix.json b/plugin.video.alfa/channels/descargasmix.json index d519252e..ba8fc20d 100644 --- a/plugin.video.alfa/channels/descargasmix.json +++ b/plugin.video.alfa/channels/descargasmix.json @@ -1,7 +1,7 @@ { "id": "descargasmix", "name": "DescargasMIX", - "language": "es", + "language": ["cast", "lat"], "active": true, "version": 1, "adult": false, @@ -31,7 +31,6 @@ "banner": "descargasmix.png", "categories": [ "movie", - "latino", "vos", "torrent", "documentary", diff --git a/plugin.video.alfa/channels/discoverymx.json b/plugin.video.alfa/channels/discoverymx.json index 0f3cedc0..6de0bf1e 100755 --- a/plugin.video.alfa/channels/discoverymx.json +++ b/plugin.video.alfa/channels/discoverymx.json @@ -3,7 +3,7 @@ "name": "Discoverymx", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "discoverymx.png", "banner": "discoverymx.png", "version": 1, @@ -18,7 +18,6 @@ } ], "categories": [ - "latino", "documentary" ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/divxatope.json b/plugin.video.alfa/channels/divxatope.json index 8690adca..fb58b863 100755 --- a/plugin.video.alfa/channels/divxatope.json +++ b/plugin.video.alfa/channels/divxatope.json @@ -3,7 +3,7 @@ "name": "Divxatope", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "divxatope.png", "banner": "divxatope.png", "version": 1, diff --git a/plugin.video.alfa/channels/divxtotal.json b/plugin.video.alfa/channels/divxtotal.json index 3803aa1d..f9826b37 100755 --- a/plugin.video.alfa/channels/divxtotal.json +++ b/plugin.video.alfa/channels/divxtotal.json @@ -3,7 +3,7 @@ "name": "Divxtotal", "active": true, "adult": false, - "language": "es", + "language": ["cast"], "thumbnail": "http://imgur.com/Madj03A.jpg", "version": 1, "changes": [ diff --git a/plugin.video.alfa/channels/documaniatv.json b/plugin.video.alfa/channels/documaniatv.json index 5338cc1c..01b5e0bb 100755 --- a/plugin.video.alfa/channels/documaniatv.json +++ b/plugin.video.alfa/channels/documaniatv.json @@ -3,7 +3,7 @@ "name": "DocumaniaTV", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "http://i.imgur.com/qMR9sg9.png", "banner": "documaniatv.png", "version": 1, diff --git a/plugin.video.alfa/channels/documentalesonline.json b/plugin.video.alfa/channels/documentalesonline.json index fe8308a3..edcab55f 100755 --- a/plugin.video.alfa/channels/documentalesonline.json +++ b/plugin.video.alfa/channels/documentalesonline.json @@ -3,7 +3,7 @@ "name": "Documentales Online", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "http://i.imgur.com/fsrnC4m.jpg", "version": 1, "changes": [ diff --git a/plugin.video.alfa/channels/doomtv.json b/plugin.video.alfa/channels/doomtv.json index f51eb8e8..72bdbfd9 100755 --- a/plugin.video.alfa/channels/doomtv.json +++ b/plugin.video.alfa/channels/doomtv.json @@ -1,17 +1,13 @@ { "id": "doomtv", "name": "doomtv", - "compatible": { - "addon_version": "4.3" - }, "active": true, "adult": false, - "language": "es", + "language": ["lat"], "thumbnail": "https://s2.postimg.org/jivgi4ak9/doomtv.png", "banner": "https://s32.postimg.org/6gxyripvp/doomtv_banner.png", "version": 1, "categories": [ - "latino", "movie", "direct" ], diff --git a/plugin.video.alfa/channels/doramastv.json b/plugin.video.alfa/channels/doramastv.json index 767edadc..5ab1403f 100755 --- a/plugin.video.alfa/channels/doramastv.json +++ b/plugin.video.alfa/channels/doramastv.json @@ -3,7 +3,7 @@ "name": "DoramasTV", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "doramastv.png", "banner": "doramastv.png", "version": 1, diff --git a/plugin.video.alfa/channels/downloads.json b/plugin.video.alfa/channels/downloads.json index bed761f0..f38f25a1 100755 --- a/plugin.video.alfa/channels/downloads.json +++ b/plugin.video.alfa/channels/downloads.json @@ -3,7 +3,7 @@ "name": "Descargas", "active": false, "adult": false, - "language": "es", + "language": ["*"], "version": 1, "changes": [ { diff --git a/plugin.video.alfa/channels/ecarteleratrailers.json b/plugin.video.alfa/channels/ecarteleratrailers.json index 5b66a830..7def6f7c 100755 --- a/plugin.video.alfa/channels/ecarteleratrailers.json +++ b/plugin.video.alfa/channels/ecarteleratrailers.json @@ -3,7 +3,7 @@ "name": "Trailers ecartelera", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "ecarteleratrailers.png", "banner": "ecarteleratrailers.png", "version": 1, diff --git a/plugin.video.alfa/channels/elitetorrent.json b/plugin.video.alfa/channels/elitetorrent.json index 5287e4f4..12372cf1 100644 --- a/plugin.video.alfa/channels/elitetorrent.json +++ b/plugin.video.alfa/channels/elitetorrent.json @@ -3,7 +3,7 @@ "name": "Elite Torrent", "active": true, "adult": false, - "language": "es", + "language": ["cast"], "thumbnail": "elitetorrent.png", "banner": "elitetorrent.png", "version": 2, diff --git a/plugin.video.alfa/channels/elsenordelanillo.json b/plugin.video.alfa/channels/elsenordelanillo.json index 101f0a31..692d99b1 100755 --- a/plugin.video.alfa/channels/elsenordelanillo.json +++ b/plugin.video.alfa/channels/elsenordelanillo.json @@ -3,7 +3,7 @@ "name": "El señor del anillo", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "elsenordelanillo.png", "banner": "elsenordelanillo.png", "version": 1, @@ -18,7 +18,6 @@ } ], "categories": [ - "latino", "movie" ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/eporner.json b/plugin.video.alfa/channels/eporner.json index 4ddc9dfe..f364548a 100755 --- a/plugin.video.alfa/channels/eporner.json +++ b/plugin.video.alfa/channels/eporner.json @@ -3,7 +3,7 @@ "name": "Eporner", "active": true, "adult": true, - "language": "es", + "language": ["*"], "thumbnail": "eporner.png", "banner": "eporner.png", "version": 1, diff --git a/plugin.video.alfa/channels/erotik.json b/plugin.video.alfa/channels/erotik.json index 661c670d..89cdafce 100755 --- a/plugin.video.alfa/channels/erotik.json +++ b/plugin.video.alfa/channels/erotik.json @@ -3,7 +3,7 @@ "name": "Erotik", "active": true, "adult": true, - "language": "es", + "language": ["*"], "thumbnail": "http://www.youfreeporntube.com/uploads/custom-logo.png", "banner": "http://www.youfreeporntube.com/uploads/custom-logo.png", "version": 1, diff --git a/plugin.video.alfa/channels/estadepelis.json b/plugin.video.alfa/channels/estadepelis.json index 5c51852b..b76cdb29 100755 --- a/plugin.video.alfa/channels/estadepelis.json +++ b/plugin.video.alfa/channels/estadepelis.json @@ -1,12 +1,9 @@ { "id": "estadepelis", "name": "Estadepelis", - "compatible": { - "addon_version": "4.3" - }, "active": true, "adult": false, - "language": "es", + "language": ["lat"], "thumbnail": "https://s24.postimg.org/nsgit7fhh/estadepelis.png", "banner": "https://s28.postimg.org/ud0l032ul/estadepelis_banner.png", "version": 1, @@ -33,7 +30,6 @@ } ], "categories": [ - "latino", "movie" ], "settings": [ diff --git a/plugin.video.alfa/channels/estrenosgo.json b/plugin.video.alfa/channels/estrenosgo.json index 94c0678c..45bf0de6 100755 --- a/plugin.video.alfa/channels/estrenosgo.json +++ b/plugin.video.alfa/channels/estrenosgo.json @@ -3,7 +3,7 @@ "name": "EstrenosGo", "active": true, "adult": false, - "language": "es", + "language": ["cast"], "fanart": "https://github.com/master-1970/resources/raw/master/images/fanart/estrenosgo.png", "thumbnail": "https://github.com/master-1970/resources/raw/master/images/squares/estrenosgo.png", "banner": "estrenosgo.png", @@ -24,6 +24,7 @@ ], "categories": [ "movie", - "tvshow" + "tvshow", + "torrent" ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/filesmonster_catalogue.json b/plugin.video.alfa/channels/filesmonster_catalogue.json index 0a29e612..9d5422c9 100755 --- a/plugin.video.alfa/channels/filesmonster_catalogue.json +++ b/plugin.video.alfa/channels/filesmonster_catalogue.json @@ -3,7 +3,7 @@ "name": "Filesmonster Catalogue", "active": true, "adult": true, - "language": "es", + "language": ["*"], "thumbnail": "filesmonster_catalogue.png", "banner": "filesmonster_catalogue.png", "version": 1, diff --git a/plugin.video.alfa/channels/freecambay.json b/plugin.video.alfa/channels/freecambay.json index b9b0beff..5f43e5ab 100755 --- a/plugin.video.alfa/channels/freecambay.json +++ b/plugin.video.alfa/channels/freecambay.json @@ -1,7 +1,7 @@ { "id": "freecambay", "name": "FreeCamBay", - "language": "es", + "language": ["*"], "active": true, "adult": true, "version": 1, diff --git a/plugin.video.alfa/channels/gmobi.json b/plugin.video.alfa/channels/gmobi.json index 857423af..cc8951c4 100644 --- a/plugin.video.alfa/channels/gmobi.json +++ b/plugin.video.alfa/channels/gmobi.json @@ -3,7 +3,7 @@ "name": "gmobi", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "version": 1, "thumbnail": "http://gnula.mobi/wp-content/uploads/2016/08/Untitled-6.png", "banner": "", diff --git a/plugin.video.alfa/channels/gmobi.py b/plugin.video.alfa/channels/gmobi.py index d927f2c0..b768f4af 100644 --- a/plugin.video.alfa/channels/gmobi.py +++ b/plugin.video.alfa/channels/gmobi.py @@ -1,7 +1,7 @@ -# -*- coding: iso-8859-1 -*- -#------------------------------------------------------------ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------ # Alfa -#------------------------------------------------------------ +# ------------------------------------------------------------ import urlparse,urllib2,urllib,re import os, sys @@ -18,11 +18,11 @@ from platformcode import config, logger def mainlist(item): logger.info() itemlist = [] - itemlist.append(item.clone(title="Novedades" , action="peliculas", url="http://gnula.mobi/")) - itemlist.append(item.clone(title="Castellano" , action="peliculas", + itemlist.append(item.clone(title="Novedades", action="peliculas", url="http://gnula.mobi/")) + itemlist.append(item.clone(title="Castellano", action="peliculas", url="http://www.gnula.mobi/tag/esp)anol/")) - itemlist.append(item.clone(title="Latino" , action="peliculas", url="http://gnula.mobi/tag/latino/")) - itemlist.append(item.clone(title="VOSE" , action="peliculas", url="http://gnula.mobi/tag/subtitulada/")) + itemlist.append(item.clone(title="Latino", action="peliculas", url="http://gnula.mobi/tag/latino/")) + itemlist.append(item.clone(title="VOSE", action="peliculas", url="http://gnula.mobi/tag/subtitulada/")) itemlist.append(item.clone(title="Buscar", action="search")) return itemlist diff --git a/plugin.video.alfa/channels/gnula.json b/plugin.video.alfa/channels/gnula.json index cea1c756..36decac6 100755 --- a/plugin.video.alfa/channels/gnula.json +++ b/plugin.video.alfa/channels/gnula.json @@ -3,7 +3,7 @@ "name": "Gnula", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "gnula.png", "banner": "gnula.png", "version": 1, @@ -18,7 +18,6 @@ } ], "categories": [ - "latino", "movie" ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/guaridavalencianista.json b/plugin.video.alfa/channels/guaridavalencianista.json index fcc8b8cd..fb8d26ed 100755 --- a/plugin.video.alfa/channels/guaridavalencianista.json +++ b/plugin.video.alfa/channels/guaridavalencianista.json @@ -3,7 +3,7 @@ "name": "La Guarida valencianista", "active": true, "adult": false, - "language": "es", + "language": ["cast"], "thumbnail": "guaridavalencianista.png", "banner": "guaridavalencianista.png", "version": 1, diff --git a/plugin.video.alfa/channels/hdfull.json b/plugin.video.alfa/channels/hdfull.json index c1512fa4..9c33d55e 100755 --- a/plugin.video.alfa/channels/hdfull.json +++ b/plugin.video.alfa/channels/hdfull.json @@ -3,7 +3,7 @@ "name": "HDFull", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "hdfull.png", "banner": "hdfull.png", "version": 1, diff --git a/plugin.video.alfa/channels/hentaienespanol.json b/plugin.video.alfa/channels/hentaienespanol.json index 47a8ba67..ac517505 100755 --- a/plugin.video.alfa/channels/hentaienespanol.json +++ b/plugin.video.alfa/channels/hentaienespanol.json @@ -3,7 +3,7 @@ "name": "HentaiEnEspañol", "active": true, "adult": true, - "language": "es", + "language": ["*"], "thumbnail": "https://s11.postimg.org/cmuwcvvpf/hentaienespanol.png", "banner": "https://s3.postimg.org/j3qkfut8z/hentaienespanol_banner.png", "version": 1, diff --git a/plugin.video.alfa/channels/hentaiid.json b/plugin.video.alfa/channels/hentaiid.json index d86cc149..7299938a 100755 --- a/plugin.video.alfa/channels/hentaiid.json +++ b/plugin.video.alfa/channels/hentaiid.json @@ -3,7 +3,7 @@ "name": "Hentai ID", "active": true, "adult": true, - "language": "es", + "language": ["*"], "thumbnail": "https://dl.dropboxusercontent.com/u/30248079/hentai_id.png", "banner": "https://dl.dropboxusercontent.com/u/30248079/hentai_id2.png", "version": 1, diff --git a/plugin.video.alfa/channels/idocumentales.json b/plugin.video.alfa/channels/idocumentales.json index 203c5f2a..3f66b565 100755 --- a/plugin.video.alfa/channels/idocumentales.json +++ b/plugin.video.alfa/channels/idocumentales.json @@ -3,7 +3,7 @@ "name": "Idocumentales", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "https://s27.postimg.org/pjq3y552b/idocumentales.png", "banner": "https://s16.postimg.org/6d8bh1z1x/idocumentales_banner.png", "version": 1, diff --git a/plugin.video.alfa/channels/inkapelis.json b/plugin.video.alfa/channels/inkapelis.json index a8e94caa..c7979090 100755 --- a/plugin.video.alfa/channels/inkapelis.json +++ b/plugin.video.alfa/channels/inkapelis.json @@ -3,7 +3,7 @@ "name": "Inkapelis", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "changes": [ { "date": "12/03/2017", @@ -23,8 +23,7 @@ "banner": "inkapelis.png", "categories": [ "movie", - "vos", - "latino" + "vos" ], "settings": [ { diff --git a/plugin.video.alfa/channels/javtasty.json b/plugin.video.alfa/channels/javtasty.json index 1eb1a0f1..03abfa4e 100755 --- a/plugin.video.alfa/channels/javtasty.json +++ b/plugin.video.alfa/channels/javtasty.json @@ -1,7 +1,7 @@ { "id": "javtasty", "name": "JavTasty", - "language": "es", + "language": ["*"], "active": true, "adult": true, "version": 1, diff --git a/plugin.video.alfa/channels/javus.json b/plugin.video.alfa/channels/javus.json index 1ce77a1b..16f2c5d4 100755 --- a/plugin.video.alfa/channels/javus.json +++ b/plugin.video.alfa/channels/javus.json @@ -3,7 +3,7 @@ "name": "javus.net", "active": true, "adult": true, - "language": "es", + "language": ["*"], "thumbnail": "https://s15.postimg.org/pzd3h4vy3/javus.png", "banner": "https://s21.postimg.org/5pqzedp2f/javus_banner.png", "version": 1, diff --git a/plugin.video.alfa/channels/jkanime.json b/plugin.video.alfa/channels/jkanime.json index 59b4b84c..d1c3a62b 100755 --- a/plugin.video.alfa/channels/jkanime.json +++ b/plugin.video.alfa/channels/jkanime.json @@ -3,7 +3,7 @@ "name": "JKanime", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "jkanime.png", "banner": "jkanime.png", "version": 1, diff --git a/plugin.video.alfa/channels/lacajita.json b/plugin.video.alfa/channels/lacajita.json index 02466f55..9d8e0b80 100755 --- a/plugin.video.alfa/channels/lacajita.json +++ b/plugin.video.alfa/channels/lacajita.json @@ -1,7 +1,7 @@ { "id": "lacajita", "name": "LaCajita", - "language": "es", + "language": ["cast", "lat"], "active": true, "adult": false, "version": 1, @@ -14,7 +14,6 @@ "thumbnail": "http://i.imgur.com/LVdupxc.png", "categories": [ "movie", - "latino", "vos" ], "settings": [ diff --git a/plugin.video.alfa/channels/locopelis.json b/plugin.video.alfa/channels/locopelis.json index d5df7370..95047a6a 100755 --- a/plugin.video.alfa/channels/locopelis.json +++ b/plugin.video.alfa/channels/locopelis.json @@ -1,12 +1,9 @@ { "id": "locopelis", "name": "LOCOPELIS", - "compatible": { - "addon_version": "4.3" - }, "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "https://s31.postimg.org/5worjw2nv/locopelis.png", "banner": "https://s31.postimg.org/ng87bb9jv/locopelis_banner.png", "version": 1, @@ -33,7 +30,6 @@ } ], "categories": [ - "latino", "movie" ], "settings": [ diff --git a/plugin.video.alfa/channels/maxipelis.json b/plugin.video.alfa/channels/maxipelis.json index 293a229d..98a27139 100644 --- a/plugin.video.alfa/channels/maxipelis.json +++ b/plugin.video.alfa/channels/maxipelis.json @@ -3,7 +3,7 @@ "name": "Maxipelis", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "version": 1, "thumbnail": "http://www.maxipelis.net/wp-content/uploads/2016/12/applogo.png", "banner": "", diff --git a/plugin.video.alfa/channels/maxipelis.py b/plugin.video.alfa/channels/maxipelis.py index 158c3c62..eb5968b1 100644 --- a/plugin.video.alfa/channels/maxipelis.py +++ b/plugin.video.alfa/channels/maxipelis.py @@ -1,7 +1,7 @@ -# -*- coding: iso-8859-1 -*- -#------------------------------------------------------------ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------ # Alfa -#------------------------------------------------------------ +# ------------------------------------------------------------ import urlparse,urllib2,urllib,re import os, sys @@ -13,10 +13,9 @@ from platformcode import config, logger from core import httptools from core import tmdb - - host = 'http://www.maxipelis.net' + def mainlist(item): logger.info() itemlist = [] diff --git a/plugin.video.alfa/channels/mejortorrent.json b/plugin.video.alfa/channels/mejortorrent.json index 8e877af9..402c9fcb 100755 --- a/plugin.video.alfa/channels/mejortorrent.json +++ b/plugin.video.alfa/channels/mejortorrent.json @@ -3,7 +3,7 @@ "name": "Mejor Torrent", "active": true, "adult": false, - "language": "es", + "language": ["cast"], "thumbnail": "mejortorrent.png", "banner": "mejortorrent.png", "version": 1, diff --git a/plugin.video.alfa/channels/metaserie.json b/plugin.video.alfa/channels/metaserie.json index b72af541..041622aa 100755 --- a/plugin.video.alfa/channels/metaserie.json +++ b/plugin.video.alfa/channels/metaserie.json @@ -1,12 +1,9 @@ { "id": "metaserie", "name": "MetaSerie (Latino)", - "compatible": { - "addon_version": "4.3" - }, "active": true, "adult": false, - "language": "es", + "language": ["lat"], "thumbnail": "https://s32.postimg.org/7g50yo39h/metaserie.png", "banner": "https://s31.postimg.org/u6yddil8r/metaserie_banner.png", "version": 1, @@ -33,7 +30,6 @@ } ], "categories": [ - "latino", "tvshow" ], "settings": [ diff --git a/plugin.video.alfa/channels/miltorrents.json b/plugin.video.alfa/channels/miltorrents.json index a6f12828..18e75419 100755 --- a/plugin.video.alfa/channels/miltorrents.json +++ b/plugin.video.alfa/channels/miltorrents.json @@ -3,7 +3,7 @@ "name": "Miltorrents", "active": true, "adult": false, - "language": "es", + "language": ["cast"], "version": 1, "changes": [ { diff --git a/plugin.video.alfa/channels/miradetodo.json b/plugin.video.alfa/channels/miradetodo.json index 27e9f5f8..28043b89 100755 --- a/plugin.video.alfa/channels/miradetodo.json +++ b/plugin.video.alfa/channels/miradetodo.json @@ -3,7 +3,7 @@ "name": "MiraDeTodo", "active": true, "adult": false, - "language": "es", + "language": ["lat"], "thumbnail": "https://s17.postimg.org/e8kp12mcv/miradetodo.png", "banner": "https://s7.postimg.org/it21t0dej/miradetodo-banner.png", "version": 1, @@ -18,7 +18,6 @@ } ], "categories": [ - "latino", "movie" ], "settings": [ diff --git a/plugin.video.alfa/channels/mundoflv.json b/plugin.video.alfa/channels/mundoflv.json index 3f02a6e0..905b361a 100755 --- a/plugin.video.alfa/channels/mundoflv.json +++ b/plugin.video.alfa/channels/mundoflv.json @@ -1,12 +1,9 @@ { "id": "mundoflv", "name": "MundoFlv", - "compatible": { - "addon_version": "4.3" - }, "active": true, "adult": false, - "language": "es", + "language": ["lat"], "thumbnail": "https://s32.postimg.org/h1ewz9hhx/mundoflv.png", "banner": "mundoflv.png", "version": 1, @@ -37,7 +34,6 @@ } ], "categories": [ - "latino", "tvshow" ], "settings": [ diff --git a/plugin.video.alfa/channels/newpct.json b/plugin.video.alfa/channels/newpct.json index cd8f5128..e4669030 100755 --- a/plugin.video.alfa/channels/newpct.json +++ b/plugin.video.alfa/channels/newpct.json @@ -3,7 +3,7 @@ "name": "Newpct", "active": true, "adult": false, - "language": "es", + "language": ["cast"], "thumbnail": "newpct.png", "banner": "newpct.png", "version": 1, diff --git a/plugin.video.alfa/channels/newpct1.json b/plugin.video.alfa/channels/newpct1.json index d59e3d16..ef0d543a 100755 --- a/plugin.video.alfa/channels/newpct1.json +++ b/plugin.video.alfa/channels/newpct1.json @@ -3,7 +3,7 @@ "name": "Newpct1", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "newpct1.png", "banner": "newpct1.png", "version": 1, diff --git a/plugin.video.alfa/channels/news.json b/plugin.video.alfa/channels/news.json index ba632499..b0a247d9 100755 --- a/plugin.video.alfa/channels/news.json +++ b/plugin.video.alfa/channels/news.json @@ -3,7 +3,7 @@ "name": "Novedades", "active": false, "adult": false, - "language": "es", + "language": ["*"], "version": 1, "changes": [ { diff --git a/plugin.video.alfa/channels/news.py b/plugin.video.alfa/channels/news.py index 5f3a29e0..068ba31d 100755 --- a/plugin.video.alfa/channels/news.py +++ b/plugin.video.alfa/channels/news.py @@ -93,10 +93,7 @@ def get_channels_list(): # Rellenar listas de canales disponibles channels_path = os.path.join(config.get_runtime_path(), "channels", '*.json') - channel_language = config.get_setting("channel_language") - - if channel_language == "": - channel_language = "all" + channel_language = config.get_setting("channel_language", default="all") for infile in sorted(glob.glob(channels_path)): channel_id = os.path.basename(infile)[:-5] @@ -111,7 +108,8 @@ def get_channels_list(): continue # No incluir si el canal es en un idioma filtrado - if channel_language != "all" and channel_parameters["language"] != channel_language: + if channel_language != "all" and channel_language not in channel_parameters["language"] \ + and "*" not in channel_parameters["language"]: continue # Incluir en cada categoria, si en su configuracion el canal esta activado para mostrar novedades @@ -424,10 +422,7 @@ def settings(item): def setting_channel(item): channels_path = os.path.join(config.get_runtime_path(), "channels", '*.json') - channel_language = config.get_setting("channel_language") - - if channel_language == "": - channel_language = "all" + channel_language = config.get_setting("channel_language", default="all") list_controls = [] for infile in sorted(glob.glob(channels_path)): @@ -443,7 +438,8 @@ def setting_channel(item): continue # No incluir si el canal es en un idioma filtrado - if channel_language != "all" and channel_parameters["language"] != channel_language: + if channel_language != "all" and channel_language not in channel_parameters["language"] \ + and "*" not in channel_parameters["language"]: continue # No incluir si en su configuracion el canal no existe 'include_in_newest' diff --git a/plugin.video.alfa/channels/nuvid.json b/plugin.video.alfa/channels/nuvid.json index f51412c3..ef267da0 100755 --- a/plugin.video.alfa/channels/nuvid.json +++ b/plugin.video.alfa/channels/nuvid.json @@ -1,7 +1,7 @@ { "id": "nuvid", "name": "Nuvid", - "language": "es", + "language": ["*"], "active": true, "adult": true, "version": 1, diff --git a/plugin.video.alfa/channels/ohpelis.json b/plugin.video.alfa/channels/ohpelis.json index 5c5d00f5..26b945ca 100644 --- a/plugin.video.alfa/channels/ohpelis.json +++ b/plugin.video.alfa/channels/ohpelis.json @@ -1,17 +1,13 @@ { "id": "ohpelis", "name": "OH-PELIS", - "compatible": { - "addon_version": "4.3" - }, "active": true, "adult": false, - "language": "es", + "language": ["lat"], "thumbnail": "https://s28.postimg.org/6v7ig831p/oh-pelis.png", "banner": "https://s27.postimg.org/bz0fh8jpf/oh-pelis-banner.png", "version": 1, "categories": [ - "latino", "movie" ], "settings": [ diff --git a/plugin.video.alfa/channels/pasateatorrent.json b/plugin.video.alfa/channels/pasateatorrent.json index 4b4554fa..71883a91 100755 --- a/plugin.video.alfa/channels/pasateatorrent.json +++ b/plugin.video.alfa/channels/pasateatorrent.json @@ -3,7 +3,7 @@ "name": "PasateaTorrent", "active": true, "adult": false, - "language": "es", + "language": ["cast"], "thumbnail": "http://imgur.com/iLeISt0.png", "banner": "pasateatorrent.png", "version": 1, diff --git a/plugin.video.alfa/channels/pedropolis.json b/plugin.video.alfa/channels/pedropolis.json index 23a8450d..f52134d9 100644 --- a/plugin.video.alfa/channels/pedropolis.json +++ b/plugin.video.alfa/channels/pedropolis.json @@ -3,7 +3,7 @@ "name": "PedroPolis", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "fanart": "https://scontent-lht6-1.xx.fbcdn.net/v/t31.0-8/21056316_670362456502498_8317422545691005578_o.png?oh=1f13a23a931d82e944a7ec743a19f583&oe=5A599F4D", "thumbnail": "https://scontent-lht6-1.xx.fbcdn.net/v/t1.0-9/20292600_467501756957771_6794721577753226614_n.jpg?oh=bba1479eccf0adceeb8c0d3450cc2531&oe=5A4EE0F5", "banner": "", @@ -15,7 +15,6 @@ } ], "categories": [ - "latino", "movie", "tvshow", "vos" diff --git a/plugin.video.alfa/channels/peliculasaudiolatino.json b/plugin.video.alfa/channels/peliculasaudiolatino.json index d4f6e3ea..b5884510 100755 --- a/plugin.video.alfa/channels/peliculasaudiolatino.json +++ b/plugin.video.alfa/channels/peliculasaudiolatino.json @@ -3,7 +3,7 @@ "name": "Peliculasaudiolatino", "active": true, "adult": false, - "language": "es", + "language": ["lat"], "thumbnail": "peliculasaudiolatino.png", "banner": "peliculasaudiolatino.png", "version": 1, @@ -22,7 +22,6 @@ } ], "categories": [ - "latino", "movie" ], "settings": [ diff --git a/plugin.video.alfa/channels/peliculasdk.json b/plugin.video.alfa/channels/peliculasdk.json index fa9fc63b..bbbeb098 100755 --- a/plugin.video.alfa/channels/peliculasdk.json +++ b/plugin.video.alfa/channels/peliculasdk.json @@ -3,7 +3,7 @@ "name": "PeliculasDK", "active": true, "adult": false, - "language": "es", + "language": ["cast"], "thumbnail": "http://s29.postimg.org/wzw749oon/pldklog.jpg", "banner": "peliculasdk.png", "version": 1, diff --git a/plugin.video.alfa/channels/peliculaseroticas.json b/plugin.video.alfa/channels/peliculaseroticas.json index 8bbca10b..1b9c4b0c 100755 --- a/plugin.video.alfa/channels/peliculaseroticas.json +++ b/plugin.video.alfa/channels/peliculaseroticas.json @@ -3,7 +3,7 @@ "name": "PeliculasEroticas", "active": true, "adult": true, - "language": "es", + "language": ["*"], "thumbnail": "peliculaseroticas.png", "banner": "peliculaseroticas.png", "version": 1, diff --git a/plugin.video.alfa/channels/peliculasgratis.json b/plugin.video.alfa/channels/peliculasgratis.json index 74811410..a28dc482 100755 --- a/plugin.video.alfa/channels/peliculasgratis.json +++ b/plugin.video.alfa/channels/peliculasgratis.json @@ -3,7 +3,7 @@ "name": "PeliculasGratis", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "http://imgur.com/ThH8Zmk.png", "banner": "peliculasgratis.png", "version": 1, diff --git a/plugin.video.alfa/channels/peliculashindu.json b/plugin.video.alfa/channels/peliculashindu.json index 776c6b04..1448d5de 100755 --- a/plugin.video.alfa/channels/peliculashindu.json +++ b/plugin.video.alfa/channels/peliculashindu.json @@ -3,7 +3,7 @@ "name": "PeliculasHindu", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "peliculashindu.png", "banner": "peliculashindu.png", "version": 1, diff --git a/plugin.video.alfa/channels/peliculasmx.json b/plugin.video.alfa/channels/peliculasmx.json index b3434ac4..206a132d 100755 --- a/plugin.video.alfa/channels/peliculasmx.json +++ b/plugin.video.alfa/channels/peliculasmx.json @@ -3,7 +3,7 @@ "name": "PeliculasMX", "active": true, "adult": false, - "language": "es", + "language": ["lat"], "thumbnail": "peliculasmx.png", "banner": "peliculasmx.png", "version": 1, @@ -18,7 +18,6 @@ } ], "categories": [ - "latino", "movie" ], "settings": [ diff --git a/plugin.video.alfa/channels/peliculasnu.json b/plugin.video.alfa/channels/peliculasnu.json index 431906ca..38e44252 100755 --- a/plugin.video.alfa/channels/peliculasnu.json +++ b/plugin.video.alfa/channels/peliculasnu.json @@ -1,7 +1,7 @@ { "id": "peliculasnu", "name": "Peliculas.Nu", - "language": "es", + "language": ["cast", "lat"], "active": true, "adult": false, "version": 1, @@ -27,8 +27,7 @@ "banner": "peliculasnu.png", "categories": [ "movie", - "vos", - "latino" + "vos" ], "settings": [ { diff --git a/plugin.video.alfa/channels/peliculasrey.json b/plugin.video.alfa/channels/peliculasrey.json index bbb3b0af..59c1e46d 100755 --- a/plugin.video.alfa/channels/peliculasrey.json +++ b/plugin.video.alfa/channels/peliculasrey.json @@ -3,7 +3,7 @@ "name": "peliculasrey", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "peliculasrey.png", "banner": "peliculasrey.png", "version": 1, diff --git a/plugin.video.alfa/channels/pelis24.json b/plugin.video.alfa/channels/pelis24.json deleted file mode 100755 index d20e28c6..00000000 --- a/plugin.video.alfa/channels/pelis24.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "id": "pelis24", - "name": "Pelis24", - "active": false, - "adult": false, - "language": "es", - "thumbnail": "pelis24.png", - "banner": "pelis24.png", - "version": 1, - "changes": [ - { - "date": "27/04/17", - "description": "Adaptación por cambio de dominio y estructura" - }, - { - "date": "01/07/2016", - "description": "Eliminado código innecesario" - } - ], - "categories": [ - "latino", - "movie", - "vos", - "direct" - ], - "settings": [ - { - "id": "include_in_global_search", - "type": "bool", - "label": "Incluir en busqueda global", - "default": false, - "enabled": true, - "visible": true - }, - { - "id": "include_in_newest_peliculas", - "type": "bool", - "label": "Incluir en Novedades - Peliculas", - "default": true, - "enabled": true, - "visible": true - }, - { - "id": "include_in_newest_infantiles", - "type": "bool", - "label": "Incluir en Novedades - Infantiles", - "default": true, - "enabled": true, - "visible": true - } - ] -} diff --git a/plugin.video.alfa/channels/pelis24.py b/plugin.video.alfa/channels/pelis24.py deleted file mode 100644 index fb1416ba..00000000 --- a/plugin.video.alfa/channels/pelis24.py +++ /dev/null @@ -1,215 +0,0 @@ -# -*- coding: utf-8 -*- - -import re -import sys - -from core import httptools -from core import scrapertools -from core import servertools -from core.item import Item -from platformcode import logger -from core import tmdb - - -thumbnail_host = 'https://github.com/master-1970/resources/raw/master/images/squares/pelis24.PNG' - - -def mainlist(item): - logger.info() - itemlist = [] - item.thumbnail = thumbnail_host - item.action = "peliculas" - itemlist.append(item.clone(title="Novedades", url="http://www.pelis24.tv/ultimas-peliculas/")) - itemlist.append(item.clone(title="Estrenos", url="http://pelis24.tv/estrenos/")) - itemlist.append(item.clone(title="Calidad HD", url="https://pelis24.tv/xfsearch/calidad/HD")) - itemlist.append(item.clone(title="Calidad HQ", url="https://pelis24.tv/xfsearch/calidad/HQ")) - itemlist.append(item.clone(title="Calidad SD", url="https://pelis24.tv/xfsearch/calidad/SD")) - itemlist.append(item.clone(title="Castellano", url="http://pelis24.tv/pelicula-ca/")) - itemlist.append(item.clone(title="Latino", url="https://pelis24.tv/pelicula-la/")) - itemlist.append(item.clone(title="Versión original", url="http://pelis24.tv/peliculasvo/")) - itemlist.append(item.clone(title="Versión original subtitulada", url="http://pelis24.tv/peliculas-su/")) - itemlist.append(item.clone(title="Filtrar por género", action="genero", url="http://pelis24.tv")) - itemlist.append(item.clone(title="Buscar", action="search", url="http://www.pelis24.tv/")) - return itemlist - - -def newest(categoria): - logger.info() - item = Item() - try: - if categoria == 'peliculas': - item.url = "http://www.pelis24.tv/ultimas-peliculas/" - elif categoria == 'infantiles': - item.url = "http://pelis24.tv/tags/Infantil/" - else: - return [] - - itemlist = peliculas(item) - if itemlist[-1].title == ">> Página siguiente": - itemlist.pop() - - # Se captura la excepción, para no interrumpir al canal novedades si un canal falla - except: - for line in sys.exc_info(): - logger.error("%s" % line) - return [] - - return itemlist - - -def search(item, texto): - logger.info() - try: - item.extra = texto - return buscar(item) - # Se captura la excepci?n, para no interrumpir al buscador global si un canal falla - except: - for line in sys.exc_info(): - logger.error("%s" % line) - return [] - - -def buscar(item): - itemlist = [] - if not item.page: - item.page = 1 - - url = "http://pelis24.tv/index.php?do=search&subaction=search&search_start=%s&story=%s" % ( - item.page, item.extra.replace(" ", "+")) - - data = httptools.downloadpage(url).data - data = re.sub(r"\n|\r|\t|\s{2}| ", "", data) - - patron = '(.*?)'%id) - server = servertools.get_server_from_url(scrapedurl) - title = '%s (%s) (%s)' % (item.title, server, lang) - thumbnail = '' - if 'enlac' in scrapedurl: - - if 'google' in scrapedurl: - server = 'gvideo' - elif 'openload' in scrapedurl: - server = 'openload' - - title = '%s (%s) (%s)'%(item.title, server, lang) - scrapedurl = scrapedurl.replace('embed','stream') - gdata = httptools.downloadpage(scrapedurl).data - url_list = servertools.findvideosbyserver(gdata, server) - for url in url_list: - if url[1] not in duplicated: - thumbnail = servertools.guess_server_thumbnail(server) - itemlist.append(item.clone(title=title, url=url[1], action='play', server=server, - thumbnail = thumbnail)) - duplicated.append(url[1]) - - elif '.html' in scrapedurl: - url_list = servertools.findvideosbyserver(data, server) - for url in url_list: - if url[1] not in duplicated: - thumbnail = servertools.guess_server_thumbnail(server) - itemlist.append(item.clone(title = title, url=url[1], action='play', server=server, - thumbnail = thumbnail)) - duplicated.append(url[1]) - else: - url = scrapedurl - if url not in duplicated: - thumbnail = servertools.guess_server_thumbnail(server) - itemlist.append(item.clone(title= title, url=url, action='play', server=server, thumbnail = - thumbnail)) - duplicated.append(url) - - return itemlist - - - - diff --git a/plugin.video.alfa/channels/pelisadicto.json b/plugin.video.alfa/channels/pelisadicto.json index c9e6794b..3b42723d 100755 --- a/plugin.video.alfa/channels/pelisadicto.json +++ b/plugin.video.alfa/channels/pelisadicto.json @@ -3,7 +3,7 @@ "name": "Pelisadicto", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "pelisadicto.png", "banner": "pelisadicto.png", "version": 1, @@ -18,8 +18,7 @@ } ], "categories": [ - "movie", - "latino" + "movie" ], "settings": [ { diff --git a/plugin.video.alfa/channels/peliscity.json b/plugin.video.alfa/channels/peliscity.json index 75a76237..e9c744a3 100755 --- a/plugin.video.alfa/channels/peliscity.json +++ b/plugin.video.alfa/channels/peliscity.json @@ -3,7 +3,7 @@ "name": "Peliscity", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "peliscity.png", "banner": "peliscity.png", "version": 1, @@ -19,7 +19,6 @@ ], "categories": [ "movie", - "latino", "direct", "VOS" ] diff --git a/plugin.video.alfa/channels/peliscon.json b/plugin.video.alfa/channels/peliscon.json index d08a4de2..527c1253 100755 --- a/plugin.video.alfa/channels/peliscon.json +++ b/plugin.video.alfa/channels/peliscon.json @@ -3,7 +3,7 @@ "name": "Peliscon", "active": true, "adult": false, - "language": "es", + "language": ["cast"], "thumbnail": "http://imgur.com/yTQRPUJ.png", "version": 1, "changes": [ diff --git a/plugin.video.alfa/channels/pelisencasa.json b/plugin.video.alfa/channels/pelisencasa.json index fc6f25fe..7f8b77cd 100755 --- a/plugin.video.alfa/channels/pelisencasa.json +++ b/plugin.video.alfa/channels/pelisencasa.json @@ -3,14 +3,13 @@ "name": "PelisEnCasa", "active": true, "adult": false, - "language": "es", + "language": ["lat"], "thumbnail": "https://s14.postimg.org/iqiq0bxn5/pelisencasa.png", "banner": "https://s18.postimg.org/j775ehbg9/pelisencasa_banner.png", "version": 1, "date": "17/03/2017", "changes": "First release", "categories": [ - "latino", "movie" ], "settings": [ diff --git a/plugin.video.alfa/channels/pelisfox.json b/plugin.video.alfa/channels/pelisfox.json index c8730240..3f94badb 100755 --- a/plugin.video.alfa/channels/pelisfox.json +++ b/plugin.video.alfa/channels/pelisfox.json @@ -3,7 +3,7 @@ "name": "pelisfox", "active": true, "adult": false, - "language": "es", + "language": ["lat"], "thumbnail": "https://s14.postimg.org/c43etc1lt/pelisfox.png", "banner": "https://s30.postimg.org/p6twg905d/pelisfox-banner.png", "version": 1, @@ -22,7 +22,6 @@ } ], "categories": [ - "latino", "direct", "movie" ], diff --git a/plugin.video.alfa/channels/pelisgratis.json b/plugin.video.alfa/channels/pelisgratis.json index 63d1efb1..7f5b5e5d 100755 --- a/plugin.video.alfa/channels/pelisgratis.json +++ b/plugin.video.alfa/channels/pelisgratis.json @@ -3,7 +3,7 @@ "name": "PelisGratis", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "https://s30.postimg.org/kilh4lr4x/pelisgratis.png", "banner": "https://s15.postimg.org/nztottswb/pelisgratis-banner.png", "version": 1, @@ -14,7 +14,6 @@ } ], "categories": [ - "latino", "movie" ], "settings": [ diff --git a/plugin.video.alfa/channels/pelisipad.json b/plugin.video.alfa/channels/pelisipad.json index 151da853..fa6f8eb4 100755 --- a/plugin.video.alfa/channels/pelisipad.json +++ b/plugin.video.alfa/channels/pelisipad.json @@ -1,7 +1,7 @@ { "id": "pelisipad", "name": "PelisIpad", - "language": "es", + "language": ["cast"], "active": true, "adult": false, "version": 1, diff --git a/plugin.video.alfa/channels/pelismagnet.json b/plugin.video.alfa/channels/pelismagnet.json index 5418faa0..01a65eee 100755 --- a/plugin.video.alfa/channels/pelismagnet.json +++ b/plugin.video.alfa/channels/pelismagnet.json @@ -3,7 +3,7 @@ "name": "PelisMagnet", "active": true, "adult": false, - "language": "es", + "language": ["cast"], "thumbnail": "pelismagnet.png", "banner": "pelismagnet.png", "changes": { diff --git a/plugin.video.alfa/channels/pelispedia.json b/plugin.video.alfa/channels/pelispedia.json index 43890255..17bfdead 100755 --- a/plugin.video.alfa/channels/pelispedia.json +++ b/plugin.video.alfa/channels/pelispedia.json @@ -3,7 +3,7 @@ "name": "PelisPedia", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "fanart": "http://i.imgur.com/9QbyJrf.jpg", "thumbnail": "pelispedia.png", "banner": "pelispedia.png", diff --git a/plugin.video.alfa/channels/pelispekes.json b/plugin.video.alfa/channels/pelispekes.json index 5f7e2304..060ceb9c 100755 --- a/plugin.video.alfa/channels/pelispekes.json +++ b/plugin.video.alfa/channels/pelispekes.json @@ -3,7 +3,7 @@ "name": "PelisPekes", "active": true, "adult": false, - "language": "es", + "language": ["lat"], "thumbnail": "pelispekes.png", "banner": "pelispekes.png", "version": 1, diff --git a/plugin.video.alfa/channels/pelisplanet.json b/plugin.video.alfa/channels/pelisplanet.json index 7e7f76ad..d5c61c97 100644 --- a/plugin.video.alfa/channels/pelisplanet.json +++ b/plugin.video.alfa/channels/pelisplanet.json @@ -3,7 +3,7 @@ "name": "PelisPlanet", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "fanart": "https://raw.githubusercontent.com/Inter95/tvguia/master/thumbnails/pelisplanetbg.png", "thumbnail": "https://raw.githubusercontent.com/Inter95/tvguia/master/thumbnails/pelisplanet.png", "banner": "https://raw.githubusercontent.com/Inter95/tvguia/master/thumbnails/pelisplanetbaner.png", diff --git a/plugin.video.alfa/channels/pelisplus.json b/plugin.video.alfa/channels/pelisplus.json index ac7e85d8..08d52f01 100644 --- a/plugin.video.alfa/channels/pelisplus.json +++ b/plugin.video.alfa/channels/pelisplus.json @@ -1,12 +1,9 @@ { "id": "pelisplus", "name": "PelisPlus", - "compatible": { - "addon_version": "4.3" - }, "active": true, "adult": false, - "language": "es", + "language": ["lat"], "thumbnail": "https://s13.postimg.org/z5dbzfasn/pelisplus.png", "banner": "https://s16.postimg.org/p9xz2vlo5/pelisplus_banner.png", "version": 1, @@ -41,7 +38,6 @@ } ], "categories": [ - "latino", "movie", "tvshow", "documentary", diff --git a/plugin.video.alfa/channels/pelisplusco.json b/plugin.video.alfa/channels/pelisplusco.json index be1cae91..646d455f 100644 --- a/plugin.video.alfa/channels/pelisplusco.json +++ b/plugin.video.alfa/channels/pelisplusco.json @@ -3,11 +3,11 @@ "name": "PelisPlus.co", "active": true, "adult": false, + "language": ["cast", "lat"], "thumbnail": "https://s26.postimg.org/jov1pmbh5/pelisplusco.png", "banner": "https://s26.postimg.org/4hf259jmh/pelisplusco-banner.png", "version": 1, "categories": [ - "latino", "movie", "tvshow", "documentary", diff --git a/plugin.video.alfa/channels/pelisxporno.json b/plugin.video.alfa/channels/pelisxporno.json index 9dd87023..6d485009 100755 --- a/plugin.video.alfa/channels/pelisxporno.json +++ b/plugin.video.alfa/channels/pelisxporno.json @@ -3,7 +3,7 @@ "name": "Pelisxporno", "active": true, "adult": true, - "language": "es", + "language": ["*"], "thumbnail": "http://i.imgur.com/ywMHwat.png", "banner": "pelisxporno.png", "changes": [ diff --git a/plugin.video.alfa/channels/pepecine.json b/plugin.video.alfa/channels/pepecine.json index 4dd1174b..1e8d37e9 100755 --- a/plugin.video.alfa/channels/pepecine.json +++ b/plugin.video.alfa/channels/pepecine.json @@ -3,7 +3,7 @@ "name": "Pepecine", "active": true, "adult": false, - "language": "es", + "language": ["cast"], "fanart": "https://d12.usercdn.com/i/02278/u875vjx9c0xs.png", "thumbnail": "pepecine.png", "banner": "pepecine.png", diff --git a/plugin.video.alfa/channels/playmax.json b/plugin.video.alfa/channels/playmax.json index 49cc6afb..b850ccc6 100755 --- a/plugin.video.alfa/channels/playmax.json +++ b/plugin.video.alfa/channels/playmax.json @@ -1,7 +1,7 @@ { "id": "playmax", "name": "PlayMax", - "language": "es", + "language": ["cast", "lat"], "active": true, "adult": false, "version": 1, diff --git a/plugin.video.alfa/channels/playmax.py b/plugin.video.alfa/channels/playmax.py index 9b79bc37..2a8298bd 100644 --- a/plugin.video.alfa/channels/playmax.py +++ b/plugin.video.alfa/channels/playmax.py @@ -302,7 +302,7 @@ def fichas(item): # data = re.sub(r"\n|\r|\t|\s{2}|-\s", "", data) fichas_marca = {'1': 'Siguiendo', '2': 'Pendiente', '3': 'Favorita', '4': 'Vista', '5': 'Abandonada'} - patron = '
]*>[^<]*<[^>]+href="\.([^"]+)".*?src-data="\.([^"]+)".*?' \ + patron = '
]*>[^<]*<[^>]+href="\.([^"]+)".*?src-data="([^"]+)".*?' \ '
(?:
([^<]+)
|)([^<]+)
' matches = scrapertools.find_multiple_matches(data, patron) @@ -312,7 +312,6 @@ def fichas(item): scrapedurl = host + scrapedurl.rsplit("-dc=")[0] if not "-dc=" in scrapedurl: scrapedurl += "-dc=" - scrapedthumbnail = host + scrapedthumbnail action = "findvideos" if __menu_info__: action = "menu_info" diff --git a/plugin.video.alfa/channels/playpornx.json b/plugin.video.alfa/channels/playpornx.json index f8a62643..2e1d4f4c 100644 --- a/plugin.video.alfa/channels/playpornx.json +++ b/plugin.video.alfa/channels/playpornx.json @@ -3,7 +3,7 @@ "name": "PlayPornX", "active": true, "adult": true, - "language": "es", + "language": ["*"], "thumbnail": "https://s3.postimg.org/3rkfrnypv/playpornx.png", "banner": "https://s3.postimg.org/it5qa1gyb/playpornx-banner.png", "version": 1, diff --git a/plugin.video.alfa/channels/plusdede.json b/plugin.video.alfa/channels/plusdede.json index a5464c28..6d9912ba 100755 --- a/plugin.video.alfa/channels/plusdede.json +++ b/plugin.video.alfa/channels/plusdede.json @@ -3,7 +3,7 @@ "name": "Plusdede", "active": true, "adult": false, - "language": "es", + "language": ["cast"], "thumbnail": "plusdede.png", "banner": "plusdede.png", "version": 1, diff --git a/plugin.video.alfa/channels/pordede.json b/plugin.video.alfa/channels/pordede.json index 65a34761..a99cd21e 100755 --- a/plugin.video.alfa/channels/pordede.json +++ b/plugin.video.alfa/channels/pordede.json @@ -3,7 +3,7 @@ "name": "Pordede", "active": true, "adult": false, - "language": "es", + "language": ["cast"], "thumbnail": "pordede.png", "banne": "pordede.png", "version": 1, diff --git a/plugin.video.alfa/channels/pornhub.json b/plugin.video.alfa/channels/pornhub.json index 6a7f4be6..f22c6134 100755 --- a/plugin.video.alfa/channels/pornhub.json +++ b/plugin.video.alfa/channels/pornhub.json @@ -3,7 +3,7 @@ "name": "PornHub", "active": true, "adult": true, - "language": "es", + "language": ["*"], "fanart": "http://i.imgur.com/PwFvoss.jpg", "thumbnail": "http://s22.postimg.org/5lzcocfqp/pornhub_logo.jpg", "banner": "pornhub.png", diff --git a/plugin.video.alfa/channels/porntrex.json b/plugin.video.alfa/channels/porntrex.json index b525c7b1..849a4ac9 100755 --- a/plugin.video.alfa/channels/porntrex.json +++ b/plugin.video.alfa/channels/porntrex.json @@ -1,7 +1,7 @@ { "id": "porntrex", "name": "Porntrex", - "language": "es", + "language": ["*"], "active": true, "adult": true, "version": 1, diff --git a/plugin.video.alfa/channels/puyasubs.json b/plugin.video.alfa/channels/puyasubs.json index e31841e6..95b2e7a9 100755 --- a/plugin.video.alfa/channels/puyasubs.json +++ b/plugin.video.alfa/channels/puyasubs.json @@ -3,7 +3,7 @@ "name": "PuyaSubs!", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "http://i.imgur.com/aad4psi.png", "banner": "http://i.imgur.com/trFDT39.png", "version": 1, diff --git a/plugin.video.alfa/channels/pymovie.json b/plugin.video.alfa/channels/pymovie.json index 79f10b3e..cfbbdc10 100755 --- a/plugin.video.alfa/channels/pymovie.json +++ b/plugin.video.alfa/channels/pymovie.json @@ -3,7 +3,7 @@ "name": "pymovie", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "https://s27.postimg.org/hvmvz7vab/pymovie.png", "banner": "https://s28.postimg.org/3k0wjnwul/pymovie_banner.png", "version": 1, @@ -22,7 +22,6 @@ } ], "categories": [ - "latino", "movie", "tvshow", "documentary" diff --git a/plugin.video.alfa/channels/qserie.json b/plugin.video.alfa/channels/qserie.json index 6839e07b..ebdaccbd 100755 --- a/plugin.video.alfa/channels/qserie.json +++ b/plugin.video.alfa/channels/qserie.json @@ -3,7 +3,7 @@ "name": "QSerie", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "https://s31.postimg.org/dousrbu9n/qserie.png", "banner": "https://s32.postimg.org/nk1quq1wl/qserie_banner.png", "version": 1, @@ -22,7 +22,6 @@ } ], "categories": [ - "latino", "tvshow" ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/quierodibujosanimados.json b/plugin.video.alfa/channels/quierodibujosanimados.json index cba08198..538f5351 100755 --- a/plugin.video.alfa/channels/quierodibujosanimados.json +++ b/plugin.video.alfa/channels/quierodibujosanimados.json @@ -3,7 +3,7 @@ "name": "Quiero Dibujos Animados", "active": true, "adult": false, - "language": "es", + "language": ["cast"], "thumbnail": "quierodibujosanimados.png", "banner": "quierodibujosanimados.png", "fanart": "quierodibujosanimados.jpg", diff --git a/plugin.video.alfa/channels/repelis.json b/plugin.video.alfa/channels/repelis.json index 2803277a..34e8b50b 100755 --- a/plugin.video.alfa/channels/repelis.json +++ b/plugin.video.alfa/channels/repelis.json @@ -3,7 +3,7 @@ "name": "Repelis", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "repelis.png", "banner": "repelis.png", "version": 1, @@ -23,7 +23,8 @@ ], "categories": [ "movie", - "documentary" + "documentary", + "vos" ], "settings": [ { diff --git a/plugin.video.alfa/channels/search.json b/plugin.video.alfa/channels/search.json index e5808ff9..6cb3a753 100755 --- a/plugin.video.alfa/channels/search.json +++ b/plugin.video.alfa/channels/search.json @@ -3,7 +3,7 @@ "name": "Buscador global", "active": false, "adult": false, - "language": "es", + "language": ["*"], "version": 1, "changes": [ { diff --git a/plugin.video.alfa/channels/search.py b/plugin.video.alfa/channels/search.py index 4ae621fc..73a0190a 100644 --- a/plugin.video.alfa/channels/search.py +++ b/plugin.video.alfa/channels/search.py @@ -70,10 +70,7 @@ def settings(item): def setting_channel(item): channels_path = os.path.join(config.get_runtime_path(), "channels", '*.json') - channel_language = config.get_setting("channel_language") - - if channel_language == "": - channel_language = "all" + channel_language = config.get_setting("channel_language", default="all") list_controls = [] for infile in sorted(glob.glob(channels_path)): @@ -89,7 +86,8 @@ def setting_channel(item): continue # No incluir si el canal es en un idioma filtrado - if channel_language != "all" and channel_parameters["language"] != channel_language: + if channel_language != "all" and channel_language not in channel_parameters["language"] \ + and "*" not in channel_parameters["language"]: continue # No incluir si en la configuracion del canal no existe "include_in_global_search" @@ -292,11 +290,8 @@ def do_search(item, categories=None): channels_path = os.path.join(config.get_runtime_path(), "channels", '*.json') logger.info("channels_path=%s" % channels_path) - channel_language = config.get_setting("channel_language") + channel_language = config.get_setting("channel_language", default="all") logger.info("channel_language=%s" % channel_language) - if channel_language == "": - channel_language = "all" - logger.info("channel_language=%s" % channel_language) # Para Kodi es necesario esperar antes de cargar el progreso, de lo contrario # el cuadro de progreso queda "detras" del cuadro "cargando..." y no se le puede dar a cancelar @@ -347,7 +342,8 @@ def do_search(item, categories=None): continue # No busca si el canal es en un idioma filtrado - if channel_language != "all" and channel_parameters["language"] != channel_language: + if channel_language != "all" and channel_language not in channel_parameters["language"] \ + and "*" not in channel_parameters["language"]: logger.info("%s -idioma no válido-" % basename_without_extension) continue diff --git a/plugin.video.alfa/channels/seodiv.json b/plugin.video.alfa/channels/seodiv.json index 1dcceec1..71bd7772 100755 --- a/plugin.video.alfa/channels/seodiv.json +++ b/plugin.video.alfa/channels/seodiv.json @@ -1,12 +1,9 @@ { "id": "seodiv", "name": "Seodiv", - "compatible": { - "addon_version": "4.3" - }, "active": true, "adult": false, - "language": "es", + "language": ["lat"], "thumbnail": "https://s32.postimg.org/gh8lhbkb9/seodiv.png", "banner": "https://s31.postimg.org/klwjzp7t7/seodiv_banner.png", "version": 1, diff --git a/plugin.video.alfa/channels/seriecanal.json b/plugin.video.alfa/channels/seriecanal.json index 8e14a0d0..88db8c97 100755 --- a/plugin.video.alfa/channels/seriecanal.json +++ b/plugin.video.alfa/channels/seriecanal.json @@ -3,7 +3,7 @@ "name": "Seriecanal", "active": true, "adult": false, - "language": "es", + "language": ["cast"], "thumbnail": "http://i.imgur.com/EwMK8Yd.png", "banner": "seriecanal.png", "version": 1, diff --git a/plugin.video.alfa/channels/seriesadicto.json b/plugin.video.alfa/channels/seriesadicto.json index 4039a308..4633e4dc 100755 --- a/plugin.video.alfa/channels/seriesadicto.json +++ b/plugin.video.alfa/channels/seriesadicto.json @@ -3,7 +3,7 @@ "name": "Seriesadicto", "active": true, "adult": false, - "language": "es", + "language": ["cast"], "thumbnail": "seriesadicto.png", "banner": "seriesadicto.png", "version": 1, diff --git a/plugin.video.alfa/channels/seriesblanco.json b/plugin.video.alfa/channels/seriesblanco.json index 4e1616fb..d9eb21b6 100755 --- a/plugin.video.alfa/channels/seriesblanco.json +++ b/plugin.video.alfa/channels/seriesblanco.json @@ -3,7 +3,7 @@ "name": "Seriesblanco", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "seriesblanco.png", "banner": "seriesblanco.png", "version": 1, @@ -23,8 +23,7 @@ ], "categories": [ "tvshow", - "vos", - "latino" + "vos" ], "settings": [ { diff --git a/plugin.video.alfa/channels/seriesdanko.json b/plugin.video.alfa/channels/seriesdanko.json index a8090bb9..076d2ce7 100755 --- a/plugin.video.alfa/channels/seriesdanko.json +++ b/plugin.video.alfa/channels/seriesdanko.json @@ -3,7 +3,7 @@ "name": "Seriesdanko", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "seriesdanko.png", "banner": "seriesdanko.png", "version": 1, diff --git a/plugin.video.alfa/channels/serieslan.json b/plugin.video.alfa/channels/serieslan.json index 47e0f9dc..7927fbb8 100755 --- a/plugin.video.alfa/channels/serieslan.json +++ b/plugin.video.alfa/channels/serieslan.json @@ -3,7 +3,7 @@ "name": "SeriesLan", "active": true, "adult": false, - "language": "es", + "language": ["lat"], "thumbnail": "http://i.imgur.com/s6CBxlw.png", "banner": "http://i.imgur.com/c1YTgNT.png", "version": 1, @@ -14,7 +14,6 @@ } ], "categories": [ - "tvshow", - "latino" + "tvshow" ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/serieslatino.json b/plugin.video.alfa/channels/serieslatino.json index 5572fd74..e3718988 100755 --- a/plugin.video.alfa/channels/serieslatino.json +++ b/plugin.video.alfa/channels/serieslatino.json @@ -1,12 +1,9 @@ { "id": "serieslatino", "name": "SeriesLatino", - "compatible": { - "addon_version": "4.3" - }, "active": true, "adult": false, - "language": "es", + "language": ["lat"], "thumbnail": "https://s17.postimg.org/rpmc90y9r/serieslatino.png", "banner": "https://s8.postimg.org/ka707waat/serieslatino_banner.png", "version": 1, @@ -33,7 +30,6 @@ } ], "categories": [ - "latino", "tvshow" ], "settings": [ diff --git a/plugin.video.alfa/channels/seriesmeme.json b/plugin.video.alfa/channels/seriesmeme.json index 8f0abc0e..07786a0c 100755 --- a/plugin.video.alfa/channels/seriesmeme.json +++ b/plugin.video.alfa/channels/seriesmeme.json @@ -3,7 +3,7 @@ "name": "SeriesMeme", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "seriesmeme.png", "banner": "seriesmeme.png", "version": 1, @@ -14,7 +14,6 @@ } ], "categories": [ - "tvshow", - "latino" + "tvshow" ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/seriespapaya.json b/plugin.video.alfa/channels/seriespapaya.json index ccd7763f..fe12bc7a 100755 --- a/plugin.video.alfa/channels/seriespapaya.json +++ b/plugin.video.alfa/channels/seriespapaya.json @@ -3,7 +3,7 @@ "name": "SeriesPapaya", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "http://i.imgur.com/P1D92cf.png", "banner": "http://i.imgur.com/OHHvi5z.png", "version": 1, diff --git a/plugin.video.alfa/channels/seriesyonkis.json b/plugin.video.alfa/channels/seriesyonkis.json index 54fde9a4..9a37397d 100755 --- a/plugin.video.alfa/channels/seriesyonkis.json +++ b/plugin.video.alfa/channels/seriesyonkis.json @@ -3,7 +3,7 @@ "name": "Seriesyonkis", "active": true, "adult": false, - "language": "es", + "language": ["cast"], "thumbnail": "seriesyonkis.png", "banner": "seriesyonkis.png", "fanart": "seriesyonkis.jpg", diff --git a/plugin.video.alfa/channels/serviporno.json b/plugin.video.alfa/channels/serviporno.json index 9255e43f..19cccf00 100755 --- a/plugin.video.alfa/channels/serviporno.json +++ b/plugin.video.alfa/channels/serviporno.json @@ -3,7 +3,7 @@ "name": "Serviporno", "active": true, "adult": true, - "language": "es", + "language": ["*"], "thumbnail": "serviporno.png", "banner": "serviporno.png", "version": 1, diff --git a/plugin.video.alfa/channels/sipeliculas.json b/plugin.video.alfa/channels/sipeliculas.json index c83ae8b4..62377c04 100755 --- a/plugin.video.alfa/channels/sipeliculas.json +++ b/plugin.video.alfa/channels/sipeliculas.json @@ -3,7 +3,7 @@ "name": "SiPeliculas", "active": true, "adult": false, - "language": "es", + "language": "[lat]", "banner": "https://s24.postimg.org/5wcznkxhv/sipeliculas.png", "thumbnail": "https://s23.postimg.org/adrl2k5mz/sipeliculas.png", "version": 1, @@ -18,7 +18,6 @@ } ], "categories": [ - "latino", "movie" ], "settings": [ diff --git a/plugin.video.alfa/channels/submityouflicks.json b/plugin.video.alfa/channels/submityouflicks.json index c93a2fc7..bf6daf4f 100755 --- a/plugin.video.alfa/channels/submityouflicks.json +++ b/plugin.video.alfa/channels/submityouflicks.json @@ -3,7 +3,7 @@ "name": "Submit Your Flicks", "active": true, "adult": true, - "language": "es", + "language": ["*"], "banner": "submityouflicks.png", "thumbnail": "submityouflicks.png", "version": 1, diff --git a/plugin.video.alfa/channels/teledocumentales.json b/plugin.video.alfa/channels/teledocumentales.json index d2cb95eb..2c390f3e 100755 --- a/plugin.video.alfa/channels/teledocumentales.json +++ b/plugin.video.alfa/channels/teledocumentales.json @@ -3,7 +3,7 @@ "name": "Teledocumentales", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "banner": "teledocumentales.png", "thumbnail": "teledocumentales.png", "version": 1, diff --git a/plugin.video.alfa/channels/torrentlocura.json b/plugin.video.alfa/channels/torrentlocura.json index 6f6b7fc7..11ea8fd8 100755 --- a/plugin.video.alfa/channels/torrentlocura.json +++ b/plugin.video.alfa/channels/torrentlocura.json @@ -3,7 +3,7 @@ "name": "Torrentlocura", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "banner": "torrentlocura.png", "thumbnail": "http://imgur.com/EWmLS3d.png", "fanart": "http://imgur.com/V7QZLAL.jpg", diff --git a/plugin.video.alfa/channels/tubehentai.json b/plugin.video.alfa/channels/tubehentai.json index 7a724688..49bd6fc2 100755 --- a/plugin.video.alfa/channels/tubehentai.json +++ b/plugin.video.alfa/channels/tubehentai.json @@ -3,7 +3,7 @@ "name": "tubehentai", "active": true, "adult": true, - "language": "es", + "language": ["*"], "banner": "tubehentai.png", "thumbnail": "tubehentai.png", "version": 1, diff --git a/plugin.video.alfa/channels/tupornotv.json b/plugin.video.alfa/channels/tupornotv.json index ba5e7769..4502963d 100755 --- a/plugin.video.alfa/channels/tupornotv.json +++ b/plugin.video.alfa/channels/tupornotv.json @@ -3,7 +3,7 @@ "name": "tuporno.tv", "active": true, "adult": true, - "language": "es", + "language": ["*"], "banner": "tupornotv.png", "thumbnail": "tupornotv.png", "version": 1, diff --git a/plugin.video.alfa/channels/tvmoviedb.json b/plugin.video.alfa/channels/tvmoviedb.json index cc476ca8..dfff7b67 100755 --- a/plugin.video.alfa/channels/tvmoviedb.json +++ b/plugin.video.alfa/channels/tvmoviedb.json @@ -3,7 +3,7 @@ "name": "TvMovieDB", "active": true, "adult": false, - "language": "es", + "language": ["*"], "thumbnail": "http://i.imgur.com/HA7fvgD.png", "version": 1, "changes": [ diff --git a/plugin.video.alfa/channels/tvseriesdk.json b/plugin.video.alfa/channels/tvseriesdk.json index 142994b6..cddcc681 100644 --- a/plugin.video.alfa/channels/tvseriesdk.json +++ b/plugin.video.alfa/channels/tvseriesdk.json @@ -3,12 +3,11 @@ "name": "TVSeriesdk", "active": true, "adult": false, - "language": "es", + "language": ["lat"], "thumbnail": "https://s13.postimg.org/jrvqmqfnb/tvseriesdk.png", "banner": "https://s16.postimg.org/r6mbel0f9/tvseriesdk-banner.png", "version": 1, "categories": [ - "latino", "tvshow" ], "settings": [ diff --git a/plugin.video.alfa/channels/tvvip.json b/plugin.video.alfa/channels/tvvip.json deleted file mode 100755 index cccf69ed..00000000 --- a/plugin.video.alfa/channels/tvvip.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "id": "tvvip", - "name": "TV-VIP", - "active": false, - "adult": false, - "language": "es", - "banner": "http://i.imgur.com/wyRk5AG.png", - "thumbnail": "http://i.imgur.com/gNHVlI4.png", - "version": 1, - "changes": [ - { - "date": "15/03/2017", - "description": "limpieza código" - }, - { - "date": "04/01/2017", - "description": "Se desactiva el canal hasta posible arreglo." - } - ], - "categories": [ - "movie", - "tvshow", - "documentary" - ], - "settings": [ - { - "id": "include_in_global_search", - "type": "bool", - "label": "Incluir en busqueda global", - "default": true, - "enabled": true, - "visible": true - } - ] -} \ No newline at end of file diff --git a/plugin.video.alfa/channels/tvvip.py b/plugin.video.alfa/channels/tvvip.py deleted file mode 100755 index 27eb31dc..00000000 --- a/plugin.video.alfa/channels/tvvip.py +++ /dev/null @@ -1,805 +0,0 @@ -# -*- coding: utf-8 -*- - -import os -import re -import unicodedata -import urllib - -from core import jsontools -from core import scrapertools -from core.item import Item -from platformcode import config, logger - -host = "http://tv-vip.com" -headers = [['User-Agent', 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:46.0) Gecko/20100101 Firefox/46.0'], - ['Accept', 'application/json, text/javascript, */*; q=0.01'], - ['Accept-Language', 'es-ES,es;q=0.8,en-US;q=0.5,en;q=0.3'], - ['Accept-Encoding', 'gzip, deflate'], - ['Connection', 'keep-alive'], - ['DNT', '1'], - ['Referer', 'http://tv-vip.com']] - -header_string = "|User-Agent=Mozilla/5.0 (Windows NT 10.0; WOW64; rv:46.0) Gecko/20100101 Firefox/46.0" \ - "&Referer=http://tv-vip.com&Cookie=" - - -def mainlist(item): - logger.info() - item.viewmode = "movie" - itemlist = [] - - data = scrapertools.anti_cloudflare("http://tv-vip.com/json/playlist/home/index.json", host=host, headers=headers) - - head = header_string + get_cookie_value() - itemlist.append(Item(channel=item.channel, title="Películas", action="submenu", - thumbnail="http://tv-vip.com/json/playlist/peliculas/thumbnail.jpg" + head, - fanart="http://tv-vip.com/json/playlist/peliculas/background.jpg" + head, viewmode="movie")) - itemlist.append(Item(channel=item.channel, title="Series", action="submenu", - thumbnail="http://tv-vip.com/json/playlist/series/poster.jpg" + head, - fanart="http://tv-vip.com/json/playlist/series/background.jpg" + head, viewmode="movie")) - itemlist.append(Item(channel=item.channel, title="Versión Original", action="entradasconlistas", - url="http://tv-vip.com/json/playlist/version-original/index.json", - thumbnail="http://tv-vip.com/json/playlist/version-original/thumbnail.jpg" + head, - fanart="http://tv-vip.com/json/playlist/version-original/background.jpg" + head, - viewmode="movie_with_plot")) - itemlist.append(Item(channel=item.channel, title="Documentales", action="entradasconlistas", - url="http://tv-vip.com/json/playlist/documentales/index.json", - thumbnail="http://tv-vip.com/json/playlist/documentales/thumbnail.jpg" + head, - fanart="http://tv-vip.com/json/playlist/documentales/background.jpg" + head, - viewmode="movie_with_plot")) - itemlist.append(Item(channel=item.channel, title="Películas Infantiles", action="entradasconlistas", - url="http://tv-vip.com/json/playlist/peliculas-infantiles/index.json", - thumbnail="http://tv-vip.com/json/playlist/peliculas-infantiles/thumbnail.jpg" + head, - fanart="http://tv-vip.com/json/playlist/peliculas-infantiles/background.jpg" + head, - viewmode="movie_with_plot")) - itemlist.append(Item(channel=item.channel, title="Series Infantiles", action="entradasconlistas", - url="http://tv-vip.com/json/playlist/series-infantiles/index.json", - thumbnail="http://tv-vip.com/json/playlist/series-infantiles/thumbnail.jpg" + head, - fanart="http://tv-vip.com/json/playlist/series-infantiles/background.jpg" + head, - viewmode="movie_with_plot")) - itemlist.append(Item(channel=item.channel, title="Buscar...", action="search", - thumbnail="http://i.imgur.com/gNHVlI4.png", fanart="http://i.imgur.com/9loVksV.png")) - - return itemlist - - -def search(item, texto): - logger.info() - texto = texto.replace(" ", "%20") - if item.title == "Buscar...": item.extra = "local" - item.url = "http://tv-vip.com/video-prod/s/search?q=%s&n=100" % texto - - try: - return busqueda(item, texto) - # Se captura la excepción, para no interrumpir al buscador global si un canal falla - except: - import sys - for line in sys.exc_info(): - logger.error("%s" % line) - return [] - - -def busqueda(item, texto): - logger.info() - itemlist = [] - - data = scrapertools.anti_cloudflare(item.url, host=host, headers=headers) - data = jsontools.load(data) - head = header_string + get_cookie_value() - for child in data["objectList"]: - infolabels = {} - - infolabels['year'] = child['year'] - if child['tags']: infolabels['genre'] = ', '.join([x.strip() for x in child['tags']]) - infolabels['rating'] = child['rate'].replace(',', '.') - infolabels['votes'] = child['rateCount'] - if child['cast']: infolabels['cast'] = child['cast'].split(",") - infolabels['director'] = child['director'] - - if 'playListChilds' not in child: - infolabels['plot'] = child['description'] - type = "repo" - fulltitle = unicodedata.normalize('NFD', unicode(child['name'], 'utf-8')) \ - .encode('ASCII', 'ignore').decode("utf-8") - title = child['name'] - infolabels['duration'] = child['duration'] - if child['height'] < 720: - quality = "[B] [SD][/B]" - elif child['height'] < 1080: - quality = "[B] [720p][/B]" - elif child['height'] >= 1080: - quality = "[B] [1080p][/B]" - if child['name'] == "": - title = child['id'].rsplit(".", 1)[0] - else: - title = child['name'] - if child['year']: - title += " (" + child['year'] + ")" - title += quality - else: - type = "playlist" - infolabels['plot'] = "Contiene:\n" + "\n".join(child['playListChilds']) + "\n".join(child['repoChilds']) - fulltitle = child['id'] - title = "[COLOR red][LISTA][/COLOR] " + child['id'].replace('-', ' ').capitalize() + " ([COLOR gold]" + \ - str(child['number']) + "[/COLOR])" - - # En caso de búsqueda global se filtran los resultados - if item.extra != "local": - if "+" in texto: texto = "|".join(texto.split("+")) - if not re.search(r'(?i)' + texto, title, flags=re.DOTALL): continue - - url = "http://tv-vip.com/json/%s/%s/index.json" % (type, child["id"]) - # Fanart - if child['hashBackground']: - fanart = "http://tv-vip.com/json/%s/%s/background.jpg" % (type, child["id"]) - else: - fanart = "http://tv-vip.com/json/%s/%s/thumbnail.jpg" % (type, child["id"]) - # Thumbnail - if child['hasPoster']: - thumbnail = "http://tv-vip.com/json/%s/%s/poster.jpg" % (type, child["id"]) - else: - thumbnail = fanart - thumbnail += head - fanart += head - - if type == 'playlist': - itemlist.insert(0, Item(channel=item.channel, action="entradasconlistas", title=bbcode_kodi2html(title), - url=url, thumbnail=thumbnail, fanart=fanart, fulltitle=fulltitle, - infoLabels=infolabels, viewmode="movie_with_plot", folder=True)) - else: - itemlist.append(Item(channel=item.channel, action="findvideos", title=bbcode_kodi2html(title), url=url, - thumbnail=thumbnail, fanart=fanart, fulltitle=fulltitle, contentTitle=fulltitle, - context="05", infoLabels=infolabels, viewmode="movie_with_plot", folder=True)) - - return itemlist - - -def submenu(item): - logger.info() - itemlist = [] - data = scrapertools.anti_cloudflare("http://tv-vip.com/json/playlist/home/index.json", host=host, headers=headers) - head = header_string + get_cookie_value() - if item.title == "Series": - itemlist.append(Item(channel=item.channel, title="Nuevos Capítulos", action="episodios", - url="http://tv-vip.com/json/playlist/nuevos-capitulos/index.json", - thumbnail="http://tv-vip.com/json/playlist/nuevos-capitulos/background.jpg" + head, - fanart="http://tv-vip.com/json/playlist/nuevos-capitulos/background.jpg" + head, - viewmode="movie")) - itemlist.append(Item(channel=item.channel, title="Más Vistas", action="series", - url="http://tv-vip.com/json/playlist/top-series/index.json", - thumbnail="http://tv-vip.com/json/playlist/top-series/thumbnail.jpg" + head, - fanart="http://tv-vip.com/json/playlist/top-series/background.jpg" + head, - contentTitle="Series", viewmode="movie_with_plot")) - itemlist.append(Item(channel=item.channel, title="Últimas Series", action="series", - url="http://tv-vip.com/json/playlist/series/index.json", - thumbnail=item.thumbnail, fanart=item.fanart, contentTitle="Series", - viewmode="movie_with_plot")) - itemlist.append(Item(channel=item.channel, title="Lista de Series A-Z", action="series", - url="http://tv-vip.com/json/playlist/series/index.json", thumbnail=item.thumbnail, - fanart=item.fanart, contentTitle="Series", viewmode="movie_with_plot")) - else: - itemlist.append(Item(channel=item.channel, title="Novedades", action="entradas", - url="http://tv-vip.com/json/playlist/000-novedades/index.json", - thumbnail="http://tv-vip.com/json/playlist/ultimas-peliculas/thumbnail.jpg" + head, - fanart="http://tv-vip.com/json/playlist/ultimas-peliculas/background.jpg" + head, - viewmode="movie_with_plot")) - itemlist.append(Item(channel=item.channel, title="Más vistas", action="entradas", - url="http://tv-vip.com/json/playlist/peliculas-mas-vistas/index.json", - thumbnail="http://tv-vip.com/json/playlist/peliculas-mas-vistas/thumbnail.jpg" + head, - fanart="http://tv-vip.com/json/playlist/peliculas-mas-vistas/background.jpg" + head, - viewmode="movie_with_plot")) - itemlist.append(Item(channel=item.channel, title="Categorías", action="cat", - url="http://tv-vip.com/json/playlist/peliculas/index.json", - thumbnail=item.thumbnail, fanart=item.fanart)) - itemlist.append(Item(channel=item.channel, title="Películas 3D", action="entradasconlistas", - url="http://tv-vip.com/json/playlist/3D/index.json", - thumbnail="http://tv-vip.com/json/playlist/3D/thumbnail.jpg" + head, - fanart="http://tv-vip.com/json/playlist/3D/background.jpg" + head, - viewmode="movie_with_plot")) - return itemlist - - -def cat(item): - logger.info() - itemlist = [] - - data = scrapertools.anti_cloudflare(item.url, host=host, headers=headers) - data = jsontools.load(data) - head = header_string + get_cookie_value() - exception = ["peliculas-mas-vistas", "ultimas-peliculas"] - for child in data["sortedPlaylistChilds"]: - if child["id"] not in exception: - url = "http://tv-vip.com/json/playlist/%s/index.json" % child["id"] - # Fanart - if child['hashBackground']: - fanart = "http://tv-vip.com/json/playlist/%s/background.jpg" % child["id"] - else: - fanart = "http://tv-vip.com/json/playlist/%s/thumbnail.jpg" % child["id"] - # Thumbnail - thumbnail = "http://tv-vip.com/json/playlist/%s/thumbnail.jpg" % child["id"] - thumbnail += head - fanart += head - title = child['id'].replace('-', ' ').capitalize().replace("Manga", "Animación/Cine Oriental") - title += " ([COLOR gold]" + str(child['number']) + "[/COLOR])" - itemlist.append( - Item(channel=item.channel, action="entradasconlistas", title=bbcode_kodi2html(title), url=url, - thumbnail=thumbnail, fanart=fanart, folder=True)) - - return itemlist - - -def entradas(item): - logger.info() - itemlist = [] - if item.title == "Nuevos Capítulos": - context = "5" - else: - context = "05" - data = scrapertools.anti_cloudflare(item.url, host=host, headers=headers) - data = jsontools.load(data) - head = header_string + get_cookie_value() - for child in data["sortedRepoChilds"]: - infolabels = {} - - infolabels['plot'] = child['description'] - infolabels['year'] = child['year'] - if child['tags']: infolabels['genre'] = ', '.join([x.strip() for x in child['tags']]) - infolabels['rating'] = child['rate'].replace(',', '.') - infolabels['votes'] = child['rateCount'] - infolabels['duration'] = child['duration'] - if child['cast']: infolabels['cast'] = child['cast'].split(",") - infolabels['director'] = child['director'] - url = "http://tv-vip.com/json/repo/%s/index.json" % child["id"] - # Fanart - if child['hashBackground']: - fanart = "http://tv-vip.com/json/repo/%s/background.jpg" % child["id"] - else: - fanart = "http://tv-vip.com/json/repo/%s/thumbnail.jpg" % child["id"] - # Thumbnail - if child['hasPoster']: - thumbnail = "http://tv-vip.com/json/repo/%s/poster.jpg" % child["id"] - else: - thumbnail = fanart - thumbnail += head - fanart += head - - if child['height'] < 720: - quality = "[B] [SD][/B]" - elif child['height'] < 1080: - quality = "[B] [720p][/B]" - elif child['height'] >= 1080: - quality = "[B] [1080p][/B]" - fulltitle = unicodedata.normalize('NFD', unicode(child['name'], 'utf-8')).encode('ASCII', 'ignore') \ - .decode("utf-8") - if child['name'] == "": - title = child['id'].rsplit(".", 1)[0] - else: - title = child['name'] - if child['year']: - title += " (" + child['year'] + ")" - title += quality - - itemlist.append(Item(channel=item.channel, action="findvideos", server="", title=title, url=url, - thumbnail=thumbnail, fanart=fanart, fulltitle=fulltitle, infoLabels=infolabels, - contentTitle=fulltitle, context=context)) - - return itemlist - - -def entradasconlistas(item): - logger.info() - itemlist = [] - - data = scrapertools.anti_cloudflare(item.url, host=host, headers=headers) - data = jsontools.load(data) - head = header_string + get_cookie_value() - # Si hay alguna lista - contentSerie = False - contentList = False - if data['playListChilds']: - itemlist.append(Item(channel=item.channel, title="**LISTAS**", action="", text_color="red", text_bold=True, - folder=False)) - for child in data['sortedPlaylistChilds']: - infolabels = {} - - infolabels['plot'] = "Contiene:\n" + "\n".join(child['playListChilds']) + "\n".join(child['repoChilds']) - if child['seasonNumber'] and not contentList and re.search(r'(?i)temporada', child['id']): - infolabels['season'] = child['seasonNumber'] - contentSerie = True - else: - contentSerie = False - contentList = True - title = child['id'].replace('-', ' ').capitalize() + " ([COLOR gold]" + str(child['number']) + "[/COLOR])" - url = "http://tv-vip.com/json/playlist/%s/index.json" % child["id"] - thumbnail = "http://tv-vip.com/json/playlist/%s/thumbnail.jpg" % child["id"] - if child['hashBackground']: - fanart = "http://tv-vip.com/json/playlist/%s/background.jpg" % child["id"] - else: - fanart = "http://tv-vip.com/json/playlist/%s/thumbnail.jpg" % child["id"] - - thumbnail += head - fanart += head - itemlist.append(Item(channel=item.channel, action="entradasconlistas", title=bbcode_kodi2html(title), - url=url, thumbnail=thumbnail, fanart=fanart, fulltitle=child['id'], - infoLabels=infolabels, viewmode="movie_with_plot")) - else: - contentList = True - if data["sortedRepoChilds"] and len(itemlist) > 0: - itemlist.append(Item(channel=item.channel, title="**VÍDEOS**", action="", text_color="blue", text_bold=True, - folder=False)) - - for child in data["sortedRepoChilds"]: - infolabels = {} - - infolabels['plot'] = child['description'] - infolabels['year'] = data['year'] - if child['tags']: infolabels['genre'] = ', '.join([x.strip() for x in child['tags']]) - infolabels['rating'] = child['rate'].replace(',', '.') - infolabels['votes'] = child['rateCount'] - infolabels['duration'] = child['duration'] - if child['cast']: infolabels['cast'] = child['cast'].split(",") - infolabels['director'] = child['director'] - url = "http://tv-vip.com/json/repo/%s/index.json" % child["id"] - # Fanart - if child['hashBackground']: - fanart = "http://tv-vip.com/json/repo/%s/background.jpg" % child["id"] - else: - fanart = "http://tv-vip.com/json/repo/%s/thumbnail.jpg" % child["id"] - # Thumbnail - if child['hasPoster']: - thumbnail = "http://tv-vip.com/json/repo/%s/poster.jpg" % child["id"] - else: - thumbnail = fanart - thumbnail += head - fanart += head - if child['height'] < 720: - quality = "[B] [SD][/B]" - elif child['height'] < 1080: - quality = "[B] [720p][/B]" - elif child['height'] >= 1080: - quality = "[B] [1080p][/B]" - fulltitle = unicodedata.normalize('NFD', unicode(child['name'], 'utf-8')).encode('ASCII', 'ignore') \ - .decode("utf-8") - if child['name'] == "": - title = child['id'].rsplit(".", 1)[0] - else: - title = child['name'] - if child['year']: - title += " (" + child['year'] + ")" - title += quality - - itemlist.append(Item(channel=item.channel, action="findvideos", title=bbcode_kodi2html(title), url=url, - thumbnail=thumbnail, fanart=fanart, fulltitle=fulltitle, infoLabels=infolabels, - contentTitle=fulltitle, context="05", viewmode="movie_with_plot", folder=True)) - - # Se añade item para añadir la lista de vídeos a la videoteca - if data['sortedRepoChilds'] and len(itemlist) > 0 and contentList: - if config.get_videolibrary_support(): - itemlist.append(Item(channel=item.channel, text_color="green", title="Añadir esta lista a la videoteca", - url=item.url, action="listas")) - elif contentSerie: - if config.get_videolibrary_support(): - itemlist.append(Item(channel=item.channel, title="Añadir esta serie a la videoteca", url=item.url, - action="series_library", fulltitle=data['name'], show=data['name'], - text_color="green")) - - return itemlist - - -def series(item): - logger.info() - itemlist = [] - - data = scrapertools.anti_cloudflare(item.url, host=host, headers=headers) - data = jsontools.load(data) - head = header_string + get_cookie_value() - exception = ["top-series", "nuevos-capitulos"] - for child in data["sortedPlaylistChilds"]: - if child["id"] not in exception: - infolabels = {} - - infolabels['plot'] = child['description'] - infolabels['year'] = child['year'] - if child['tags']: infolabels['genre'] = ', '.join([x.strip() for x in child['tags']]) - infolabels['rating'] = child['rate'].replace(',', '.') - infolabels['votes'] = child['rateCount'] - if child['cast']: infolabels['cast'] = child['cast'].split(",") - infolabels['director'] = child['director'] - infolabels['mediatype'] = "episode" - if child['seasonNumber']: infolabels['season'] = child['seasonNumber'] - url = "http://tv-vip.com/json/playlist/%s/index.json" % child["id"] - # Fanart - if child['hashBackground']: - fanart = "http://tv-vip.com/json/playlist/%s/background.jpg" % child["id"] - else: - fanart = "http://tv-vip.com/json/playlist/%s/thumbnail.jpg" % child["id"] - # Thumbnail - if child['hasPoster']: - thumbnail = "http://tv-vip.com/json/playlist/%s/poster.jpg" % child["id"] - else: - thumbnail = fanart - thumbnail += head - fanart += head - - if item.contentTitle == "Series": - if child['name'] != "": - fulltitle = unicodedata.normalize('NFD', unicode(child['name'].split(" Temporada")[0], 'utf-8')) \ - .encode('ASCII', 'ignore').decode("utf-8") - fulltitle = fulltitle.replace('-', '') - title = child['name'] + " (" + child['year'] + ")" - else: - title = fulltitle = child['id'].capitalize() - if "Temporada" not in title: - title += " [Temporadas: [COLOR gold]" + str(child['numberOfSeasons']) + "[/COLOR]]" - elif item.title == "Más Vistas": - title = title.replace("- Temporada", "--- Temporada") - else: - if data['name'] != "": - fulltitle = unicodedata.normalize('NFD', unicode(data['name'], 'utf-8')).encode('ASCII', 'ignore') \ - .decode("utf-8") - if child['seasonNumber']: - title = data['name'] + " --- Temporada " + child['seasonNumber'] + \ - " [COLOR gold](" + str(child['number']) + ")[/COLOR]" - else: - title = child['name'] + " [COLOR gold](" + str(child['number']) + ")[/COLOR]" - else: - fulltitle = unicodedata.normalize('NFD', unicode(data['id'], 'utf-8')).encode('ASCII', 'ignore') \ - .decode("utf-8") - if child['seasonNumber']: - title = data['id'].capitalize() + " --- Temporada " + child['seasonNumber'] + \ - " [COLOR gold](" + str(child['number']) + ")[/COLOR]" - else: - title = data['id'].capitalize() + " [COLOR gold](" + str(child['number']) + ")[/COLOR]" - if not child['playListChilds']: - action = "episodios" - else: - action = "series" - itemlist.append(Item(channel=item.channel, action=action, title=bbcode_kodi2html(title), url=url, server="", - thumbnail=thumbnail, fanart=fanart, fulltitle=fulltitle, infoLabels=infolabels, - contentTitle=fulltitle, context="25", viewmode="movie_with_plot", folder=True)) - if len(itemlist) == len(data["sortedPlaylistChilds"]) and item.contentTitle != "Series": - - itemlist.sort(key=lambda item: item.title, reverse=True) - if config.get_videolibrary_support(): - itemlist.append(Item(channel=item.channel, title="Añadir esta serie a la videoteca", url=item.url, - action="add_serie_to_library", show=data['name'], - text_color="green", extra="series_library")) - - if item.title == "Últimas Series": return itemlist - if item.title == "Lista de Series A-Z": itemlist.sort(key=lambda item: item.fulltitle) - - if data["sortedRepoChilds"] and len(itemlist) > 0: - itemlist.append(Item(channel=item.channel, title="**VÍDEOS RELACIONADOS/MISMA TEMÁTICA**", text_color="blue", - text_bold=True, action="", folder=False)) - for child in data["sortedRepoChilds"]: - infolabels = {} - - if child['description']: - infolabels['plot'] = data['description'] - else: - infolabels['plot'] = child['description'] - infolabels['year'] = data['year'] - if not child['tags']: - infolabels['genre'] = ', '.join([x.strip() for x in data['tags']]) - else: - infolabels['genre'] = ', '.join([x.strip() for x in child['tags']]) - infolabels['rating'] = child['rate'].replace(',', '.') - infolabels['duration'] = child['duration'] - if child['cast']: infolabels['cast'] = child['cast'].split(",") - infolabels['director'] = child['director'] - - url = "http://tv-vip.com/json/repo/%s/index.json" % child["id"] - # Fanart - if child['hashBackground']: - fanart = "http://tv-vip.com/json/repo/%s/background.jpg" % child["id"] - else: - fanart = "http://tv-vip.com/json/repo/%s/thumbnail.jpg" % child["id"] - # Thumbnail - if child['hasPoster']: - thumbnail = "http://tv-vip.com/json/repo/%s/poster.jpg" % child["id"] - else: - thumbnail = fanart - thumbnail += head - fanart += head - - if child['height'] < 720: - quality = "[B] [SD][/B]" - elif child['height'] < 1080: - quality = "[B] [720p][/B]" - elif child['height'] >= 1080: - quality = "[B] [1080p][/B]" - fulltitle = unicodedata.normalize('NFD', unicode(child['name'], 'utf-8')).encode('ASCII', 'ignore') \ - .decode("utf-8") - - if child['name'] == "": - title = child['id'].rsplit(".", 1)[0] - else: - title = child['name'] - if child['year']: - title += " (" + child['year'] + ")" - title += quality - - itemlist.append(Item(channel=item.channel, action="findvideos", title=bbcode_kodi2html(title), url=url, - server="", thumbnail=thumbnail, fanart=fanart, fulltitle=fulltitle, infoLabels=infolabels, - contentTitle=fulltitle, context="25", viewmode="movie_with_plot", folder=True)) - if item.extra == "new": - itemlist.sort(key=lambda item: item.title, reverse=True) - - return itemlist - - -def episodios(item): - logger.info() - logger.info("categoriaaa es " + item.tostring()) - itemlist = [] - # Redirección para actualización de videoteca - if item.extra == "series_library": - itemlist = series_library(item) - return itemlist - - data = scrapertools.anti_cloudflare(item.url, host=host, headers=headers) - data = jsontools.load(data) - head = header_string + get_cookie_value() - # Se prueba un método u otro porque algunas series no están bien listadas - if data["sortedRepoChilds"]: - for child in data["sortedRepoChilds"]: - if item.infoLabels: - item.infoLabels['duration'] = str(child['duration']) - item.infoLabels['season'] = str(data['seasonNumber']) - item.infoLabels['episode'] = str(child['episode']) - item.infoLabels['mediatype'] = "episode" - contentTitle = item.fulltitle + "|" + str(data['seasonNumber']) + "|" + str(child['episode']) - # En caso de venir del apartado nuevos capítulos se redirige a la función series para mostrar los demás - if item.title == "Nuevos Capítulos": - url = "http://tv-vip.com/json/playlist/%s/index.json" % child["season"] - action = "series" - extra = "new" - else: - url = "http://tv-vip.com/json/repo/%s/index.json" % child["id"] - action = "findvideos" - extra = "" - if child['hasPoster']: - thumbnail = "http://tv-vip.com/json/repo/%s/poster.jpg" % child["id"] - else: - thumbnail = "http://tv-vip.com/json/repo/%s/thumbnail.jpg" % child["id"] - thumbnail += head - try: - title = fulltitle = child['name'].rsplit(" ", 1)[0] + " - " + child['name'].rsplit(" ", 1)[1] - except: - title = fulltitle = child['id'] - itemlist.append(item.clone(action=action, server="", title=title, url=url, thumbnail=thumbnail, - fanart=item.fanart, fulltitle=fulltitle, contentTitle=contentTitle, context="35", - viewmode="movie", extra=extra, show=item.fulltitle, folder=True)) - else: - for child in data["repoChilds"]: - url = "http://tv-vip.com/json/repo/%s/index.json" % child - if data['hasPoster']: - thumbnail = "http://tv-vip.com/json/repo/%s/poster.jpg" % child - else: - thumbnail = "http://tv-vip.com/json/repo/%s/thumbnail.jpg" % child - thumbnail += head - title = fulltitle = child.capitalize().replace('_', ' ') - itemlist.append(item.clone(action="findvideos", server="", title=title, url=url, thumbnail=thumbnail, - fanart=item.fanart, fulltitle=fulltitle, contentTitle=item.fulltitle, - context="25", show=item.fulltitle, folder=True)) - - # Opción de añadir a la videoteca en casos de series de una única temporada - if len(itemlist) > 0 and not "---" in item.title and item.title != "Nuevos Capítulos": - if config.get_videolibrary_support() and item.show == "": - if "-" in item.title: - show = item.title.split('-')[0] - else: - show = item.title.split('(')[0] - itemlist.append(Item(channel=item.channel, title="Añadir esta serie a la videoteca", text_color="green", - url=item.url, action="add_serie_to_library", show=show, extra="series_library")) - return itemlist - - -def series_library(item): - logger.info() - # Funcion unicamente para añadir/actualizar series a la libreria - lista_episodios = [] - show = item.show.strip() - - data_serie = scrapertools.anti_cloudflare(item.url, host=host, headers=headers) - data_serie = jsontools.load(data_serie) - # Para series que en la web se listan divididas por temporadas - if data_serie["sortedPlaylistChilds"]: - for season_name in data_serie["sortedPlaylistChilds"]: - url_season = "http://tv-vip.com/json/playlist/%s/index.json" % season_name['id'] - data = scrapertools.anti_cloudflare(url_season, host=host, headers=headers) - data = jsontools.load(data) - - if data["sortedRepoChilds"]: - for child in data["sortedRepoChilds"]: - url = "http://tv-vip.com/json/repo/%s/index.json" % child["id"] - fulltitle = child['name'].rsplit(" ", 1)[0] + " - " + child['name'].rsplit(" ", 1)[1] - try: - check_filename = scrapertools.get_season_and_episode(fulltitle) - except: - fulltitle += " " + str(data['seasonNumber']) + "x00" - lista_episodios.append(Item(channel=item.channel, action="findvideos", server="", - title=fulltitle, extra=url, url=item.url, fulltitle=fulltitle, - contentTitle=fulltitle, show=show)) - else: - for child in data["repoChilds"]: - url = "http://tv-vip.com/json/repo/%s/index.json" % child - fulltitle = child.capitalize().replace('_', ' ') - try: - check_filename = scrapertools.get_season_and_episode(fulltitle) - except: - fulltitle += " " + str(data['seasonNumber']) + "x00" - lista_episodios.append(Item(channel=item.channel, action="findvideos", server="", - title=fulltitle, extra=url, url=item.url, contentTitle=fulltitle, - fulltitle=fulltitle, show=show)) - # Para series directas de una sola temporada - else: - data = data_serie - if data["sortedRepoChilds"]: - for child in data["sortedRepoChilds"]: - url = "http://tv-vip.com/json/repo/%s/index.json" % child["id"] - fulltitle = child['name'].rsplit(" ", 1)[0] + " - " + child['name'].rsplit(" ", 1)[1] - try: - check_filename = scrapertools.get_season_and_episode(fulltitle) - except: - fulltitle += " 1x00" - lista_episodios.append(Item(channel=item.channel, action="findvideos", server="", title=fulltitle, - contentTitle=fulltitle, url=item.url, extra=url, fulltitle=fulltitle, - show=show)) - else: - for child in data["repoChilds"]: - url = "http://tv-vip.com/json/repo/%s/index.json" % child - fulltitle = child.capitalize().replace('_', ' ') - try: - check_filename = scrapertools.get_season_and_episode(fulltitle) - except: - fulltitle += " 1x00" - lista_episodios.append(Item(channel=item.channel, action="findvideos", server="", title=fulltitle, - contentTitle=fulltitle, url=item.url, extra=url, fulltitle=fulltitle, - show=show)) - - return lista_episodios - - -def findvideos(item): - logger.info() - itemlist = [] - - # En caso de llamarse a la función desde una serie de la videoteca - if item.extra.startswith("http"): item.url = item.extra - data = scrapertools.anti_cloudflare(item.url, host=host, headers=headers) - data = jsontools.load(data) - id = urllib.quote(data['id']) - for child in data["profiles"].keys(): - videopath = urllib.quote(data["profiles"][child]['videoUri']) - for i in range(0, len(data["profiles"][child]['servers'])): - url = data["profiles"][child]['servers'][i]['url'] + videopath - size = " " + data["profiles"][child]["sizeHuman"] - resolution = " [" + (data["profiles"][child]['videoResolution']) + "]" - title = "Ver vídeo en " + resolution.replace('1920x1080', 'HD-1080p') - if i == 0: - title += size + " [COLOR purple]Mirror " + str(i + 1) + "[/COLOR]" - else: - title += size + " [COLOR green]Mirror " + str(i + 1) + "[/COLOR]" - # Para poner enlaces de mayor calidad al comienzo de la lista - if data["profiles"][child]["profileId"] == "default": - itemlist.insert(i, item.clone(action="play", server="directo", title=bbcode_kodi2html(title), url=url, - contentTitle=item.fulltitle, viewmode="list", extra=id, folder=False)) - else: - itemlist.append(item.clone(action="play", server="directo", title=bbcode_kodi2html(title), url=url, - contentTitle=item.fulltitle, viewmode="list", extra=id, folder=False)) - - itemlist.append(item.clone(channel="trailertools", action="buscartrailer", title="Buscar Tráiler", - text_color="magenta")) - if len(itemlist) > 0 and item.extra == "": - if config.get_videolibrary_support(): - itemlist.append(Item(channel=item.channel, title="Añadir enlaces a la videoteca", text_color="green", - contentTitle=item.fulltitle, url=item.url, action="add_pelicula_to_library", - infoLabels={'title': item.fulltitle}, extra="findvideos", fulltitle=item.fulltitle)) - - return itemlist - - -def play(item): - import time - import requests - logger.info() - itemlist = [] - - cookie = get_cookie_value() - headers_play = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:46.0) Gecko/20100101 Firefox/46.0', - 'Accept': 'application/json, text/javascript, */*; q=0.01', - 'Accept-Language': 'es-ES,es;q=0.8,en-US;q=0.5,en;q=0.3', - 'Accept-Encoding': 'gzip, deflate', - 'Connection': 'keep-alive', - 'DNT': '1', - 'Referer': 'http://tv-vip.com/film/' + item.extra + '/', - 'Cookie': cookie} - - head = "|User-Agent=" + headers_play['User-Agent'] + "&Referer=" + headers_play['Referer'] + "&Cookie=" + \ - headers_play['Cookie'] - uri = scrapertools.find_single_match(item.url, '(/transcoder[\w\W]+)') - uri_request = "http://tv-vip.com/video-prod/s/uri?uri=%s&_=%s" % (uri, int(time.time())) - - data = requests.get(uri_request, headers=headers_play) - data = jsontools.load(data.text) - url = item.url.replace("/transcoder/", "/s/transcoder/") + "?tt=" + str(data['tt']) + \ - "&mm=" + data['mm'] + "&bb=" + data['bb'] + head - itemlist.append(item.clone(action="play", server="directo", url=url, folder=False)) - return itemlist - - -def listas(item): - logger.info() - # Para añadir listas a la videoteca en carpeta CINE - itemlist = [] - data = scrapertools.anti_cloudflare(item.url, host=host, headers=headers) - data = jsontools.load(data) - head = header_string + get_cookie_value() - for child in data["sortedRepoChilds"]: - infolabels = {} - - # Fanart - if child['hashBackground']: - fanart = "http://tv-vip.com/json/repo/%s/background.jpg" % child["id"] - else: - fanart = "http://tv-vip.com/json/repo/%s/thumbnail.jpg" % child["id"] - # Thumbnail - if child['hasPoster']: - thumbnail = "http://tv-vip.com/json/repo/%s/poster.jpg" % child["id"] - else: - thumbnail = fanart - thumbnail += head - fanart += head - - url = "http://tv-vip.com/json/repo/%s/index.json" % child["id"] - if child['name'] == "": - title = scrapertools.slugify(child['id'].rsplit(".", 1)[0]) - else: - title = scrapertools.slugify(child['name']) - title = title.replace('-', ' ').replace('_', ' ').capitalize() - infolabels['title'] = title - try: - from core import videolibrarytools - new_item = item.clone(title=title, url=url, fulltitle=title, fanart=fanart, extra="findvideos", - thumbnail=thumbnail, infoLabels=infolabels, category="Cine") - videolibrarytools.add_movie(new_item) - error = False - except: - error = True - import traceback - logger.error(traceback.format_exc()) - - if not error: - itemlist.append(Item(channel=item.channel, title='Lista añadida correctamente a la videoteca', - action="", folder=False)) - else: - itemlist.append(Item(channel=item.channel, title='ERROR. Han ocurrido uno o varios errores en el proceso', - action="", folder=False)) - - return itemlist - - -def get_cookie_value(): - cookies = os.path.join(config.get_data_path(), 'cookies', 'tv-vip.com.dat') - cookiedatafile = open(cookies, 'r') - cookiedata = cookiedatafile.read() - cookiedatafile.close() - cfduid = scrapertools.find_single_match(cookiedata, "tv-vip.*?__cfduid\s+([A-Za-z0-9\+\=]+)") - cfduid = "__cfduid=" + cfduid - return cfduid - - -def bbcode_kodi2html(text): - if config.get_platform().startswith("plex") or config.get_platform().startswith("mediaserver"): - import re - text = re.sub(r'\[COLOR\s([^\]]+)\]', - r'', - text) - text = text.replace('[/COLOR]', '') \ - .replace('[CR]', '
') \ - .replace('[B]', '') \ - .replace('[/B]', '') \ - .replace('"color: white"', '"color: auto"') - - return text diff --git a/plugin.video.alfa/channels/ultrapeliculashd.json b/plugin.video.alfa/channels/ultrapeliculashd.json index 24a4c8b6..e9970d58 100755 --- a/plugin.video.alfa/channels/ultrapeliculashd.json +++ b/plugin.video.alfa/channels/ultrapeliculashd.json @@ -1,7 +1,7 @@ { "id": "ultrapeliculashd", "name": "UltraPeliculasHD", - "language": "es", + "language": ["lat"], "active": true, "adult": false, "banner": "https://s9.postimg.org/5yxsq205r/ultrapeliculashd_banner.png", @@ -18,7 +18,6 @@ } ], "categories": [ - "latino", "movie" ], "settings": [ diff --git a/plugin.video.alfa/channels/unsoloclic.json b/plugin.video.alfa/channels/unsoloclic.json index c41c0fea..2494c67a 100755 --- a/plugin.video.alfa/channels/unsoloclic.json +++ b/plugin.video.alfa/channels/unsoloclic.json @@ -3,7 +3,7 @@ "name": "Unsoloclic", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "banner": "unsoloclic.png", "thumbnail": "unsoloclic.png", "version": 1, diff --git a/plugin.video.alfa/channels/vepelis.json b/plugin.video.alfa/channels/vepelis.json index be41cc37..535de3d5 100755 --- a/plugin.video.alfa/channels/vepelis.json +++ b/plugin.video.alfa/channels/vepelis.json @@ -3,7 +3,7 @@ "name": "VePelis", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "banner": "vepelis.png", "thumbnail": "vepelis.png", "version": 1, @@ -18,7 +18,6 @@ } ], "categories": [ - "latino", "movie" ], "settings": [ diff --git a/plugin.video.alfa/channels/ver-peliculas.json b/plugin.video.alfa/channels/ver-peliculas.json index ba3889f4..994e7b40 100644 --- a/plugin.video.alfa/channels/ver-peliculas.json +++ b/plugin.video.alfa/channels/ver-peliculas.json @@ -5,11 +5,10 @@ "name": "Ver-peliculas", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "version": 1, "categories": [ - "movie", - "latino" + "movie" ], "settings": [ { diff --git a/plugin.video.alfa/channels/vernovelasonline.json b/plugin.video.alfa/channels/vernovelasonline.json index 617a9a61..f861a05c 100644 --- a/plugin.video.alfa/channels/vernovelasonline.json +++ b/plugin.video.alfa/channels/vernovelasonline.json @@ -3,7 +3,7 @@ "name": "Ver Novelas Online", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "https://s16.postimg.org/g4lzydrmd/vernovelasonline1.png", "banner": "https://s16.postimg.org/w44nhxno5/vernovelasonline2.png", "version": 1, @@ -14,8 +14,7 @@ } ], "categories": [ - "tvshow", - "latino" + "tvshow" ], "settings": [ { diff --git a/plugin.video.alfa/channels/verpeliculasnuevas.json b/plugin.video.alfa/channels/verpeliculasnuevas.json index cd9b7b88..b2d502c7 100755 --- a/plugin.video.alfa/channels/verpeliculasnuevas.json +++ b/plugin.video.alfa/channels/verpeliculasnuevas.json @@ -3,10 +3,7 @@ "name": "VerPeliculasNuevas", "active": true, "adult": false, - "language": "es", - "compatible": { - "addon_version": "4.3" - }, + "language": ["cast", "lat"], "banner": "https://s23.postimg.org/4uyyz6w4b/verpeliculasnuevas_banner.png", "thumbnail": "https://s27.postimg.org/atgs5erab/verpeliculasnuevas.png", "version": 1, @@ -33,7 +30,6 @@ } ], "categories": [ - "latino", "movie" ], "settings": [ diff --git a/plugin.video.alfa/channels/verpelis.json b/plugin.video.alfa/channels/verpelis.json index 51de7929..4ce5372b 100644 --- a/plugin.video.alfa/channels/verpelis.json +++ b/plugin.video.alfa/channels/verpelis.json @@ -3,7 +3,7 @@ "name": "Ver-pelis", "active": true, "adult": false, - "language": "es", + "language": ["cast", "lat"], "thumbnail": "http://imgur.com/lmYQgOu.png", "version": 1, "changes": [ diff --git a/plugin.video.alfa/channels/verseriesonlinetv.json b/plugin.video.alfa/channels/verseriesonlinetv.json index d8b5201c..620f28d9 100755 --- a/plugin.video.alfa/channels/verseriesonlinetv.json +++ b/plugin.video.alfa/channels/verseriesonlinetv.json @@ -3,7 +3,7 @@ "name": "Veriesonlinetv", "active": true, "adult": false, - "language": "es", + "language": ["lat"], "banner": "verseriesonlinetv.png", "thumbnail": "http://s6.postimg.org/gl0ok4t01/verserieslogo.png", "version": 1, diff --git a/plugin.video.alfa/channels/verseriesynovelas.json b/plugin.video.alfa/channels/verseriesynovelas.json deleted file mode 100755 index 5ee0e6cb..00000000 --- a/plugin.video.alfa/channels/verseriesynovelas.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "id": "verseriesynovelas", - "name": "Ver Series y Novelas", - "active": false, - "adult": false, - "language": "es", - "banner": "verseriesynovelas.png", - "thumbnail": "http://i.imgur.com/ZhQknRE.png", - "version": 1, - "changes": [ - { - "date": "17/05/2017", - "description": "Canal desactivado por cambio de dominio, a la espera de si lo arreglan" - }, - { - "date": "15/03/2017", - "description": "limpieza código" - }, - { - "date": "16/02/2017", - "description": "Ligeros cambios para mejorar la carga de enlaces" - }, - { - "date": "11/10/2016", - "description": "Reparado por cambios en la web, ahora necesita registro" - } - ], - "categories": [ - "latino", - "vos", - "tvshow" - ], - "settings": [ - { - "id": "include_in_global_search", - "type": "bool", - "label": "Incluir en busqueda global", - "default": true, - "enabled": true, - "visible": true - }, - { - "id": "include_in_newest_series", - "type": "bool", - "label": "Incluir en Novedades - Series", - "default": true, - "enabled": true, - "visible": true - }, - { - "id": "modo_grafico", - "type": "bool", - "label": "Buscar información extra", - "default": true, - "enabled": true, - "visible": true - }, - { - "id": "perfil", - "type": "list", - "label": "Perfil de color", - "default": 2, - "enabled": true, - "visible": true, - "lvalues": [ - "Perfil 3", - "Perfil 2", - "Perfil 1" - ] - }, - { - "id": "verseriesynovelasuser", - "type": "text", - "label": "@30014", - "default": "", - "enabled": true, - "visible": true - }, - { - "id": "verseriesynovelaspassword", - "label": "@30015", - "type": "text", - "default": "", - "enabled": "!eq(-1,'')", - "hidden": true, - "visible": true - } - ] -} \ No newline at end of file diff --git a/plugin.video.alfa/channels/verseriesynovelas.py b/plugin.video.alfa/channels/verseriesynovelas.py deleted file mode 100755 index b9664db5..00000000 --- a/plugin.video.alfa/channels/verseriesynovelas.py +++ /dev/null @@ -1,393 +0,0 @@ -# -*- coding: utf-8 -*- - -import re - -from core import httptools -from core import scrapertools -from core import servertools -from core.item import Item -from platformcode import config, logger - -# Configuracion del canal -__modo_grafico__ = config.get_setting('modo_grafico', 'verseriesynovelas') -__perfil__ = config.get_setting('perfil', 'verseriesynovelas') - -# Fijar perfil de color -perfil = [['0xFFFFE6CC', '0xFFFFCE9C', '0xFF994D00'], - ['0xFFA5F6AF', '0xFF5FDA6D', '0xFF11811E'], - ['0xFF58D3F7', '0xFF2E9AFE', '0xFF2E64FE']] -color1, color2, color3 = perfil[__perfil__] - - -def login(check_login=True): - logger.info() - - try: - user = config.get_setting("verseriesynovelasuser", "verseriesynovelas") - password = config.get_setting("verseriesynovelaspassword", "verseriesynovelas") - if user == "" and password == "": - return False, "Para ver los enlaces de este canal es necesario registrarse en www.verseriesynovelas.tv" - elif user == "" or password == "": - return False, "Usuario o contraseña en blanco. Revisa tus credenciales" - if check_login: - data = httptools.downloadpage("http://www.verseriesynovelas.tv/").data - if user in data: - return True, "" - - post = "log=%s&pwd=%s&redirect_to=http://www.verseriesynovelas.tv/wp-admin/&action=login" % (user, password) - data = httptools.downloadpage("http://www.verseriesynovelas.tv/iniciar-sesion", post=post).data - if "La contraseña que has introducido" in data: - logger.error("Error en el login") - return False, "Contraseña errónea. Comprueba tus credenciales" - elif "Nombre de usuario no válido" in data: - logger.error("Error en el login") - return False, "Nombre de usuario no válido. Comprueba tus credenciales" - else: - logger.info("Login correcto") - return True, "" - except: - import traceback - logger.error(traceback.format_exc()) - return False, "Error durante el login. Comprueba tus credenciales" - - -def mainlist(item): - logger.info() - itemlist = [] - item.text_color = color1 - - logueado, error_message = login() - - if not logueado: - itemlist.append(item.clone(title=error_message, action="", text_color="darkorange")) - else: - itemlist.append( - item.clone(title="Nuevos Capítulos", action="novedades", fanart="http://i.imgur.com/9loVksV.png", - url="http://www.verseriesynovelas.tv/archivos/nuevo")) - itemlist.append(item.clone(title="Últimas Series", action="ultimas", fanart="http://i.imgur.com/9loVksV.png", - url="http://www.verseriesynovelas.tv/")) - itemlist.append( - item.clone(title="Lista de Series A-Z", action="indices", fanart="http://i.imgur.com/9loVksV.png", - url="http://www.verseriesynovelas.tv/")) - itemlist.append(item.clone(title="Categorías", action="indices", fanart="http://i.imgur.com/9loVksV.png", - url="http://www.verseriesynovelas.tv/")) - itemlist.append(item.clone(title="", action="")) - itemlist.append(item.clone(title="Buscar...", action="search", fanart="http://i.imgur.com/9loVksV.png")) - itemlist.append(item.clone(title="Configurar canal...", action="configuracion", text_color="gold", folder=False)) - - return itemlist - - -def configuracion(item): - from platformcode import platformtools - ret = platformtools.show_channel_settings() - platformtools.itemlist_refresh() - return ret - - -def indices(item): - logger.info() - - itemlist = [] - data = httptools.downloadpage(item.url).data - data = data.replace("\n", "").replace("\t", "") - - if "Categorías" in item.title: - bloque = scrapertools.find_single_match(data, 'Seleccion tu categoria(.*?)') - matches = scrapertools.find_multiple_matches(bloque, '(.*?)') - for url, title in matches: - itemlist.append(item.clone(action="ultimas", title=title, url=url)) - else: - bloque = scrapertools.find_single_match(data, '
    (.*?)
') - matches = scrapertools.find_multiple_matches(bloque, '(.*?)') - for url, title in matches: - itemlist.append(item.clone(action="ultimas", title=title, url=url)) - - return itemlist - - -def search(item, texto): - logger.info() - item.url = "http://www.verseriesynovelas.tv/archivos/h1/?s=" + texto - if "Buscar..." in item.title: - return ultimas(item, texto) - else: - try: - return busqueda(item, texto) - except: - import sys - for line in sys.exc_info(): - logger.error("%s" % line) - return [] - - -def busqueda(item, texto=""): - logger.info() - itemlist = [] - item.text_color = color2 - - data = httptools.downloadpage(item.url).data - data = data.replace("\n", "").replace("\t", "") - - bloque = scrapertools.find_single_match(data, '
- + diff --git a/plugin.video.alfa/servers/fileserve.json b/plugin.video.alfa/servers/fileserve.json deleted file mode 100755 index 9138b3a1..00000000 --- a/plugin.video.alfa/servers/fileserve.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "active": false, - "changes": [ - { - "date": "25/03/2016", - "description": "Versión incial" - } - ], - "find_videos": { - "ignore_urls": [], - "patterns": [ - { - "pattern": "http://www.fileserve.com/file/([A-Z0-9a-z]{7}])", - "url": "http://www.fileserve.com/file/\\1" - } - ] - }, - "free": false, - "id": "fileserve", - "name": "fileserve", - "settings": [ - { - "default": false, - "enabled": true, - "id": "black_list", - "label": "Incluir en lista negra", - "type": "bool", - "visible": true - }, - { - "default": 0, - "enabled": true, - "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", - "lvalues": [ - "No", - "1", - "2", - "3", - "4", - "5" - ], - "type": "list", - "visible": false - } - ], - "version": 1 -} \ No newline at end of file diff --git a/plugin.video.alfa/servers/fileserve.py b/plugin.video.alfa/servers/fileserve.py deleted file mode 100755 index 90d89d08..00000000 --- a/plugin.video.alfa/servers/fileserve.py +++ /dev/null @@ -1,53 +0,0 @@ -# -*- coding: utf-8 -*- - -import re - -from core import scrapertools -from platformcode import logger - - -def test_video_exists(page_url): - logger.info("(page_url='%s')" % page_url) - - # Existe: http://www.fileserve.com/file/E5Y5R5E - # No existe: - data = scrapertools.cache_page(page_url) - patron = '
[^<]+([^<]+)<' - matches = re.compile(patron, re.DOTALL).findall(data) - - if len(matches) > 0: - return True, "" - else: - patron = '

  • (File not available)

    ' - matches = re.compile(patron, re.DOTALL).findall(data) - if len(matches) > 0: - return False, "El archivo ya no está disponible
    en fileserve o ha sido borrado" - - return True, "" - - -def get_video_url(page_url, premium=False, user="", password="", video_password=""): - logger.info("(page_url='%s')" % page_url) - - video_urls = [] - - if premium: - # Accede a la home para precargar la cookie - data = scrapertools.cache_page("http://fileserve.com/index.php") - - # Hace el login - url = "http://fileserve.com/login.php" - post = "loginUserName=%s&loginUserPassword=%s&autoLogin=on&ppp=102&loginFormSubmit=Login" % (user, password) - data = scrapertools.cache_page(url, post=post) - - location = scrapertools.get_header_from_response(page_url, header_to_get="location") - logger.info("location=" + location) - - if location.startswith("http"): - extension = location[-4:] - video_urls.append(["%s (Premium) [fileserve]" % extension, location]) - - for video_url in video_urls: - logger.info("%s - %s" % (video_url[0], video_url[1])) - - return video_urls