Merge pull request #1147 from lopezvg/master

Dontorrent: potenciado con BTDigg; Assistant: nueva versión

plugin.video.alfa/channels/cinecalidad.py

@@ -41,8 +41,8 @@
 canonical = {
              'channel': 'cinecalidad', 
              'host': config.get_setting("current_host", 'cinecalidad', default=''), 
-             'host_alt': ["https://cinecalidad3.com/"], 
-             'host_black_list': [], 
+             'host_alt': ["https://www5.cine-calidad.com/"], 
+             'host_black_list': ["https://cinecalidad3.com/"], 
              'CF': False, 'CF_test': False, 'alfa_s': True
             }
 host = canonical['host'] or canonical['host_alt'][0]

plugin.video.alfa/channels/divxtotal.py

@@ -36,8 +36,8 @@
 canonical = {
              'channel': 'divxtotal', 
              'host': config.get_setting("current_host", 'divxtotal', default=''), 
-             'host_alt': ["https://www.divxtotal.re/"], 
-             'host_black_list': ["https://www.divxtotal.pm/", "https://www.divxtotal.nl/"], 
+             'host_alt': ["https://divxtotál.com"], 
+             'host_black_list': ["https://www.divxtotal.re/", "https://www.divxtotal.pm/", "https://www.divxtotal.nl/"], 
              'pattern': '<li>\s*<a\s*href="([^"]+)"\s*>\S*\/a><\/li>', 
              'CF': False, 'CF_test': False, 'alfa_s': True
             }

plugin.video.alfa/channels/dontorrent.json

@@ -67,6 +67,22 @@
       "enabled": true,
       "visible": true
     },
