Merge branch 'main' into main

site-generator

@@ -67,18 +67,21 @@ Perl Template Toolkit.
                 - GRANT EXECUTE ON `hpr_hpr`.* TO 'hpr-generator'@'localhost';
 
         Install the needed Perl modules using preferred method (distribution packages, CPAN, etc.)
-                * GetOpt
-                * Pod::Usage
                 * Config::Std
-                * Template
-                * Template::Plugin::File
-                * Template::Plugin::DBI
-                * Template::Plugin::HTML::Strip
-                * DBI
-                * Tie::DBI
                 * DBD::SQLite or DBD:mysql
+                * DBI
+                * Data::Dumper
                 * Date::Calc
+                * GetOpt::Long
+                * HTML::Entities
+                * Pod::Usage
+                * Template
+                * Template::Plugin::DBI
+                * Template::Plugin::Date
+                * Template::Plugin::File
+                * Template::Plugin::HTML::Strip
                 * Text::CSV_XS
+                * Tie::DBI
 
 =head1 AUTHOR
 
@@ -115,7 +118,8 @@ use Getopt::Long qw(:config auto_help);
 use Pod::Usage;
 use Config::Std;
 use Text::CSV_XS;
-use HTML::Entities qw(encode_entities_numeric);
+#use HTML::Entities qw(encode_entities_numeric);
+use HTML::Entities qw(encode_entities);
 use Date::Calc;
 use DBI;
 use DBD::SQLite;
