Add "Fetch Screenwriters" menu item.

This is a separate item from "Fetch", because it takes a lot longer.

5 files changed, 68 insertions, 24 deletions

diff --git a/c/episodelistview.c b/c/episodelistview.c
index 3b23c30..42c207d 100644
--- a/c/episodelistview.c
+++ b/c/episodelistview.c
@@ -453,7 +453,7 @@ ElvUpdateItem(LPLVITEM lpLvi)
 	tszName = NULL;
 	PI(t,lpLvi->lParam) goto r;
 	P("episode_data","episode_title",2,t) {
-		P("episode_data","fetch_episode_data",0,t) goto r;
+		P("episode_data","update_episode_data",0,t) goto r;
 		P("episode_data","episode_title",2,t) goto r;
 	}
 	GAC(t+1,&szName) goto r;
diff --git a/c/main.c b/c/main.c
index c4482c5..f312206 100644
--- a/c/main.c
+++ b/c/main.c
@@ -216,7 +216,15 @@ WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 		    {
 			term_t t;
 			t = T(0);
-			P("episode_data","fetch_episode_data",0,t);
+			P("episode_data","update_episode_data",0,t);
+			ElvUpdate();
+			break;
+		    }
+		case IDM_FILE_SCREENWRITERS:
+		    {
+			term_t t;
+			t = T(0);
+			P("episode_data","update_screenwriters",0,t);
 			ElvUpdate();
 			break;
 		    }
@@ -465,16 +473,15 @@ UpdateLayout()
 
 	/* Resize data list view. */
 	SendMessage(HDlv, WM_SETREDRAW, FALSE, 0);
+	SendMessage(HElv, WM_SETREDRAW, FALSE, 0);
 	cyDlv = rc.bottom-yStatus-LvHeight(HDlv, DLVSIKEY);
 	MoveWindow(HDlv, 0, cyDlv, rc.right, rc.bottom-yStatus-cyDlv, TRUE);
 	ListView_SetColumnWidth(HDlv, DLVSIKEY, LVSCW_AUTOSIZE);
 	cxColumn = ListView_GetColumnWidth(HDlv, 0)+4;
 	ListView_SetColumnWidth(HDlv, DLVSIKEY, cxColumn);
 	ListView_SetColumnWidth(HDlv, DLVSIVALUE, rc.right-cxColumn-CxVScroll-4);
-	SendMessage(HDlv, WM_SETREDRAW, TRUE, 0);
 
 	/* Resize episode list view. */
-	SendMessage(HElv, WM_SETREDRAW, FALSE, 0);
 	MoveWindow(HElv, 0, 0, rc.right, cyDlv+1, TRUE);
 	ListView_SetColumnWidth(HElv, ELVSIEPISODE, LVSCW_AUTOSIZE);
 	cxColumn = ListView_GetColumnWidth(HElv, ELVSIEPISODE)+4;
@@ -482,6 +489,7 @@ UpdateLayout()
 	cxColumn += ListView_GetColumnWidth(HElv, ELVSIRATING);
 	ListView_SetColumnWidth(HElv, ELVSITITLE, rc.right-cxColumn-CxVScroll-4);
 	SendMessage(HElv, WM_SETREDRAW, TRUE, 0);
