sarah/vcinema
1
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: sarah:6c5162c6c3c6ef3be94b804393f114ec9bf44535
Branches Tags
sarah:master
sarah:task/refactor-viewings-representation
sarah:feature/add-year-roundup-scripts
sarah:feature/improve-table-generation
..
compare: sarah:0ab9d81a882bca346b0363188896df205cd51cb1
Branches Tags
sarah:task/refactor-viewings-representation
sarah:feature/add-year-roundup-scripts
sarah:feature/improve-table-generation
sarah:master

No commits in common. "6c5162c6c3c6ef3be94b804393f114ec9bf44535" and "0ab9d81a882bca346b0363188896df205cd51cb1" have entirely different histories.
6c5162c6c3 ... 0ab9d81a88

2 changed files with 4 additions and 45 deletions
Show Stats Expand all files Collapse all files

2
update_keywords_scores.py
View File

@ -56,7 +56,7 @@ def add_keyword_scores(keyword_data, min_vcinema_count, min_imdb_count):
keyword_data[keyword]['score'] = score keyword_data[keyword]['score'] = score
def build_page(keyword_data, minimum_score=1.0): def build_table(keyword_data, minimum_score=1.0):
keyword_data = {k: v for k, v in keyword_data.items() if 'score' in v and v['score'] >= minimum_score} keyword_data = {k: v for k, v in keyword_data.items() if 'score' in v and v['score'] >= minimum_score}
keyword_data = OrderedDict(sorted(keyword_data.items(), key=lambda t: t[1]['score'], reverse=True)) keyword_data = OrderedDict(sorted(keyword_data.items(), key=lambda t: t[1]['score'], reverse=True))

47
update_wiki.py
View File

