Support for the no tournaments page

- Replaced all URL constants with get_tibia_url method

Author: Galarzaa90

serve.py

@@ -21,21 +21,21 @@ async def home(request):
     return web.Response(text=content, content_type='text/html')
 
 
-@routes.get('/character/{name}')
+@routes.get('/characters/{name}')
 async def get_character(request):
     name = request.match_info['name']
     char = await app["tibiapy"].fetch_character(name)
     return web.Response(text=char.to_json())
 
 
-@routes.get('/guild/{name}')
+@routes.get('/guilds/{name}')
 async def get_guild(request):
     name = request.match_info['name']
     char = await app["tibiapy"].fetch_guild(name)
     return web.Response(text=char.to_json())
 
 
-@routes.get('/guilds/{name}')
+@routes.get('/worlds/{name}/guilds')
 async def get_guilds(request):
     name = request.match_info['name']
     guild_list = await app["tibiapy"].fetch_world_guilds(name)
@@ -86,7 +86,7 @@ async def get_worlds(request):
     return web.Response(text=worlds.to_json())
 
 
-@routes.get('/world/{name}')
+@routes.get('/worlds/{name}')
 async def get_world(request):
     name = request.match_info['name']
     world = await app["tibiapy"].fetch_world(name)
@@ -113,6 +113,22 @@ async def get_news_html(request):
     return web.Response(text=news.content, content_type='text/html')
 
 
