Made Popular async as well
Fixed unittests TODO: Use self.api in all routines
This commit is contained in:
lomion
parent
28c2a9e474
commit
954a55e628
121
test_tmdb.py
121
test_tmdb.py
|
|
@ -6,6 +6,7 @@ from tmdb.tmdb import TmdbBot, MessageConstructor
|
|||
from tmdb.database import Database
|
||||
from sqlalchemy import create_engine
|
||||
import time
|
||||
import requests
|
||||
|
||||
def apiRequests(command):
|
||||
api_key = '51d75c00dc1502dc894b7773ec3e7a15'
|
||||
|
|
@ -24,42 +25,38 @@ class TestTmdbMethods(unittest.IsolatedAsyncioTestCase):
|
|||
await movie.load_parameters()
|
||||
id = await movie.search_title('Breakfast Club')
|
||||
self.assertEqual(id, 2108)
|
||||
print(time.time() - start)
|
||||
await movie.close_session()
|
||||
'''
|
||||
def test_cast(self):
|
||||
|
||||
async def test_cast(self):
|
||||
movie = Movie()
|
||||
movie.search_title('Breakfast Club')
|
||||
await movie.load_parameters()
|
||||
await movie.search_title('Breakfast Club')
|
||||
self.assertEqual('Emilio Estevez', movie.cast[0])
|
||||
await movie.close_session()
|
||||
|
||||
def test_title(self):
|
||||
async def test_title(self):
|
||||
movie = Movie()
|
||||
movie.search_title('Breakfast Club')
|
||||
await movie.load_parameters()
|
||||
await movie.search_title('Breakfast Club')
|
||||
self.assertEqual('The Breakfast Club', movie.title)
|
||||
await movie.close_session()
|
||||
|
||||
def test_overview(self):
|
||||
async def test_overview(self):
|
||||
movie = Movie()
|
||||
movie.search_title('Breakfast Club')
|
||||
await movie.load_parameters()
|
||||
await movie.search_title('Breakfast Club')
|
||||
description = 'Five high school students from different walks of'
|
||||
self.assertEqual(description, movie.overview[:len(description)])
|
||||
await movie.close_session()
|
||||
|
||||
def test_change_language(self):
|
||||
async def test_change_language(self):
|
||||
movie = Movie()
|
||||
await movie.load_parameters()
|
||||
movie.set_language('en')
|
||||
movie.search_title('Breakfast Club')
|
||||
await movie.search_title('Breakfast Club')
|
||||
description = 'Five high school students from different walks of life endure a Saturday detention'
|
||||
self.assertEqual(description, movie.overview[:len(description)])
|
||||
|
||||
def test_html_construction(self):
|
||||
movie = Movie()
|
||||
movie.query_details('550')
|
||||
constructor = MessageConstructor(movie)
|
||||
constructor.overview_length = 10
|
||||
message = constructor.construct_html_message()
|
||||
self.assertEqual(message, """<p><a href="https://www.themoviedb.org/movie/550"><b>Fight Club</b></a></p>
|
||||
<p>A ticking- [...]</p>
|
||||
<p>Acting: Edward Norton, Brad Pitt, Helena Bonham Carter</p>
|
||||
<p>Taken from www.themoviedb.org</p>""")
|
||||
await movie.close_session()
|
||||
|
||||
def test_database_language(self):
|
||||
engine = create_engine('sqlite:///test.db', echo=True)
|
||||
|
|
@ -69,23 +66,29 @@ class TestTmdbMethods(unittest.IsolatedAsyncioTestCase):
|
|||
db.set_language('@testuser:example.com', 'en')
|
||||
self.assertEqual(str(db.get_language('@testuser:example.com')), 'en')
|
||||
|
||||
def test_id_lookup(self):
|
||||
async def test_id_lookup(self):
|
||||
movie = Movie()
|
||||
movie.query_details('2108')
|
||||
await movie.load_parameters()
|
||||
await movie.query_details('2108')
|
||||
self.assertEqual('The Breakfast Club', movie.title)
|
||||
await movie.close_session()
|
||||
|
||||
def test_search_fails(self):
|
||||
async def test_search_fails(self):
|
||||
movie = Movie()
|
||||
id = movie.search_title('Breakfast Club 2019')
|
||||
await movie.load_parameters()
|
||||
id = await movie.search_title('Breakfast Club 2019')
|
||||
self.assertEqual(id, None)
|
||||
self.assertEqual(None, movie.title)
|
||||
await movie.close_session()
|
||||
|
||||
def test_search_year(self):
|
||||
async def test_search_year(self):
|
||||
movie = Movie()
|
||||
id = movie.search_title('Dune')
|
||||
await movie.load_parameters()
|
||||
id = await movie.search_title('Dune')
|
||||
self.assertEqual(id, 438631)
|
||||
id = movie.search_title('Dune', 1984)
|
||||
id = await movie.search_title('Dune', 1984)
|
||||
self.assertEqual(id, 841)
|
||||
await movie.close_session()
|
||||
|
||||
def test_split_year(self):
|
||||
tmdb = TmdbBot("", "", "", "", "", "", "", "", "")
|
||||
|
|
@ -96,62 +99,82 @@ class TestTmdbMethods(unittest.IsolatedAsyncioTestCase):
|
|||
self.assertEqual('Dune', title)
|
||||
self.assertEqual(2020, year)
|
||||
|
||||
def test_set_poster_size(self):
|
||||
async def test_set_poster_size(self):
|
||||
movie = Movie()
|
||||
await movie.load_parameters()
|
||||
size = movie.set_poster_size("w500")
|
||||
self.assertEqual(size, "w500")
|
||||
self.assertEqual(movie.base_url_poster, f"{movie.base_url_images}w500")
|
||||
size = movie.set_poster_size("w666")
|
||||
self.assertEqual(size, None)
|
||||
await movie.close_session()
|
||||
|
||||
# TV Shows
|
||||
def test_search_tvshow(self):
|
||||
async def test_search_tvshow(self):
|
||||
movie = TvShow()
|
||||
id = movie.search_title('The Flash')
|
||||
await movie.load_parameters()
|
||||
id = await movie.search_title('The Flash')
|
||||
self.assertEqual(id, 60735)
|
||||
await movie.close_session()
|
||||
|
||||
def test_tv_title(self):
|
||||
async def test_tv_title(self):
|
||||
movie = TvShow()
|
||||
movie.search_title('The Flash')
|
||||
await movie.load_parameters()
|
||||
await movie.search_title('The Flash')
|
||||
self.assertEqual('The Flash', movie.title)
|
||||
await movie.close_session()
|
||||
|
||||
def test_cast_2(self):
|
||||
async def test_cast_2(self):
|
||||
movie = TvShow()
|
||||
movie.search_title('The Flash')
|
||||
await movie.load_parameters()
|
||||
await movie.search_title('The Flash')
|
||||
self.assertEqual('Danielle Panabaker', movie.cast[2])
|
||||
await movie.close_session()
|
||||
|
||||
def test_poster_path(self):
|
||||
async def test_poster_path(self):
|
||||
movie = Movie()
|
||||
movie.search_title('Dune')
|
||||
self.assertEqual(movie.poster_url, "http://image.tmdb.org/t/p/w92/9HNZTw2D3cM1yA08FF5SeWEO9eX.jpg")
|
||||
await movie.load_parameters()
|
||||
await movie.search_title('Dune')
|
||||
self.assertEqual(movie.poster_url, "http://image.tmdb.org/t/p/w92/lr3cYNDlJcpT1EWzFH42aSIvkab.jpg")
|
||||
await movie.close_session()
|
||||
|
||||
def test_movie_popular_length(self):
|
||||
async def test_movie_popular_length(self):
|
||||
results = apiRequests('/movie/popular')
|
||||
list = MoviePopular()
|
||||
self.assertEqual(list.query(), results['total_results'])
|
||||
await list.load_parameters()
|
||||
text = await list.query()
|
||||
self.assertEqual(text, results['total_results'])
|
||||
await list.close_session()
|
||||
|
||||
def test_movie_popular_id(self):
|
||||
async def test_movie_popular_id(self):
|
||||
results = apiRequests('/movie/popular')
|
||||
list = MoviePopular()
|
||||
list.query()
|
||||
await list.load_parameters()
|
||||
await list.query()
|
||||
self.assertEqual(list.list[2]['id'], results['results'][2]['id'])
|
||||
await list.close_session()
|
||||
|
||||
def test_movie_popular_html(self):
|
||||
async def test_movie_popular_html(self):
|
||||
results = apiRequests('/movie/popular')
|
||||
list = MoviePopular()
|
||||
list.query()
|
||||
await list.load_parameters()
|
||||
await list.query()
|
||||
test_result = escape(results['results'][-1]['title'])
|
||||
tested = list.getListHtml()[(len(results['results'][-1]['title']) + 8) * -1:]
|
||||
tested = await list.getListHtml()
|
||||
tested = tested[(len(results['results'][-1]['title']) + 8) * -1:]
|
||||
self.assertEqual(tested, f"""{test_result}</a></p>""")
|
||||
await list.close_session()
|
||||
|
||||
def test_movie_popular_text(self):
|
||||
async def test_movie_popular_text(self):
|
||||
results = apiRequests('/movie/popular')
|
||||
list = MoviePopular()
|
||||
list.query()
|
||||
await list.load_parameters()
|
||||
await list.query()
|
||||
test_result = results['results'][-1]['title']
|
||||
tested = list.getListText()[(len(results['results'][-1]['title'])) * -1:]
|
||||
tested = await list.getListText()
|
||||
tested = tested[(len(results['results'][-1]['title'])) * -1:]
|
||||
self.assertEqual(tested, test_result)
|
||||
'''
|
||||
await list.close_session()
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
|
|
|||
32
tmdb/tmdb.py
32
tmdb/tmdb.py
|
|
@ -57,6 +57,7 @@ class TmdbBot(Plugin):
|
|||
async def start(self) -> None:
|
||||
await super().start()
|
||||
self.db = Database(self.database)
|
||||
self.api = None
|
||||
|
||||
# async def send_movie_info(self, evt: MessageEvent, movie) -> None:
|
||||
# mxc_uri = await self.client.upload_media(data=movie.get_image_binary())
|
||||
|
|
@ -136,15 +137,20 @@ class TmdbBot(Plugin):
|
|||
await self.send_image(evt, movie.title, movie.get_image_binary())
|
||||
|
||||
async def init_movie(self):
|
||||
movie = Movie()
|
||||
await movie.load_parameters()
|
||||
return movie
|
||||
self.api = Movie()
|
||||
await self.api.load_parameters()
|
||||
return self.api
|
||||
|
||||
async def init_tvshow(self):
|
||||
show = TvShow()
|
||||
await show.load_parameters()
|
||||
return show
|
||||
|
||||
async def init_moviepopular(self):
|
||||
movie = MoviePopular()
|
||||
await movie.load_parameters()
|
||||
return movie
|
||||
|
||||
async def movie_id(self, evt: MessageEvent, message: str = "") -> None:
|
||||
movie = await self.init_movie()
|
||||
self.poster_size(evt, movie)
|
||||
|
|
@ -160,12 +166,14 @@ class TmdbBot(Plugin):
|
|||
await self.movie_id(evt, message)
|
||||
|
||||
async def movie_popular(self, evt: MessageEvent, message: str = "") -> None:
|
||||
popular = MoviePopular()
|
||||
popular = await self.init_moviepopular()
|
||||
language = self.db.get_language(evt.sender)
|
||||
if language:
|
||||
popular.set_language(language)
|
||||
length = 5
|
||||
await self.send_html_message(evt, popular.getListText(length), popular.getListHtml(length))
|
||||
text = await popular.getListText(length)
|
||||
html = await popular.getListHtml(length)
|
||||
await self.send_html_message(evt, text, html)
|
||||
|
||||
@command.new("movie-search", help="Movie lookup by Title")
|
||||
@command.argument("message", pass_raw=True, required=True)
|
||||
|
|
@ -225,15 +233,15 @@ class TmdbBot(Plugin):
|
|||
await self.tvshow_search(evt, message)
|
||||
|
||||
async def movie_search(self, evt: MessageEvent, message: str = "") -> None:
|
||||
movie = await self.init_movie()
|
||||
self.poster_size(evt, movie)
|
||||
await self.init_movie()
|
||||
self.poster_size(evt, self.api)
|
||||
language = self.db.get_language(evt.sender)
|
||||
if language:
|
||||
movie.set_language(language)
|
||||
self.api.set_language(language)
|
||||
title, year = self.split_title_year(message)
|
||||
await movie.search_title(title, year)
|
||||
if movie.valid:
|
||||
await self.send_movie_info(evt, movie)
|
||||
await self.api.search_title(title, year)
|
||||
if self.api.valid:
|
||||
await self.send_movie_info(evt, self.api)
|
||||
else:
|
||||
content = TextMessageEventContent(
|
||||
msgtype=MessageType.NOTICE, format=Format.HTML,
|
||||
|
|
@ -276,3 +284,5 @@ class TmdbBot(Plugin):
|
|||
await self.send_help(evt)
|
||||
else:
|
||||
await self.send_help(evt)
|
||||
if self.api:
|
||||
self.api.close_session()
|
||||
|
|
|
|||
|
|
@ -88,14 +88,14 @@ class MoviePopular(TmdbApi):
|
|||
self.list = []
|
||||
self.length = 0
|
||||
|
||||
def query(self) -> int:
|
||||
result = self.request('/movie/popular')
|
||||
async def query(self) -> int:
|
||||
result = await self.request('/movie/popular')
|
||||
self.length = result['total_results']
|
||||
self.list = result['results']
|
||||
return self.length
|
||||
|
||||
def getListHtml(self, length: int = None) -> str:
|
||||
self.query()
|
||||
async def getListHtml(self, length: int = None) -> str:
|
||||
await self.query()
|
||||
html = ""
|
||||
if length:
|
||||
loop = length
|
||||
|
|
@ -105,8 +105,8 @@ class MoviePopular(TmdbApi):
|
|||
html += f"""<p><a href="https://www.themoviedb.org/movie/{str(element['id'])}">{escape(element['title'])}</a></p>"""
|
||||
return html
|
||||
|
||||
def getListText(self, length: int = None) -> str:
|
||||
self.query()
|
||||
async def getListText(self, length: int = None) -> str:
|
||||
await self.query()
|
||||
text = ""
|
||||
if length:
|
||||
loop = length
|
||||
|
|
|
|||
Loading…
Reference in a new issue