@ -1,9 +1,6 @@
from bookstack import Bookstack from bookstack import Bookstack
from update_films_by_country import get_films_by_country, build_page as build_films_by_country_page, FILMS_BY_COUNTRY_PAGE_ID from update_films_by_country import get_films_by_country, build_page as build_films_by_country_page, FILMS_BY_COUNTRY_PAGE_ID
from update_film_references import get_films_by_reference, build_page as build_film_references_page, FILM_BY_REFERENCES_PAGE_ID
from update_films_by_year import get_films_by_year, build_page as build_films_by_year_page, FILMS_BY_YEAR_PAGE_ID from update_films_by_year import get_films_by_year, build_page as build_films_by_year_page, FILMS_BY_YEAR_PAGE_ID
from update_hidden_themes import get_hidden_themes, build_page as build_hidden_themes_page, HIDDEN_THEMES_PAGE_ID
from update_keywords_scores import get_keyword_scores, build_page as build_keyword_scores_page, KEYWORD_SCORES_PAGE_ID
from vcinema_utils import VCinemaUtils from vcinema_utils import VCinemaUtils
from update_viewings_csv import update_viewings_csv from update_viewings_csv import update_viewings_csv
@ -11,8 +8,7 @@ import argparse
from progress.bar import IncrementalBar 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, update_films_by_year, update_films_by_country):
update_film_references, update_hidden_themes, update_keyword_scores):
if update_csv: if update_csv:
print("Updating CSV") print("Updating CSV")
update_viewings_csv(token_id, token_secret) update_viewings_csv(token_id, token_secret)
@ -27,15 +23,11 @@ def update_wiki(token_id, token_secret, update_csv, update_films_by_year, update
if update_films_by_country: if update_films_by_country:
data_fields.append("countries") data_fields.append("countries")
if update_film_references or update_hidden_themes or update_keyword_scores:
data_fields.append("keywords")
viewing_count = len(viewings) viewing_count = len(viewings)
with IncrementalBar('Retrieving movie data', max=viewing_count, suffix='%(percent).1f%% - %(eta)ds remaining', check_tty=False) as bar: 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) VCinemaUtils.add_imdb_data_to_viewings(viewings, data_fields, bar)
update_page_count = sum([update_films_by_year, update_films_by_country, update_film_references, update_page_count = sum([update_films_by_year, update_films_by_country])
update_hidden_themes, update_keyword_scores])
with IncrementalBar('Processing viewing data', max=update_page_count, suffix='%(percent).1f%% - %(eta)ds remaining', check_tty=False) as bar: with IncrementalBar('Processing viewing data', max=update_page_count, suffix='%(percent).1f%% - %(eta)ds remaining', check_tty=False) as bar:
if update_films_by_year: if update_films_by_year:
@ -44,16 +36,6 @@ def update_wiki(token_id, token_secret, update_csv, update_films_by_year, update
if update_films_by_country: if update_films_by_country:
films_by_country = get_films_by_country(viewings) films_by_country = get_films_by_country(viewings)
bar.next() bar.next()
if update_film_references:
films_by_reference = get_films_by_reference(viewings)
bar.next()
if update_hidden_themes:
hidden_themes = get_hidden_themes(viewings, token_id, token_secret)
bar.next()
if update_keyword_scores:
keyword_scores = get_keyword_scores(viewings)
bar.next()
bar.finish() bar.finish()
@ -64,15 +46,6 @@ def update_wiki(token_id, token_secret, update_csv, update_films_by_year, update
if update_films_by_country: if update_films_by_country:
films_by_country_page = build_films_by_country_page(films_by_country) films_by_country_page = build_films_by_country_page(films_by_country)
bar.next() bar.next()
if update_film_references:
films_by_reference_page = build_film_references_page(films_by_reference)
bar.next()
if update_hidden_themes:
hidden_themes_page = build_hidden_themes_page(hidden_themes)
bar.next()
if update_keyword_scores:
keyword_scores_page = build_keyword_scores_page(keyword_scores)
bar.next()
bar.finish() bar.finish()
@ -83,15 +56,6 @@ def update_wiki(token_id, token_secret, update_csv, update_films_by_year, update
if update_films_by_country: if update_films_by_country:
Bookstack.update_page(VCinemaUtils.JACKNET_WIKI_URL, token_id, token_secret, FILMS_BY_COUNTRY_PAGE_ID, markdown=films_by_country_page) Bookstack.update_page(VCinemaUtils.JACKNET_WIKI_URL, token_id, token_secret, FILMS_BY_COUNTRY_PAGE_ID, markdown=films_by_country_page)
bar.next() bar.next()
if update_film_references:
Bookstack.update_page(VCinemaUtils.JACKNET_WIKI_URL, token_id, token_secret, FILM_BY_REFERENCES_PAGE_ID, markdown=films_by_reference_page)
bar.next()
if update_hidden_themes:
Bookstack.update_page(VCinemaUtils.JACKNET_WIKI_URL, token_id, token_secret, HIDDEN_THEMES_PAGE_ID, markdown=hidden_themes_page)
bar.next()
if update_keyword_scores:
Bookstack.update_page(VCinemaUtils.JACKNET_WIKI_URL, token_id, token_secret, KEYWORD_SCORES_PAGE_ID, markdown=keyword_scores_page)
bar.next()
bar.finish() bar.finish()
@ -104,12 +68,7 @@ if __name__ == '__main__':
parser.add_argument('update_csv', help='Update viewings.csv file, default: True', default=True) 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_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) parser.add_argument('update films_by_country', help='Update films by country page, default: True', default=True)
parser.add_argument('update_films_by_reference', help='Update films by reference page, default: True', default=True)
parser.add_argument('update_hidden_themes', help='Update hidden themese page, default: True', default=True)
parser.add_argument('update_keyword_scores', help='Upate keyword scores page - THIS TAKES A WHILE, default: False', default=False)
args = parser.parse_args() args = parser.parse_args()
update_wiki(args.token_id, args.token_secret, args.update_csv, args.update_films_by_year, update_wiki(args.token_id, args.token_secret, args.update_csv, args.update_films_by_year, args.update_films_by_country)
args.update_films_by_country, args.update_films_by_reference, args.update_hidden_themes,
args.update_keyword_scores)