+@routes.get('/tournaments/{tournament_id}')
+async def get_tournaments(request):
+    tournament_id = request.match_info['tournament_id']
+    tournament = await app["tibiapy"].fetch_tournament(int(tournament_id))
+    return web.Response(text=tournament.to_json())
+
+
+@routes.get('/tournaments/{tournament_id}/leaderboards/{world}/{page}')
+async def get_tournaments_leaderboard(request):
+    tournament_id = request.match_info['tournament_id']
+    world = request.match_info['world']
+    page = request.match_info['page']
+    tournament = await app["tibiapy"].fetch_tournament_leaderboard(int(tournament_id), world, int(page))
+    return web.Response(text=tournament.to_json())
+
+
 def json_error(status_code: int, exception: Exception, tb=None) -> web.Response:
     return web.Response(
         status=status_code,

tests/resources/README.md

@@ -100,6 +100,7 @@ nonexistent world or a unselected world.
 - [tibiacom_leaderboard_selector.txt](tournaments/tibiacom_leaderboard_selector.txt) - The content of the tournament leaderboards before selecting any options.
 - [tibiacom_not_found.txt](tournaments/tibiacom_not_found.txt) - The content of the tournament section for a tournament that doesn't exist.
 - [tibiacom_sign_up.txt](tournaments/tibiacom_sign_up.txt) - The content for the tournament's page for a upcoming tournament.
+- [tibiacomnot_active.txt](tournaments/tibiacom_not_active.txt) - The content for the tournament's page when there's no running tournament.
 
 ## World resources
  - [tibiacom_online.txt](world/tibiacom_online.txt) - An online world on Tibia.com.

tests/resources/tournaments/tibiacom_not_active.txt

@@ -0,0 +1,8 @@
+<div class="BoxContent" style="background-image:url(https://static.tibia.com/images/global/content/scroll.gif);">
+<center class="TournamentBannerRelaive"><img src="https://static.tibia.com/images/global/content/tournament_banner.png" /></center><br /><div class="TableContainer"> <table class="Table5" cellpadding="0" cellspacing="0"> <div class="CaptionContainer"> <div class="CaptionInnerContainer"> <span class="CaptionEdgeLeftTop" style="background-image:url(https://static.tibia.com/images/global/content/box-frame-edge.gif);" /></span> <span class="CaptionEdgeRightTop" style="background-image:url(https://static.tibia.com/images/global/content/box-frame-edge.gif);" /></span> <span class="CaptionBorderTop" style="background-image:url(https://static.tibia.com/images/global/content/table-headline-border.gif);"></span> <span class="CaptionVerticalLeft" style="background-image:url(https://static.tibia.com/images/global/content/box-frame-vertical.gif);" /></span> <div class="Text">Your Tournament Information</div> <span class="CaptionVerticalRight" style="background-image:url(https://static.tibia.com/images/global/content/box-frame-vertical.gif);" /></span> <span class="CaptionBorderBottom" style="background-image:url(https://static.tibia.com/images/global/content/table-headline-border.gif);"></span> <span class="CaptionEdgeLeftBottom" style="background-image:url(https://static.tibia.com/images/global/content/box-frame-edge.gif);" /></span> <span class="CaptionEdgeRightBottom" style="background-image:url(https://static.tibia.com/images/global/content/box-frame-edge.gif);" /></span> </div> </div> <tr> <td> <div class="InnerTableContainer"> <table style="width:100%;"><tr><td><div class="TableShadowContainerRightTop"> <div class="TableShadowRightTop" style="background-image:url(https://static.tibia.com/images/global/content/table-shadow-rt.gif);"></div></div><div class="TableContentAndRightShadow" style="background-image:url(https://static.tibia.com/images/global/content/table-shadow-rm.gif);"> <div class="TableContentContainer"> <table class="TableContent" width="100%" style="border:1px solid #faf0d7;"><tr class="Even"><td><p><div id="TournamentPersonalInformationLoginButton"><form action="https://www.tibia.com/account/index.php?subtopic=redirectlogin&redirect=https%3A%2F%2Fwww.tibia.com%2Fcommunity%2F%3Fsubtopic%3Dtournament" method="post" style="padding:0px;margin:0px;"><div class="BigButton" style="background-image:url(https://static.tibia.com/images/global/buttons/sbutton.gif)"><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);"><div class="BigButtonOver" style="background-image:url(https://static.tibia.com/images/global/buttons/sbutton_over.gif);"></div><input class="ButtonText" type="image" name="Login" alt="Login" src="https://static.tibia.com/images/global/buttons/_sbutton_login.gif"></div></div></form></div><b>Log in</b> to see your personal Tournament information!</p></td></tr> </table> </div></div><div class="TableShadowContainer"> <div class="TableBottomShadow" style="background-image:url(https://static.tibia.com/images/global/content/table-shadow-bm.gif);"> <div class="TableBottomLeftShadow" style="background-image:url(https://static.tibia.com/images/global/content/table-shadow-bl.gif);"></div> <div class="TableBottomRightShadow" style="background-image:url(https://static.tibia.com/images/global/content/table-shadow-br.gif);"></div> </div></div></td></tr><tr><td><table class="InnerTableButtonRow" cellpadding="0" cellspacing="0"><tr><td><div style="float: right; margin-right: 5px; margin-left: 5px;"><form action="https://www.tibia.com/community/?subtopic=tournamentleaderboards" method="post" style="padding:0px;margin:0px;"><div class="BigButton" style="background-image:url(https://static.tibia.com/images/global/buttons/sbutton.gif)"><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);"><div class="BigButtonOver" style="background-image:url(https://static.tibia.com/images/global/buttons/sbutton_over.gif);"></div><input class="ButtonText" type="image" name="Tournament Leaderboard" alt="Tournament Leaderboard" src="https://static.tibia.com/images/global/buttons/_sbutton_leaderboard.gif"></div></div></form></div><div style="float: right; margin-right: 5px; margin-left: 5px;"><form action="https://www.tibia.com/community/?subtopic=tournament" method="post" style="padding:0px;margin:0px;"><input type="hidden" name="action" value="archive"><div class="BigButton" style="background-image:url(https://static.tibia.com/images/global/buttons/sbutton.gif)"><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);"><div class="BigButtonOver" style="background-image:url(https://static.tibia.com/images/global/buttons/sbutton_over.gif);"></div><input class="ButtonText" type="image" name="Tournament Archive" alt="Tournament Archive" src="https://static.tibia.com/images/global/buttons/_sbutton_archive.gif"></div></div></form></div></tr></table></td></tr> </table> </div> </td> </tr> </table></div><br /><div class="TableContainer"> <table class="Table5" cellpadding="0" cellspacing="0"> <div class="CaptionContainer"> <div class="CaptionInnerContainer"> <span class="CaptionEdgeLeftTop" style="background-image:url(https://static.tibia.com/images/global/content/box-frame-edge.gif);" /></span> <span class="CaptionEdgeRightTop" style="background-image:url(https://static.tibia.com/images/global/content/box-frame-edge.gif);" /></span> <span class="CaptionBorderTop" style="background-image:url(https://static.tibia.com/images/global/content/table-headline-border.gif);"></span> <span class="CaptionVerticalLeft" style="background-image:url(https://static.tibia.com/images/global/content/box-frame-vertical.gif);" /></span> <div class="Text">Tournament Details</div> <span class="CaptionVerticalRight" style="background-image:url(https://static.tibia.com/images/global/content/box-frame-vertical.gif);" /></span> <span class="CaptionBorderBottom" style="background-image:url(https://static.tibia.com/images/global/content/table-headline-border.gif);"></span> <span class="CaptionEdgeLeftBottom" style="background-image:url(https://static.tibia.com/images/global/content/box-frame-edge.gif);" /></span> <span class="CaptionEdgeRightBottom" style="background-image:url(https://static.tibia.com/images/global/content/box-frame-edge.gif);" /></span> </div> </div> <tr> <td> <div class="InnerTableContainer"> <table style="width:100%;"><tr><td><div class="TableShadowContainerRightTop"> <div class="TableShadowRightTop" style="background-image:url(https://static.tibia.com/images/global/content/table-shadow-rt.gif);"></div></div><div class="TableContentAndRightShadow" style="background-image:url(https://static.tibia.com/images/global/content/table-shadow-rm.gif);"> <div class="TableContentContainer"> <table class="TableContent" width="100%" style="border:1px solid #faf0d7;"><tr><td><b>Currently there is no Tournament running.</b><p>Check out our <a href="https://www.tibia.com/news/">News</a> section regularly to find out when the next Tournament will start!</p></td></tr> </table> </div></div><div class="TableShadowContainer"> <div class="TableBottomShadow" style="background-image:url(https://static.tibia.com/images/global/content/table-shadow-bm.gif);"> <div class="TableBottomLeftShadow" style="background-image:url(https://static.tibia.com/images/global/content/table-shadow-bl.gif);"></div> <div class="TableBottomRightShadow" style="background-image:url(https://static.tibia.com/images/global/content/table-shadow-br.gif);"></div> </div></div></td></tr> </table> </div> </td> </tr> </table></div><br /> </div>
+</div>
+</div>
+ <div class="Border_1" style="background-image:url(https://static.tibia.com/images/global/content/border-1.gif);"></div>
+<div class="CornerWrapper-b"><div class="Corner-bl" style="background-image:url(https://static.tibia.com/images/global/content/corner-bl.gif);"></div></div>
+<div class="CornerWrapper-b"><div class="Corner-br" style="background-image:url(https://static.tibia.com/images/global/content/corner-br.gif);"></div></div>
+</div>

tests/tests_tournament.py

@@ -6,6 +6,7 @@
 
 FILE_TOURNAMENT_SIGN_UP = "tournaments/tibiacom_sign_up.txt"
 FILE_TOURNAMENT_ARCHIVE = "tournaments/tibiacom_archive.txt"
+FILE_TOURNAMENT_NOT_ACTIVE = "tournaments/tibiacom_not_active.txt"
 FILE_TOURNAMENT_NOT_FOUND = "tournaments/tibiacom_not_found.txt"
 FILE_TOURNAMENT_LEADERBOARD_ENDED = "tournaments/tibiacom_leaderboard_ended.txt"
 FILE_TOURNAMENT_LEADERBOARD_CURRENT = "tournaments/tibiacom_leaderboard_current.txt"
@@ -126,6 +127,12 @@ def test_tournament_from_content_archived(self):
         self.assertIsNone(last_prize.deed)
         self.assertIsNone(last_prize.other_rewards)
 
+    def test_tournament_from_content_not_active(self):
+        """Testing parsing the tournament page when ther'es no active tournament.."""
+        content = self._load_resource(FILE_TOURNAMENT_NOT_ACTIVE)
+        tournament = Tournament.from_content(content)
+        self.assertIsNone(tournament)
+
     def test_tournament_from_content_not_found(self):
         """Testing parsing a tournament that doesn't exist."""
         content = self._load_resource(FILE_TOURNAMENT_NOT_FOUND)

tests/tests_utils.py

@@ -181,6 +181,6 @@ def test_parse_integer(self):
 
     def test_get_tibia_url(self):
         self.assertEqual("https://www.tibia.com/community/?subtopic=character&name=Galarzaa+Fidera",
-                         get_tibia_url("community", "character", {"name": "Galarzaa Fidera"}))
+                         get_tibia_url("community", "character", name="Galarzaa Fidera"))
         self.assertEqual("https://www.tibia.com/community/?subtopic=character&name=Fn%F6",
-                         get_tibia_url("community", "character", {"name": "Fnö"}))
+                         get_tibia_url("community", "character", name="Fnö"))

