Merge pull request '[I107] Fix calculation of the days until next available episode timeslot' (#108) from I107_Error-generating-next-available-episode into main

Reviewed-on: #108

README.md

@@ -67,4 +67,5 @@ and add the label "**Feature Request**".
 ## Authors and acknowledgment
 * Roan "Rho`n" Horning 
 * gordons
-* Ken Fallon
+* Ken Fallon
+* norrist

public_html/css/hpr.css

@@ -248,6 +248,11 @@ pre.comment {
 	line-height: 1.2rem;
 }
 
+h3.title { margin: 1.25rem 0 0.75rem 0 }
+p.meta { margin: 0.25rem 0 }
+p.summary { margin: 0.25rem 0 }
+p.listen-in { margin-top: 0 }
+
 @media only screen and (max-width: 680px) { 
 	#container {width: 95%;}
 	img#hprlogo {float: left; max-width: 85px; padding: .35em;}

site.cfg

@@ -146,6 +146,10 @@ content: content-promote.tpl.html
 navigation: navigation-about.tpl.html
 content: content-sitemap.tpl.html
 
+[tags]
+navigation: navigation-main.tpl.html
+content: content-tags.tpl.html
+
 [twat_episode]
 navigation: navigation-get-shows.tpl.html
 content: content-twat_episode.tpl.html

templates/content-about.tpl.html

@@ -1,6 +1,6 @@
   <h1>About HPR.</h1>
   <h2 id="history">History<a href="#history">.</a></h2>
-  <p>Hacker Public Radio (HPR) is an Internet Radio show (podcast) that releases shows every weekday Monday through Friday. HPR has a long lineage going back to <a target="_blank" href="http://www.oldskoolphreak.com" target="_blank">Radio FreeK America</a>, <a target="_blank" href="http://www.binrev.com" target="_blank">Binary Revolution Radio</a> &amp; <a target="_blank" href="http://nomicon.info" target="_blank">Infonomicon</a>, and it is a direct continuation of <a target="_blank" href="<!--% absolute_url(baseurl) %-->twat.html" target="_blank">Twatech</a> radio. Please listen to StankDawg&#39;s &quot;<a target="_blank" href="<!--% absolute_url(baseurl) %-->eps/hpr0001.mp3" target="_blank">Introduction to HPR</a>&quot; for more information.</p>
+  <p>Hacker Public Radio (HPR) is an Internet Radio show (podcast) that releases shows every weekday Monday through Friday. HPR has a long lineage going back to <a target="_blank" href="http://www.oldskoolphreak.com" target="_blank">Radio FreeK America</a>, <a target="_blank" href="http://www.binrev.com" target="_blank">Binary Revolution Radio</a> &amp; <a target="_blank" href="http://nomicon.info" target="_blank">Infonomicon</a>, and it is a direct continuation of <a target="_blank" href="<!--% absolute_url(baseurl) %-->twat.html" target="_blank">Twatech</a> radio. Please listen to StankDawg&#39;s &quot;<a target="_blank" href="<!--% media_path(1, 'hpr', 'mp3', baseurl, media_baseurl) %-->" target="_blank">Introduction to HPR</a>&quot; for more information.</p>
 
   <h2 id="community">The HPR Community<a href="#community">.</a></h2>
   <p>What differentiates HPR from other podcasts is that the shows are crowd sourced from the community - fellow listeners like <strong><a target="_blank" href="<!--% absolute_url(baseurl) %-->contact.html" target="_blank">you</a></strong>. There is no restriction on how long the show can be, nor on the topic you can cover as long as they are not spam and <em>&quot;are of interest to <a target="_blank" href="http://en.wikipedia.org/wiki/Hacker_(hobbyist)" target="_blank">Hackers</a>&quot;</em>. If you want to see what topics have been covered so far just have a look at our <a target="_blank" href="<!--% absolute_url(baseurl) %-->eps/index.html" target="_blank">Archive</a>. We also allow for a <a target="_blank" href="<!--% absolute_url(baseurl) %-->series/index.html" target="_blank">series</a> of shows so that hosts can go into more detail on a topic.<p>

templates/content-correspondent.tpl.html

@@ -62,11 +62,13 @@
 		</p>
 	<!--% FOREACH hpr_show IN hpr_shows; %-->
 
-		<!--% show_summary(hpr_show, 'hide_host') %-->
+	<!--% show_summary(hpr_show, 'hide_host') %-->
-    <!--% END %-->
+    <p class="listen-in"><!--% display_listen_in(hpr_show.id) %--></p>
+	<!--% END %-->
 	<!--% FOREACH twat_show IN twat_shows; %-->
 
 		<!--% twat_show_summary(twat_show, 'hide_host') %-->
+		<p class="listen-in"><!--% display_listen_in(twat_show.id,"twat") %--></p>
     <!--% END %-->
 	</article>
 	<p><a href="contribute.html">Become a Correspondent</a></p>

templates/content-episode.tpl.html

@@ -18,10 +18,10 @@
 		</p>
 <p><!--% show_avatar(episode.hostid, episode.host) %-->
 Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(episode.hostid) %-->.html"><!--% episode.host %--></a> on <span><!--% episode.date %--></span> is flagged as <span><!--% display_explicit(episode.explicit) %--></span> and is released under a <span><!--% episode.license %--> license</span>. <br>
-<!--% display_tags(episode.tags) %--> <br>
+<!--% display_tags(episode.tags) %-->  
+
+<label>Comments: </label><!--% display_comments_tally(episode.id, episode.eps_tally) %--> <br>
 <!--% listen_now(episode, "hpr", baseurl, media_baseurl) %-->
-<!--% display_listen_in(episode.id) %--> | 
-<!--% display_comments_tally(episode.id, episode.eps_tally) %-->
 </p>
 <h3><!--% show_series(episode.series, episode.seriesid, "Part of the series") %--></h3> 
 <p><em><!--% episode.series_description %--></em></p>

templates/content-episodes.tpl.html

@@ -11,6 +11,7 @@
 <!--% FOREACH episodes IN DBI.query(query_episodes) 
 %-->
 	<!--% show_summary(episodes) %-->
+	<p class="listen-in"><!--% display_listen_in(episodes.id) %--></p>
 <!--% END %-->
 <h2 id="twat_episodes">Today With a Techie Archived Shows</h2>
 	<p>

templates/content-index.tpl.html

@@ -34,7 +34,7 @@
 	%-->
 	<!--% USE date %-->
 	<!--% calc = date.calc %-->
-	<!--%  days_till_next_episode = calc.Delta_Days(date.format(date.now, '%Y'),date.format(date.now, '%m'),date.format(date.now, '%d'),next_available_episode_result.last_year,next_available_episode_result.last_month,next_available_episode_result.last_day + 1) %-->
+	<!--%  days_till_next_episode = calc.Delta_Days(date.format(date.now, '%Y'),date.format(date.now, '%m'),date.format(date.now, '%d'),next_available_episode_result.last_year,next_available_episode_result.last_month,next_available_episode_result.last_day) %-->
 	<!--% END %-->
 	<!--% USE date %-->  
 	<!--% delta = date.calc.N_Delta_YMD(2005,9,19, date.format(date.now, '%Y'),date.format(date.now, '%m'),date.format(date.now, '%d')) %-->
@@ -63,10 +63,10 @@
 		<h3><!--% latest_episodes.summary%--></h3>
 		<p class="meta"$><!--% show_avatar(latest_episodes.hostid, latest_episodes.host, host_cnt) %-->
 	Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(latest_episodes.hostid) %-->.html"><!--% latest_episodes.host %--></a> on <!--% latest_episodes.date %--> is flagged as <!--% display_explicit(latest_episodes.explicit) %--> and released under a <!--% latest_episodes.license %--> license. <br>
-<!--% display_tags(latest_episodes.tags) %--><br>
+	<!--% display_tags(latest_episodes.tags) %--> 
+	<span><!--% show_series(latest_episodes.series, latest_episodes.seriesid) %--></span>
+	<span><label>Comments: </label><!--% display_comments_tally(latest_episodes.id, latest_episodes.eps_tally) %--></span><br>
 <!--% listen_now(latest_episodes, "hpr", baseurl, media_baseurl) %-->
-<small><!--% display_listen_in(latest_episodes.id) %--> <!--% show_series(latest_episodes.series, latest_episodes.seriesid) %--> | 
-<!--% display_comments_tally(latest_episodes.id, latest_episodes.eps_tally) %--></small>
 		</p>
 	</header>
 		<!--% tidy_notes(latest_episodes.notes) %-->
@@ -84,6 +84,7 @@
 <!--% FOREACH last_5_weeks_episodes IN DBI.query(query_last_5_weeks_episodes) 
 %-->
 	<!--% show_summary(last_5_weeks_episodes) %-->
+	<p class="listen-in"><!--% display_listen_in(last_5_weeks_episodes.id) %--></p>
 <!--% END %-->
 </article>
 <h1>Older Shows</h1>

templates/content-series_episode.tpl.html

@@ -22,5 +22,6 @@
 <!--% show_results = query_shows.execute(id) %-->
 <!--% FOREACH show IN show_results %-->
 <!--% show_summary(show) %-->
+<p class="listen-in"><!--% display_listen_in(show.id) %--></p>
 <!--% END %-->
 </article>

templates/content-tags.tpl.html

@@ -0,0 +1,85 @@
+<!--% PROCESS 'shared-utils.tpl.html' %-->
+<!--% PROCESS "queries-tags-${constants.database}.tpl.html" %-->
+<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
+<!--% PERL %-->
+$Template::Stash::PRIVATE = undef; # Allow . in tag
+<!--% END %-->
+<!--% uniq_tag_count = 0 %-->
+<!--% comma_re = '(?x)(?:^|,\s*)(?:"((?>[^"]*)(?:""[^"]*)*)"|([^",]*))'; %-->
+<!--# 'Moka5,interview, "computer science"' -->
+<!--% FOREACH episode IN DBI.query(query_tags);
+    ep_id = episode.id;
+    ep_tags = episode.tags;
+    FOREACH tag_str IN ep_tags.split(comma_re);
+        NEXT UNLESS tag_str;
+        NEXT IF tag_str == '';
+        tag = tag_str.lower;
+        first_char = tag.substr(0,1);
+        IF first_char == '.';
+            first_char = '&#x0002E;'; # Unicode .
+        END;
+        IF all_tags.${first_char}.exists(tag);
+            all_tags.${first_char}.${tag}.count = all_tags.${first_char}.${tag}.count + 1;
+            all_tags.${first_char}.${tag}.urls.push(ep_id);
+        ELSE;
+            all_tags.${first_char}.${tag}.count = 1;
+            uniq_tag_count = uniq_tag_count + 1;
+            all_tags.${first_char}.${tag}.urls = [ep_id];
+        END;
+    END;
+END %-->
+<!--% USE date %-->
+<!--% all_first = ['#','&#x0002E;','/','0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z'] %-->
+
+<style>
+    .columns3 { columns: 3 auto; list-style-type: none }
+    hr.thin {
+        border: 0;
+        height: 0;
+        border-top: 1px solid rgba(0, 0, 0, 0.1);
+        border-bottom: 1px solid rgba(255, 255, 255, 0.3);
+    }
+    p.ralign { text-align: right }
+</style>
+<article>
+	<a id="TOP"><h1 class="title">Tag summary</h1></a>
+	<h4 class="date">Page generated on <!--% date.format(date.now, format => '%Y-%m-%d at %H:%M:%S UTC', gmt => 1) %--></h4>
+	<p>This section summarises all of the tags currently used throughout the
+	database. The tags are in alphabetical order and each is followed by links to
+	the show numbers where it is used so you can see the context the author used
+	it in. There are currently <!--% uniq_tag_count %--> unique tags in the system.</p>
+	<h4>Alphabetical index</h4>
+	<p>This is an index to the initial letters of the tags below.</p>
+	<ul class="columns3">
+    <!--% FOREACH first_char IN all_first %-->
+        <!--% IF all_tags.${first_char} %-->
+            <li><a href="<!--% absolute_path(baseurl) %-->tags.html#<!--% all_tags.${first_char}.keys.sort.first %-->"><strong><!--% first_char %--></strong></a></li>
+        <!--% END %-->
+    <!--% END %-->
+	</ul>
+	<hr>
+    <!--% FOREACH first_char IN all_first %-->
+        <!--% IF all_tags.${first_char} %-->
+		<p class="ralign"><a href="<!--% absolute_path(baseurl) %-->tags.html#TOP">&UpArrow; Go to index</a></p>
+	        <h3>Tags beginning with '<!--% first_char %-->'</h3>
+	        <ul>
+                <!--% FOREACH tag IN all_tags.${first_char}.keys.sort %-->
+    	        	<li>
+    	        		<a id="<!--% tag %-->"><strong><!--% tag %--></strong></a>: 
+                        <!--% ep_links = [] %-->
+                        <!--% FOREACH ep_id IN all_tags.${first_char}.${tag}.urls.nsort;
+							ep_links.push("<a href=\"${absolute_path(baseurl)}eps/hpr" _ zero_pad_left(ep_id) _ '/index.html"'
+                                ' target="_blank" aria-label="' _ tag _
+                                ' - show ' _ ep_id _ '">' _ ep_id _ '</a>');
+                        END %-->
+                        <!--% ep_links.join(', ') %-->
+    	        	</li>
+                <!--% END %-->
+	        </ul>
+        <!--% END %-->
+    <!--% END %-->
+	<p><a href="#TOP">Go to TOP of page</a></p>
+</article>
+<!--% PERL %-->
+$Template::Stash::PRIVATE = 1;
+<!--% END %-->

templates/navigation-main.tpl.html

@@ -5,7 +5,7 @@
 			<li><a href="<!--% absolute_path(baseurl) %-->syndication.html">Get Shows</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->contribute.html">Give Shows</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->help_out.html">Contribute</a></li>
-			<li><a href="http://www.hackerpublicradio.org/tags.php">Tags</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->tags.html">Tags</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->about.html">About</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->search.html">Search</a></li>
 		</ul>

templates/page.tpl.html

@@ -43,7 +43,11 @@
 			<a href="<!--% absolute_path(baseurl) %-->sitemap.html">Site Map</a>
 			- <a href="#maincontent">skip to main content</a>
 			</p>
-		<h1 id="sitename">Hacker <a href="https://www.hackerpublicradio.org/comments_viewer.php">P</a>ublic <a href="<!--% absolute_path(baseurl) %-->syndication.html">R</a>adio</h1>
+			<h1 id="sitename">
+				<a href="<!--% absolute_path(baseurl) %-->correspondents/index.html">H</a>acker
+				<a href="<!--% absolute_path(baseurl) %-->comments_viewer.html">P</a>ublic
+				<a href="<!--% absolute_path(baseurl) %-->syndication.html">R</a>adio
+			</h1>
 		<h2>Your ideas, projects, opinions - podcasted.</h2>
 		<h3>New episodes Monday through Friday.</h3>
 	</div>

templates/queries-index-mysql.tpl.html

@@ -6,9 +6,9 @@
 		)
 		SELECT 
 			MIN(next_id.id_next) AS \'next_id\', 
-			DATE_FORMAT(MIN(last_date), \'%Y\') AS \'last_year\',
+			DATE_FORMAT(DATE_ADD(MIN(last_date), INTERVAL 1 DAY), \'%Y\') AS \'last_year\',
-			DATE_FORMAT(MIN(last_date), \'%d\') AS \'last_day\',
+			DATE_FORMAT(DATE_ADD(MIN(last_date), INTERVAL 1 DAY), \'%d\') AS \'last_day\',
-			DATE_FORMAT(MIN(last_date), \'%m\') AS \'last_month\'
+			DATE_FORMAT(DATE_ADD(MIN(last_date), INTERVAL 1 DAY), \'%m\') AS \'last_month\'
 		FROM next_id
 		LEFT JOIN eps ON next_id.id_next = eps.id 
 		WHERE eps.id IS NULL

templates/queries-index-sqlite.tpl.html

@@ -6,9 +6,9 @@
 		)
 		SELECT 
 			MIN(next_id.id_next) AS \'next_id\', 
-			strftime(\'%Y\', MIN (last_date)) AS \'last_year\',
+			strftime(\'%Y\', DATE (MIN (last_date), \'+1 Days\')) AS \'last_year\',
-			strftime(\'%d\', MIN (last_date)) AS \'last_day\',
+			strftime(\'%d\', DATE (MIN (last_date), \'+1 Days\')) AS \'last_day\',
-			strftime(\'%m\', MIN (last_date)) AS \'last_month\'
+			strftime(\'%m\', DATE (MIN (last_date), \'+1 Days\')) AS \'last_month\'
 		FROM next_id
 		LEFT JOIN eps ON next_id.id_next = eps.id 
 		WHERE eps.id IS NULL

templates/queries-tags-mysql.tpl.html

@@ -0,0 +1 @@
+<!--% query_tags = 'SELECT id, tags FROM eps' %-->

templates/queries-tags-sqlite.tpl.html

@@ -0,0 +1 @@
+<!--% query_tags = 'SELECT id, tags FROM eps' %-->

templates/shared-episode-summary.tpl.html

@@ -19,20 +19,26 @@ from the series <em><a href="<!--% baseurl %-->series/<!--% zero_pad_left(series
 <!--% IF episode_type == "" %--><!--% episode_type = 'hpr' %--><!--% END %-->
  Listen in 
 <!--% IF episode_type == 'hpr' %-->
-<a href="<!--% media_path(eps_id, episode_type, 'ogg', baseurl, media_baseurl) %-->">ogg</a>,
+<a href="<!--% media_path(eps_id, episode_type, 'ogg', baseurl, media_baseurl) %-->" aria-label="Download <!--% episode_type %--><!--% zero_pad_left(eps_id) %--> as">ogg</a>,
-<a href="<!--% media_path(eps_id, episode_type, 'spx', baseurl, media_baseurl) %-->">spx</a>,
+<a href="<!--% media_path(eps_id, episode_type, 'spx', baseurl, media_baseurl) %-->" aria-label="Download <!--% episode_type %--><!--% zero_pad_left(eps_id) %--> as">spx</a>,
 or 
 <!--% END %-->
-<a href="<!--% media_path(eps_id, episode_type, 'mp3', baseurl, media_baseurl) %-->">mp3</a> format.
+<a href="<!--% media_path(eps_id, episode_type, 'mp3', baseurl, media_baseurl) %-->" aria-label="Download <!--% episode_type %--><!--% zero_pad_left(eps_id) %--> as">mp3</a> format.
 <!--% END %-->
 
 <!--% MACRO display_comments_tally(eps_id, tally) BLOCK %-->
-<a href="<!--% absolute_path(baseurl) %-->eps/hpr<!--% zero_pad_left(eps_id) %-->/index.html#comments">Comments (<!--% tally %-->)</a>.
+<a href="<!--% absolute_path(baseurl) %-->eps/hpr<!--% zero_pad_left(eps_id) %-->/index.html#comments" aria-label="Comments for hpr<!--% zero_pad_left(eps_id) %-->"><!--% IF tally > 0 %--><!--% tally %--><!--% ELSE %-->(Be the first)<!--% END %--></a>.
 <!--% END %-->
 
 <!--% MACRO show_meta(show, hide_tags) BLOCK %-->
-	<span><label>Released:</label> <!--% show.date %-->.</span> <span><label>Duration:</label> <!--% display_episode_duration(show.duration) %-->.</span> <span><label>Flag:</label> <!--% display_explicit(show.explicit) %-->.</span> <span><!--% show_series(show.series, show.seriesid) %--></span>  <br>
+	<span><label>Released:</label> <!--% show.date %-->.</span> 
-	<!--% IF hide_tags == "" %--><!--% display_tags(tags) %--><!--% END %-->
+	<span><label>Duration:</label> <!--% display_episode_duration(show.duration) %-->.</span> 
+	<span><label>Flag:</label> <!--% display_explicit(show.explicit) %-->.</span> 
+	<span><!--% show_series(show.series, show.seriesid) %--></span>  <br>
+	<!--% IF hide_tags == "" %--><!--% display_tags(show.tags) %--><!--% END %-->
+	<!--% IF show.comentsTally || show.commentsTally == 0 %-->
+	<span><label>Comments:</label> <!--% display_comments_tally(show.id, show.commentsTally) %--></span>
+	<!--% END %-->
 <!--% END %-->
 
 <!--% MACRO show_summary(show, hide_host) BLOCK %-->
@@ -41,9 +47,8 @@ or
 		hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(show.hostid) %-->.html"><!--% show.host %--></a>
 	<!--% END %-->
 	</h3>
-	<p class="meta"><!--% show_meta(show) %--><br>
+	<p class="meta"><!--% show_meta(show) %--></p>
-    <!--% show.summary %-->
+	<p class="summary"><!--% show.summary %--></p>
-	</p>
 <!--% END %-->
 
 <!--% MACRO twat_show_summary(show, hide_host) BLOCK %-->
@@ -52,8 +57,7 @@ or
 		hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(show.hostid) %-->.html"><!--% show.host %--></a>
 	<!--% END %-->
 	</h3>
-	<p class="meta"><!--% show_meta(show) %--><br>
+	<p class="meta"><!--% show_meta(show) %--></p>
-    <!--% show.summary %-->
+	<p class="summary"><!--% show.summary %--></p>
-	</p>
 <!--% END %-->
 

templates/shared-listen-now.tpl.html

@@ -1,16 +1,12 @@
-<!--% MACRO listen_now(episode, episode_type, baseurl, media_baseurl) BLOCK %-->
+<!--% PROCESS 'shared-episode-summary.tpl.html' %-->
-	<h2>Listen Now</h2>
+
-	<p>Duration: <!--% display_episode_duration(episode.duration) %--></p>
+<!--% MACRO listen_now(episode, episode_type, baseurl, media_baseurl, hide_duration) BLOCK %-->
+<p><!--% display_listen_in(episode.id, episode_type) %--> Play now:<br>	
 	<audio controls preload="none">
 	<source src="<!--% media_path(episode.id, episode_type, 'ogg', baseurl, media_baseurl) %-->" type="audio/ogg" >
 		<source src="<!--% media_path(episode.id, episode_type, 'mp3', baseurl, media_baseurl) %-->" type="audio/mpeg" >
 	</audio>
-	<ul>
+	<!--% IF !hide_duration %--><br>
-<!--% IF episode_type != "twat" %-->
+	Duration: <!--% display_episode_duration(episode.duration) %--><!--% END %--></p>
-		<li>ogg: <a href="<!--% media_path(episode.id, episode_type, 'ogg', baseurl, media_baseurl) %-->"><!--% media_path(episode.id, episode_type, 'ogg', baseurl, media_baseurl) %--></a></li>
-		<li>spx: <a href="<!--% media_path(episode.id, episode_type, 'spx', baseurl, media_baseurl) %-->"><!--% media_path(episode.id, episode_type, 'spx', baseurl, media_baseurl) %--></a></li>
-<!--% END %-->
-		<li>mp3: <a href="<!--% media_path(episode.id, episode_type, 'mp3', baseurl, media_baseurl) %-->"><!--% media_path(episode.id, episode_type, 'mp3', baseurl, media_baseurl) %--></a></li>
-	</ul>
 <!--% END %-->