From 73f9e8ca872c7a8e7acbedc6b0b5db6cc861f22d Mon Sep 17 00:00:00 2001 From: Indranil012 Date: Sat, 11 Mar 2023 20:34:58 +0530 Subject: [PATCH] refactor: refactor config.toml and populate tag from config file --- app/controllers/Releases.py | 2 +- app/routers/patches.py | 3 ++- app/routers/tools.py | 3 ++- config.toml | 13 +++++++++++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/app/controllers/Releases.py b/app/controllers/Releases.py index 014dd29..209cd4c 100644 --- a/app/controllers/Releases.py +++ b/app/controllers/Releases.py @@ -106,7 +106,7 @@ class Releases: releases: dict[str, list] = {} releases['tools'] = [] - results: list = await asyncio.gather(*[self.__get_release(repository, tag) for repository in repositories]) + results: list = await asyncio.gather(*[self.__get_release(repository, tag) for _, repository in repositories.items()]) releases['tools'] = [asset for result in results for asset in result] diff --git a/app/routers/patches.py b/app/routers/patches.py index 8213571..d82c8f2 100644 --- a/app/routers/patches.py +++ b/app/routers/patches.py @@ -19,4 +19,5 @@ async def patches(request: Request, response: Response) -> dict: json: list of latest patches """ - return await releases.get_patches_json() + return await releases.get_patches_json(config['repositories']['patches'], + config['release']['tag']) diff --git a/app/routers/tools.py b/app/routers/tools.py index 8e26f3d..005b9cd 100644 --- a/app/routers/tools.py +++ b/app/routers/tools.py @@ -18,4 +18,5 @@ async def tools(request: Request, response: Response) -> dict: Returns: json: information about the patching tools' latest version """ - return await releases.get_latest_releases(config['app']['repositories']) + return await releases.get_latest_releases(config['repositories'], + config['release']['tag']) diff --git a/config.toml b/config.toml index 81dac14..5927601 100644 --- a/config.toml +++ b/config.toml @@ -54,8 +54,17 @@ database = 5 [auth] access_token_expires = false -[app] -repositories = ["revanced/revanced-patcher", "revanced/revanced-patches", "revanced/revanced-integrations", "revanced/revanced-manager", "revanced/revanced-cli", "revanced/revanced-website", "revanced/revanced-releases-api"] +[repositories] +patcher = "revanced/revanced-patcher" +patches = "revanced/revanced-patches" +integration = "revanced/revanced-integrations" +manager = "revanced/revanced-manager" +cli = "revanced/revanced-cli" +website = "revanced/revanced-website" +release-api = "revanced/revanced-releases-api" + +[Release] +tag = "latest" [socials] website = "https://revanced.app"