tibiapy/abc.py

@@ -8,19 +8,11 @@
 from tibiapy.enums import HouseType, HouseStatus, HouseOrder
 from tibiapy.utils import get_tibia_url
 
-CHARACTER_URL = "https://www.tibia.com/community/?subtopic=characters&name=%s"
 CHARACTER_URL_TIBIADATA = "https://api.tibiadata.com/v2/characters/%s.json"
-HOUSE_URL = "https://www.tibia.com/community/?subtopic=houses&page=view&houseid=%d&world=%s"
 HOUSE_URL_TIBIADATA = "https://api.tibiadata.com/v2/house/%s/%d.json"
-HOUSE_LIST_URL = "https://www.tibia.com/community/?subtopic=houses&world=%s&town=%s&type=%s&status=%s&order=%s"
 HOUSE_LIST_URL_TIBIADATA = "https://api.tibiadata.com/v2/houses/%s/%s/%s.json"
-GUILD_URL = "https://www.tibia.com/community/?subtopic=guilds&page=view&GuildName=%s"
 GUILD_URL_TIBIADATA = "https://api.tibiadata.com/v2/guild/%s.json"
-GUILD_LIST_URL = "https://www.tibia.com/community/?subtopic=guilds&world="
 GUILD_LIST_URL_TIBIADATA = "https://api.tibiadata.com/v2/guilds/%s.json"
