Merge pull request '[i307] Add M3U playlist download option to main series page' (#308) from i307_Add-M3U-playlist-download-option-to-main-series-page into main

Reviewed-on: #308

public_html/css/hpr.css

@@ -403,6 +403,9 @@ article > p,
 	font-size: var(--default-header-4-font-size);
 	margin-left: 22px;
 }
+.lane.stack > article > footer {
+	margin-bottom: 1rem;
+}
 a.lane-button {
 	display: flex;
 	flex-direction: column;
@@ -733,10 +736,13 @@ fieldset > table td input[type="radio"] {
 	padding: 0;
 }
 .series-description {
-	margin: 0;
+	margin: 0 0 1rem 0;
 	padding: 0;
 	font-style: italic;
 }
+.series-desciption > *:last-child {
+	margin-bottom: 0;
+}
 .sr-only {
 	position: absolute;
 	width: 1px;

site.cfg

@@ -171,3 +171,15 @@ media_file_extension: spx
 [comments]
 root_template: rss-comments.tpl.xml
 filename: comments.rss
+
+[correspondent_m3u]
+root_template: m3u.tpl.m3u8
+content: m3u-correspondent.tpl.m3u8
+filename: correspondents/[id]/playlist.m3u8
+multipage: true
+
+[series_episodes_m3u]
+root_template: m3u.tpl.m3u8
+content: m3u-series_episodes.tpl.m3u8
+filename: series/[id].m3u8
+multipage: true

templates/content-correspondent.tpl.html

@@ -29,7 +29,7 @@
 					<p><label>email:</label> <u><!--% this_host.email %--></u></p>
 					<div><label>profile:</label> <!--% this_host.profile %--></div>
 					<p><label>episodes:</label> <strong><!--% hpr_show_count + twt_show_count %--></strong></p>
-				</div>
+					<p><a href="<!--% absolute_url(baseurl,'//correspondents') %-->/<!--% zero_pad_left(this_host.hostid) %-->/playlist.m3u8">Download the M3U playlist</a>.</p>
 				</div>
 				<div class="lane stack">
 				<!--% FOREACH hpr_show IN hpr_shows; %-->

templates/content-series.tpl.html

@@ -13,6 +13,7 @@
 		<li>Date of earliest show: <!--% series.earliest_show %--></li>
 		<li>Date of latest show: <!--% series.latest_show %--></li>
 		<li>Series RSS feeds: <a href="<!--% absolute_path(baseurl) %-->hpr_ogg_rss.php?series=<!--% series.id %-->">ogg</a>, <a href="<!--% absolute_path(baseurl) %-->hpr_spx_rss.php?series=<!--% series.id %-->">spx</a>, <a href="<!--% absolute_path(baseurl) %-->hpr_mp3_rss.php?series=<!--% series.id %-->">mp3</a></li>
+		<li><a href="<!--% absolute_url(baseurl,'//series') %-->/<!--% zero_pad_left(series.id) %-->.m3u8">Download the M3U playlist</a></li>
 	</ul>
 	<div class="series-description"><!--% series.description %--></div>
   </article>

templates/content-series_episode.tpl.html

@@ -13,6 +13,7 @@
 	<li>Date of earliest show: <!--% series.earliest_show %--></li>
 	<li>Date of latest show: <!--% series.latest_show %--></li>
 	<li>Series RSS feeds: <a href="<!--% absolute_path(baseurl) %-->hpr_ogg_rss.php?series=<!--% series.id %-->&full=1&gomax=1">ogg</a>, <a href="<!--% absolute_path(baseurl) %-->hpr_spx_rss.php?series=<!--% series.id %-->&full=1&gomax=1">spx</a>, <a href="<!--% absolute_path(baseurl) %-->hpr_mp3_rss.php?series=<!--% series.id %-->&full=1&gomax=1">mp3</a></li>
+	<li><a href="<!--% absolute_url(baseurl,'//series') %-->/<!--% zero_pad_left(series.id) %-->.m3u8">Download the M3U playlist</a></li>
 </ul>
 <p><em><!--% series.description %--></em></p>
 <section id="series_episodes" class="lane stack">

templates/ids-correspondent_m3u.tpl.html

@@ -0,0 +1,7 @@
+<!--% USE DBI(constants.driver) %-->
+<!--% FOREACH host IN DBI.query(
+	'select h.hostid from hosts as h'
+) %-->
+,<!--% host.hostid %-->
+<!--% END %-->
+

templates/ids-series_episodes_m3u.tpl.html

@@ -0,0 +1,7 @@
+<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
+<!--% FOREACH series IN DBI.query(
+	'select s.id from miniseries as s'
+) %-->
+,<!--% series.id %-->
+<!--% END %-->
+

templates/m3u-correspondent.tpl.m3u8

@@ -0,0 +1,24 @@
+<!--% PROCESS 'shared-utils.tpl.html' %-->
+<!--% PROCESS 'queries-correspondent.tpl.html' %-->
+<!--% USE DBI(constants.driver) %-->
+<!--% results_hpr_shows = DBI.prepare(query_hpr_shows) %-->
+<!--% hpr_shows = results_hpr_shows.execute(id); %-->
+<!--% FOREACH hpr_show IN hpr_shows; %-->
+#EXTINF: <!--% hpr_show.duration %-->,<!--% hpr_show.host %--> - <!--% hpr_show.title %-->
+
+
+<!--% media_path(hpr_show.id, 'hpr', 'mp3', baseurl, media_baseurl) %-->
+
+
+<!--% END %-->
+<!--% results_hpr_shows = DBI.prepare(query_twt_shows) %-->
+<!--% twt_result_status = results_twt_show_count.execute(id); %-->
+<!--% twt_shows = results_hpr_shows.execute(id); %-->
+<!--% FOREACH hpr_show IN twt_shows; %-->
+#EXTINF: <!--% hpr_show.duration %-->,<!--% hpr_show.host %--> - <!--% hpr_show.title %-->
+
+
+<!--% media_path(hpr_show.id, 'twt', 'mp3', baseurl, media_baseurl) %-->
+
+
+<!--% END %-->

templates/m3u-series_episodes.tpl.m3u8

@@ -0,0 +1,13 @@
+<!--% PROCESS 'shared-utils.tpl.html' %-->
+<!--% PROCESS 'queries-series_episodes.tpl.html' %-->
+<!--% USE DBI(constants.driver) %-->
+<!--% results_hpr_shows = DBI.prepare(query_shows_sql) %-->
+<!--% hpr_shows = results_hpr_shows.execute(id); %-->
+<!--% FOREACH hpr_show IN hpr_shows; %-->
+#EXTINF: <!--% hpr_show.duration %-->,<!--% hpr_show.host %--> - <!--% hpr_show.title %-->
+
+
+<!--% media_path(hpr_show.id, 'hpr', 'mp3', baseurl, media_baseurl) %-->
+
+
+<!--% END %-->

templates/m3u.tpl.m3u8

@@ -0,0 +1,2 @@
+#EXTM3U
+<!--% INCLUDE $content %-->

templates/queries-series_episodes.tpl.html

@@ -14,14 +14,24 @@
 		 WHERE miniseries.id = ?
 		 ORDER BY name'
 %-->
-<!--% query_shows_sql = 'SELECT
+<!--% query_shows_sql = 'WITH
+	comment_tallies AS (	
+		SELECT 
+			eps_id,
+			COUNT(eps_id) AS eps_tally
+		FROM comments
+		GROUP BY eps_id 
+	)
+	SELECT
 	id, date, title,
 	duration, summary, notes,
 	explicit, eps.license, tags,
-	hosts.host, hosts.hostid
+	hosts.host, hosts.hostid,
+	COALESCE(comment_tallies.eps_tally,0) AS commentsTally
 	FROM eps
 	INNER JOIN hosts
 	ON eps.hostid = hosts.hostid
+	LEFT JOIN comment_tallies ON eps.id = comment_tallies.eps_id
 	WHERE series = ? AND eps.date < date(\'now\', \'+1 days\')
 	ORDER BY eps.id DESC
 	'