skoobasteeve/telegram-moviebot
1
0
Fork 0
mirror of https://github.com/skoobasteeve/telegram-moviebot.git synced 2026-03-20 03:28:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from skoobasteeve/year-lookup

Browse Source 
Year lookup
This commit is contained in:
Ray Lyon
2022-04-23 09:39:53 -04:00
committed by GitHub
parent d89e41cebb c03c0e6e9a
commit 3c5e2d76e6
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
telegram-moviebot/movie_check.py
View File

@@ -5,7 +5,7 @@ import re
from datetime import datetime from datetime import datetime
def tmdb_lookup(tmdb_url, tmdb_headers, movie): def tmdb_lookup(tmdb_url, tmdb_headers, movie, year=None):
movie = re.sub('[^a-zA-Z.\d\s]', '', movie) movie = re.sub('[^a-zA-Z.\d\s]', '', movie)
tmdb_params = { tmdb_params = {
@@ -15,6 +15,9 @@ def tmdb_lookup(tmdb_url, tmdb_headers, movie):
"include_adult": False "include_adult": False
} }
if year:
tmdb_params["primary_release_year"] = year
tmdb_search = requests.get(f"{tmdb_url}/search/movie", params=tmdb_params, tmdb_search = requests.get(f"{tmdb_url}/search/movie", params=tmdb_params,
headers=tmdb_headers).json() headers=tmdb_headers).json()

20
telegram-moviebot/telegram-moviebot.py
View File

@@ -53,14 +53,24 @@ def start(update: Update, context: CallbackContext):
def movie_lookup(movie): def movie_lookup(movie):
logger.info(f'Looking up movie: "{movie}"')
if "-Year" in movie:
year = movie.split("-Year")[1].strip()
movie = movie.split("-Year")[0].strip()
logger.info(f'Looking up movie: "{movie}" ({year})')
movie_id, movie_title, movie_year, movie_rating = (
movie_check.tmdb_lookup(tmdb_url, tmdb_headers, movie, year))
else:
logger.info(f'Looking up movie: "{movie}"')
movie_id, movie_title, movie_year, movie_rating = (
movie_check.tmdb_lookup(tmdb_url, tmdb_headers, movie))
tmdb_page = "https://themoviedb.org/movie/" tmdb_page = "https://themoviedb.org/movie/"
movie_id, movie_title, movie_year, movie_rating = (
movie_check.tmdb_lookup(tmdb_url, tmdb_headers, movie))
if movie_id == "404": if movie_id == "404":
tg_reply = ("I'm having trouble finding that movie\. " + tg_reply = ("I'm having trouble finding that movie\. " +
"Check your spelling and try again\.") "Check your spelling and try again\.")
logger.info('Movie not found in TMDB.')
similarity = 0 similarity = 0
return tg_reply, similarity return tg_reply, similarity
@@ -68,6 +78,7 @@ def movie_lookup(movie):
if sa_response == "404": if sa_response == "404":
tg_reply = ("I'm having trouble finding that movie\. " + tg_reply = ("I'm having trouble finding that movie\. " +
"Check your spelling and try again\.") "Check your spelling and try again\.")
logger.info('Movie not found by the Streaming Availability API.')
similarity = 0 similarity = 0
return tg_reply, similarity return tg_reply, similarity
@@ -110,8 +121,9 @@ def input_movie(update: Update, context: CallbackContext):
context.bot.send_message(chat_id=update.effective_chat.id, context.bot.send_message(chat_id=update.effective_chat.id,
text=movie_info, parse_mode=ParseMode.MARKDOWN_V2) text=movie_info, parse_mode=ParseMode.MARKDOWN_V2)
if similarity < .80 and similarity != 0: if similarity < .80 and similarity != 0:
logger.info("Result accuracy was below the threshold. Sending follow-up message.")
followup_msg = ("Not the movie you're looking for? " + followup_msg = ("Not the movie you're looking for? " +
"Sorry, I have to implement a 'year' function\.") "Try adding '\-year' followed by the release year after the title\.")
context.bot.send_message(chat_id=update.effective_chat.id, context.bot.send_message(chat_id=update.effective_chat.id,
text=followup_msg, parse_mode=ParseMode.MARKDOWN_V2) text=followup_msg, parse_mode=ParseMode.MARKDOWN_V2)