-NEWS_URL = "https://www.tibia.com/news/?subtopic=newsarchive&id=%d"
-NEWS_SEARCH_URL = "https://www.tibia.com/news/?subtopic=newsarchive"
-WORLD_URL = "https://www.tibia.com/community/?subtopic=worlds&world=%s"
 WORLD_URL_TIBIADATA = "https://api.tibiadata.com/v2/world/%s.json"
 
 
@@ -147,7 +139,7 @@ def get_url(cls, name):
         --------
         :class:`str`
             The URL to the character's page."""
-        return CHARACTER_URL % urllib.parse.quote(name.encode('iso-8859-1'))
+        return get_tibia_url("community", "characters", name=name)
 
     @classmethod
     def get_url_tibiadata(cls, name):
@@ -206,7 +198,7 @@ def get_url(cls, name):
         --------
         :class:`str`
             The URL to the guild's page"""
-        return GUILD_URL % urllib.parse.quote(name.encode('iso-8859-1'))
+        return get_tibia_url("community", "guilds", page="view", GuildName=name)
 
     @classmethod
     def get_url_tibiadata(cls, name):
@@ -237,7 +229,7 @@ def get_world_list_url(cls, world):
         :class:`str`
             The URL to the guild's page
         """
-        return GUILD_LIST_URL + urllib.parse.quote(world.title().encode('iso-8859-1'))
+        return get_tibia_url("community", "guilds", world=world)
 
     @classmethod
     def get_world_list_url_tibiadata(cls, world):
@@ -302,7 +294,7 @@ def get_url(cls, house_id, world):
         -------
         The URL to the house in Tibia.com
         """
-        return HOUSE_URL % (house_id, world)
+        return get_tibia_url("community", "houses", page="view", houseid=house_id, world=world)
 
     @classmethod
     def get_url_tibiadata(cls, house_id, world):
