read token from file

update_wiki.py

@@ -2,6 +2,7 @@ from wiki_pages import FilmsByCountry, FilmsByReference, FilmsByYear, HiddenThem
 from vcinema_utils import VCinemaUtils
 
 import argparse
+import json
 from progress.bar import IncrementalBar
 
 
@@ -33,35 +34,59 @@ def update_wiki(token_id, token_secret, update_csv, pages):
     with IncrementalBar('Retrieving movie data', max=viewing_count, suffix='%(percent).1f%% - %(eta)ds remaining', check_tty=False) as bar:
         VCinemaUtils.add_imdb_data_to_viewings(viewings, data_fields, bar)
 
-    print("Processing viewing data")
+    update_page_count = sum([update_films_by_year, update_films_by_country, update_film_references,
+                             update_hidden_themes, update_keyword_scores])
 
-    if update_films_by_year:
+    with IncrementalBar('Processing viewing data', max=update_page_count, suffix='%(percent).1f%% - %(eta)ds remaining', check_tty=False) as bar:
-        films_by_year = FilmsByYear.get_films_by_year(viewings)
+        if update_films_by_year:
-        FilmsByYear.update_page(token_id, token_secret, films_by_year)
+            films_by_year = FilmsByYear.get_films_by_year(viewings)
-    if update_films_by_country:
+            bar.next()
-        films_by_country = FilmsByCountry.get_films_by_country(viewings)
+        if update_films_by_country:
-        FilmsByCountry.update_page(token_id, token_secret, films_by_country)
+            films_by_country = FilmsByCountry.get_films_by_country(viewings)
-    if update_film_references:
+            bar.next()
-        films_by_reference = FilmsByReference.get_films_by_reference(viewings)
+        if update_film_references:
-        FilmsByReference.update_page(token_id, token_secret, films_by_reference)
+            films_by_reference = FilmsByReference.get_films_by_reference(viewings)
-    if update_hidden_themes:
+            bar.next()
-        hidden_themes = HiddenThemes.get_hidden_themes(viewings, token_id, token_secret)
+        if update_hidden_themes:
-        HiddenThemes.update_page(token_id, token_secret, hidden_themes)
+            hidden_themes = HiddenThemes.get_hidden_themes(viewings, token_id, token_secret)
-    if update_keyword_scores:
+            bar.next()
-        keyword_scores = KeywordScores.get_keyword_scores(viewings)
+        if update_keyword_scores:
-        KeywordScores.update_page(token_id, token_secret, keyword_scores)
+            keyword_scores = KeywordScores.get_keyword_scores(viewings)
+            bar.next()
 
-    print("Done!")
+        bar.finish()
+
+    with IncrementalBar('Updating pages', max=update_page_count, check_tty=False) as bar:
+        if update_films_by_year:
+            FilmsByYear.update_page(token_id, token_secret, films_by_year)
+            bar.next()
+        if update_films_by_country:
+            FilmsByCountry.update_page(token_id, token_secret, films_by_country)
+            bar.next()
+        if update_film_references:
+            FilmsByReference.update_page(token_id, token_secret, films_by_reference)
+            bar.next()
+        if update_hidden_themes:
+            HiddenThemes.update_page(token_id, token_secret, hidden_themes)
+            bar.next()
+        if update_keyword_scores:
+            KeywordScores.update_page(token_id, token_secret, keyword_scores)
+            bar.next()
+
+        bar.finish()
 
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='Update wiki pages.')
-    parser.add_argument('token_id', help='API token ID.')
-    parser.add_argument('token_secret', help='API token secret.')
 
-    parser.add_argument("--do_not_update_csv", action="store_true")
+    parser.add_argument('--update_csv', help='Update viewings.csv file, default: True', default=True, required=False)
     parser.add_argument('--pages', nargs="+", default=['years', 'countries', 'references', 'themes', 'scores'], required=False)
 
     args = parser.parse_args()
 
-    update_wiki(args.token_id, args.token_secret, not args.do_not_update_csv, args.pages)
+    with open('token.json') as json_file:
+        token = json.load(json_file)
+
+    update_wiki(token['token_id'], token['token_secret'], not args.do_not_update_csv, args.pages)
+
+    update_wiki(args.token_id, args.token_secret, args.update_csv, args.pages)

wiki_pages/ActorScores.py

@@ -0,0 +1,26 @@
+from collections import Counter, OrderedDict
+import warnings
+
+from vcinema_utils import VCinemaUtils
+
+warnings.filterwarnings("ignore")
+
+
+def get_actor_scores(viewings):
+    for viewing_ind in range(len(viewings)):
+        viewing = viewings[viewing_ind]
+
+        cast_list = []
+
+        for cast_member in viewing['cast']:
+            cast_member_name = (cast_member['name'], cast_member.currentRole)
+            cast_list.append(cast_member_name)
+
+        viewings[viewing_ind]['cast'] = cast_list
+
+    viewings_filtered_by_cast_member = VCinemaUtils.filter_viewings(viewings, "cast")
+
+    viewings_filtered_by_cast_member = OrderedDict(sorted(viewings_filtered_by_cast_member.items(), key=lambda t: len(t[1]), reverse=True))
+
+    return viewings_filtered_by_cast_member
+

wiki_pages/HiddenThemes.py

@@ -28,27 +28,28 @@ def get_hidden_themes(viewings, token_id, token_secret):
 
     # Add hidden themes
     for date, data in viewings_filtered_watch_date.items():
-        hidden_themes = set()
+        keyword_counts = {}
 
         if len(data['viewings']) > 1:
-            viewings_keywords = []
-
             for viewing in data['viewings']:
                 if 'keywords' in viewing:
-                    viewings_keywords.append(set(viewing['keywords']))
+                    for keyword in viewing['keywords']:
+                        if keyword in keyword_counts.keys():
+                            keyword_counts[keyword] += 1
+                        else:
+                            keyword_counts[keyword] = 1
 
-            if len(viewings_keywords) > 1:
+            keyword_counts = {k: v for k, v in sorted(keyword_counts.items(), key=lambda item: item[1], reverse=True)}
-                hidden_themes = set.intersection(*viewings_keywords)
 
-        if hidden_themes != set():
+            viewings_filtered_watch_date[date]['keyword_counts'] = keyword_counts
-            viewings_filtered_watch_date[date]['hidden_themes'] = list(hidden_themes)
 
     return viewings_filtered_watch_date
 
 
 def update_page(token_id, token_secret, hidden_themes):
     page = build_page(hidden_themes)
-    Bookstack.update_page(VCinemaUtils.JACKNET_WIKI_URL, token_id, token_secret, PAGE_ID, markdown=page)
+    print(page)
+    # Bookstack.update_page(VCinemaUtils.JACKNET_WIKI_URL, token_id, token_secret, PAGE_ID, markdown=page)
 
 
 def build_page(hidden_themes):