Skip to content

Commit

Permalink
Merge branch 'master' of github.com:elgatito/script.elementum.burst
Browse files Browse the repository at this point in the history
  • Loading branch information
elgatito committed Jan 13, 2022
2 parents 25d49ec + 8d460b5 commit 701f323
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 15 deletions.
3 changes: 3 additions & 0 deletions burst/provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import urllib
from .client import Client
from elementum.provider import log, get_setting, set_setting
from .filtering import cleanup_results
from .providers.definitions import definitions, longest
from .utils import ADDON_PATH, get_int, clean_size, get_alias
from kodi_six import xbmc, xbmcaddon, py2_encode
Expand Down Expand Up @@ -69,6 +70,8 @@ def generate_payload(provider, generator, filtering, verify_name=True, verify_si
log.debug(filtering.reason)

log.debug('[%s] >>>>>> %s would send %d torrents to Elementum <<<<<<<' % (provider, provider, len(results)))
results = cleanup_results(results)
log.debug('[%s] >>>>>> %s would send %d torrents to Elementum after cleanup <<<<<<<' % (provider, provider, len(results)))

return results

Expand Down
13 changes: 6 additions & 7 deletions burst/providers/providers.json
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@
"anime_keywords2": "{title:original} {season:2}x01|S{season:2}",
"anime_keywords_fallback": "{title:original} s{season:2}",
"anime_query": "28&incldead=0&inclexternal=0&lang=0&sort=seeders&order=desc",
"base_url": "https://www.gtdb.to/search_results.php?search=QUERY&EXTRA&cat=",
"base_url": "https://glodls.to/search_results.php?search=QUERY&EXTRA&cat=",
"color": "FF88681E",
"enabled": true,
"general_extra": "",
Expand Down Expand Up @@ -957,7 +957,7 @@
"anime_keywords2": "{title:original} {season:2}x01|S{season:2}",
"anime_keywords_fallback": "{title:original} s{season:2}",
"anime_query": "%20category:anime/?field=seeders&sorder=desc&QUERY",
"base_url": "https://katcr.to/usearch/",
"base_url": "https://kickasstorrents.to/usearch/",
"color": "FFFEDF64",
"enabled": true,
"general_extra": "",
Expand All @@ -979,7 +979,7 @@
"row": "find_once('table', ('class', ['frontPageWidget'])).find_all('tr', start=2)",
"seeds": "item(tag='td', order=5)",
"size": "item(tag='td', order=2)",
"torrent": "'https://katcr.to%s' % item(tag='a', order=2, attribute='href')"
"torrent": "'https://kickasstorrents.to%s' % item(tag='a', order=2, attribute='href')"
},
"predefined": false,
"private": false,
Expand Down Expand Up @@ -1498,7 +1498,7 @@
"separator": "+",
"show_query": "",
"subpage": false,
"tor_dns_alias": "nnmclub5toro7u65.onion",
"tor_dns_alias": "nnmclub2vvjqzjne6q4rrozkkkdmlvnrcsyes2bbkm7e5ut2aproy4id.onion",
"tv_extra": "",
"tv_extra2": "",
"tv_keywords": "{title:ru:en} s{season:2}e{episode:2}",
Expand Down Expand Up @@ -1703,7 +1703,6 @@
"separator": "%20",
"subpage": null,
"show_query": "0/EXTRA/300/2/QUERY",
"tor_dns_alias": "rutorc6mqdinc4cz.onion",
"tv_keywords": "{title:en:ru} {season:2}x01|(01-{season:2}x01)|S{season:2}|(S01-{season:2})",
"tv_extra": "4",
"tv_keywords_fallback": "{title:en:ru} {season:2}x01|(01-{season:2}x01)|S{season:2}|(S01-{season:2})",
Expand Down Expand Up @@ -1758,7 +1757,7 @@
"separator": "+",
"show_query": "",
"subpage": false,
"tor_dns_alias": "rutrackerripnext.onion",
"tor_dns_alias": "torrentsru5dbmqszbdinnz7cjiubxsjngq52qij6ih3fmp3gn7hwqqd.onion",
"tv_extra": "",
"tv_extra2": "",
"tv_keywords": "\"{title:en:ru}\" \"Сезон {season}\"",
Expand Down Expand Up @@ -1982,7 +1981,7 @@
"separator": "%20",
"show_query": "200",
"subpage": null,
"tor_dns_alias": "piratebayztemzmv.onion",
"tor_dns_alias": "piratebayo3klnzokct3wt5yyxb2vpebbuyjl7m623iaxmqhsd52coid.onion",
"tv_extra": "",
"tv_extra2": "",
"tv_keywords": "{title:en} s{season:2}e{episode:2}",
Expand Down
16 changes: 8 additions & 8 deletions resources/language/Swedish/strings.po
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ msgstr "Privata bevakare [N .. ]"

msgctxt "#32132"
msgid "Remove quotes from search query"
msgstr "Ta bort citat från sökfrågan"
msgstr "Ta bort citat från sökförfrågan"

msgctxt "#32133"
msgid "Resolution"
Expand All @@ -352,28 +352,28 @@ msgstr "Videokvalitét"

msgctxt "#32135"
msgid "Belarusian"
msgstr ""
msgstr "Vitryska"

msgctxt "#32136"
msgid "SOCKS4a"
msgstr ""
msgstr "SOCKS4a"

msgctxt "#32137"
msgid "SOCKS5h"
msgstr ""
msgstr "SOCKS5h"

msgctxt "#32138"
msgid "From Elementum settings (resolve hosts by proxy)"
msgstr ""
msgstr "Från Elementum-inställningar (lösa värdar av proxy)"

msgctxt "#32139"
msgid "First enable built-in HTTP proxy in Elementum"
msgstr ""
msgstr "Aktivera först inbyggd HTTP-proxy i Elementum"

msgctxt "#32140"
msgid "Use Tor domain alias"
msgstr ""
msgstr "Använd Tor-domänalias"

msgctxt "#32141"
msgid "First set SOCKS both in Burst&Elementum or proxy http via Elementum"
msgstr ""
msgstr "Ställ först in SOCKS i både Burst & Elementum eller proxy-http via Elementum"

0 comments on commit 701f323

Please sign in to comment.