@@ -347,7 +339,8 @@ def get_list_url(cls, world, town, house_type: HouseType = HouseType.HOUSE, stat
         """
         house_type = "%ss" % house_type.value
         status = "" if status is None else status.value
-        return HOUSE_LIST_URL % (urllib.parse.quote(world), urllib.parse.quote(town), house_type, status, order.value)
+        return get_tibia_url("community", "houses", world=world, town=town, type=house_type, status=status,
+                             order=order.value)
 
     @classmethod
     def get_list_url_tibiadata(cls, world, town, house_type: HouseType = HouseType.HOUSE):
@@ -469,7 +462,7 @@ def get_url(cls, news_id):
         --------
         :class:`str`
             The URL to the news' page"""
-        return NEWS_URL % news_id
+        return get_tibia_url("news", "newsarchive", id=news_id)
 
     @classmethod
     def get_list_url(cls):
@@ -485,7 +478,7 @@ def get_list_url(cls):
         :class:`str`
             The URL to the news archive page on Tibia.com.
         """
-        return NEWS_SEARCH_URL
+        return get_tibia_url("news", "newsarchive")
 
 
 class BaseTournament(Serializable, metaclass=abc.ABCMeta):
@@ -530,8 +523,11 @@ def get_url(cls, tournament_cycle):
         """
         params = None
         if tournament_cycle:
-            params = {"tournamentcycle": tournament_cycle}
-        return get_tibia_url("community", "tournament", params)
+            params = {
+                "tournamentcycle": tournament_cycle,
+                "action": "archive",
+            }
+        return get_tibia_url("community", "tournament", **params)
 
 
 class BaseWorld(Serializable, metaclass=abc.ABCMeta):
@@ -609,7 +605,7 @@ def get_url(cls, name):
         :class:`str`
             The URL to the world's information page.
         """
-        return WORLD_URL % name.title()
+        return get_tibia_url("community", "worlds", world=name.title())
 
     @classmethod
     def get_url_tibiadata(cls, name):

tibiapy/client.py

@@ -441,7 +441,7 @@ async def fetch_news_archive(self, begin_date, end_date, categories=None, types=
         if NewsType.NEWS_TICKER in types:
             data["filter_ticker"] = "ticker"
 
-        content = await self._post(tibiapy.abc.NEWS_SEARCH_URL, data)
+        content = await self._post(News.get_list_url(), data)
         news = ListedNews.list_from_content(content)
         return news
 

tibiapy/highscores.py

@@ -5,7 +5,7 @@
 import math
 
 from tibiapy import Category, InvalidContent, Vocation, VocationFilter, abc
-from tibiapy.utils import parse_json, parse_tibiacom_content, try_enum
+from tibiapy.utils import get_tibia_url, parse_json, parse_tibiacom_content, try_enum
 
 __all__ = (
     "ExpHighscoresEntry",
@@ -16,7 +16,6 @@
 
 results_pattern = re.compile(r'Results: (\d+)')
 
-HIGHSCORES_URL = "https://www.tibia.com/community/?subtopic=highscores&world=%s&list=%s&profession=%d&currentpage=%d"
 HIGHSCORES_URL_TIBIADATA = "https://api.tibiadata.com/v2/highscores/%s/%s/%s.json"
 
 
@@ -211,7 +210,8 @@ def get_url(cls, world, category=Category.EXPERIENCE, vocation=VocationFilter.AL
         -------
         The URL to the Tibia.com highscores.
         """
-        return HIGHSCORES_URL % (world, category.value, vocation.value, page)
+        return get_tibia_url("community", "highscores", world=world, list=category.value, profession=vocation.value,
+                             currentpage=page)
 
     @classmethod
     def get_url_tibiadata(cls, world, category=Category.EXPERIENCE, vocation=VocationFilter.ALL):

tibiapy/kill_statistics.py

@@ -1,15 +1,13 @@
 from typing import Dict
 
 from tibiapy import abc, InvalidContent
-from tibiapy.utils import parse_tibiacom_content
+from tibiapy.utils import get_tibia_url, parse_tibiacom_content
 
 __all__ = (
     "KillStatistics",
     "RaceEntry",
 )
 
-KILL_STATISTICS_URL = "https://www.tibia.com/community/?subtopic=killstatistics&world=%s"
-
 
 class KillStatistics(abc.Serializable):
     """Represents the kill statistics of a world.
@@ -56,7 +54,7 @@ def get_url(cls, world):
         -------
         The URL to the Tibia.com kill statistics for this world.
         """
-        return KILL_STATISTICS_URL % world
+        return get_tibia_url("community", "killstatistics", world=world)
 
     @classmethod
     def from_content(cls, content):