From f44cc0a4c177e717bfdb16050dc7d8ff91e56046 Mon Sep 17 00:00:00 2001 From: Sarah Date: Fri, 8 Apr 2022 21:37:14 +0100 Subject: [PATCH] add helper method --- update_film_references.py | 4 +--- update_films_by_country.py | 7 +------ update_films_by_year.py | 7 +------ vcinema_utils/VCinemaUtils.py | 13 +++++++++++++ 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/update_film_references.py b/update_film_references.py index e908c46..1539219 100644 --- a/update_film_references.py +++ b/update_film_references.py @@ -22,8 +22,6 @@ def build_page(films_by_reference_keyword): for year in reference_keywords_sorted.keys(): films_by_reference_table += "\n" films_by_reference_table += str(string.capwords(year[13:].replace("-", " "))) + " | " - - film_links = ["[{}](https://www.imdb.com/title/tt{}/)".format(film['title'], film['imdb_id']) for film in reference_keywords_sorted[year]] - films_by_reference_table += "
".join(film_links) + films_by_reference_table += VCinemaUtils.get_film_list(reference_keywords_sorted[year]) return films_by_reference_table diff --git a/update_films_by_country.py b/update_films_by_country.py index 6959cc8..2478e4d 100644 --- a/update_films_by_country.py +++ b/update_films_by_country.py @@ -61,12 +61,7 @@ def build_table(films_by_country): table += flags[country] table += " | " - - film_links = [] - for film in films: - film_links.append("[{}](https://www.imdb.com/title/tt{}/)".format(film['title'], film['imdb_id'])) - - table += "
".join(film_links) + table += VCinemaUtils.get_film_list(films) return table diff --git a/update_films_by_year.py b/update_films_by_year.py index 731882e..cd4c594 100644 --- a/update_films_by_year.py +++ b/update_films_by_year.py @@ -20,11 +20,6 @@ def build_page(films_by_year): for year in films_by_year_sorted.keys(): page += "\n" page += str(year) + " | " - - films = [] - for film in films_by_year_sorted[year]: - films.append("[{}](https://www.imdb.com/title/tt{}/)".format(film['title'], film['imdb_id'])) - - page += "
".join(films) + page += VCinemaUtils.get_film_list(films_by_year_sorted[year]) return page diff --git a/vcinema_utils/VCinemaUtils.py b/vcinema_utils/VCinemaUtils.py index 40e8954..40681d3 100644 --- a/vcinema_utils/VCinemaUtils.py +++ b/vcinema_utils/VCinemaUtils.py @@ -115,3 +115,16 @@ def filter_viewings(viewings, filter_field): viewings_filtered[viewing_field] = [viewing] return viewings_filtered + + +def get_film_list(films): + film_links = [] + + for film in films: + film_link = "[{}](https://www.imdb.com/title/tt{}/)".format(film['title'], film['imdb_id']) + film_links.append(film_link) + + if len(film_links) > 0: + return "
".join(film_links) + else: + return ""