+	SendMessage(HDlv, WM_SETREDRAW, TRUE, 0);
 
 	/* Resize status bar parts. */
 	{
diff --git a/c/resource.h b/c/resource.h
index dc6b576..9c3bf2a 100644
--- a/c/resource.h
+++ b/c/resource.h
@@ -12,6 +12,7 @@
 #define IDM_FILE_REFRESH       	402
 #define IDM_FILE_RESET		403
 #define IDM_FILE_FETCH		404
+#define IDM_FILE_SCREENWRITERS	405
 #define IDM_FILE_ABOUT		411
 #define IDM_VIEW_WATCHED       	421
 #define IDM_VIEW_TV_ORIGINAL	422
diff --git a/c/resource.rc b/c/resource.rc
index 82b4eaa..2742c58 100644
--- a/c/resource.rc
+++ b/c/resource.rc
@@ -8,6 +8,7 @@ BEGIN
 	POPUP "&File"
 	BEGIN
 		MENUITEM "&Fetch", IDM_FILE_FETCH
+		MENUITEM "Fetch Screen&writers", IDM_FILE_SCREENWRITERS
 		MENUITEM "&Refresh", IDM_FILE_REFRESH
 		MENUITEM "Re&set", IDM_FILE_RESET
 		MENUITEM "E&xit", IDM_FILE_EXIT
diff --git a/pl/episode_data.pl b/pl/episode_data.pl
index af91d4e..3e0ee1b 100644
--- a/pl/episode_data.pl
+++ b/pl/episode_data.pl
@@ -1,5 +1,6 @@
 :- module(episode_data, [ensure_episode_data/0,
-			 fetch_episode_data/0,
+			 update_episode_data/0,
+			 update_screenwriters/0,
 			 retract_episode/1,
 			 episode_count/1,
 			 rate_episode/2,
@@ -26,7 +27,7 @@ detach :-
 	db_detach.
 
 ensure_episode_data :- episode_title(_, _), !.
-ensure_episode_data :- fetch_episode_data.
+ensure_episode_data :- update_episode_data.
 
 retract_episode(Ep) :-
 	(   episode_title(Ep, _)
@@ -64,12 +65,9 @@ tv_original(Ep) :- episode_datum(Ep, 'Source', 'TV Original').
 
 % Remote data retrieval.
 
-episode_number(Ep) --> integer(Ep).
-episode_number(Ep) --> integer(Ep), "WPS", integer(_).
-
-fetch_episode_data :-
+update_episode_data :-
 	findall(Ep-Title-Data,
-		(remote_episode_title_data(Ep, Title, Data)),
+		(fetch_episode_title_data(Ep, Title, Data)),
 		Set),
 	maplist(set_episode_data, Set).
 
@@ -94,20 +92,11 @@ maybe_assert_episode_datum(Ep, Key, Value) :-
 	    assert_episode_datum(Ep, Key, Value)
 	).
 
-fetch_html(H) :-
-	catch(http_load_html('https://www.detectiveconanworld.com/wiki/Anime', H),
-	      _,
-	      fail),
-	!,
-	nb_setval(html, H).
-
-remote_html(H) :-
-	(   nb_current(html, H), !
-	;   fetch_html(H)
-	).
+episode_number(Ep) --> integer(Ep).
+episode_number(Ep) --> integer(Ep), "WPS", integer(_).
 
-remote_episode_title_data(Ep, Title, ['Date'-Date, 'Source'-Source, 'Hint'-Hint]) :-
-	remote_html(H),
+fetch_episode_title_data(Ep, Title, ['Date'-Date, 'Source'-Source, 'Hint'-Hint]) :-
+	cached_html('https://www.detectiveconanworld.com/wiki/Anime', H),
 	xpath(H, //tr(td(index(3),@style='background:#f2fde9;')), R),
 	xpath(R, td(index(1),normalize_space), Ep0),
 	atom_phrase(episode_number(Ep), Ep0),
@@ -118,6 +107,51 @@ remote_episode_title_data(Ep, Title, ['Date'-Date, 'Source'-Source, 'Hint'-Hint]
 	atom_string(Source, Source1),
 	xpath(R, td(index(8),normalize_space), Hint).
 
+update_screenwriters :-
+	findall(Ep-Name,
+		(maybe_fetch_screenwriter_episode(Name, Ep)),
+		Set),
+	maplist(set_episode_screenwriter, Set).
+
+set_episode_screenwriter(Ep-Name) :-
+	maybe_assert_episode_datum(Ep, 'Screenwriter', Name).
+
+maybe_fetch_screenwriter_episode(Name, Ep) :-
+	\+ episode_datum(Ep, 'Screenwriter', Ep),
+	fetch_screenwriter_episode(Name, Ep).
+
+fetch_screenwriter(Name) :-
+	cached_html('https://www.detectiveconanworld.com/wiki/Category:Screenplay_writers', H),
+	xpath(H, //'div'(@id='mw-pages')//a, A),
+	xpath(A, /self(normalize_space), Name).
+
+fetch_screenwriter_url(Name, U) :-
+	cached_html('https://www.detectiveconanworld.com/wiki/Category:Screenplay_writers', H),
+	xpath(H, //'div'(@id='mw-pages')//a, A),
+	xpath(A, /self(normalize_space), Name),
+	xpath(A, /self(@href), U).
+
+absolute_url(R) --> "https://www.detectiveconanworld.com", R.
+screenwriter_episode(Ep) --> string(_), "(Episode ", integer(Ep), ")", string(_).
+screenwriter_episode(Ep) --> string(_), "(Episodes ", integer(Ep1), "-", integer(Ep2), ")", string(_),
+			     { between(Ep1, Ep2, Ep) }.
+
+fetch_screenwriter_episode(Name, Ep) :-
+	fetch_screenwriter_url(Name, U0),
+	atom_phrase(absolute_url(U0), U),
+	cached_html(U, H),
+	xpath(H, //div(@id='mw-content-text')//li, L),
+	xpath(L, /self(normalize_space), T),
+	atom_phrase(screenwriter_episode(Ep), T).
+
+fetch_html(U, H) :-
+	catch(http_load_html(U, H), _, fail),
+	!,
+	nb_setval(U, H).
+
+cached_html(U, H) :- nb_current(U, H), !.
+cached_html(U, H) :- fetch_html(U, H).
+
 http_load_html(URL, DOM) :-
         setup_call_cleanup(http_open(URL, In,
                            [ timeout(60)