update_film_references.py

@@ -22,6 +22,8 @@ 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("-", " "))) + " | "
-        films_by_reference_table += VCinemaUtils.get_film_list(reference_keywords_sorted[year])
+
+        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 += "<br>".join(film_links)
 
     return films_by_reference_table

update_films_by_country.py

@@ -61,7 +61,12 @@ def build_table(films_by_country):
             table += flags[country]
 
         table += " | "
-        table += VCinemaUtils.get_film_list(films)
+
+        film_links = []
+        for film in films:
+            film_links.append("[{}](https://www.imdb.com/title/tt{}/)".format(film['title'], film['imdb_id']))
+
+        table += "<br>".join(film_links)
 
     return table
 

update_films_by_year.py

@@ -20,6 +20,11 @@ def build_page(films_by_year):
     for year in films_by_year_sorted.keys():
         page += "\n"
         page += str(year) + " | "
-        page += VCinemaUtils.get_film_list(films_by_year_sorted[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 += "<br>".join(films)
 
     return page

update_wiki.py

@@ -8,7 +8,7 @@ import argparse
 from progress.bar import IncrementalBar
 
 
-def update_wiki(token_id, token_secret, update_csv, update_films_by_year, update_films_by_country):
+def update_wiki(token_id, token_secret, update_csv=False, update_films_by_year=True, update_films_by_country=True):
     if update_csv:
         print("Updating CSV")
         update_viewings_csv(token_id, token_secret)
@@ -69,10 +69,6 @@ if __name__ == '__main__':
     parser.add_argument('token_id', help='API token ID.')
     parser.add_argument('token_secret', help='API token secret.')
 
-    parser.add_argument('update_csv', help='Update viewings.csv file, default: True', default=True)
-    parser.add_argument('update_films_by_year', help='Update films by release year page, default: True', default=True)
-    parser.add_argument('update films_by_country', help='Update films by country page, default: True', default=True)
-
     args = parser.parse_args()
 
-    update_wiki(args.token_id, args.token_secret, args.update_csv, args.update_films_by_year, args.update_films_by_country)
+    update_wiki(args.token_id, args.token_secret)

vcinema_utils/VCinemaUtils.py

@@ -84,7 +84,7 @@ def add_imdb_data_to_viewings(viewings, field_names, progress_bar=None):
     with ThreadPoolExecutor(4) as executor:
         future_imdb_tasks = set()
 
-        if ('keywords' in field_names and len(field_names) > 1) or ('keywords' not in field_names and len(field_names) > 0):
+        if ('keywords' in field_names and field_names > 1) or ('keywords' not in field_names and field_names > 0):
             future_imdb_tasks.update(executor.submit(add_imdb_data, viewing['imdb_id'], viewings, field_names, progress_bar) for viewing in viewings)
 
         if 'keywords' in field_names:
@@ -115,16 +115,3 @@ 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 "<br>".join(film_links)
-    else:
-        return ""