Merge remote-tracking branch 'Minoshiro/master'

Mino-shiro · Aug 17, 2017 · 016be16 · 016be16
2 parents 919afe4 + 1f8f325
commit 016be16
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/minoshiro/minoshiro.py b/minoshiro/minoshiro.py
@@ -566,9 +566,9 @@ async def __find_manga_updates(self, cached_ids, medium,
                     mu_id
                 )}, None
             else:
-                return {'url': await mu.get_manga_url(
+                return await mu.get_manga_url(
                     self.session_manager, query, names, timeout
-                )}, None
+                ), None
 
         return None, None
 
@@ -592,8 +592,8 @@ async def __find_lndb(self, cached_ids, medium, query, names, timeout):
                     lndb_id
                 )}, None
             else:
-                return {'url': await lndb.get_light_novel_url(
-                    self.session_manager, query, names, timeout)}, None
+                return await lndb.get_light_novel_url(
+                    self.session_manager, query, names, timeout), None
         return None, None
 
     async def __find_novel_updates(self, cached_ids, medium,
@@ -616,9 +616,9 @@ async def __find_novel_updates(self, cached_ids, medium,
                 return {'url': nu.get_light_novel_by_id(
                     nu_id
                 )}, None
-            return {'url': await nu.get_light_novel_url(
+            return await nu.get_light_novel_url(
                 self.session_manager, query, names, timeout
-            )}, None
+            ), None
 
         return None, None
 

diff --git a/minoshiro/web_api/ani_list.py b/minoshiro/web_api/ani_list.py
@@ -179,6 +179,7 @@ async def get_page_by_popularity(session_manager, medium: Medium,
                         }}
                     synonyms
                     id
+                    url: siteUrl
                     type
                     format
                     }}
@@ -213,6 +214,7 @@ def __get_query_string(medium, query, search=False) -> str:
             english
             native
             }}
+            url: siteUrl
             startDate {{
             year
             month

diff --git a/minoshiro/web_api/kitsu.py b/minoshiro/web_api/kitsu.py
@@ -110,6 +110,8 @@ async def search_entries(self, medium: Medium,
         )
         if js:
             closest_entry = get_closest(query, js['data'])
+            if closest_entry:
+                closest_entry['url'] = closest_entry['links']['self']
             return closest_entry
 
     async def get_entry_by_id(self, medium, id_, timeout=3) -> Optional[dict]:
@@ -137,4 +139,6 @@ async def get_entry_by_id(self, medium, id_, timeout=3) -> Optional[dict]:
         )
 
         first = js['data']
+        if first[0]:
+            first[0]['url'] = first[0]['links']['self']
         return first.pop()
diff --git a/minoshiro/web_api/mal.py b/minoshiro/web_api/mal.py
@@ -48,6 +48,8 @@ async def get_entry_details(session_manager, header_info: dict,
         if medium == Medium.ANIME:
             data = {
                 'id': thing.find('id').text,
+                'url': 'https://myanimelist.net/anime/'
+                       f'{thing.find("id").text}',
                 'title': thing.find('title').text,
                 'english': thing.find('english').text,
                 'synonyms': synonyms,
@@ -62,6 +64,8 @@ async def get_entry_details(session_manager, header_info: dict,
         else:
             data = {
                 'id': thing.find('id').text,
+                'url': 'https://myanimelist.net/manga/'
+                       f'{thing.find("id").text}',
                 'title': thing.find('title').text,
                 'english': thing.find('english').text,
                 'synonyms': synonyms,