Internal Rework

Contents/Code/__init__.py

@@ -1,5 +1,5 @@
 from search import search_anime
-from update import update_anime
+from update import update_anime, update_movie
 
 EN = Locale.Language.English
 
@@ -25,7 +25,7 @@ def search(self, results, media, lang, manual):
         search_anime('tv', results, media, lang)
 
     def update(self, metadata, media, lang, force):
-        update_anime('tv', metadata, media, force)
+        update_anime(metadata, media, force)
 
 
 class AniListMovie(Agent.Movies):
@@ -40,4 +40,4 @@ def search(self, results, media, lang, manual):
         search_anime('movie', results, media, lang)
 
     def update(self, metadata, media, lang, force):
-        update_anime('movie', metadata, media, force)
+        update_movie(metadata, media, force)

Contents/Code/providers.py

@@ -1,15 +1,14 @@
-from datetime import datetime
 from time import sleep
 import certifi
 import requests
 
-
 def get_anime(id):
     query = '''
         query {
             Page {
                 media(id: ''' + id + ''') {
                     genres
+                    duration
                     episodes
                     averageScore
                     description
@@ -110,27 +109,27 @@ def get_anime(id):
 
 
 def get_episodes(id):
-    sleep(4)
+    sleep(4) #TODO: Rate limit FIX
     anime_episodes = {}
-
-    mal_request = requests.get(
-        'https://api.jikan.moe/v3/anime/' + id + '/episodes',
-        verify=certifi.where()
-    ).content
-    episodes = JSON.ObjectFromString(mal_request)
-
+    page = 1
+    has_next_page = True
     try:
-        mal_request = requests.get(
-            'https://api.jikan.moe/v3/anime/' + id + '/episodes',
-            verify=certifi.where()
-        ).content
-        episodes = JSON.ObjectFromString(mal_request)
-
-        for episode in episodes['episodes']:
-            if not episode['recap']:
-                anime_episodes[episode['episode_id']] = episode
-
+        while has_next_page:
+            episodes = get_episode_data(id, page)
+            has_next_page = episodes['pagination']['has_next_page']
+            page += 1
+            for episode in episodes['data']:
+                if not episode['recap']:
+                    anime_episodes[episode['mal_id']] = episode
         return anime_episodes
     except:
         Log.Error('Error getting mal data')
     return
+
+def get_episode_data(id, page):
+
+    mal_request = requests.get(
+        'https://api.jikan.moe/v4/anime/' + id + '/episodes?page=' + str(page),
+        verify=certifi.where()
+    ).content
+    return JSON.ObjectFromString(mal_request)

Contents/Code/search.py

@@ -1,7 +1,7 @@
 from utils import requests_retry_session
 import certifi
 import re
-
+    
 
 def search_anime(type, results, media, lang):
     search_term = media.show if type == 'tv' else media.name
@@ -77,7 +77,6 @@ def search_anime(type, results, media, lang):
             id=str(result['id']),
             name=result['title']['romaji'],
             year=result['startDate']['year'],
-            thumb=result['coverImage']['extraLarge'],
             score=s,
             lang=lang
         ))