From 1b6a80bbe5800771774adeb469d861919dc3f70d Mon Sep 17 00:00:00 2001 From: Goldy <153996346+g0ldyy@users.noreply.github.com> Date: Tue, 26 Nov 2024 15:30:39 +0100 Subject: [PATCH 03/10] feat: random addon id --- comet/api/core.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/comet/api/core.py b/comet/api/core.py index 1dabf54..dc7b458 100644 --- a/comet/api/core.py +++ b/comet/api/core.py @@ -1,5 +1,7 @@ import PTT import RTN +import random +import string from fastapi import APIRouter, Request from fastapi.responses import RedirectResponse @@ -61,7 +63,7 @@ async def manifest(b64config: str = None): debrid_extension = get_debrid_extension(config["debridService"]) return { - "id": settings.ADDON_ID, + "id": f"{settings.ADDON_ID}.{''.join(random.choice(string.ascii_letters) for _ in range(4))}", "name": f"{settings.ADDON_NAME}{(' | ' + debrid_extension) if debrid_extension is not None else ''}", "description": "Stremio's fastest torrent/debrid search add-on.", "version": "1.0.0", From 01a10d1d4cfbd89af0b7736836165a64ffa9ac7d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 14:31:36 +0000 Subject: [PATCH 04/10] chore(main): release 1.47.0 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15fb74d..4f28bdb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.47.0](https://github.com/g0ldyy/comet/compare/v1.46.0...v1.47.0) (2024-11-26) + + +### Features + +* random addon id ([1b6a80b](https://github.com/g0ldyy/comet/commit/1b6a80bbe5800771774adeb469d861919dc3f70d)) + ## [1.46.0](https://github.com/g0ldyy/comet/compare/v1.45.0...v1.46.0) (2024-11-24) From 49cd90bd0092fd25fe866c3a9120e966a855cd76 Mon Sep 17 00:00:00 2001 From: Goldy <153996346+g0ldyy@users.noreply.github.com> Date: Tue, 26 Nov 2024 17:33:41 +0100 Subject: [PATCH 05/10] =?UTF-8?q?feat:=20GG=20Debrid-Link,=20restrictions?= =?UTF-8?q?=20defeated=20=F0=9F=A4=93=E2=98=9D=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comet/debrid/debridlink.py | 117 +++++++++++++++++++++---------------- 1 file changed, 67 insertions(+), 50 deletions(-) diff --git a/comet/debrid/debridlink.py b/comet/debrid/debridlink.py index e7206de..810ed41 100644 --- a/comet/debrid/debridlink.py +++ b/comet/debrid/debridlink.py @@ -29,20 +29,31 @@ class DebridLink: return False async def get_instant(self, chunk: list): - try: - get_instant = await self.session.get( - f"{self.api_url}/seedbox/cached?url={','.join(chunk)}" - ) - return await get_instant.json() - except Exception as e: - logger.warning( - f"Exception while checking hashes instant availability on Debrid-Link: {e}" - ) + responses = [] + for hash in chunk: + try: + add_torrent = await self.session.post( + "https://debrid-link.com/api/v2/seedbox/add", + data={"url": hash, "wait": True, "async": True}, + ) + add_torrent = await add_torrent.json() + + torrent_id = add_torrent["value"]["id"] + await self.session.delete(f"{self.api_url}/seedbox/{torrent_id}/remove") + + responses.append(add_torrent) + except Exception as e: + logger.warning( + f"Exception while checking cached status on DebridLink for {hash}: {e}" + ) + pass + + return responses async def get_files( self, torrent_hashes: list, type: str, season: str, episode: str, kitsu: bool ): - chunk_size = 250 + chunk_size = 10 chunks = [ torrent_hashes[i : i + chunk_size] for i in range(0, len(torrent_hashes), chunk_size) @@ -54,61 +65,67 @@ class DebridLink: responses = await asyncio.gather(*tasks) - availability = [ - response for response in responses if response and response.get("success") - ] + availability = [] + for response_list in responses: + for response in response_list: + availability.append(response) files = {} if type == "series": for result in availability: - for hash, torrent_data in result["value"].items(): - for file in torrent_data["files"]: - filename = file["name"] + torrent_files = result["value"]["files"] + for file in torrent_files: + if file["downloadPercent"] != 100: + continue - if not is_video(filename): + filename = file["name"] + + if not is_video(filename): + continue + + if "sample" in filename.lower(): + continue + + filename_parsed = parse(filename) + if episode not in filename_parsed.episodes: + continue + + if kitsu: + if filename_parsed.seasons: + continue + else: + if season not in filename_parsed.seasons: continue - if "sample" in filename.lower(): - continue + files[result["value"]["hashString"]] = { + "index": torrent_files.index(file), + "title": filename, + "size": file["size"], + } - filename_parsed = parse(filename) - if episode not in filename_parsed.episodes: - continue - - if kitsu: - if filename_parsed.seasons: - continue - else: - if season not in filename_parsed.seasons: - continue - - files[hash] = { - "index": torrent_data["files"].index(file), - "title": filename, - "size": file["size"], - } - - break + break else: for result in availability: - for hash, torrent_data in result["value"].items(): - for file in torrent_data["files"]: - filename = file["name"] + value = result["value"] + torrent_files = value["files"] + for file in torrent_files: + if file["downloadPercent"] != 100: + continue - if not is_video(filename): - continue + filename = file["name"] - if "sample" in filename.lower(): - continue + if not is_video(filename): + continue - files[hash] = { - "index": torrent_data["files"].index(file), - "title": filename, - "size": file["size"], - } + if "sample" in filename.lower(): + continue - break + files[value["hashString"]] = { + "index": torrent_files.index(file), + "title": filename, + "size": file["size"], + } return files From 42f7a06a181f72391da553263ca74cae252f15a6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 16:34:21 +0000 Subject: [PATCH 06/10] chore(main): release 1.48.0 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f28bdb..a4c5c53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.48.0](https://github.com/g0ldyy/comet/compare/v1.47.0...v1.48.0) (2024-11-26) + + +### Features + +* GG Debrid-Link, restrictions defeated 🤓☝️ ([49cd90b](https://github.com/g0ldyy/comet/commit/49cd90bd0092fd25fe866c3a9120e966a855cd76)) + ## [1.47.0](https://github.com/g0ldyy/comet/compare/v1.46.0...v1.47.0) (2024-11-26) From f9c0ec0a84b6fa9a1e791990b690b6f8ffe0922d Mon Sep 17 00:00:00 2001 From: Goldy <153996346+g0ldyy@users.noreply.github.com> Date: Tue, 26 Nov 2024 17:43:03 +0100 Subject: [PATCH 07/10] fix: we don't want to spam debrid-link shit --- comet/debrid/debridlink.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/comet/debrid/debridlink.py b/comet/debrid/debridlink.py index 810ed41..b3f7261 100644 --- a/comet/debrid/debridlink.py +++ b/comet/debrid/debridlink.py @@ -33,7 +33,7 @@ class DebridLink: for hash in chunk: try: add_torrent = await self.session.post( - "https://debrid-link.com/api/v2/seedbox/add", + f"{self.api_url}/seedbox/add", data={"url": hash, "wait": True, "async": True}, ) add_torrent = await add_torrent.json() @@ -42,10 +42,7 @@ class DebridLink: await self.session.delete(f"{self.api_url}/seedbox/{torrent_id}/remove") responses.append(add_torrent) - except Exception as e: - logger.warning( - f"Exception while checking cached status on DebridLink for {hash}: {e}" - ) + except: pass return responses From b62e093174ffdfe766a2e2ed4d36cceb39daefd3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 16:43:43 +0000 Subject: [PATCH 08/10] chore(main): release 1.48.1 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4c5c53..4e818f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.48.1](https://github.com/g0ldyy/comet/compare/v1.48.0...v1.48.1) (2024-11-26) + + +### Bug Fixes + +* we don't want to spam debrid-link shit ([f9c0ec0](https://github.com/g0ldyy/comet/commit/f9c0ec0a84b6fa9a1e791990b690b6f8ffe0922d)) + ## [1.48.0](https://github.com/g0ldyy/comet/compare/v1.47.0...v1.48.0) (2024-11-26) From 30ecbcec4560510b260c43ec2ed04a82e724c743 Mon Sep 17 00:00:00 2001 From: Goldy <153996346+g0ldyy@users.noreply.github.com> Date: Tue, 26 Nov 2024 18:53:36 +0100 Subject: [PATCH 09/10] feat: torbox speed improvement + torbox proxy stream fix --- comet/api/stream.py | 34 ++++++++++++++++++++-------------- comet/debrid/torbox.py | 2 +- comet/utils/general.py | 4 +++- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/comet/api/stream.py b/comet/api/stream.py index eda303f..9fd9655 100644 --- a/comet/api/stream.py +++ b/comet/api/stream.py @@ -213,9 +213,7 @@ async def stream( if "searched" in hash: continue - all_sorted_ranked_files[hash] = orjson.loads( - result["data"] - ) + all_sorted_ranked_files[hash] = orjson.loads(result["data"]) if len(all_sorted_ranked_files) != 0 and set(indexers).issubset(trackers_found): debrid_extension = get_debrid_extension( @@ -662,22 +660,30 @@ async def playback(request: Request, b64config: str, hash: str, index: str): range_header = request.headers.get("range", "bytes=0-") try: - response = await session.head( - download_link, headers={"Range": range_header} - ) + if config["debridService"] != "torbox": + response = await session.head( + download_link, headers={"Range": range_header} + ) + else: + response = await session.get( + download_link, headers={"Range": range_header} + ) except aiohttp.ClientResponseError as e: if e.status == 503 and config["debridService"] == "alldebrid": - proxy = ( - settings.DEBRID_PROXY_URL - ) # proxy is not needed to proxy realdebrid stream + proxy = ( + settings.DEBRID_PROXY_URL + ) # proxy is needed only to proxy alldebrid streams - response = await session.head( - download_link, headers={"Range": range_header}, proxy=proxy - ) + response = await session.head( + download_link, headers={"Range": range_header}, proxy=proxy + ) else: - raise + logger.warning(f"Exception while proxying {download_link}: {e}") + return - if response.status == 206: + if response.status == 206 or ( + response.status == 200 and config["debridService"] == "torbox" + ): id = str(uuid.uuid4()) await database.execute( f"INSERT {'OR IGNORE ' if settings.DATABASE_TYPE == 'sqlite' else ''}INTO active_connections (id, ip, content, timestamp) VALUES (:id, :ip, :content, :timestamp){' ON CONFLICT DO NOTHING' if settings.DATABASE_TYPE == 'postgresql' else ''}", diff --git a/comet/debrid/torbox.py b/comet/debrid/torbox.py index 887c2ff..2e9cd6d 100644 --- a/comet/debrid/torbox.py +++ b/comet/debrid/torbox.py @@ -43,7 +43,7 @@ class TorBox: async def get_files( self, torrent_hashes: list, type: str, season: str, episode: str, kitsu: bool ): - chunk_size = 100 + chunk_size = 50 chunks = [ torrent_hashes[i : i + chunk_size] for i in range(0, len(torrent_hashes), chunk_size) diff --git a/comet/utils/general.py b/comet/utils/general.py index 074d2a0..375da71 100644 --- a/comet/utils/general.py +++ b/comet/utils/general.py @@ -716,7 +716,9 @@ async def add_torrent_to_cache( for indexer in indexers: hash = f"searched-{indexer}-{name}-{season}-{episode}" - searched = copy.deepcopy(sorted_ranked_files[list(sorted_ranked_files.keys())[0]]) + searched = copy.deepcopy( + sorted_ranked_files[list(sorted_ranked_files.keys())[0]] + ) searched["infohash"] = hash searched["data"]["tracker"] = indexer From 482a24b0d29a7bc311a43438f303f2edac3c4c5d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 17:54:14 +0000 Subject: [PATCH 10/10] chore(main): release 1.49.0 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e818f7..6a126d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.49.0](https://github.com/g0ldyy/comet/compare/v1.48.1...v1.49.0) (2024-11-26) + + +### Features + +* torbox speed improvement + torbox proxy stream fix ([30ecbce](https://github.com/g0ldyy/comet/commit/30ecbcec4560510b260c43ec2ed04a82e724c743)) + ## [1.48.1](https://github.com/g0ldyy/comet/compare/v1.48.0...v1.48.1) (2024-11-26)