@@ -425,7 +429,8 @@ sub parse_csv {
 sub xml_entity {
     my ($text) = @_;
 
-    encode_entities_numeric( $text );
+#    encode_entities_numeric( $text );
+    encode_entities( $text );
 
     return $text;
 }

site.cfg

@@ -29,6 +29,7 @@ content: page.tpl.html
 #baseurl: OPTIONAL [i.e. file://<full path to local website directory>]
 #baseurl: file:///home/roan/Development/hpr/website/hpr_generator/public_html/
 baseurl: https://hackerpublicradio.org/
+http_baseurl: http://hackerpublicradio.org/
 hub_baseurl: https://hub.hackerpublicradio.org/
 media_baseurl: https://archive.org/download/hpr$eps_id/
 generator_name: The HPR Robot

templates/content-about.tpl.html

@@ -40,7 +40,7 @@
   <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 href="https://web.archive.org/web/20230323053905/http://www.oldskoolphreak.com/" >Radio FreeK America</a>, 
     <a href="https://web.archive.org/web/20220123174618/https://www.binrev.com/forums/" >Binary Revolution Radio</a> &amp; <a href="https://web.archive.org/web/20150208172826/http://www.nomicon.info/" >Infonomicon</a>, 
-    and it is a direct continuation of <a href="<!--% absolute_url(baseurl,'twat.html') %-->" >Twatech</a> radio. 
+    and it is a rename of <a href="<!--% absolute_url(baseurl,'twat.html') %-->" >Today With a Techie</a> radio.
     Please listen to StankDawg&#39;s &quot;<a href="<!--% media_path(1, 'hpr', 'mp3', baseurl, media_baseurl) %-->" >
       Introduction to HPR</a>&quot; for more information.</p>
 

templates/content-episodes.tpl.html

@@ -17,7 +17,7 @@
 	<p>
 		<!-- Creative Commons License -->
 		<a rel="license" href="https://creativecommons.org/licenses/by-nc-sa/2.5/"><img alt="Creative Commons License" border="0" src="https://creativecommons.org/images/public/somerights20.png" width="88" height="31" /></a><br>The following work is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nc-sa/2.5/">Creative Commons Attribution-NonCommercial-ShareAlike 2.5 License</a>.</p>
-	<p>T.W.A.T. Radio was brought to you by <a href="https://en.wikipedia.org/wiki/Infonomicon">The Infonomicon Computer Club</a></p>
+	<p>Today With a Techie Radio was brought to you by <a href="https://en.wikipedia.org/wiki/Infonomicon">The Infonomicon Computer Club</a></p>
 <!--% FOREACH twat_episode IN DBI.query('
 	SELECT 
         eps.id, 

templates/content-syndication.tpl.html

@@ -77,13 +77,16 @@
     <li><a href="<!--% absolute_path(baseurl) %-->comments.rss">Listener contributed comments to the episodes</a></li>
   </ul>
 </article>
+<hr />
+<h1>Other Download Options</h1>
 <article>
   <header>
     <h2>Site Replication Sources</h2>
   </header>
   <ul>
   <li><a href="<!--% absolute_path(baseurl) %-->hpr.sql">Daily Database Dump in SQL Format</a></li>
-  <li><a href="https://repo.anhonesthost.net/explore/repos" >All the HPR Source Code is on GitTea</a></li>
+  <li><a href="https://repo.anhonesthost.net/explore/repos">All the HPR Source Code is on GitTea</a></li>
+  <li><a href="https://hub.hackerpublicradio.org/stats.json">Current Statistics on the HPR Project (updated every 15 mins)</a></li>
   <ul>
 </article>
 <article>

templates/page.tpl.html

@@ -75,7 +75,7 @@
         <li><a href="http://audio.textfiles.com/shows/radiofreekamerica/">Radio Freek America</a></li>
         <li><a href="http://audio.textfiles.com/shows/binrev/">BinRev Radio</a></li>
         <li><a href="http://audio.textfiles.com/shows/infonomicon/">Infonomicon</a></li>
-        <li><a href="http://audio.textfiles.com/shows/twat/">Talk With a Techie</a></li>
+        <li><a href="http://audio.textfiles.com/shows/twat/">Today With a Techie</a></li>
       </ul>
     </nav>
     <nav class="column">

templates/rss.tpl.xml

@@ -2,8 +2,8 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 <?xml version="1.0" encoding="UTF-8" ?>
 <rss version="2.0"
-	xmlns:googleplay="https://www.google.com/schemas/play-podcasts/1.0"
+	xmlns:googleplay="http://www.google.com/schemas/play-podcasts/1.0"
-	xmlns:atom="https://www.w3.org/2005/Atom"
+	xmlns:atom="http://www.w3.org/2005/Atom"
 	xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd" >
 <channel>
   <title>Hacker Public Radio</title>
@@ -17,7 +17,7 @@
   <itunes:category text="Education">
     <itunes:category text="Training"/>
   </itunes:category>
-  <itunes:image href="<!--% absolute_url(baseurl) %-->images/hpr_feed_itunes.png"/>
+  <itunes:image href="<!--% absolute_url(http_baseurl) %-->images/hpr_feed_itunes.png"/>
   <itunes:explicit>yes</itunes:explicit>
   <itunes:author>Hacker Public Radio</itunes:author>
   <itunes:keywords>Community Radio, Tech Interviews, Linux, Open, Hobby, Software Freedom</itunes:keywords>
@@ -30,8 +30,8 @@
   </itunes:owner>
   <webMaster>admin@hackerpublicradio.org (HPR Volunteer)</webMaster>
   <generator>site-generator</generator>
-  <docs>https://www.rssboard.org/rss-specification</docs>
+  <docs>http://www.rssboard.org/rss-specification</docs>
-  <ttl>43200</ttl>
+  <ttl>720</ttl>
   <skipDays>
     <day>Saturday</day>
     <day>Sunday</day>
@@ -47,9 +47,9 @@
   <googleplay:author>HPR Volunteer</googleplay:author>
   <googleplay:description>Hacker Public Radio is a podcast that releases shows every weekday Monday through Friday. Our shows are produced by the community (you) and can be on any topic that is of interest to hackers and hobbyists.</googleplay:description>
   <googleplay:email>admin@hackerpublicradio.org</googleplay:email>
-  <googleplay:image href="<!--% absolute_url(baseurl) %-->images/hpr_feed_itunes.png"/>
+  <googleplay:image href="<!--% absolute_url(http_baseurl) %-->images/hpr_feed_itunes.png"/>
   <googleplay:category text="Technology"/>
-  <atom:link href="<!--% absolute_url(baseurl) %--><!--% filename %-->" rel="self" type="application/rss+xml" />
+  <atom:link href="<!--% absolute_url(http_baseurl) %--><!--% filename %-->" rel="self" type="application/rss+xml" />
   <pubDate><!--% format_feed_date(date.now) %--></pubDate>
 
   <!--% INCLUDE $content %-->

templates/shared-item.tpl.xml

@@ -1,24 +1,25 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 <!--% MACRO display_item(episode, file_extension, audio_mime_type) BLOCK %-->
-<!--% USE HTML.Strip %-->
+<!--% USE HTML.Strip emit_spaces = 0 %-->
 <!--% IF audio_mime_type == ""  %-->
 <!--% audio_mime_type = 'ogg' %-->
 <!--% END %-->
 <item>
     <itunes:explicit><!--% display_explicit_feed(episode.explicit) %--></itunes:explicit>
-    <googleplay:explicit><!--% display_explicit_feed(episode.explicit) %--></googleplay:explicit>
+    <googleplay:explicit><!--% display_explicit_feed_2(episode.explicit) %--></googleplay:explicit>
-    <title>HPR<!--% zero_pad_left(episode.id) %-->: <!--% episode.title %--></title>
+    <title>HPR<!--% zero_pad_left(episode.id) %-->: <!--% episode.title  | html_strip | xml_entity %--></title>
     <author><!--% episode.email %--> (<!--% episode.host %-->)</author>
     <googleplay:author><!--% episode.email %--> (<!--% episode.host %-->)</googleplay:author>
     <itunes:author><!--% episode.email %--> (<!--% episode.host %-->)</itunes:author>
-    <googleplay:image href="<!--% absolute_url(baseurl) %-->images/hpr_feed_itunes.png"/>
+    <googleplay:image href="<!--% absolute_url(http_baseurl) %-->images/hpr_feed_itunes.png"/>
     <link><!--% absolute_url(baseurl) %-->eps/hpr<!--% zero_pad_left(episode.id) %-->/index.html</link>
     <description><![CDATA[<!--% episode.notes %-->]]>
 </description>
     <itunes:summary><![CDATA[<!--% episode.notes.substr(0, 4000) | html_strip | xml_entity %-->]]>
 </itunes:summary>
     <pubDate><!--% format_feed_date(episode.date) %--></pubDate>
-    <enclosure url="<!--% baseurl %-->eps/hpr<!--% zero_pad_left(episode.id) %-->.<!--% file_extension %-->" length="<!--% episode.length %-->" type="audio/<!--% audio_mime_type %-->"/>
+    <enclosure url="<!--% http_baseurl %-->eps/hpr<!--% zero_pad_left(episode.id) %-->.<!--% file_extension %-->" length="<!--% episode.length %-->" type="audio/<!--% audio_mime_type %-->"/>
-    <guid><!--% baseurl %-->eps/hpr<!--% zero_pad_left(episode.id) %-->.<!--% file_extension %--></guid>
+    <guid><!--% http_baseurl %-->eps/hpr<!--% zero_pad_left(episode.id) %-->.<!--% file_extension %--></guid>
-  </item>
+</item>
+
 <!--% END %-->

templates/shared-utils.tpl.html

@@ -35,6 +35,10 @@
 <!--% display_choice(is_explicit, 'yes', 'no') %-->
 <!--% END %-->
 
+<!--% MACRO display_explicit_feed_2(is_explicit) BLOCK %-->
+<!--% display_choice(is_explicit, 'Yes', 'No') %-->
+<!--% END %-->
+
 <!--% MACRO format_feed_date(date_to_format) BLOCK %-->
 <!--% USE feed_date = date(format = '%a, %d %b %Y %H:%M:%S +0000', gmt=1)  %-->
 <!--% feed_date.format(date_to_format) %-->