Added support for tv shows.
This commit is contained in:
parent
2cd339f731
commit
3341325ca7
29
app.py
29
app.py
@ -12,6 +12,7 @@ from scripts import database
|
||||
from admin import admin
|
||||
from movies import movies
|
||||
from comics import comics
|
||||
from tv import tv
|
||||
|
||||
|
||||
class NullHandler(logging.Handler):
|
||||
@ -28,6 +29,7 @@ app = Flask(__name__)
|
||||
app.register_blueprint(comics.Comics)
|
||||
app.register_blueprint(admin.Admin)
|
||||
app.register_blueprint(movies.Movies)
|
||||
app.register_blueprint(tv.TV)
|
||||
app.config["SECRET_KEY"] = "***REMOVED***"
|
||||
app.config["FLASK_LOG_LEVEL"] = "DEBUG"
|
||||
flask_log = Logging(app)
|
||||
@ -63,6 +65,12 @@ def get_movies():
|
||||
func.get_movies()
|
||||
|
||||
|
||||
def get_tv_shows():
|
||||
with app.app_context():
|
||||
func.get_tv_shows()
|
||||
func.get_tv_episodes()
|
||||
|
||||
|
||||
with app.app_context():
|
||||
database.initialize_db()
|
||||
thread = threading.Thread(target=get_comics, args=())
|
||||
@ -71,6 +79,9 @@ with app.app_context():
|
||||
thread2 = threading.Thread(target=get_movies, args=())
|
||||
thread2.daemon = True
|
||||
thread2.start()
|
||||
thread3 = threading.Thread(target=get_tv_shows, args=())
|
||||
thread3.daemon = True
|
||||
thread3.start()
|
||||
|
||||
|
||||
@app.teardown_appcontext
|
||||
@ -94,8 +105,26 @@ def update_movie_db(sender, **kw):
|
||||
print(e)
|
||||
|
||||
|
||||
def update_tv_show_db(sender, **kw):
|
||||
try:
|
||||
database.add_tv_shows(kw["tv_show"])
|
||||
if kw["tv_episodes"]:
|
||||
database.add_tv_episodes(kw["tv_episodes"])
|
||||
except Exception as e:
|
||||
print(e)
|
||||
|
||||
|
||||
def update_tv_episodes_db(sender, **kw):
|
||||
try:
|
||||
database.add_tv_episodes(kw["tv_episodes"])
|
||||
except Exception as e:
|
||||
print(e)
|
||||
|
||||
|
||||
func.comic_loaded.connect(update_comic_db)
|
||||
func.movie_loaded.connect(update_movie_db)
|
||||
func.tv_show_loaded.connect(update_tv_show_db)
|
||||
func.tv_episodes_loaded.connect(update_tv_episodes_db)
|
||||
|
||||
|
||||
@login_manager.user_loader
|
||||
|
||||
@ -146,8 +146,8 @@ def comic_gallery(publisher, series, series_year, issue):
|
||||
def get_comic_page(comic_id, page_number):
|
||||
meta = database.db_get_comic_by_id(comic_id)
|
||||
comic = func.open_comic(meta["path"])
|
||||
byteImage = BytesIO(comic.getPage(page_number))
|
||||
image = Image(file=byteImage)
|
||||
byte_image = BytesIO(comic.getPage(page_number))
|
||||
image = Image(file=byte_image)
|
||||
response = make_response(image.make_blob())
|
||||
response.headers["cache-control"] = "public"
|
||||
date = pytz.utc.localize(datetime.datetime.utcfromtimestamp(os.path.getmtime(meta["path"])))
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<div class="col-3" style="padding: 10px">
|
||||
<a href="/comics/{{ publisher_series[i]["publisher"]|urlencode }}?series={{ publisher_series[i]["series"]|urlencode }}&seriesYear={{ publisher_series[i]["seriesYear"] }}">
|
||||
<div class="card">
|
||||
<img class="card-img" src="/comics/get_comic/{{ publisher_series[i]['id'] }}/0/thumbnail">
|
||||
<img class="card-img" src="/comics/get_comic/{{ publisher_series[i]['id'] }}/0/thumbnail" onerror="this.src='/static/images/default.png'">
|
||||
<div class="card-body">
|
||||
{{ publisher_series[i]["series"] }} {{ publisher_series[i]["seriesYear"] }}
|
||||
</div>
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
{% for page_number in range(start, end) %}
|
||||
<div style="margin: auto" class="comic-thumbnail card bg-dark text-white">
|
||||
<a href="/comics/{{ comic["publisher"]|urlencode }}?series={{ comic["series"]|urlencode }}&seriesYear={{ comic["seriesYear"] }}&issue={{ comic["issue"]|urlencode }}&pageNumber={{ page_number }}">
|
||||
<img src="/comics/get_comic/{{ comic["id"] }}/{{ page_number }}/thumbnail" alt="" style="display: inline">
|
||||
<img src="/comics/get_comic/{{ comic["id"] }}/{{ page_number }}/thumbnail" alt="" style="display: inline" onerror="this.src='/static/images/default.png'">
|
||||
<p class="card-text">{{ 1+page_number }}/{{ comic["pageCount"] }}</p>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
@ -1,7 +1,15 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block nav %}
|
||||
<a class="btn btn-primary" href="{{ url_for("comics.search") }}" style="position: fixed; margin: 5px; right: 10px">Search</a>
|
||||
<nav class="navbar navbar-expand">
|
||||
<ul class="navbar-nav mr-auto"></ul>
|
||||
<form class="form-inline" method="get" action="/comics/search">
|
||||
<div class="form-group mx-2">
|
||||
<input type="text" class="form-control" minlength="3" name="q">
|
||||
</div>
|
||||
<button type="submit" class="btn btn-primary">Search</button>
|
||||
</form>
|
||||
</nav>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<div class="col-4" style="padding: 10px">
|
||||
<a href="/comics/{{ publishers[i] }}">
|
||||
<div class="card">
|
||||
<img class="card-img" src="/static/images/{{ publishers[i] }}.png">
|
||||
<img class="card-img" src="/static/images/{{ publishers[i] }}.png" onerror="this.src='/static/images/default_banner.png'">
|
||||
<div class="card-body">
|
||||
{{ publishers[i] }}
|
||||
</div>
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<div class="col-3" style="padding: 10px">
|
||||
<a href="/comics/{{ comics[i]["publisher"]|urlencode }}?series={{ comics[i]["series"]|urlencode }}&seriesYear={{ comics[i]["seriesYear"] }}&issue={{ comics[i]["issue"]|urlencode }}">
|
||||
<div class="card">
|
||||
<img class="card-img" src="/comics/get_comic/{{ comics[i]['id'] }}/0/thumbnail">
|
||||
<img class="card-img" src="/comics/get_comic/{{ comics[i]['id'] }}/0/thumbnail" onerror="this.src='/static/images/default.png'">
|
||||
<div class="card-body">
|
||||
{{ comics[i]["series"] }} {% if comics[i]["issue"] > 0 %}{{ "#{0:g}".format(comics[i]["issue"]) }}{% endif %} {% if comics[i]["title"] != None %}{{ comics[i]["title"] }} {% endif %}
|
||||
</div>
|
||||
|
||||
@ -1,11 +1,6 @@
|
||||
from flask import Blueprint, render_template, request, make_response, send_file, send_from_directory
|
||||
from flask_login import login_required
|
||||
|
||||
from urllib import parse
|
||||
from io import BytesIO
|
||||
from wand.image import Image
|
||||
import os, pytz, datetime
|
||||
|
||||
from scripts import database, func
|
||||
|
||||
Movies = Blueprint("movies", __name__, template_folder="templates")
|
||||
|
||||
@ -1,7 +1,15 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block nav %}
|
||||
<a class="btn btn-primary" href="{{ url_for("movies.search") }}" style="position: fixed; margin: 5px; right: 10px">Search</a>
|
||||
<nav class="navbar navbar-expand">
|
||||
<ul class="navbar-nav mr-auto"></ul>
|
||||
<form class="form-inline" method="get" action="/movies/search">
|
||||
<div class="form-group mx-2">
|
||||
<input type="text" class="form-control" minlength="3" name="q">
|
||||
</div>
|
||||
<button type="submit" class="btn btn-primary">Search</button>
|
||||
</form>
|
||||
</nav>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<div class="col-4" style="padding: 10px">
|
||||
<a href="/movies/{{ movies[i]["imdb_id"] }}{% if movies[i]["extended"] == 1 %}/extended{% endif %}{% if movies[i]["directors_cut"]==1 %}/directors_cut{% endif %}">
|
||||
<div class="card">
|
||||
<img class="card-img" src="https://image.tmdb.org/t/p/original{{ movies[i]["poster_path"] }}" alt="">
|
||||
<img class="card-img" src="https://image.tmdb.org/t/p/original{{ movies[i]["poster_path"] }}" alt="" onerror="this.src='/static/images/default.png'">
|
||||
<div class="card-body">
|
||||
{{ movies[i]["title"] }} ({{ movies[i]["year"] }})
|
||||
</div>
|
||||
|
||||
@ -109,6 +109,26 @@ def initialize_db():
|
||||
"directors_cut" INTEGER,
|
||||
"poster_path" TEXT,
|
||||
"backdrop_path" TEXT
|
||||
)""")
|
||||
get_db().execute("""CREATE TABLE IF NOT EXISTS "tv_shows" (
|
||||
"imdb_id" TEXT UNIQUE,
|
||||
"tmdb_id" INTEGER UNIQUE,
|
||||
"title" TEXT,
|
||||
"year" INTEGER,
|
||||
"description" TEXT,
|
||||
"poster_path" TEXT,
|
||||
"path" TEXT
|
||||
)""")
|
||||
get_db().execute("""CREATE TABLE IF NOT EXISTS "tv_episodes" (
|
||||
"imdb_id" INTEGER UNIQUE,
|
||||
"parent_imdb_id" INTEGER,
|
||||
"tmdb_id" INTEGER UNIQUE,
|
||||
"title" TEXT,
|
||||
"season" INTEGER,
|
||||
"episode" INTEGER,
|
||||
"description" TEXT,
|
||||
"still_path" TEXT,
|
||||
"path" TEXT
|
||||
)""")
|
||||
get_db().execute("CREATE INDEX IF NOT EXISTS path_index ON comics(path);")
|
||||
get_db().execute("CREATE INDEX IF NOT EXISTS id_index ON comic_thumbnails(id);")
|
||||
@ -116,6 +136,7 @@ def initialize_db():
|
||||
|
||||
get_imdb().execute("CREATE INDEX IF NOT EXISTS original_title_index ON title_basics(originalTitle)")
|
||||
get_imdb().execute("CREATE INDEX IF NOT EXISTS primary_title_index ON title_basics(primaryTitle)")
|
||||
get_imdb().execute("CREATE INDEX IF NOT EXISTS parent_tconst_index ON title_episode(parentTconst)")
|
||||
get_imdb().commit()
|
||||
|
||||
|
||||
@ -134,6 +155,23 @@ def add_movies(movies):
|
||||
get_db().commit()
|
||||
|
||||
|
||||
def add_tv_shows(tv_show):
|
||||
try:
|
||||
get_db().execute("INSERT INTO tv_shows(imdb_id, tmdb_id, title, year, description, poster_path, path) VALUES(?,?,?,?,?,?,?)", tv_show)
|
||||
get_db().commit()
|
||||
except Exception as e:
|
||||
print(type(e), e)
|
||||
|
||||
|
||||
def add_tv_episodes(episodes):
|
||||
for episode in episodes:
|
||||
try:
|
||||
get_db().execute("INSERT INTO tv_episodes(imdb_id, parent_imdb_id, tmdb_id, title, season, episode, description, still_path, path) VALUES(?,?,?,?,?,?,?,?,?)", episode)
|
||||
get_db().commit()
|
||||
except Exception as e:
|
||||
print(type(e), e)
|
||||
|
||||
|
||||
def add_comics(meta, thumbnails):
|
||||
data = []
|
||||
for info in meta:
|
||||
@ -253,6 +291,29 @@ def movie_path_in_db(path):
|
||||
return False
|
||||
|
||||
|
||||
def tv_show_path_in_db(path):
|
||||
try:
|
||||
result = get_db().execute("SELECT path FROM tv_shows WHERE path=?", [path]).fetchone()
|
||||
if result:
|
||||
return True
|
||||
except Exception as e:
|
||||
print(path)
|
||||
print(type(e), e)
|
||||
return False
|
||||
|
||||
|
||||
def tv_episode_path_in_db(path):
|
||||
try:
|
||||
result = get_db().execute("SELECT path FROM tv_episodes WHERE path=?", [path]).fetchone()
|
||||
if result:
|
||||
return True
|
||||
except Exception as e:
|
||||
print(path)
|
||||
print(type(e), e)
|
||||
return False
|
||||
|
||||
|
||||
|
||||
def verify_paths():
|
||||
rows = get_db().execute("SELECT path FROM comics").fetchall()
|
||||
get_db().commit()
|
||||
@ -278,11 +339,35 @@ def imdb_get_movie(title, year):
|
||||
return row
|
||||
|
||||
|
||||
def imdb_get_tv_show(title, year):
|
||||
row = get_imdb().execute(
|
||||
"SELECT tconst FROM title_basics WHERE (originalTitle LIKE ? OR primaryTitle LIKE ?) AND (titleType LIKE 'tvSeries' OR titleType LIKE 'tvMiniSeries') AND startYear=?",
|
||||
(title, title, year)).fetchone()
|
||||
return row
|
||||
|
||||
|
||||
def imdb_get_tv_episode(imdb_id, season, episode):
|
||||
row = get_imdb().execute(
|
||||
"SELECT tconst FROM title_episode WHERE parentTconst=? AND seasonNumber=? AND episodeNumber=?",
|
||||
[imdb_id, season, episode]).fetchone()
|
||||
return row
|
||||
|
||||
|
||||
def tmdb_get_movie_by_imdb_id(imdb_id):
|
||||
data = tmdb.get_movie_data(imdb_id)
|
||||
return data
|
||||
|
||||
|
||||
def tmdb_get_tv_show_by_imdb_id(imdb_id):
|
||||
data = tmdb.get_tv_show_data(imdb_id)
|
||||
return data
|
||||
|
||||
|
||||
def tmdb_get_tv_episode_by_imdb_id(imdb_id):
|
||||
data = tmdb.get_tv_episode_data(imdb_id)
|
||||
return data
|
||||
|
||||
|
||||
def db_get_all_movies():
|
||||
rows = get_db().execute("SELECT * FROM movies ORDER BY title, year;").fetchall()
|
||||
return rows
|
||||
@ -293,6 +378,21 @@ def db_get_movie_by_imdb_id(imdb_id, extended=0, directors_cut=0):
|
||||
return row
|
||||
|
||||
|
||||
def get_all_tv_shows():
|
||||
rows = get_db().execute("SELECT * FROM tv_shows ORDER BY title, year;").fetchall()
|
||||
return rows
|
||||
|
||||
|
||||
def get_tv_show_episodes_by_imdb_id(imdb_id):
|
||||
rows = get_db().execute("SELECT * FROM tv_episodes WHERE parent_imdb_id=? ORDER BY season, episode", [imdb_id]).fetchall()
|
||||
return rows
|
||||
|
||||
|
||||
def db_get_episode_by_imdb_id(imdb_id):
|
||||
row = get_db().execute("SELECT * FROM tv_episodes WHERE imdb_id=?", [imdb_id]).fetchone()
|
||||
return row
|
||||
|
||||
|
||||
def db_search_table_columns_by_query(query, table, columns, group="", order=""):
|
||||
results = {}
|
||||
final_query = "%"+query.replace(" ", "%")+"%"
|
||||
@ -356,6 +456,21 @@ def db_search_movies(query):
|
||||
return movies
|
||||
|
||||
|
||||
def db_search_tv_shows(query):
|
||||
results = db_search_table_columns_by_query(query, "tv_shows", ["title", "year", "description"], order="title")
|
||||
tv_shows = []
|
||||
for show in results["title"]:
|
||||
if show not in tv_shows:
|
||||
tv_shows.append(show)
|
||||
for show in results["description"]:
|
||||
if show not in tv_shows:
|
||||
tv_shows.append(show)
|
||||
for show in results["year"]:
|
||||
if show not in tv_shows:
|
||||
tv_shows.append(show)
|
||||
return tv_shows
|
||||
|
||||
|
||||
def resize_image(image, new_width=256, new_height=256):
|
||||
new_image = image
|
||||
orig_height = new_image.height
|
||||
|
||||
@ -10,6 +10,8 @@ from scripts import database
|
||||
rpi_signals = Namespace()
|
||||
comic_loaded = rpi_signals.signal("comic-loaded")
|
||||
movie_loaded = rpi_signals.signal("movie-loaded")
|
||||
tv_show_loaded = rpi_signals.signal("tv_show_loaded")
|
||||
tv_episodes_loaded = rpi_signals.signal("tv_episodes_loaded")
|
||||
|
||||
publishers_to_ignore = ["***REMOVED***"]
|
||||
|
||||
@ -26,6 +28,7 @@ MC_COMICS_DIRECTORY = "C:\\Users\\Matthew\\Documents\\Comics"
|
||||
|
||||
COMICS_DIRECTORY = RPI_COMICS_DIRECTORY if os.path.exists(RPI_COMICS_DIRECTORY) else MC_COMICS_DIRECTORY
|
||||
MOVIES_DIRECTORY = RPI_MOVIES_DIRECTORY
|
||||
TV_SHOWS_DIRECTORY = RPI_TV_SHOWS_DIRECTORY
|
||||
|
||||
#############
|
||||
|
||||
@ -74,6 +77,7 @@ def get_comics():
|
||||
def get_comic(path):
|
||||
meta = []
|
||||
thumbnails = []
|
||||
if path.endswith(".cbr"):
|
||||
if not database.comic_path_in_db(path):
|
||||
try:
|
||||
test_path = path.encode("utf8")
|
||||
@ -118,7 +122,7 @@ def open_comic(path):
|
||||
|
||||
def get_movies():
|
||||
print("start load movies")
|
||||
pattern = r"(.+)( \(....\))(\(extended\))?( Director's Cut)?(\.mkv)"
|
||||
pattern = r"(.+) \((....)\)(\(extended\))?( Director's Cut)?(\.mkv)"
|
||||
movies = []
|
||||
total_movies = 0
|
||||
movies_in_db = 0
|
||||
@ -135,9 +139,9 @@ def get_movies():
|
||||
print(f, "did not match regex.")
|
||||
continue
|
||||
print("movie path:", path)
|
||||
title = f[:-4].replace(match.group(2), "")
|
||||
title = match.group(1)
|
||||
print("movie title:", title)
|
||||
year = int(match.group(2)[2:-1])
|
||||
year = int(match.group(2))
|
||||
extended = 0
|
||||
directors_cut = 0
|
||||
if match.group(3):
|
||||
@ -149,7 +153,7 @@ def get_movies():
|
||||
else:
|
||||
imdb_data = database.imdb_get_movie(title, year)
|
||||
if not imdb_data:
|
||||
print("could not get imdb data")
|
||||
print("could not get imdb data for:", title, year)
|
||||
continue
|
||||
imdb_id = imdb_data["tconst"]
|
||||
length = imdb_data["runtimeMinutes"]
|
||||
@ -176,3 +180,65 @@ def get_movies():
|
||||
print("total movies:", total_movies)
|
||||
print("movies in database:", movies_in_db)
|
||||
print("movies added:", movies_added)
|
||||
|
||||
|
||||
def get_tv_shows():
|
||||
dir_pattern = r"(.+) \((....)\)"
|
||||
for dir in sorted(os.listdir(TV_SHOWS_DIRECTORY)):
|
||||
dir_match = re.fullmatch(dir_pattern, dir)
|
||||
if dir_match:
|
||||
path = TV_SHOWS_DIRECTORY+dir+"/"
|
||||
if not database.tv_show_path_in_db(path):
|
||||
series_name = dir_match.group(1)
|
||||
series_year = int(dir_match.group(2))
|
||||
imdb_data = database.imdb_get_tv_show(series_name, series_year)
|
||||
if not imdb_data:
|
||||
print("could not get imdb data for:", series_name, series_year)
|
||||
continue
|
||||
imdb_id = imdb_data["tconst"]
|
||||
tmdb_data = database.tmdb_get_tv_show_by_imdb_id(imdb_id)
|
||||
if not tmdb_data:
|
||||
print("could not get tmdb data for:", series_name, series_year)
|
||||
with open("/var/lib/rpiWebApp/log.txt", "a") as f:
|
||||
f.write("could not get tmdb data for: " + imdb_id + " " + series_name + " " + str(series_year)+"\n")
|
||||
continue
|
||||
tmdb_id = tmdb_data[0]
|
||||
description = tmdb_data[1]
|
||||
poster_path = tmdb_data[2]
|
||||
tv_show_data = (imdb_id, tmdb_id, series_name, series_year, description, poster_path, path)
|
||||
tv_show_loaded.send("anonymous", tv_show=tv_show_data)
|
||||
print("finished load tv shows.")
|
||||
|
||||
|
||||
def get_tv_episodes():
|
||||
video_pattern = r"S(..)E(..) - (.+)(.mp4|.mkv)"
|
||||
rows = database.get_all_tv_shows()
|
||||
for tv_show in rows:
|
||||
episodes = []
|
||||
for video in sorted(os.listdir(tv_show["path"])):
|
||||
video_match = re.fullmatch(video_pattern, video)
|
||||
if video_match:
|
||||
path = tv_show["path"] + video
|
||||
if not database.tv_episode_path_in_db(path):
|
||||
season = int(video_match.group(1))
|
||||
episode = int(video_match.group(2))
|
||||
episode_name = video_match.group(3)
|
||||
episode_imdb_data = database.imdb_get_tv_episode(tv_show["imdb_id"], season, episode)
|
||||
if not episode_imdb_data:
|
||||
print("could not get imdb data for:", tv_show["title"], tv_show["year"], season, episode)
|
||||
continue
|
||||
episode_imdb_id = episode_imdb_data["tconst"]
|
||||
episode_tmdb_data = database.tmdb_get_tv_episode_by_imdb_id(episode_imdb_id)
|
||||
if not episode_tmdb_data:
|
||||
print("could not get tmdb data for:", tv_show["title"], tv_show["year"], season, episode)
|
||||
with open("/var/lib/rpiWebApp/log.txt", "a") as f:
|
||||
f.write("could not get tmdb data for: " + episode_imdb_id + " " + tv_show["title"] + " " + str(
|
||||
tv_show["year"]) + " " + str(season) + " " + str(episode) + "\n")
|
||||
continue
|
||||
episode_tmdb_id = episode_tmdb_data[0]
|
||||
episode_description = episode_tmdb_data[1]
|
||||
episode_still_path = episode_tmdb_data[2]
|
||||
episodes.append((episode_imdb_id, tv_show["imdb_id"], episode_tmdb_id, episode_name, season, episode,
|
||||
episode_description, episode_still_path, path))
|
||||
tv_episodes_loaded.send("anonymous", tv_episodes=episodes)
|
||||
print("finish load tv episodes.")
|
||||
|
||||
@ -1,4 +1,7 @@
|
||||
import requests
|
||||
import logging
|
||||
logging.getLogger("requests").setLevel(logging.WARNING)
|
||||
logging.getLogger("urllib3").setLevel(logging.WARNING)
|
||||
|
||||
API_KEY = "***REMOVED***"
|
||||
TMDB_FIND_URL = "https://api.themoviedb.org/3/find/"
|
||||
@ -24,3 +27,48 @@ def get_movie_data(imdb_id):
|
||||
backdrop_path = info["movie_results"][0]["backdrop_path"]
|
||||
|
||||
return movie_id, overview, poster_path, backdrop_path
|
||||
|
||||
|
||||
def get_tv_show_data(imdb_id):
|
||||
data = {
|
||||
"api_key": API_KEY,
|
||||
"language": "en-US",
|
||||
"external_source": "imdb_id"
|
||||
}
|
||||
r = requests.get(TMDB_FIND_URL+imdb_id, data=data)
|
||||
info = dict(r.json())
|
||||
if "status_code" in info.keys():
|
||||
print("error getting tmdb data, status code:", info["status_code"])
|
||||
return None
|
||||
if info["tv_results"] == []:
|
||||
print("no tmdb results for:", imdb_id)
|
||||
return None
|
||||
print("tmdb movie title:", info["tv_results"][0]["name"])
|
||||
tv_show_id = info["tv_results"][0]["id"]
|
||||
overview = info["tv_results"][0]["overview"]
|
||||
poster_path = info["tv_results"][0]["poster_path"]
|
||||
|
||||
return tv_show_id, overview, poster_path
|
||||
|
||||
|
||||
def get_tv_episode_data(imdb_id):
|
||||
data = {
|
||||
"api_key": API_KEY,
|
||||
"language": "en-US",
|
||||
"external_source": "imdb_id"
|
||||
}
|
||||
r = requests.get(TMDB_FIND_URL+imdb_id, data=data)
|
||||
info = dict(r.json())
|
||||
if "status_code" in info.keys():
|
||||
print("error getting tmdb data, status code:", info["status_code"])
|
||||
return None
|
||||
if info["tv_episode_results"] == []:
|
||||
print("no tmdb results for:", imdb_id)
|
||||
return None
|
||||
print("tmdb movie title:", info["tv_episode_results"][0]["name"])
|
||||
tv_episode_id = info["tv_episode_results"][0]["id"]
|
||||
name = info["tv_episode_results"][0]["name"]
|
||||
overview = info["tv_episode_results"][0]["overview"]
|
||||
still_path = info["tv_episode_results"][0]["still_path"]
|
||||
|
||||
return tv_episode_id, overview, still_path
|
||||
|
||||
BIN
static/images/default.png
Normal file
BIN
static/images/default.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
BIN
static/images/default_banner.png
Normal file
BIN
static/images/default_banner.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8.1 KiB |
@ -35,6 +35,9 @@
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ url_for("movies.index") }}">Movies</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ url_for("tv.index") }}">Tv</a>
|
||||
</li>
|
||||
</ul>
|
||||
<ul class="navbar-nav">
|
||||
<li class="nav-item">
|
||||
|
||||
2
test.py
2
test.py
@ -18,7 +18,7 @@ db.row_factory = sqlite3.Row
|
||||
|
||||
DC_Comics = ["DC", "Young Animal", "WildStorm", "Earth-M", "Vertigo", "Sandman Universe", "DC Black Label", "Wonder Comics", "DC Ink", "DC Zoom", "Mad", "All Star", "Amalgam Comics", "DC Focus", "Elseworlds", "First Wave", "Helix", "Impact Comics", "Johnny DC", "Minx", "Paradox Press", "Piranha Press", "Tangent Comics", "WildStorm Productions", "America's Best Comics", "Cliffhanger", "CMX Manga", "Homage Comics", "WildStorm Signature", "Zuda Comics"]
|
||||
|
||||
Marvel = ["Aircel Comics", "alibu Comics", "Atlas Comics", "Atlas", "CrossGen comics", "CrossGen", "Curtis Magazines", "Disney Books Group", "Disney Kingdoms", "Epic Comics", "Eternity Comics", "Humorama", "Icon Comics", "Infinite Comics", "Malibu Comics", "Marvel 2099", "Marvel Absurd", "Marvel Adventures", "Marvel Age", "Marvel Books", "Marvel Comics 2", "Marvel Comics", "Marvel Edge", "Marvel Frontier", "Marvel Illustrated", "Marvel Knights", "Marvel Magazine Group", "Marvel Mangaverse", "Marvel Monsters Group", "Marvel Music", "Marvel Next", "Marvel Noir", "Marvel Press", "Marvel UK", "Marvel Unlimited", "Max", "MAX", "MC2", "New Universe", "Paramount Comics", "Power Comics", "Razorline", "Star Comics", "Timely Comics", "Timely", "Tsunami", "Ultimate Comics", "Ultimate Marvel"]
|
||||
Marvel = ["Aircel Comics", "alibu Comics", "Atlas Comics", "Atlas", "CrossGen comics", "CrossGen", "Curtis Magazines", "Disney Books Group", "Disney Kingdoms", "Epic Comics", "Eternity Comics", "Humorama", "Icon Comics", "Infinite Comics", "Malibu Comics", "Marvel 2099", "Marvel Absurd", "Marvel Adventures", "Marvel Age", "Marvel Books", "Marvel Comics 2", "Marvel Comics", "Marvel Edge", "Marvel Frontier", "Marvel Illustrated", "Marvel Knights", "Marvel Magazine Group", "Marvel Mangaverse", "Marvel Monsters Group", "Marvel Music", "Marvel Next", "Marvel Noir", "Marvel Press", "Marvel UK", "Marvel Unlimited", "Max", "MAX", "MC2", "New Universe", "Paramount Comics", "Power Comics", "Razorline", "Star Comics", "Timely Comics", "Timely", "Tsunami", "Ultimate Comics", "Ultimate Marvel", "Non-Pareil Publishing Corp.", "St. Johns Publishing Co.", "Vital Publications, Inc."]
|
||||
|
||||
|
||||
def get_db():
|
||||
|
||||
56
tv/templates/tv/episodeViewer.html
Normal file
56
tv/templates/tv/episodeViewer.html
Normal file
@ -0,0 +1,56 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block content %}
|
||||
{% for episode in episodes %}
|
||||
{% if episode["season"] == season_num and episode["episode"] == episode_num %}
|
||||
<div class="container" style="text-align: center">
|
||||
<video class="video-js vjs-big-play-centered" style="display: inline-block" controls preload="auto" width="1100"
|
||||
poster="https://image.tmdb.org/t/p/original{{ episode["still_path"] }}" data-setup="{}">
|
||||
<source src="{{ url_for("tv.index") }}/get_episode/{{ episode["imdb_id"] }}" type="video/webm">
|
||||
<p class='vjs-no-js'>
|
||||
To view this video please enable JavaScript, and consider upgrading to a web browser that
|
||||
<a href='https://videojs.com/html5-video-support/' target='_blank'>supports HTML5 video</a>
|
||||
</p>
|
||||
</video>
|
||||
<h1>{{ episode["title"] }}</h1>
|
||||
<p style="text-align: left">{{ episode["description"] }}</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% with %}
|
||||
{% set seasons = [] %}
|
||||
<form action="" method="get" class="form-row">
|
||||
<div class="col-auto">
|
||||
<select name="season" onchange='this.form.submit()' class="custom-select">
|
||||
{% for episode in episodes %}
|
||||
{% if episode["season"] not in seasons %}
|
||||
<option value="{{ episode["season"] }}" {% if episode["season"] == season_num %}selected{% endif %}>
|
||||
Season {{ episode["season"] }}
|
||||
</option>
|
||||
{{ seasons.append(episode["season"]) }}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-auto">
|
||||
<select name="episode" onchange='this.form.submit()' class="custom-select">
|
||||
{% for episode in episodes %}
|
||||
{% if episode["season"] == season_num %}
|
||||
<option value="{{ episode["episode"] }}" {% if episode["episode"] == episode_num %}selected{% endif %}>
|
||||
Episode {{ episode["episode"] }}
|
||||
</option>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
<button type="submit" hidden>submit</button>
|
||||
</form>
|
||||
{% endwith %}
|
||||
{% endblock %}
|
||||
|
||||
{% block footer_content %}
|
||||
<div class="container">
|
||||
<img src="/static/svg/tmdb.svg" alt="" style="height: 40px;">
|
||||
<p>This product uses the TMDb API but is not endorsed or certified by TMDb.</p>
|
||||
</div>
|
||||
{% endblock footer_content %}
|
||||
34
tv/templates/tv/index.html
Normal file
34
tv/templates/tv/index.html
Normal file
@ -0,0 +1,34 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block nav %}
|
||||
<nav class="navbar navbar-expand">
|
||||
<ul class="navbar-nav mr-auto"></ul>
|
||||
<form class="form-inline" method="get" action="/tv/search">
|
||||
<div class="form-group mx-2">
|
||||
<input type="text" class="form-control" minlength="3" name="q">
|
||||
</div>
|
||||
<button type="submit" class="btn btn-primary">Search</button>
|
||||
</form>
|
||||
</nav>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div style="text-align: center">
|
||||
{% include "pagination.html" %}
|
||||
</div>
|
||||
<div class="container col-7">
|
||||
<div class="row justify-content-start">
|
||||
{% include "tv/tvShowList.html" %}
|
||||
</div>
|
||||
</div>
|
||||
<div style="text-align: center">
|
||||
{% include "pagination.html" %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block footer_content %}
|
||||
<div class="container">
|
||||
<img src="/static/svg/tmdb.svg" alt="" style="height: 40px;">
|
||||
<p>This product uses the TMDb API but is not endorsed or certified by TMDb.</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
38
tv/templates/tv/search.html
Normal file
38
tv/templates/tv/search.html
Normal file
@ -0,0 +1,38 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block nav %}
|
||||
<nav class="navbar navbar-expand">
|
||||
<ul class="navbar-nav mr-auto"></ul>
|
||||
<form class="form-inline" method="get" action="">
|
||||
<div class="form-group mx-2">
|
||||
<input type="text" class="form-control" minlength="3" name="q">
|
||||
</div>
|
||||
<button type="submit" class="btn btn-primary">Search</button>
|
||||
</form>
|
||||
</nav>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div style="text-align: center">
|
||||
{% include "pagination.html" %}
|
||||
</div>
|
||||
<div class="container col-7">
|
||||
{% if movies != [] %}
|
||||
<div class="row justify-content-start">
|
||||
{% include "tv/tvShowList.html" %}
|
||||
</div>
|
||||
{% else %}
|
||||
<h1>No results.</h1>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div style="text-align: center">
|
||||
{% include "pagination.html" %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block footer_content %}
|
||||
<div class="container">
|
||||
<img src="/static/svg/tmdb.svg" alt="" style="height: 40px;">
|
||||
<p>This product uses the TMDb API but is not endorsed or certified by TMDb.</p>
|
||||
</div>
|
||||
{% endblock footer_content %}
|
||||
12
tv/templates/tv/tvShowList.html
Normal file
12
tv/templates/tv/tvShowList.html
Normal file
@ -0,0 +1,12 @@
|
||||
{% for i in range(start, end) %}
|
||||
<div class="col-4" style="padding: 10px">
|
||||
<a href="/tv/{{ tv_shows[i]["imdb_id"] }}">
|
||||
<div class="card">
|
||||
<img class="card-img" src="https://image.tmdb.org/t/p/original{{ tv_shows[i]["poster_path"] }}" alt="" onerror="this.src='/static/images/default.png'">
|
||||
<div class="card-body">
|
||||
{{ tv_shows[i]["title"] }} ({{ tv_shows[i]["year"] }})
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
</div>
|
||||
{% endfor %}
|
||||
66
tv/tv.py
Normal file
66
tv/tv.py
Normal file
@ -0,0 +1,66 @@
|
||||
from flask import Blueprint, render_template, request, make_response, send_file, send_from_directory
|
||||
from flask_login import login_required
|
||||
|
||||
from scripts import database, func
|
||||
|
||||
TV = Blueprint("tv", __name__, template_folder="templates")
|
||||
|
||||
|
||||
@TV.route("/tv")
|
||||
@login_required
|
||||
def index():
|
||||
try:
|
||||
page = request.args.get("page", 1, type=int)
|
||||
max_items = request.args.get("max_items", 30, type=int)
|
||||
tv_shows = database.get_all_tv_shows()
|
||||
start = (max_items * (page - 1))
|
||||
end = len(tv_shows) if len(tv_shows) < max_items * page else max_items * page
|
||||
return render_template("tv/index.html", title="Tv", tv_shows=tv_shows, page=page, max_items=max_items, start=start, end=end, item_count=len(tv_shows))
|
||||
except Exception as e:
|
||||
print(type(e), e)
|
||||
return str(type(e))+" "+str(e)
|
||||
|
||||
|
||||
@TV.route("/tv/search")
|
||||
@login_required
|
||||
def search():
|
||||
try:
|
||||
page = request.args.get("page", 1, type=int)
|
||||
max_items = request.args.get("max_items", 30, type=int)
|
||||
start = 0
|
||||
end = 0
|
||||
query = request.args.get("q")
|
||||
tv_shows = []
|
||||
if query:
|
||||
tv_shows = database.db_search_tv_shows(query)
|
||||
start = (max_items * (page - 1))
|
||||
end = len(tv_shows) if len(tv_shows) < max_items * page else max_items * page
|
||||
return render_template("tv/search.html", title="Tv", tv_shows=tv_shows, page=page, max_items=max_items,
|
||||
start=start, end=end, item_count=len(tv_shows))
|
||||
except Exception as e:
|
||||
print(type(e), e)
|
||||
return str(type(e))+" "+str(e)
|
||||
|
||||
|
||||
@TV.route("/tv/<imdb_id>")
|
||||
@login_required
|
||||
def episode_viewer(imdb_id):
|
||||
try:
|
||||
episodes = database.get_tv_show_episodes_by_imdb_id(imdb_id)
|
||||
season = request.args.get("season", type=int, default=episodes[0]["season"])
|
||||
episode = request.args.get("episode", type=int, default=episodes[0]["episode"])
|
||||
return render_template("tv/episodeViewer.html", title="Tv", episodes=episodes, season_num=season, episode_num=episode)
|
||||
except Exception as e:
|
||||
print(type(e), e)
|
||||
return str(type(e)) + " " + str(e)
|
||||
|
||||
|
||||
@TV.route("/tv/get_episode/<imdb_id>")
|
||||
@login_required
|
||||
def get_episode(imdb_id):
|
||||
episode_data = database.db_get_episode_by_imdb_id(imdb_id)
|
||||
filename = "S{:02d}E{:02d} - {}.mkv".format(episode_data["season"], episode_data["episode"], episode_data["title"])
|
||||
dir = episode_data["path"].replace(filename, "")
|
||||
response = make_response(send_from_directory(dir, filename))
|
||||
response.headers["content-type"] = "video/webm"
|
||||
return response
|
||||
Loading…
x
Reference in New Issue
Block a user