From a7130ddf5617ae62ca7b5970fe05910f639a6f5a Mon Sep 17 00:00:00 2001 From: Xevion Date: Mon, 9 Mar 2020 22:57:32 -0500 Subject: [PATCH] finish download/build by Season buttons and methods, new episode boxes --- app/models.py | 10 ++++++---- app/routes.py | 8 ++++---- app/templates/season.html | 18 +++++++++++------- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/app/models.py b/app/models.py index ee1a1e1..0bae1ae 100644 --- a/app/models.py +++ b/app/models.py @@ -43,11 +43,16 @@ class Season(db.Model): db.session.commit() ep.build() else: - print(f"Rebuilding Season {self.id}, Episode {episode}") if rebuild: + print(f"Rebuilding Season {self.id}, Episode {episode}") ep.build() pass + def download(self, force=False): + episodes = Episode.query.filter_by(season_id=self.id).all() + for ep in episodes: + ep.build(force=force) + @staticmethod def create_all(build=True): """creates new Season objects and runs build() on them""" @@ -65,9 +70,6 @@ class Season(db.Model): for season in Season.query.all(): season.build(rebuild=True) - @staticmethod - - @property def episodes(self): """returns a List of Episodes under this Season""" diff --git a/app/routes.py b/app/routes.py index 55fc574..e85ccf0 100644 --- a/app/routes.py +++ b/app/routes.py @@ -23,16 +23,16 @@ def viewEpisode(season, episode): return render_template("episode.html", episode=e, seasons=Season.query.all()) -@app.route("/redownload/") +@app.route("/rebuild/") def rebuildSeason(season): season = Season.query.filter_by(id=season).first_or_404() - season.rebuild() + season.build(rebuild=True) return redirect(url_for("viewSeason", season=season.id)) @app.route("/redownload/") -def rebuildSeason(season): +def redownloadSeason(season): seasonObj = Season.query.filter_by(id=season).first_or_404() - seasonObj.redownload_all() + seasonObj.download(force=True) return redirect(url_for("viewSeason", season=season)) @app.route("/rebuild///") diff --git a/app/templates/season.html b/app/templates/season.html index 7c948b4..598811b 100644 --- a/app/templates/season.html +++ b/app/templates/season.html @@ -1,15 +1,19 @@ {% extends 'content.html' %} {% block content %} {{ super() }} - -See all Seasons -

- -Season {{ season.id }} +
{% for episode in season.episodes %} - Episode {{ episode.number }} -
+ {% endfor %} {% endblock content %} \ No newline at end of file