diff --git a/main.py b/main.py index 510e7cb9e8062207be748ec7bfa9866578950a23..0c895c7d935647549bd046248739917bdfba1bc7 100644 --- a/main.py +++ b/main.py @@ -1,7 +1,7 @@ from sys import stderr from sqlalchemy.exc import SQLAlchemyError -from movies import MovieDatabase, Genre +from movies import MovieDatabase, Movie from kivy.app import App @@ -14,8 +14,8 @@ class MoviesApp(App): self.session = self.movie_database.create_session() def print_records(self): - for genre in self.session.query(Genre): - print(genre.name) + for movie in self.session.query(Movie): + print(f'{movie.title}{" " * (12 - len(movie.title))}(budget ${movie.budget}, gross revenue ${movie.gross_revenue})') def main(): diff --git a/movies_installer.py b/movies_installer.py index fb3d41cef69a123319e7edbe59a71ae490763a97..36e4007f5bba268c480925ff07c6b1b23f64ab00 100644 --- a/movies_installer.py +++ b/movies_installer.py @@ -4,53 +4,14 @@ from datetime import date from sqlalchemy.exc import SQLAlchemyError -from movies import MovieDatabase, Movie, Genre, Review +from movies import MovieDatabase, Movie def add_starter_data(session): - biography = Genre(name='Biography') - drama = Genre(name='Drama') - history = Genre(name='History') - action = Genre(name='Action') - adventure = Genre(name='Adventure') - sci_fi = Genre(name='SciFi') - session.add(biography) - session.add(drama) - session.add(history) - session.add(action) - session.add(adventure) - session.add(sci_fi) - - # Hidden Figures (Biography, Drama, History) - # 2016 October 15 - # Budget: $25,000,000 - # Gross Revenue: $206,000,000 - # Sample review from IMDB: - # "★★★★★★★★★☆ In the opinion of this reviewer, an extraordinary achievement." - hidden_figures = Movie(title='Hidden Figures', budget=25000000, gross_revenue=206000000, - opening_date=date(2016, 10, 15), genres=[biography, drama, history]) - session.add(hidden_figures) - extraordinary_achievement = Review(movie=hidden_figures, score=9, - comments='In the opinion of this reviewer, an extraordinary achievement.') - session.add(extraordinary_achievement) - - # Avengers: Infinity War (Action, Adventure) - # 2018 April 27 - # Budget: $300,000,000 - # Gross Revenue: $2,048,000,000 - # Sample reviews from IMDB: - # "★★★★★★★★★★ A summer film that IS even better than the hype." - # "★★★★★★☆☆☆☆ Bordering on a comedy, "Infinity War" is overhyped, lacked direction, but at times impressed." - infinity_war = Movie(title='Avengers: Infinity War', budget=300000000, gross_revenue=2048000000, - opening_date=date(2018, 4, 27), genres=[action, adventure]) - session.add(infinity_war) - better_than_hype = Review(movie=infinity_war, score=10, - comments='A summer film that IS even better than the hype.') - bordering_on_comedy = Review(movie=infinity_war, score=6, - comments='Bordering on a comedy, "Infinity War" is overhyped, lacked direction, but ' - 'at times impressed.') - session.add(better_than_hype) - session.add(bordering_on_comedy) + session.add(Movie(title='Example I', budget=1000, gross_revenue=2000)) + session.add(Movie(title='Example II', budget=2000, gross_revenue=2000)) + session.add(Movie(title='Example III', budget=2000, gross_revenue=1000)) + session.add(Movie(title='Example IV', budget=1000, gross_revenue=1000)) def main():