+    {
+      "id": "find_alt_link_option",
+      "type": "bool",
+      "label": "Quiere usar la funcionalidad del buscador BTDigg para nuevos enlaces o episodios?",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "find_alt_search",
+      "type": "bool",
+      "label": "Quiere usar también la funcionalidad de BTDigg en las búsquedas de Películas o Series?",
+      "default": true,
+      "enabled": true,
+      "visible": "!eq(-1,false)"
+    },
     {
       "id": "filter_languages",
       "type": "list",

plugin.video.alfa/channels/filmoves.py

@@ -35,8 +35,8 @@
 canonical = {
              'channel': 'filmoves', 
              'host': config.get_setting("current_host", 'filmoves', default=''), 
-             'host_alt': ["https://filmoves.com/"], 
-             'host_black_list': [], 
+             'host_alt': ["https://www.filmoves.net/"], 
+             'host_black_list': ["https://filmoves.com/"], 
              'CF': False, 'CF_test': False, 'alfa_s': True
             }
 host = canonical['host'] or canonical['host_alt'][0]

plugin.video.alfa/channels/grantorrent.py

@@ -601,6 +601,8 @@ def findvideos(item):
                 return itemlist                                     # si no hay más datos, algo no funciona, pintamos lo que tenemos
 
     patron = '()()<div\s*class\s*=\s*"mt-3"\s*>\s*<div\s*class\s*=\s*"flex[^>]*>\s*<a\s*href\s*=\s*"([^"]+)"'
+    if not scrapertools.find_single_match(data, patron):
+        patron = '()()<td class="px-6[^>]*>\s*<a\s*href\s*=\s*"([^"]+)"'
 
     if not item.armagedon:
         if not item.matches:

plugin.video.alfa/channels/hdfull.py

@@ -32,8 +32,8 @@
 canonical = {
              'channel': 'hdfull', 
              'host': config.get_setting("current_host", 'hdfull', default=''), 
-             'host_alt': ['https://hdfull.lol/', 'https://hdfull.link/', 'https://hdfull.click/', 'https://hdfull.stream/'], 
-             'host_black_list': ['https://hdfull.one/', 'https://hdfull.vip/', 'https://hd-full.cc/'], 
+             'host_alt': ['https://hdfull.fun/'], 
+             'host_black_list': ['https://hdfull.lol/', 'https://hdfull.one/'], 
              'CF': False, 'CF_test': False, 'alfa_s': True
             }
 host = canonical['host'] or canonical['host_alt'][0]

plugin.video.alfa/channels/newpct1.json

@@ -130,15 +130,15 @@
       "id": "clonenewpct1_channels_list",
       "type": "text",
       "label": "Lista de clones de NewPct1 y orden de uso",
-      "default": "('1', 'atomixhq', 'https://atomixhq.link/', 'movie, tvshow, season, episode', ''), ('0', 'pctmix1', 'https://pctmix1.com/', 'movie, tvshow, season, episode', ''), ('0', 'pctreload1', 'https://pctreload1.com/', 'movie, tvshow, season, episode', ''), ('0', 'maxitorrent', 'https://maxitorrent.com/', 'movie, tvshow, season, episode', ''), ('0', 'pctmix', 'https://pctmix.com/', 'movie, tvshow, season, episode', ''), ('0', 'pctreload', 'https://pctreload.com/', 'movie, tvshow, season, episode', ''), ('0', 'descargas2020', 'https://descargas2020.net/', 'movie, tvshow, season, episode', ''), ('0', 'tumejortorrent', 'https://tumejortorrent.org/', 'movie, tvshow, season, episode', ''), ('0', 'torrentrapid', 'https://torrentrapid.org/', 'movie, tvshow, season, episode', 'serie_episodios'), ('0', 'planetatorrent', 'http://planetatorrent.com/', 'movie, tvshow, season, episode', ''), ('0', 'tvsinpagar', 'http://www.tvsinpagar.com/', 'tvshow, season, episode', ''), ('0', 'torrentlocura', 'https://torrentlocura.cc/', 'movie, tvshow, season, episode', ''), ('0', 'mispelisyseries', 'http://mispelisyseries.com/', 'movie', 'search, listado_busqueda'), ('0', 'pctnew', 'https://pctnew.org/', 'movie, tvshow, season, episode', '')",
+      "default": "('1', 'atomixhq', 'https://atomixhq.club/', 'movie, tvshow, season, episode', ''), ('0', 'pctmix1', 'https://pctmix1.com/', 'movie, tvshow, season, episode', ''), ('0', 'pctreload1', 'https://pctreload1.com/', 'movie, tvshow, season, episode', ''), ('0', 'maxitorrent', 'https://maxitorrent.com/', 'movie, tvshow, season, episode', ''), ('0', 'pctmix', 'https://pctmix.com/', 'movie, tvshow, season, episode', ''), ('0', 'pctreload', 'https://pctreload.com/', 'movie, tvshow, season, episode', ''), ('0', 'descargas2020', 'https://descargas2020.net/', 'movie, tvshow, season, episode', ''), ('0', 'tumejortorrent', 'https://tumejortorrent.org/', 'movie, tvshow, season, episode', ''), ('0', 'torrentrapid', 'https://torrentrapid.org/', 'movie, tvshow, season, episode', 'serie_episodios'), ('0', 'planetatorrent', 'http://planetatorrent.com/', 'movie, tvshow, season, episode', ''), ('0', 'tvsinpagar', 'http://www.tvsinpagar.com/', 'tvshow, season, episode', ''), ('0', 'torrentlocura', 'https://torrentlocura.cc/', 'movie, tvshow, season, episode', ''), ('0', 'mispelisyseries', 'http://mispelisyseries.com/', 'movie', 'search, listado_busqueda'), ('0', 'pctnew', 'https://pctnew.org/', 'movie, tvshow, season, episode', '')",
       "enabled": true,
       "visible": false
     },
     {
       "id": "intervenidos_channels_list",
       "type": "text",
       "label": "Lista de canales y clones de NewPct1 intervenidos y orden de sustitucion de URLs",
-      "default": "('0', 'canal_org', 'canal_des', 'url_org', 'url_des', 'patron1', 'patron2', 'patron3', 'patron4', 'patron5', 'content_inc', 'content_exc', 'ow_force'), ('1', 'atomixhq', 'atomixhq', 'atomixhq.art', 'https://atomixhq.link/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'atomixhq', 'atomixhq', 'atomixhq.top', 'https://atomixhq.link/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'atomixhq', 'atomixhq', 'atomixhq.net', 'https://atomixhq.link/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'atomixhq', 'atomixhq', 'atomixhq.one', 'https://atomixhq.link/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'atomixhq', 'atomixhq', 'atomixhq.com', 'https://atomixhq.link/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'maxitorrent', 'atomixhq', 'maxitorrent.com', 'https://atomixhq.link/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'pctmix1', 'atomixhq', 'pctmix1.com', 'https://atomixhq.link/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'pctreload1', 'atomixhq', 'pctreload1.com', 'https://atomixhq.link/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'pctreload', 'atomixhq', 'pctreload.com', 'https://atomixhq.link/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'pctmix', 'atomixhq', 'pctmix.com', 'https://atomixhq.link/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'descargas2020', 'atomixhq', 'descargas2020.com', 'https://atomixhq.link/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'descargas2020', 'atomixhq', 'descargas2020.org', 'https://atomixhq.link/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'pctnew', 'atomixhq', 'pctnew.com', 'https://atomixhq.link/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'pctnew', 'atomixhq', 'pctnew.org', 'https://atomixhq.link/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'tumejortorrent', 'atomixhq', 'tumejortorrent.com', 'https://atomixhq.link/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'torrentrapid', 'atomixhq', 'torrentrapid.com', 'https://atomixhq.link/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'torrentlocura', 'atomixhq', 'torrentlocura.com', 'https://atomixhq.link/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'tvsinpagar', 'atomixhq', 'www.tvsinpagar.com', 'https://atomixhq.link/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'mispelisyseries', 'atomixhq', 'mispelisyseries.com', 'https://atomixhq.link/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'planetatorrent', 'atomixhq', 'planetatorrent.com', 'https://atomixhq.link/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no')",
+      "default": "('0', 'canal_org', 'canal_des', 'url_org', 'url_des', 'patron1', 'patron2', 'patron3', 'patron4', 'patron5', 'content_inc', 'content_exc', 'ow_force'), ('1', 'atomixhq', 'atomixhq', 'atomixhq.link', 'https://atomixhq.club/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'atomixhq', 'atomixhq', 'atomixhq.art', 'https://atomixhq.club/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'atomixhq', 'atomixhq', 'atomixhq.top', 'https://atomixhq.club/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'atomixhq', 'atomixhq', 'atomixhq.net', 'https://atomixhq.club/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'atomixhq', 'atomixhq', 'atomixhq.one', 'https://atomixhq.club/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'atomixhq', 'atomixhq', 'atomixhq.com', 'https://atomixhq.club/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'maxitorrent', 'atomixhq', 'maxitorrent.com', 'https://atomixhq.club/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'pctmix1', 'atomixhq', 'pctmix1.com', 'https://atomixhq.club/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'pctreload1', 'atomixhq', 'pctreload1.com', 'https://atomixhq.club/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'pctreload', 'atomixhq', 'pctreload.com', 'https://atomixhq.club/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'pctmix', 'atomixhq', 'pctmix.com', 'https://atomixhq.club/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'descargas2020', 'atomixhq', 'descargas2020.com', 'https://atomixhq.club/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'descargas2020', 'atomixhq', 'descargas2020.org', 'https://atomixhq.club/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'pctnew', 'atomixhq', 'pctnew.com', 'https://atomixhq.club/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'pctnew', 'atomixhq', 'pctnew.org', 'https://atomixhq.club/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'tumejortorrent', 'atomixhq', 'tumejortorrent.com', 'https://atomixhq.club/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'torrentrapid', 'atomixhq', 'torrentrapid.com', 'https://atomixhq.club/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'torrentlocura', 'atomixhq', 'torrentlocura.com', 'https://atomixhq.club/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'tvsinpagar', 'atomixhq', 'www.tvsinpagar.com', 'https://atomixhq.club/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'mispelisyseries', 'atomixhq', 'mispelisyseries.com', 'https://atomixhq.club/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no'), ('1', 'planetatorrent', 'atomixhq', 'planetatorrent.com', 'https://atomixhq.club/', '\u0028http\\S+\u0029\\/\\w+-\u0028?:org|com\u0029', '', '', '', '', '*', '', 'no')",
       "enabled": true,
       "visible": false
     },