apply changes

vcinema_utils/VCinemaFilm.py

@@ -1,14 +1,37 @@
+import vcinema_utils
 from vcinema_utils.Viewing import Viewing
 
 
 class VCinemaFilm:
 
-    def __init__(self, name, imdb_id):
-        self.name = name
-        self.imdb_id = imdb_id
-        self.viewings = []
+    def __init__(self, title, imdb_id):
+        self._title = title
+        self._imdb_id = imdb_id
+        self._viewings = []
+        self._imdb_data = {}
 
     def add_viewing(self, date, season, rating):
         viewing = Viewing(date, season, rating)
 
-        self.viewings.append(viewing)
+        self._viewings.append(viewing)
+
+    def add_imdb_data(self, field, value):
+        self._imdb_data[field] = value
+
+    def get_imdb_data(self, field):
+        if field in self._imdb_data:
+            return self._imdb_data[field]
+        else:
+            return None
+
+    def get_imdb_url(self):
+        return "https://www.imdb.com/title/tt{}/".format(self._imdb_id)
+
+    def get_imdb_link(self):
+        return vcinema_utils.VCinemaUtils.generate_markdown_link(self._title, self.get_imdb_url())
+
+    def get_title(self):
+        return self._title
+
+    def get_imdb_id(self):
+        return self._imdb_id

vcinema_utils/VCinemaUtils.py

@@ -1,7 +1,8 @@
-from collections import Counter
 from concurrent.futures import ThreadPoolExecutor
 import csv
+from datetime import datetime
 
+from vcinema_utils.VCinemaFilm import VCinemaFilm
 from imdb_utils import IMDbUtils
 from bookstack import Bookstack
 
@@ -20,75 +21,74 @@ def get_viewings_csv_attachment_id(token_id, token_secret):
     return next((x['id'] for x in attachments if x['uploaded_to'] == CSV_PAGE_ID and x['name'] == viewings_csv_file_name), None)
 
 
-def get_vcinema_viewings(token_id, token_secret, viewings_csv=None, combine_repeat_viewings=True):
-    if viewings_csv is None:
-        attachment_id = get_viewings_csv_attachment_id(token_id, token_secret)
-        viewings_csv = Bookstack.get_attachment(JACKNET_WIKI_URL, token_id, token_secret, attachment_id)
+def get_vcinema_viewings(token_id, token_secret):
+    attachment_id = get_viewings_csv_attachment_id(token_id, token_secret)
 
+    viewings_csv = Bookstack.get_attachment(JACKNET_WIKI_URL, token_id, token_secret, attachment_id)
     viewings_csv = viewings_csv.decode("utf-8")
+
     viewings_csv_rows = viewings_csv.strip().split("\n")
 
     viewings = list(csv.DictReader(viewings_csv_rows, quotechar='"'))
 
-    if combine_repeat_viewings:
-        for viewing in viewings:
-            viewing['viewings'] = [
-                {'date_watched': viewing['date_watched'], 'season': viewing['season'], 'rating': viewing['rating']}]
-            viewing.pop('date_watched')
-            viewing.pop('season')
-            viewing.pop('rating')
-
-        watch_counts = Counter([x['imdb_id'] for x in viewings])
-        repeat_watches = [k for k, v in watch_counts.items() if v > 1]
-
-        for film in repeat_watches:
-            viewing_indexes = [index for index, viewing in enumerate(viewings) if viewing['imdb_id'] == film]
-
-            first_watch = viewings[viewing_indexes[0]]
-
-            for index in viewing_indexes[1::]:
-                first_watch['viewings'].extend(viewings[index]['viewings'])
-
-            for index in reversed(viewing_indexes[1::]):
-                viewings.pop(index)
-
     return viewings
 
 
-def add_imdb_data(imdb_id, viewings, data_fields, progressbar=None):
+def get_vcinema_films(token_id, token_secret):
+    viewings = get_vcinema_viewings(token_id, token_secret)
+    films = {}
+
+    for viewing in viewings:
+        imdb_id = viewing["imdb_id"]
+        title = viewing["title"]
+
+        if imdb_id not in films.keys():
+            film = VCinemaFilm(imdb_id=imdb_id, title=title)
+            films[imdb_id] = film
+
+        date_watched = datetime.strptime(viewing['date_watched'], "%Y-%m-%d")
+        season = viewing['season']
+        rating = viewing['rating']
+
+        films[imdb_id].add_viewing(date_watched, season, rating)
+
+    return list(films.values())
+
+
+def add_imdb_data(imdb_id, films, data_fields, progressbar=None):
     movie = IMDbUtils.get_movie(imdb_id)
 
-    for viewing in viewings:
-        if viewing['imdb_id'] == movie.movieID:
+    for film in films:
+        if film.get_imdb_id() == movie.movieID:
             for field_name in data_fields:
                 if field_name in movie:
-                    viewing[field_name] = movie[field_name]
+                    film.add_imdb_data(field_name, movie[field_name])
 
     if progressbar is not None:
         progressbar.next()
 
 
-def add_imdb_keywords(imdb_id, viewings, progressbar=None):
+def add_imdb_keywords(imdb_id, films, progressbar=None):
     movie = IMDbUtils.get_movie_keywords(imdb_id)
 
-    for viewing in viewings:
-        if viewing['imdb_id'] == movie.movieID:
+    for film in films:
+        if film.get_imdb_id() == movie.movieID:
             if 'keywords' in movie:
