refactor

vcinema_utils/VCinemaUtils.py

@@ -135,7 +135,7 @@ def generate_markdown_link(text, url):
 
 
 def generate_imdb_film_link(film):
-    return generate_markdown_link(film['title'], "https://www.imdb.com/title/tt{}/".format(film['imdb_id']))
+    return generate_markdown_link(film['title'], generate_imdb_url(film['imdb_id']))
 
 
 def generate_wikipedia_page_link(page_title):

wiki_pages/FilmsByReference.py

@@ -33,26 +33,26 @@ def get_films_by_reference(viewings):
                             page_title = referenced_page.title
                             page_url = referenced_page.url
 
-                        except wikipedia.DisambiguationError as e1:
-                            page_title = e1.title
-                            page_url = "https://en.wikipedia.org/wiki/{}".format(e1.title.replace(" ", "_"))
+                        except wikipedia.DisambiguationError as e:
+                            page_title = e.title
+                            page_url = VCinemaUtils.generate_wikipedia_url(page_title)
                         except wikipedia.PageError as _:
                             try:
                                 referenced_page = wikipedia.page(title=searches[0], auto_suggest=False)
 
                                 page_title = referenced_page.title
                                 page_url = referenced_page.url
-                            except wikipedia.DisambiguationError as e2:
-                                page_title = e2.title
-                                page_url = "https://en.wikipedia.org/wiki/{}".format(e2.title.replace(" ", "_"))
+                            except wikipedia.DisambiguationError as e:
+                                page_title = e.title
+                                page_url = VCinemaUtils.generate_wikipedia_url(page_title)
 
                         if page_title in films_by_reference.keys():
                             films_by_reference[page_title]["films"].append(viewing)
                             films_by_reference[page_title]["keywords"].append(keyword)
                         else:
                             films_by_reference[page_title] = {"url": page_url,
-                                                      "keywords": [keyword],
-                                                      "films": [viewing]}
+                                                              "keywords": [keyword],
+                                                              "films": [viewing]}
 
     return films_by_reference
 
@@ -73,10 +73,9 @@ def build_page(films_by_reference):
         row_data = []
 
         reference_url = referenced["url"]
-        reference_title = reference
         referenced_films = referenced["films"]
 
-        row_data.append("[{}]({})".format(reference_title, reference_url))
+        row_data.append(VCinemaUtils.generate_markdown_link(reference, reference_url))
         row_data.append(VCinemaUtils.get_film_list(referenced_films))
 
         table += " | ".join(row_data)