From fb50570aad38a7a882629d109d8d6d7fffc69097 Mon Sep 17 00:00:00 2001 From: newt-sc <47229722+newt-sc@users.noreply.github.com> Date: Sun, 17 Nov 2024 15:25:14 +0200 Subject: [PATCH] release: v2.91.0 --- CHANGELOG.md | 3 + meta.json | 2 +- providerModules/a4kScrapers/urls.json | 7 +- providers/a4kScrapers/en/torrent/bitlord.py | 86 --------------------- 4 files changed, 5 insertions(+), 93 deletions(-) delete mode 100644 providers/a4kScrapers/en/torrent/bitlord.py diff --git a/CHANGELOG.md b/CHANGELOG.md index 7aa3793..65c297e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +* [v2.91.0](https://github.com/a4k-openproject/a4kScrapers/releases/tag/a4kScrapers-2.91.0): + * remove bitlord (down) + * [v2.90.0](https://github.com/a4k-openproject/a4kScrapers/releases/tag/a4kScrapers-2.90.0): * add mediafusion * remove torrentioelf (eol & too many issues) diff --git a/meta.json b/meta.json index 685d0f4..8f68ac0 100644 --- a/meta.json +++ b/meta.json @@ -1,6 +1,6 @@ { "author": "Unknown", - "version":"2.90.0", + "version":"2.91.0", "name":"a4kScrapers", "update_directory": "https://github.com/a4k-openproject/a4kScrapers/archive/", "remote_meta": "https://raw.githubusercontent.com/newt-sc/a4kScrapers/master/meta.json", diff --git a/providerModules/a4kScrapers/urls.json b/providerModules/a4kScrapers/urls.json index 0dca7ee..dc569c7 100644 --- a/providerModules/a4kScrapers/urls.json +++ b/providerModules/a4kScrapers/urls.json @@ -3,12 +3,7 @@ "cached": { "search": "", "domains": [{ "base": "" }] }, "-7torrents": { "search": "", "domains": [{ "base": "" }] }, "-anirena": { "search": "", "domains": [{ "base": "" }] }, - "bitlord": { - "search": "/get_list", - "domains": [ - { "base": "https://bitlordsearch.com" } - ] - }, + "-bitlord": { "search": "", "domains": [{ "base": "" }] }, "bitsearch": { "search": "/search?q=%s&sort=size&limit=100", "domains": [ diff --git a/providers/a4kScrapers/en/torrent/bitlord.py b/providers/a4kScrapers/en/torrent/bitlord.py deleted file mode 100644 index 1006b29..0000000 --- a/providers/a4kScrapers/en/torrent/bitlord.py +++ /dev/null @@ -1,86 +0,0 @@ -# -*- coding: utf-8 -*- - -from providerModules.a4kScrapers import core - -class sources(core.DefaultSources): - def __init__(self, *args, **kwargs): - super(sources, self).__init__(__name__, *args, **kwargs) - - def _get_token_and_cookies(self, url): - response = self._request.get(url.base) - if response.status_code != 200: - return (None, None) - - token_id = core.re.findall(r'token\: (.*)\n', response.text)[0] - token = ''.join(core.re.findall(token_id + r" ?\+?\= ?'(.*)'", response.text)) - - cookies = '' - for cookie in response.cookies: - cookies += '%s=%s;' % (cookie.name, cookie.value) - - return (token, cookies) - - def _search_request(self, url, query, force_token_refresh=False): - (token, cookies) = core.database.get(self._get_token_and_cookies, 0 if force_token_refresh else 1, url) - if not token: - return [] - - headers = { - 'x-request-token': token, - 'cookie': cookies - } - - query = core.quote_plus(query) - data = { - 'query': query, - 'offset': 0, - 'limit': 99, - 'filters[field]': 'seeds', - 'filters[sort]': 'desc', - 'filters[time]': 4, - 'filters[category]': 3 if self.is_movie_query() else 4, - 'filters[adult]': False, - 'filters[risky]': False - } - - response = self._request.post(url.base + url.search, data, headers=headers) - - if response.status_code != 200: - if not force_token_refresh: - return self._search_request(url, query, force_token_refresh=True) - core.tools.log('No response from %s' %url, 'error') - return [] - - response = core.json.loads(response.text) - - if response['error']: - return [] - else: - return response['content'] - - def _soup_filter(self, response): - return response - - def _title_filter(self, el): - return el['name'] - - def _info(self, el, url, torrent): - torrent['magnet'] = el['magnet'] - - try: - size = int(el['size']) - if size == 0: - torrent['magnet'] = '' - else: - if size < 120 and el['source'] == 'thePirateBay': - size = size * 1024 - elif size > 122880: - size = int(size / 1024) - elif size < 120: - torrent['magnet'] = '' - torrent['size'] = size - except: pass - - torrent['seeds'] = el['seeds'] - - return torrent