-                viewing['keywords'] = movie['keywords']
+                film.add_imdb_data('keywords', movie['keywords'])
 
     if progressbar is not None:
         progressbar.next()
 
 
-def add_imdb_data_to_viewings(viewings, field_names, progress_bar=None):
+def add_imdb_data_to_films(films, 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):
-            future_imdb_tasks.update(executor.submit(add_imdb_data, viewing['imdb_id'], viewings, field_names, progress_bar) for viewing in viewings)
+            future_imdb_tasks.update(executor.submit(add_imdb_data, film.get_imdb_id(), films, field_names, progress_bar) for film in films)
 
         if 'keywords' in field_names:
-            future_imdb_tasks.update(executor.submit(add_imdb_keywords, viewing['imdb_id'], viewings, progress_bar) for viewing in viewings)
+            future_imdb_tasks.update(executor.submit(add_imdb_keywords, film.get_imdb_id(), films, progress_bar) for film in films)
 
         progress_bar.max = len(future_imdb_tasks)
 
@@ -96,32 +96,32 @@ def add_imdb_data_to_viewings(viewings, field_names, progress_bar=None):
         progress_bar.finish()
 
 
-def filter_viewings(viewings, filter_field):
-    viewings_filtered = {}
+def filter_films(films: [VCinemaFilm], field: str) -> [VCinemaFilm]:
+    films_filtered = {}
 
-    for viewing in viewings:
-        if filter_field in viewing:
-            viewing_field = viewing[filter_field]
-            if isinstance(viewing_field, list):
-                for fve in list(viewing_field):
-                    if fve in viewings_filtered.keys():
-                        viewings_filtered[fve] += [viewing]
+    for film in films:
+        if film.get_imdb_data(field) is not None:
+            field_value = film.get_imdb_data(field)
+            if isinstance(field_value, list):
+                for value in list(field_value):
+                    if value in films_filtered.keys():
+                        films_filtered[value] += [film]
                     else:
-                        viewings_filtered[fve] = [viewing]
+                        films_filtered[value] = [film]
             else:
-                if viewing_field in viewings_filtered.keys():
-                    viewings_filtered[viewing_field] += [viewing]
+                if field_value in films_filtered.keys():
+                    films_filtered[field_value] += [film]
                 else:
-                    viewings_filtered[viewing_field] = [viewing]
+                    films_filtered[field_value] = [film]
 
-    return viewings_filtered
+    return films_filtered
 
 
-def get_film_list(films):
+def get_film_list(films: [VCinemaFilm]) -> str:
     film_links = []
 
     for film in films:
-        film_link = generate_imdb_film_link(film)
+        film_link = film.get_imdb_link()
         film_links.append(film_link)
 
     if len(film_links) > 0:
@@ -130,21 +130,13 @@ def get_film_list(films):
         return ""
 
 
-def generate_markdown_link(text, url):
+def generate_markdown_link(text, url) -> str:
     return "[{}]({})".format(text, url)
 
 
-def generate_imdb_film_link(film):
-    return generate_markdown_link(film['title'], generate_imdb_url(film['imdb_id']))
-
-
 def generate_wikipedia_page_link(page_title):
     return generate_markdown_link(page_title, generate_wikipedia_url(page_title))
 
 
-def generate_imdb_url(imdb_id):
-    return "https://www.imdb.com/title/tt{}/".format(imdb_id)
-
-
 def generate_wikipedia_url(page_title):
     return "https://en.wikipedia.org/wiki/{}".format(page_title.replace(" ", "_"))

wiki_pages/FilmsByCountry.py

@@ -16,7 +16,7 @@ PAGE_ID = 34
 
 
 def get_films_by_country(viewings):
-    viewings_filtered_by_country = VCinemaUtils.filter_viewings(viewings, "countries")
+    viewings_filtered_by_country = VCinemaUtils.filter_films(viewings, "countries")
 
     if "Czechia" in viewings_filtered_by_country.keys():
         viewings_filtered_by_country["Czech Republic"] = viewings_filtered_by_country["Czechia"]

wiki_pages/FilmsByYear.py

@@ -8,7 +8,7 @@ PAGE_ID = 24
 
 
 def get_films_by_year(viewings):
-    viewings_filtered_by_year = VCinemaUtils.filter_viewings(viewings, "year")
+    viewings_filtered_by_year = VCinemaUtils.filter_films(viewings, "year")
 
     return viewings_filtered_by_year
 

wiki_pages/HiddenThemes.py

@@ -9,7 +9,7 @@ PAGE_ID = 63
 
 def get_hidden_themes(viewings, token_id, token_secret):
     # Bit horrible to need to request this again, but it affects the order of the result table
-    viewings_ungrouped = VCinemaUtils.get_vcinema_viewings(token_id, token_secret, combine_repeat_viewings=False)
+    viewings_ungrouped = VCinemaUtils.get_vcinema_viewings(token_id, token_secret)
 
     # Copy keywords from grouped viewings to ungrouped viewings
     for viewing_ungrouped in viewings_ungrouped:

wiki_pages/KeywordScores.py

@@ -12,7 +12,7 @@ PAGE_ID = 23
 
 
 def get_keyword_scores(viewings):
-    viewings_filtered_keyword = VCinemaUtils.filter_viewings(viewings, "keywords")
+    viewings_filtered_keyword = VCinemaUtils.filter_films(viewings, "keywords")
 
     for keyword, viewings in viewings_filtered_keyword.items():
         viewings_filtered_keyword[keyword] = {"vcinema_films": viewings}