From 52a3c7fee787b8ab88e1131a9bb72669e2c55529 Mon Sep 17 00:00:00 2001 From: Evgeniy Alekseev Date: Fri, 6 Sep 2019 02:33:16 +0300 Subject: [PATCH] split apis --- setup.cfg | 5 +++ setup.py | 2 + src/service/api/routes.py | 6 +-- src/service/api/views/api/__init__.py | 0 src/service/api/views/{ => api}/bis.py | 38 +++++----------- src/service/api/views/{ => api}/loot.py | 29 +++++------- src/service/api/views/{ => api}/player.py | 33 +++----------- src/service/api/views/common/__init__.py | 0 src/service/api/views/common/bis_base.py | 48 ++++++++++++++++++++ src/service/api/views/common/loot_base.py | 42 +++++++++++++++++ src/service/api/views/common/player_base.py | 50 +++++++++++++++++++++ src/service/api/views/html/__init__.py | 0 src/service/core/config.py | 2 + 13 files changed, 180 insertions(+), 75 deletions(-) create mode 100644 setup.cfg create mode 100644 src/service/api/views/api/__init__.py rename src/service/api/views/{ => api}/bis.py (56%) rename src/service/api/views/{ => api}/loot.py (67%) rename src/service/api/views/{ => api}/player.py (50%) create mode 100644 src/service/api/views/common/__init__.py create mode 100644 src/service/api/views/common/bis_base.py create mode 100644 src/service/api/views/common/loot_base.py create mode 100644 src/service/api/views/common/player_base.py create mode 100644 src/service/api/views/html/__init__.py diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..5d55b53 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,5 @@ +[aliases] +test=pytest + +[tool:pytest] +addopts = --verbose --pyargs . diff --git a/setup.py b/setup.py index 7af20a0..a84d5bc 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,9 @@ setup( packages=find_packages(exclude=['contrib', 'docs', 'tests']), install_requires=[ + 'aiohttp_jinja2', 'aiohttp', + 'Jinja2', 'requests', 'yoyo_migrations' ], diff --git a/src/service/api/routes.py b/src/service/api/routes.py index a1452f4..9bf9957 100644 --- a/src/service/api/routes.py +++ b/src/service/api/routes.py @@ -8,9 +8,9 @@ # from aiohttp.web import Application -from .views.bis import BiSView -from .views.loot import LootView -from .views.player import PlayerView +from service.api.views.api.bis import BiSView +from service.api.views.api.loot import LootView +from service.api.views.api.player import PlayerView def setup_routes(app: Application) -> None: diff --git a/src/service/api/views/api/__init__.py b/src/service/api/views/api/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/service/api/views/bis.py b/src/service/api/views/api/bis.py similarity index 56% rename from src/service/api/views/bis.py rename to src/service/api/views/api/bis.py index 7ac7af0..974e31f 100644 --- a/src/service/api/views/bis.py +++ b/src/service/api/views/api/bis.py @@ -6,28 +6,21 @@ # # License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause # -from aiohttp.web import Response, View -from typing import Iterable, Optional +from aiohttp.web import Response -from service.core.ariyala_parser import AriyalaParser from service.models.job import Job from service.models.piece import Piece -from service.models.player import Player, PlayerId +from service.models.player import PlayerId -from ..utils import wrap_exception, wrap_invalid_param, wrap_json +from service.api.utils import wrap_exception, wrap_invalid_param, wrap_json +from service.api.views.common.bis_base import BiSBaseView -class BiSView(View): +class BiSView(BiSBaseView): async def get(self) -> Response: try: - nick = self.request.query.getone('nick', None) - party: Iterable[Player] = [ - player - for player in self.request.app['party'].party - if nick is None or player.nick == nick - ] - loot = list(sum([player.bis.pieces for player in party], [])) + loot = self.bis_get(self.request.query.getone('nick', None)) except Exception as e: self.request.app.logger.exception('could not get bis') @@ -44,18 +37,15 @@ class BiSView(View): required = ['action', 'is_tome', 'job', 'nick', 'piece'] if any(param not in data for param in required): return wrap_invalid_param(required, data) - player_id = PlayerId(Job[data['job']], data['nick']) action = data.get('action') if action not in ('add', 'remove'): return wrap_invalid_param(['action'], data) try: - piece = Piece.get(data) # type: ignore - if action == 'add': - self.request.app['party'].set_item_bis(player_id, piece) - elif action == 'remove': - self.request.app['party'].remove_item_bis(player_id, piece) + player_id = PlayerId(Job[data['job']], data['nick']) + piece: Piece = Piece.get(data) # type: ignore + self.bis_post(action, player_id, piece) except Exception as e: self.request.app.logger.exception('could not add bis') @@ -72,17 +62,13 @@ class BiSView(View): required = ['job', 'link', 'nick'] if any(param not in data for param in required): return wrap_invalid_param(required, data) - player_id = PlayerId(Job[data['job']], data['nick']) try: - parser = AriyalaParser(self.request.app['config']) - items = parser.get(data['link']) - for piece in items: - self.request.app['party'].set_item_bis(player_id, piece) - self.request.app['party'].set_bis_link(player_id, data['link']) + player_id = PlayerId(Job[data['job']], data['nick']) + link = self.bis_put(player_id, data['link']) except Exception as e: self.request.app.logger.exception('could not parse bis') return wrap_exception(e, data) - return wrap_json({'link': data['link']}, data) \ No newline at end of file + return wrap_json({'link': link}, data) \ No newline at end of file diff --git a/src/service/api/views/loot.py b/src/service/api/views/api/loot.py similarity index 67% rename from src/service/api/views/loot.py rename to src/service/api/views/api/loot.py index c2cfd58..a003a13 100644 --- a/src/service/api/views/loot.py +++ b/src/service/api/views/api/loot.py @@ -6,27 +6,21 @@ # # License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause # -from aiohttp.web import Response, View -from typing import Iterable +from aiohttp.web import Response from service.models.job import Job from service.models.piece import Piece -from service.models.player import Player, PlayerId +from service.models.player import PlayerId -from ..utils import wrap_exception, wrap_invalid_param, wrap_json +from service.api.utils import wrap_exception, wrap_invalid_param, wrap_json +from service.api.views.common.loot_base import LootBaseView -class LootView(View): +class LootView(LootBaseView): async def get(self) -> Response: try: - nick = self.request.query.getone('nick', None) - party: Iterable[Player] = [ - player - for player in self.request.app['party'].party - if nick is None or player.nick == nick - ] - loot = list(sum([player.loot for player in party], [])) + loot = self.loot_get(self.request.query.getone('nick', None)) except Exception as e: self.request.app.logger.exception('could not get loot') @@ -50,11 +44,8 @@ class LootView(View): try: player_id = PlayerId(Job[data['job']], data['nick']) - piece = Piece.get(data) - if action == 'add': - self.request.app['party'].set_item(player_id, piece) - elif action == 'remove': - self.request.app['party'].remove_item(player_id, piece) + piece: Piece = Piece.get(data) # type: ignore + self.loot_post(action, player_id, piece) except Exception as e: self.request.app.logger.exception('could not add loot') @@ -73,8 +64,8 @@ class LootView(View): return wrap_invalid_param(required, data) try: - piece = Piece.get(data) - players = self.request.app['loot'].suggest(piece) + piece: Piece = Piece.get(data) # type: ignore + players = self.loot_put(piece) except Exception as e: self.request.app.logger.exception('could not suggest loot') diff --git a/src/service/api/views/player.py b/src/service/api/views/api/player.py similarity index 50% rename from src/service/api/views/player.py rename to src/service/api/views/api/player.py index 0f0f652..7fc4dfd 100644 --- a/src/service/api/views/player.py +++ b/src/service/api/views/api/player.py @@ -6,27 +6,19 @@ # # License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause # -from aiohttp.web import Response, View -from typing import Iterable +from aiohttp.web import Response -from service.core.ariyala_parser import AriyalaParser -from service.models.bis import BiS from service.models.job import Job -from service.models.player import Player, PlayerId -from ..utils import wrap_exception, wrap_invalid_param, wrap_json +from service.api.utils import wrap_exception, wrap_invalid_param, wrap_json +from service.api.views.common.player_base import PlayerBaseView -class PlayerView(View): +class PlayerView(PlayerBaseView): async def get(self) -> Response: try: - nick = self.request.query.getone('nick', None) - party: Iterable[Player] = [ - player - for player in self.request.app['party'].party - if nick is None or player.nick == nick - ] + party = self.player_get(self.request.query.getone('nick', None)) except Exception as e: self.request.app.logger.exception('could not get loot') @@ -51,20 +43,7 @@ class PlayerView(View): return wrap_invalid_param(['action'], data) try: - if action == 'add': - player = Player(Job[data['job']], data['nick'], BiS(), [], link, priority) - player_id = player.player_id - self.request.app['party'].set_player(player) - - if link is not None: - parser = AriyalaParser(self.request.app['config']) - items = parser.get(link) - for piece in items: - self.request.app['party'].set_item_bis(player_id, piece) - - elif action == 'remove': - player_id = PlayerId(Job[data['job']], data['nick']) - self.request.app['party'].remove_player(player_id) + player_id = self.player_post(action, Job[data['job']], data['nick'], link, priority) except Exception as e: self.request.app.logger.exception('could not add loot') diff --git a/src/service/api/views/common/__init__.py b/src/service/api/views/common/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/service/api/views/common/bis_base.py b/src/service/api/views/common/bis_base.py new file mode 100644 index 0000000..92d1b71 --- /dev/null +++ b/src/service/api/views/common/bis_base.py @@ -0,0 +1,48 @@ +# +# Copyright (c) 2019 Evgeniy Alekseev. +# +# This file is part of ffxivbis +# (see https://github.com/arcan1s/ffxivbis). +# +# License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause +# +from aiohttp.web import View +from typing import List, Optional + +from service.core.ariyala_parser import AriyalaParser +from service.models.piece import Piece +from service.models.player import PlayerId + + +class BiSBaseView(View): + + def bis_add(self, player_id: PlayerId, piece: Piece) -> Piece: + self.request.app['party'].set_item_bis(player_id, piece) + return piece + + def bis_get(self, nick: Optional[str]) -> List[Piece]: + party = [ + player + for player in self.request.app['party'].party + if nick is None or player.nick == nick + ] + return list(sum([player.bis.pieces for player in party], [])) + + def bis_post(self, action: str, player_id: PlayerId, piece: Piece) -> Optional[Piece]: + if action == 'add': + return self.bis_add(player_id, piece) + elif action == 'remove': + return self.bis_remove(player_id, piece) + return None + + def bis_put(self, player_id: PlayerId, link: str) -> str: + parser = AriyalaParser(self.request.app['config']) + items = parser.get(link) + for piece in items: + self.request.app['party'].set_item_bis(player_id, piece) + self.request.app['party'].set_bis_link(player_id, link) + return link + + def bis_remove(self, player_id: PlayerId, piece: Piece) -> Piece: + self.request.app['party'].remove_item_bis(player_id, piece) + return piece diff --git a/src/service/api/views/common/loot_base.py b/src/service/api/views/common/loot_base.py new file mode 100644 index 0000000..483f20c --- /dev/null +++ b/src/service/api/views/common/loot_base.py @@ -0,0 +1,42 @@ +# +# Copyright (c) 2019 Evgeniy Alekseev. +# +# This file is part of ffxivbis +# (see https://github.com/arcan1s/ffxivbis). +# +# License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause +# +from aiohttp.web import View +from typing import List, Optional + +from service.models.piece import Piece +from service.models.player import PlayerId, PlayerIdWithCounters + + +class LootBaseView(View): + + def loot_add(self, player_id: PlayerId, piece: Piece) -> Piece: + self.request.app['party'].set_item(player_id, piece) + return piece + + def loot_get(self, nick: Optional[str]) -> List[Piece]: + party = [ + player + for player in self.request.app['party'].party + if nick is None or player.nick == nick + ] + return list(sum([player.loot for player in party], [])) + + def loot_post(self, action: str, player_id: PlayerId, piece: Piece) -> Optional[Piece]: + if action == 'add': + return self.loot_add(player_id, piece) + elif action == 'remove': + return self.loot_remove(player_id, piece) + return None + + def loot_put(self, piece: Piece) -> List[PlayerIdWithCounters]: + return self.request.app['loot'].suggest(piece) + + def loot_remove(self, player_id: PlayerId, piece: Piece) -> Piece: + self.request.app['party'].remove_item(player_id, piece) + return piece \ No newline at end of file diff --git a/src/service/api/views/common/player_base.py b/src/service/api/views/common/player_base.py new file mode 100644 index 0000000..f07af31 --- /dev/null +++ b/src/service/api/views/common/player_base.py @@ -0,0 +1,50 @@ +# +# Copyright (c) 2019 Evgeniy Alekseev. +# +# This file is part of ffxivbis +# (see https://github.com/arcan1s/ffxivbis). +# +# License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause +# +from aiohttp.web import View +from typing import List, Optional + +from service.core.ariyala_parser import AriyalaParser +from service.models.bis import BiS +from service.models.job import Job +from service.models.player import Player, PlayerId + + +class PlayerBaseView(View): + + def player_add(self, job: Job, nick: str, link: Optional[str], priority: int) -> PlayerId: + player = Player(job, nick, BiS(), [], link, priority) + player_id = player.player_id + self.request.app['party'].set_player(player) + + if link is not None: + parser = AriyalaParser(self.request.app['config']) + items = parser.get(link) + for piece in items: + self.request.app['party'].set_item_bis(player_id, piece) + + return player_id + + def player_get(self, nick: Optional[str]) -> List[Player]: + return [ + player + for player in self.request.app['party'].party + if nick is None or player.nick == nick + ] + + def player_post(self, action: str, job: Job, nick: str, link: Optional[str], priority: int) -> Optional[PlayerId]: + if action == 'add': + return self.player_add(job, nick, link, priority) + elif action == 'remove': + return self.player_remove(job, nick) + return None + + def player_remove(self, job: Job, nick: str) -> PlayerId: + player_id = PlayerId(job, nick) + self.request.app['party'].remove_player(player_id) + return player_id \ No newline at end of file diff --git a/src/service/api/views/html/__init__.py b/src/service/api/views/html/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/service/core/config.py b/src/service/core/config.py index 5c1d710..49ccb93 100644 --- a/src/service/core/config.py +++ b/src/service/core/config.py @@ -30,6 +30,8 @@ class Configuration(configparser.RawConfigParser): self.read(os.path.join(self.include, conf)) def __with_root_path(self, path: str) -> str: + if self.root_path is None: + return path return os.path.join(self.root_path, path) def get_section(self, section: str) -> Dict[str, str]: