From dce5454fe7f817c2cba0a8906fb71f1316c6dc16 Mon Sep 17 00:00:00 2001 From: newt-sc <47229722+newt-sc@users.noreply.github.com> Date: Sun, 29 Aug 2021 01:38:56 +0300 Subject: [PATCH] release: v2.65.0 --- CHANGELOG.md | 4 +++ meta.json | 2 +- providerModules/a4kScrapers/urls.json | 14 ++------- providers/a4kScrapers/en/hosters/scenerls.py | 33 -------------------- providers/a4kScrapers/en/torrent/bitcq.py | 7 ----- update_cached_db.py | 2 +- 6 files changed, 8 insertions(+), 54 deletions(-) delete mode 100644 providers/a4kScrapers/en/hosters/scenerls.py delete mode 100644 providers/a4kScrapers/en/torrent/bitcq.py diff --git a/CHANGELOG.md b/CHANGELOG.md index 0368192..d13bf61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +* [v2.65.0](https://github.com/a4k-openproject/a4kScrapers/releases/tag/a4kScrapers-2.65.0): + * remove bitcq - dead + * remove scenerls - dropping hosters support + * [v2.64.0](https://github.com/a4k-openproject/a4kScrapers/releases/tag/a4kScrapers-2.64.0): * remove btdb - dead links diff --git a/meta.json b/meta.json index 168693b..738bece 100644 --- a/meta.json +++ b/meta.json @@ -1,6 +1,6 @@ { "author": "Unknown", - "version":"2.64.0", + "version":"2.65.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 7e014c6..7bb681f 100644 --- a/providerModules/a4kScrapers/urls.json +++ b/providerModules/a4kScrapers/urls.json @@ -8,12 +8,7 @@ { "base": "https://bitlordsearch.com" } ] }, - "bitcq": { - "search": "/search?q=%s&category%%5B%%5D=1", - "domains": [ - { "base": "https://bitcq.com" } - ] - }, + "-bitcq": { "search": "", "domains": [{ "base": "" }] }, "bt4g": { "search": "/movie/search/%s/byseeders/1", "domains": [ @@ -189,11 +184,6 @@ }, "hosters": { "-rlsbb": { "search": "", "domains": [{ "base": "" }] }, - "scenerls": { - "search": "/?s=%s", - "domains": [ - { "base": "http://scene-rls.net" } - ] - } + "-scenerls": { "search": "", "domains": [{ "base": "" }] } } } diff --git a/providers/a4kScrapers/en/hosters/scenerls.py b/providers/a4kScrapers/en/hosters/scenerls.py deleted file mode 100644 index 8935b56..0000000 --- a/providers/a4kScrapers/en/hosters/scenerls.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- coding: utf-8 -*- - -from providerModules.a4kScrapers import core - -class source(core.DefaultHosterSources): - def __init__(self, *args, **kwargs): - super(source, self).__init__(__name__, *args, **kwargs) - - def search(self, hoster_url, query, search_id=None): - search_path = hoster_url.search % core.quote_plus(query) - search_url = '%s%s' % (hoster_url.base, search_path) - - - response = self._request.get(search_url) - if response.status_code != 200: - return None - - result_content = response.text - posts = result_content.split('
')[1:] - results = [] - - for post in posts: - title = core.re.findall(r"href=\"http://scene-rls\.net/.*title=\"Permalink to (.*?)\"", post)[0] - link_matches = core.re.findall(r"\"(https?:\/\/(www\.)?(.*?)\/.*?)\"", result_content) - - urls = [] - for match in link_matches: - urls.append(match[0]) - - hoster_result = core.HosterResult(title=title, urls=urls) - results.append(hoster_result) - - return results diff --git a/providers/a4kScrapers/en/torrent/bitcq.py b/providers/a4kScrapers/en/torrent/bitcq.py deleted file mode 100644 index 1fdc4c4..0000000 --- a/providers/a4kScrapers/en/torrent/bitcq.py +++ /dev/null @@ -1,7 +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) diff --git a/update_cached_db.py b/update_cached_db.py index 8caeb3b..b5fa24f 100644 --- a/update_cached_db.py +++ b/update_cached_db.py @@ -41,7 +41,7 @@ torrent_scrapers = {} for scraper in torrent_module.__all__: - if scraper in ['bitcq', 'bitlord', 'glo', 'kickass', 'lime', 'magnetdl', 'nyaa', 'piratebay', 'solidtorrents', 'torrentapi', 'torrentdownload', 'torrentgalaxy', 'torrentparadise', 'torrentz2', 'yts']: + if scraper in ['bitlord', 'glo', 'kickass', 'lime', 'magnetdl', 'nyaa', 'piratebay', 'solidtorrents', 'torrentapi', 'torrentdownload', 'torrentgalaxy', 'torrentparadise', 'yts']: torrent_scrapers[scraper] = importlib.import_module('providers.a4kScrapers.en.torrent.%s' % scraper) url = os.getenv('A4KSCRAPERS_TRAKT_API_URL')