Merge pull request '[I31] Fix URL to individual series page on series index page' (#32 ) from I31_Fix-URL into main

Reviewed-on: #32
Add missing MACRO absolute_path to link path
2022-08-26 00:17:33 +00:00 · 2022-08-25 20:10:21 -04:00 · 2022-08-19 22:20:17 -04:00 · 2022-08-19 22:19:50 -04:00 · 2022-08-19 22:11:38 -04:00 · 2022-08-19 21:25:14 -04:00
26 changed files with 278 additions and 47 deletions
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Generate two specific pages:
 `site-generator index about`		

 Generate the whole site:
-`site-generator ALL`	
+`site-generator --all`	

 Generate pages based on the same template:
 `site-generator correspondent=1,3,5..10`
--- a/public_html/hpr.ico
+++ b/public_html/hpr.ico
--- a/public_html/will-my-show-be-of-interest-to-hackers.html
+++ b/public_html/will-my-show-be-of-interest-to-hackers.html
@@ -0,0 +1,14 @@
+<html><head>
+<meta http-equiv="content-type" content="text/html; charset=windows-1252">
+<title>Will my show be of intrest to hackers ?</title>
+<style>
+p {font-size:100px;}
+</style>
+</head>
+<body>
+<p>
+YES !
+</p>
+
+
+</body><!-- If you are reading this then definately YES --></html>
--- a/26
+++ b/26
@@ -8,6 +8,7 @@

 	site-generator [OPTION]... PAGE|PAGE=<comma separated list of ids>...

+	-a, --all      generate all pages defined in configuration file
 	-l, --list     print list of configured pages
 	-p, --preview  print generated pages to standard out
 	-q, --quiet    suppress progress information while generating pages
@@ -23,7 +24,7 @@
 		site-generator index about

 		Generate the whole site:
-		site-generator ALL
+		site-generator --all

 		Generate pages based on the same template:
 		site-generator correspondent=1,3,5..10
@@ -92,33 +93,32 @@ exit main();
 sub main {

 	# Argument parsing
+	my $all;
 	my $preview;
 	my $verbose;
 	my $quiet;
 	GetOptions(
+		'all'     => \$all,
 		'list'    => \&print_available_pages,
 		'preview' => \$preview,
 		'verbose' => \$verbose,
 		'quiet'   => \$quiet,
 	) or pod2usage(1);
-	pod2usage(1) unless @ARGV;
+	pod2usage(1) unless @ARGV || $all;
 	my (@page_args) = @ARGV;

 	if ($quiet) {
 		$verbose = 'quiet';
 	};

-	# Set flag indicating whether or not to generate all pages.
-	# The flag is set to true if the special argument ALL is 
-	# passed into the generator
-	my $ALL = grep { $_ eq 'ALL' } @page_args;
-
 	# Load config file
 	read_config "site.cfg" => my %config;

 	my $tt = get_template_html($config{DBI});

-	if ($ALL) {
+	# If command line option all is set, parse configuration file 
+	# for all pages
+	if ($all) {
 		@page_args = keys %config;

 		# Remove non page sections of the configuration file
@@ -131,7 +131,13 @@ sub main {
 		if (exists($config{$parsed_arg{'page'}})) {
 			my $page_config = $config{$parsed_arg{'page'}}; 
 			$page_config->{'page'} = $parsed_arg{'page'};
-			$page_config->{'root_template'} = $config{root_template}{content};
+
+			# Set page's root_template to the default root_template if the 
+			# page root_template property is not set in the configuration file.
+			if (exists $page_config->{'root_template'} == 0) {
+				$page_config->{'root_template'} = $config{root_template}{content};
+			}
+
 			if (exists $config{root_template}{baseurl}) {
 				$page_config->{'baseurl'} = $config{root_template}{baseurl};
 			}
@@ -260,7 +266,7 @@ sub get_filename {
 		else {
 			$filename = $$config{'filename'};
 			my $padded_index = "";
-			if ($$config{'id'}) {
+			if (exists $$config{'id'}) {
 				$padded_index = sprintf("%04d", $$config{'id'});
 			}
 			$filename =~ s/\[id\]/$padded_index/;
--- a/site.cfg
+++ b/site.cfg
@@ -127,3 +127,45 @@ content: content-podcatchers.tpl.html
 [promote]
 navigation: navigation-about.tpl.html
 content: content-promote.tpl.html
+
+[sitemap]
+navigation: navigation-about.tpl.html
+content: content-sitemap.tpl.html
+
+[hpr_ogg]
+root_template: rss.tpl.xml
+content: rss-hpr.tpl.xml
+filename: hpr_ogg.rss
+media_file_extension: ogg
+
+[hpr_mp3]
+root_template: rss.tpl.xml
+content: rss-hpr.tpl.xml
+filename: hpr_mp3.rss
+media_file_extension: mp3
+audio_mime_type: mpeg
+
+[hpr_spx]
+root_template: rss.tpl.xml
+content: rss-hpr.tpl.xml
+filename: hpr_spx.rss
+media_file_extension: spx
+
+[hpr_total_ogg]
+root_template: rss.tpl.xml
+content: rss-hpr_total.tpl.xml
+filename: hpr_total_ogg.rss
+media_file_extension: ogg
+
+[hpr_total_mp3]
+root_template: rss.tpl.xml
+content: rss-hpr_total.tpl.xml
+filename: hpr_total_mp3.rss
+media_file_extension: mp3
+audio_mime_type: mpeg
+
+[hpr_total_spx]
+root_template: rss.tpl.xml
+content: rss-hpr_total.tpl.xml
+filename: hpr_total_spx.rss
+media_file_extension: spx
--- a/templates/content-contribute.tpl.html
+++ b/templates/content-contribute.tpl.html
@@ -61,7 +61,7 @@
  After you have selected a date you will be redirected to the <a href="https://www.hackerpublicradio.org/request.php">request page</a>, where you will be asked to select your show and email address. We will send a link to where you can upload your show to this address and so it must be a valid working address that you can access quickly. We intend to use <a href="https://www.gnupg.org/">GPG</a> to speed up the validation of hosts, so you may wish to use an email address that has an associated public key available on public key servers.
  </p>
  <p>
-  <a href="https://www.hackerpublicradio.org/request_a_slot.php">More Information</a>.
+  <a href="<!--% absolute_path(baseurl) %-->request_a_slot.html">More Information</a>.
  </p>
  
  <h2>Questions ?</h2>
--- a/templates/content-correspondents.tpl.html
+++ b/templates/content-correspondents.tpl.html
@@ -1,7 +1,7 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 <article>
 	<h2 class="title">Correspondents</h2>
-	<p>For more information on how to become a Correspondent see our <a href="contribute.php">contribute</a></center> page. To add a logo here, either email one to admin at hpr or setup your email on <a href="https://en.gravatar.com/">Gravatar</a>. To protect your browsing privacy we gather the images every hour and serve them directly from HPR.<p />
+	<p>For more information on how to become a Correspondent see our <a href="<!--% absolute_path(baseurl) %-->contribute.html">contribute</a></center> page. To add a logo here, either email one to admin at hpr or setup your email on <a href="https://en.gravatar.com/">Gravatar</a>. To protect your browsing privacy we gather the images every hour and serve them directly from HPR.<p />
 <!--% USE DBI(constants.driver, constants.user, constants.password) %-->
 <!--% PROCESS 'shared-avatar.tpl.html' %-->
 	<table>
@@ -27,5 +27,5 @@
 	</tr>
 	<!--% END %-->
 	</table>
-	<p><a href="contribute.php">Become a Correspondent</a></p>
+	<p><a href="<!--% absolute_path(baseurl) %-->contribute.html">Become a Correspondent</a></p>
 </article>
--- a/templates/content-help_out.tpl.html
+++ b/templates/content-help_out.tpl.html
@@ -2,10 +2,6 @@
 <h1>Help Out.</h1>
 	<h2>Submit a show</h2>
 	<p>One of the best ways to help out is to <a href="<!--% absolute_path(baseurl) %-->contribute.html">contribute a show</a>. You can find out <a href="<!--% absolute_path(baseurl) %-->stuff_you_need_to_know.html">everything you need to know here</a>. </p>
-	<h2>Report Missing Tags</h2>
-	<p>We now supply summaries and tags for all our shows which allows the shows to be indexed and linked to each other. This was not always the case so you can help us out by sending us in information on the older shows.<br />
-	<a href="<!--% absolute_path(baseurl) %-->report_missing_tags.html">Follow this link for more information on missing tags</a>.
-	</p>
 	<h2>Suggest Topics</h2>
 	<p>If there is a technical topic you would like us to cover, or if you are looking for topics to record a show on, then look no further than our <a href="<!--% absolute_path(baseurl) %-->requested_topics.html">Requested topics</a> page.</p>
 	<h2>Podcatcher Support</h2>
--- a/templates/content-index.tpl.html
+++ b/templates/content-index.tpl.html
@@ -3,25 +3,22 @@
 <hr>
  <article>
    <header>
-        <h3>welcome to hpr the community podcast</h3>
+        <h3>Welcome to HPR the Community Podcast</h3>
    </header>
 	<!--% 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')) %-->
-	<p>we started producing shows as <a href="/twat.php"><em>today with a techie</em></a> on 2005-09-19, <!--% delta.0 %--> years, <!--% delta.1 %--> months, <!--% delta.2 %--> days ago. our shows are produced by <a href="<!--% absolute_path(baseurl) %-->correspondents/index.html">listeners</a> like you and can be on any <a href="<!--% absolute_path(baseurl) %-->eps/index.html">topic</a> that <strong>"are of interest to <a href="https://en.wikipedia.org/wiki/hacker_(hobbyist)">hackers</a>"</strong>. if you listen to hpr then please consider contributing one show a year. if you <a href="<!--% absolute_path(baseurl) %-->contribute.html">record</a> your show now it could be <a href="/calendar.php">released</a> in <strong>13</strong> days.</p>
-    <h4>meet the team</h4>
+	<p>We started producing shows as <a href="https://www.hackerpublicradio.org/twat.php"><em>Today with a Techie</em></a> on 2005-09-19, <!--% delta.0 %--> years, <!--% delta.1 %--> months, <!--% delta.2 %--> days ago. our shows are produced by <a href="<!--% absolute_path(baseurl) %-->correspondents/index.html">listeners</a> like you and can be on any <a href="<!--% absolute_path(baseurl) %-->eps/index.html">topic</a> that <strong>"are of interest to <a href="https://en.wikipedia.org/wiki/hacker_(hobbyist)">hackers</a>"</strong>. if you listen to HPR then please consider contributing one show a year. if you <a href="<!--% absolute_path(baseurl) %-->contribute.html">record</a> your show now it could be <a href="https://www.hackerpublicradio.org/calendar.php">released</a> in <strong>13</strong> days.</p>
+    <h4>Meet the team</h4>
    <p>
    <audio controls preload="none">";
-        <source src="../media/promos/all-hpr-hosts.ogg" type="audio/ogg" >
-        <source src="../media/promos/all-hpr-hosts.mp3" type="audio/mpeg" >
+        <source src="<!--% absolute_path(baseurl) %-->media/promos/all-hpr-hosts.ogg" type="audio/ogg" >
+        <source src="<!--% absolute_path(baseurl) %-->media/promos/all-hpr-hosts.mp3" type="audio/mpeg" >
    </audio>
    </p>
-    <p>
-    please help out <a href="/report_missing_tags.php">tagging</a> older shows ! 
-    </p>
  </article>
  <hr>
  <!--% PROCESS 'shared-episode-summary.tpl.html' %-->
-<h1>latest shows</h1>
+<h1>Latest Shows</h1>
 <!--% USE DBI(constants.driver, constants.user, constants.password) %-->
 <!--% FOREACH latest_episodes IN DBI.query('
 	SELECT 
@@ -52,7 +49,7 @@
 	<br>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>
 <strong>Tags:</strong> <!--% latest_episodes.tags %--><em></em>.<br>
 <small>listen in <a href="local/hpr<!--% latest_episodes.id %-->.ogg">ogg</a>, <a href="local/hpr<!--% latest_episodes.id %-->.spx">spx</a>, or <a href="local/hpr<!--% latest_episodes.id %-->.mp3">mp3</a> format. <!--% show_series(latest_episodes.series, latest_episodes.seriesid) %-->
- <a href="eps.php?id=3628#comments">comments (0)</a></small>
+ <a href="<!--% absolute_path(baseurl) %-->eps/hpr<!--% zero_pad_left(latest_episodes.id) %-->/index.html#comments">View comments.</a></small>
 		</p>
 	</header>
 		<!--% latest_episodes.notes %-->
--- a/templates/content-series.tpl.html
+++ b/templates/content-series.tpl.html
@@ -16,7 +16,7 @@
 			 GROUP BY series) AS ep ON ep.series = miniseries.id
 		 ORDER BY name'
 	) %-->
-	<h2><a href="series/<!--% zero_pad_left(series.id) %-->.html"><!--% series.name %--></a></h2>
+	<h2><a href="<!--% absolute_path(baseurl) %-->series/<!--% zero_pad_left(series.id) %-->.html"><!--% series.name %--></a></h2>
 <ul>
 	<li>Number of episodes: <!--% series.number_of_episodes %--></li>
 	<li>Open/closed: <!--% display_choice(series.private, 'closed', 'open') %--></li>
--- a/templates/content-sitemap.tpl.html
+++ b/templates/content-sitemap.tpl.html
@@ -0,0 +1,33 @@
+<!--% PROCESS 'shared-utils.tpl.html' %-->
+<h1>Sitemap</h1>
+  <ul>
+    <li><a href="https://www.hackerpublicradio/calendar.php"><strong>⇧Upload⇧</strong></a> ← Upload Your Show</li>
+    <li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home</strong></a> ← The HPR Homepage</li>
+    <li><a href="<!--% absolute_path(baseurl) %-->syndication.html">Get Shows</a> ← The RSS Syndication Feeds</li>
+    <ul>
+		<li><a href="<!--% absolute_path(baseurl) %-->correspondents/index.html">Full Episode Guide</a> ← Complete list of all the Shows.</li>
+      <li><a href="<!--% absolute_path(baseurl) %-->series/index.html">In-Depth Series</a> ← Overview of the In-Depth Series.</li>
+      <li><a href="<!--% absolute_path(baseurl) %-->download.html">Download Options</a> ← How to download the entire archive.</li>
+    </ul>
+    <li><a href="<!--% absolute_path(baseurl) %-->contribute.html">Give Shows</a> ← Upload your podcast show here.</li>
+    <ul>
+      <li><a href="<!--% absolute_path(baseurl) %-->stuff_you_need_to_know.html">Info</a> ← Stuff you need to know before uploading a show.</li>
+      <li><a href="<!--% absolute_path(baseurl) %-->theme.html">Theme</a> ← Information about HPR Theme Music.</li>
+      <li><a href="<!--% absolute_path(baseurl) %-->requested_topics.html">Topics</a> ← Requested topics.</li>
+      <li><a href="<!--% absolute_path(baseurl) %-->recording.html">Recording</a> ← How to record a podcast.</li>
+      <li><a href="<!--% absolute_path(baseurl) %-->request_a_slot.html">Scheduling</a> ← Picking a slot for your show.</li>
+    </ul>
+    <li><a href="<!--% absolute_path(baseurl) %-->help_out.html">Contribute</a> ← How you can help HPR.</li>
+    <ul>
+      <li><a href="<!--% absolute_path(baseurl) %-->contribute.html">Submit Show</a> ← Upload your podcast show here.</li>
+      <li><a href="<!--% absolute_path(baseurl) %-->requested_topics.html">Topics</a> ← Requested topics.</li>
+    </ul>
+    <li><a href="<!--% absolute_path(baseurl) %-->about.html">About</a> ← Information about the History and Governance of HPR.</li>
+    <ul>
+      <li><a href="<!--% absolute_path(baseurl) %-->correspondents/index.html">Hosts</a> ← A list of all our Hosts.</li>
+      <li><a href="<!--% absolute_path(baseurl) %-->contact.html">Contact</a> ← How to get in touch with us.</li>
+      <li><a href="<!--% absolute_path(baseurl) %-->promote.html">Promote HPR</a> ← Ways you can spread the word.</li>
+	  <li><a href="https://www.hackerpublicradio.org/comments_viewer.php">Show Comments</a> ← Read the latest comments left on shows.</li>
+    </ul>
+    <li><a href="<!--% absolute_path(baseurl) %-->search.html">Search</a> ← Search HPR</li>
+  </ul>
--- a/templates/content-stuff_you_need_to_know.tpl.html
+++ b/templates/content-stuff_you_need_to_know.tpl.html
@@ -18,13 +18,13 @@ Please join the <a href="https://hackerpublicradio.org/mailman/listinfo/hpr_hack
 <p>
 Hacker Public Radio is dedicated to sharing knowledge.
 We release about 260 shows a year, which is probably more than all of the other FOSS podcasts put together.
-If you listen to HPR, then we would love you to <a target="_blank" href="contribute.php">contribute</a> one show a year.
+If you listen to HPR, then we would love you to <a target="_blank" href="<!--% absolute_path(baseurl) %-->contribute.html">contribute</a> one show a year.
 Remember once that all the emergency shows have been used up and there are no more shows in the queue, HPR as a project will stop.

 </p>
 <h2 id="patrons">Support our Patrons<a href="#patrons">.</a></h2>
 <p>
-Our hosting is kindly provided to us by <a href="https://www.hackerpublicradio.org/correspondents.php?hostid=174">Josh Knapp</a> from <a href="https://anhonesthost.com/hosting/shared-hosting">AnHonestHost.com</a>, and The Internet Archive at <a href="https://archive.org/donate/">Archive.org</a>.
+Our hosting is kindly provided to us by <a href="<!--% absolute_path(baseurl) %-->correspondents/0174.html">Josh Knapp</a> from <a href="https://anhonesthost.com/hosting/shared-hosting">AnHonestHost.com</a>, and The Internet Archive at <a href="https://archive.org/donate/">Archive.org</a>.
 We encourage you to support our Patrons.
 Over the years kind people have donated services and supported equipment for our conferences.

@@ -64,7 +64,7 @@ We <strong>do</strong> transcode the audio into different formats.
 <p>
 Please note that this only relates to the audio you upload.
 The rest of the meta-data (branding/summaries/tags/show notes/etc.), are managed by the HPR Community, and <strong>may</strong> be edited.
-The show <a href="https://hackerpublicradio.org/eps.php?id=2210">hpr2210 :: On Freedom of Speech and Censorship</a> describes the agreed approach to this topic.
+The show <a href="<!--% absolute_path(baseurl) %-->eps/hpr2210/index.html">hpr2210 :: On Freedom of Speech and Censorship</a> describes the agreed approach to this topic.
 </p>

 </p>
@@ -81,7 +81,7 @@ When dealing with content that is "explicit" or contains material that would bes
 </p>

 <p>
-<a href="https://hackerpublicradio.org/eps.php?id=2210">hpr2210 :: On Freedom of Speech and Censorship</a> describes the agreed approach to this topic.
+<a href="<!--% absolute_path(baseurl) %-->eps/hpr2210/index.html">hpr2210 :: On Freedom of Speech and Censorship</a> describes the agreed approach to this topic.
 </p>

 <h2 id="schedule">You determine when your show will be released<a href="#schedule">.</a></h2>
--- a/templates/content-syndication.tpl.html
+++ b/templates/content-syndication.tpl.html
@@ -6,9 +6,9 @@
    Use this feed to get the archived episodes. The feed themselves run over 15Mb in size and so use them to download the archived episodes and when you are up to date switch back to the Two Week Feeds listed above.
  </p>
  <ul>
-    <li><a href="hpr_total_ogg_rss.php">ogg feed</a> Warning over 50G</li>
-    <li><a href="hpr_total_spx_rss.php">spx feed</a> Warning over 22G</li>
-    <li><a href="hpr_total_rss.php">mp3 feed</a> Warning over 36G</li>
+    <li><a href="<!--% absolute_path(baseurl) %-->hpr_total_ogg.rss">ogg feed</a> Warning over 50G</li>
+    <li><a href="<!--% absolute_path(baseurl) %-->hpr_total_spx.rss">spx feed</a> Warning over 22G</li>
+    <li><a href="<!--% absolute_path(baseurl) %-->hpr_total_mp3.rss">mp3 feed</a> Warning over 36G</li>
  </ul>
 </article>
 <article>
--- a/templates/navigation-about.tpl.html
+++ b/templates/navigation-about.tpl.html
@@ -1,6 +1,6 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>
-			<li><a href="<!--% absolute_path(baseurl) %-->calendar.php"><strong>⇧Upload⇧</strong></a></li>
+			<li><a href="https://www.hackerpublicradio.org/calendar.php"><strong>⇧Upload⇧</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->about.html">About »</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->correspondents/index.html">Hosts</a></li>
--- a/templates/navigation-contribute.tpl.html
+++ b/templates/navigation-contribute.tpl.html
@@ -1,9 +1,8 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>
-			<li><a href="<!--% absolute_path(baseurl) %-->calendar.php"><strong>⇧Upload⇧</strong></a></li>
+			<li><a href="https://www.hackerpublicradio.org/calendar.php"><strong>⇧Upload⇧</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->help_out.html">Contribute »</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->contribute.html">Submit Show</a></li>
-			<li><a href="<!--% absolute_path(baseurl) %-->report_missing_tags.html">Fix Tags</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->requested_topics.html">Topics</a></li>
 		</ul>
--- a/templates/navigation-get-shows.tpl.html
+++ b/templates/navigation-get-shows.tpl.html
@@ -1,6 +1,6 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>
-			<li><a href="<!--% absolute_path(baseurl) %-->calendar.php"><strong>⇧Upload⇧</strong></a></li>
+			<li><a href="https://www.hackerpublicradio.org/calendar.php"><strong>⇧Upload⇧</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->syndication.html"><strong>Get Shows »</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->eps/index.html">Full Episode Guide</a></li>
--- a/templates/navigation-give-shows.tpl.html
+++ b/templates/navigation-give-shows.tpl.html
@@ -1,6 +1,6 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>
-			<li><a href="<!--% absolute_path(baseurl) %-->calendar.php"><strong>⇧Upload⇧</strong></a></li>
+			<li><a href="https://www.hackerpublicradio.org/calendar.php"><strong>⇧Upload⇧</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->contribute.html">Give Shows »</strong></a>
 			<li><a href="<!--% absolute_path(baseurl) %-->stuff_you_need_to_know.html">Info</a></li>
--- a/templates/navigation-main.tpl.html
+++ b/templates/navigation-main.tpl.html
@@ -1,6 +1,6 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>	
-			<li><a href="calendar.php"><strong>⇧Upload⇧</strong></a></li>
+			<li><a href="https://www.hackerpublicradio.org/calendar.php"><strong>⇧Upload⇧</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home »</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->syndication.html">Get Shows</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->contribute.html">Give Shows</a></li>
--- a/templates/page.tpl.html
+++ b/templates/page.tpl.html
@@ -20,9 +20,9 @@
  }
  </style>
  <link rel="shortcut icon" href="hpr.ico" >
-  <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Ogg Vorbis RSS" href="/hpr_ogg_rss.php" />
-  <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Speex RSS" href="/hpr_spx_rss.php" />
-  <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio MP3 RSS" href="/hpr_mp3_rss.php" />
+  <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Ogg Vorbis RSS" href="<!--% absolute_path(baseurl) %-->hpr_ogg.rss" />
+  <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Speex RSS" href="<!--% absolute_path(baseurl) %-->hpr_spx.rss" />
+  <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio MP3 RSS" href="<!--% absolute_path(baseurl) %-->hpr_mp3.rss" />
  <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Comments RSS" href="/comments_rss.php" />
  <link rel="license" title="cc by 3.0"  href="https://creativecommons.org/licenses/by-sa/3.0/" />
  <link href="<!--% absolute_path(baseurl) %-->css/hpr.css" rel="stylesheet" />
@@ -39,10 +39,10 @@
 	<a href=""><img id="hprlogo" src="<!--% absolute_path(baseurl) %-->images/hpr_logo.png" alt=""></a>
 	<div id="hpr_banner">
 		<p id="accessible_menu">
-			<a href="sitemap.php">Site Map</a>
+			<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="comments_viewer.php">P</a>ublic <a href="/syndication.php">R</a>adio</h1>
+		<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>
 		<h2>Your ideas, projects, opinions - podcasted.</h2>
 		<h3>New episodes Monday through Friday.</h3>
 	</div>
--- a/templates/rss-hpr.tpl.xml
+++ b/templates/rss-hpr.tpl.xml
@@ -0,0 +1,5 @@
+<!--% PROCESS 'shared-item.tpl.xml' %-->
+<!--% PROCESS 'rss-query-hpr.tpl.xml' %-->
+<!--% FOREACH episode IN feed_result %-->
+<!--% display_item(episode, media_file_extension, audio_mime_type) %-->
+<!--% END %-->
--- a/templates/rss-hpr_total.tpl.xml
+++ b/templates/rss-hpr_total.tpl.xml
@@ -0,0 +1,5 @@
+<!--% PROCESS 'shared-item.tpl.xml' %-->
+<!--% PROCESS 'rss-query-hpr_total.tpl.xml' %-->
+<!--% FOREACH episode IN feed_result %-->
+<!--% display_item(episode, media_file_extension, audio_mime_type) %-->
+<!--% END %-->
--- a/templates/rss-query-hpr.tpl.xml
+++ b/templates/rss-query-hpr.tpl.xml
@@ -0,0 +1,23 @@
+<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
+<!--% query_hpr_feed = DBI.prepare('
+	SELECT 
+	eps.id, 
+	eps.explicit, 
+	strftime(\'%H:%M:%S %d:%m:%Y\', date(eps.date)) AS date,
+	eps.license, eps.duration,
+	eps.title, eps.summary, eps.tags, 
+	eps.notes,
+	hosts.local_image,
+	hosts.hostid, 
+	hosts.host, hosts.email,
+	miniseries.name AS series, miniseries.id AS seriesid
+	FROM eps 
+	INNER JOIN hosts ON eps.hostid = hosts.hostid
+	INNER JOIN miniseries ON eps.series = miniseries.id
+	WHERE eps.date < date(\'now\', \'+1 days\')
+	ORDER BY eps.date DESC 
+	LIMIT 10
+')
+%-->
+<!--% feed_result = query_hpr_feed.execute() %-->
+
--- a/templates/rss-query-hpr_total.tpl.xml
+++ b/templates/rss-query-hpr_total.tpl.xml
@@ -0,0 +1,22 @@
+<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
+<!--% query_hpr_feed = DBI.prepare('
+	SELECT 
+	eps.id, 
+	eps.explicit, 
+	strftime(\'%H:%M:%S %d:%m:%Y\', date(eps.date)) AS date,
+	eps.license, eps.duration,
+	eps.title, eps.summary, eps.tags, 
+	eps.notes,
+	hosts.local_image,
+	hosts.hostid, 
+	hosts.host, hosts.email,
+	miniseries.name AS series, miniseries.id AS seriesid
+	FROM eps 
+	INNER JOIN hosts ON eps.hostid = hosts.hostid
+	INNER JOIN miniseries ON eps.series = miniseries.id
+	WHERE eps.date < date(\'now\', \'+1 days\')
+	ORDER BY eps.date DESC 
+')
+%-->
+<!--% feed_result = query_hpr_feed.execute() %-->
+
--- a/templates/rss.tpl.xml
+++ b/templates/rss.tpl.xml
@@ -0,0 +1,57 @@
+<!--% USE date %-->
+<!--% PROCESS 'shared-utils.tpl.html' %-->
+<?xml version="1.0" encoding="UTF-8" ?>
+<rss version="2.0" 
+	xmlns:googleplay="http://www.google.com/schemas/play-podcasts/1.0" 
+	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>
+  <link>https://www.hackerpublicradio.org/about.html</link>
+  <itunes:subtitle>A daily show hosted the community on topics that are of interest to hackers and hobbyists.</itunes:subtitle>
+  <description>Hacker Public Radio is an podcast that releases shows every weekday Monday through Friday. Our shows are produced by the community (you) and can be on any topic that are of interest to hackers and hobbyists.</description>
+  <language>en-us</language>
+  <itunes:category text="Technology">
+    <itunes:category text="Tech News"/>
+  </itunes:category>
+  <itunes:category text="Education">
+    <itunes:category text="Training"/>
+  </itunes:category>
+  <itunes:image href="https://www.hackerpublicradio.org/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>
+  <copyright>Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) License</copyright>
+  <managingEditor>feedback@NOSPAM-hackerpublicradio.org (HPR Feedback)</managingEditor> 
+<!--   <author>feedback@NOSPAM-hackerpublicradio.org (HPR Feedback)</author> -->
+  <itunes:owner>    
+    <itunes:name>HPR Volunteer</itunes:name>
+    <itunes:email>admin@hackerpublicradio.org</itunes:email>
+  </itunes:owner>
+  <webMaster>admin@hackerpublicradio.org (HPR Volunteer)</webMaster> 
+  <generator>site-generator</generator> 
+  <docs>http://www.rssboard.org/rss-specification</docs>
+  <ttl>43200</ttl>
+  <skipDays>
+    <day>Saturday</day>
+    <day>Sunday</day>
+  </skipDays>
+  <image>
+    <url>https://www.hackerpublicradio.org/images/hpr_feed_small.png</url>
+    <title>Hacker Public Radio</title>
+    <link>https://www.hackerpublicradio.org/about.php</link>
+    <description>The Hacker Public Radio Old Microphone Logo</description>
+    <height>164</height>
+    <width>144</width>
+  </image>
+  <googleplay:author>HPR Volunteer</googleplay:author>
+  <googleplay:description>Hacker Public Radio is an podcast that releases shows every weekday Monday through Friday. Our shows are produced by the community (you) and can be on any topic that are of interest to hackers and hobbyists.</googleplay:description>
+  <googleplay:email>admin@hackerpublicradio.org</googleplay:email>
+  <googleplay:image href="https://www.hackerpublicradio.org/images/hpr_feed_itunes.png"/>
+  <googleplay:category text="Technology"/>
+  <atom:link href="https://www.hackerpublicradio.org/<!--% filename %-->" rel="self" type="application/rss+xml" />
+  <pubDate><!--% format_feed_date(date.now) %--></pubDate>
+  
+  <!--% INCLUDE $content %-->
+  </channel>
+</rss>
--- a/templates/shared-item.tpl.xml
+++ b/templates/shared-item.tpl.xml
@@ -0,0 +1,23 @@
+<!--% PROCESS 'shared-utils.tpl.html' %-->
+<!--% MACRO display_item(episode, file_extension, audio_mime_type) BLOCK %-->
+<!--% 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>
+	<title>HPR<!--% zero_pad_left(episode.id) %-->: <!--% episode.title %--></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="https://www.hackerpublicradio.org/images/hpr_feed_itunes.png"/>
+	<link>https://www.hackerpublicradio.org/eps/hpr/<!--% zero_pad_left(episode.id) %-->/index.html</link>
+    <description><![CDATA[<!--% episode.notes %-->]]>
+</description>
+    <itunes:summary><![CDATA[<!--% episode.notes %-->]]>
+</itunes:summary>
+    <pubDate><!--% format_feed_date(episode.date) %--></pubDate>
+    <enclosure url="http://hackerpublicradio.org/eps/hpr<!--% zero_pad_left(episode.id) %-->.<!--% file_extension %-->" length="<!--% episode.duration * 1000 %-->" type="audio/<!--% audio_mime_type %-->"/>
+	<guid>http://hackerpublicradio.org/eps/hpr<!--% zero_pad_left(episode.id) %-->.<!--% file_extension %--></guid>
+  </item>
+<!--% END %-->
--- a/templates/shared-utils.tpl.html
+++ b/templates/shared-utils.tpl.html
@@ -12,6 +12,15 @@
 <!--% display_choice(is_explicit, 'Explicit', 'Clean') %-->
 <!--% END %-->

+<!--% MACRO display_explicit_feed(is_explicit) BLOCK %-->
+<!--% display_choice(is_explicit, 'yes', 'no') %-->
+<!--% END %-->
+
+<!--% MACRO format_feed_date(date_to_format) BLOCK %-->
+<!--% USE feed_date = date(format = '%a, %e %b %Y 00:00:00 +0000', gmt=1)  %-->
+<!--% feed_date.format(date_to_format) %-->
+<!--% END %-->
+
 <!--% MACRO absolute_path(baseurl) BLOCK %-->
 <!--% IF baseurl %-->./<!--% ELSE %-->/<!--% END %-->
 <!--% END %-->
Author	SHA1	Message	Date
Roan Horning	082ea4069d	Merge pull request '[I31] Fix URL to individual series page on series index page' (#32 ) from I31_Fix-URL into main Reviewed-on: #32	2022-08-26 00:17:33 +00:00
Roan Horning	dfbb4a24db	Add missing MACRO absolute_path to link path	2022-08-25 20:10:21 -04:00
Roan Horning	4e1d525e6e	Merge branch 'main' of repo.anhonesthost.net:rho_n/hpr_generator	2022-08-19 22:20:17 -04:00
Roan Horning	694c100bcf	Add command line option all Use --all or -a when calling site-generator instead of special page ALL to generate all the configured pages for a website.	2022-08-19 22:19:50 -04:00
Roan Horning	52a314f2a9	Add command line option all Use --all or -a when calling site-generator instead of special page ALL to generate all the configured pages for a website.	2022-08-19 22:11:38 -04:00
Roan Horning	b36293e52f	Fix generation of series general page	2022-08-19 21:25:14 -04:00
Roan Horning	02eb8313d3	Fix links in intro text of index page	2022-08-18 21:26:57 -04:00
Roan Horning	ff2ced6774	Fix capitalization of introduction text on index page	2022-08-18 21:19:32 -04:00
Roan Horning	0dc5a78dae	Fix links in sitemap content template	2022-08-18 17:55:42 -04:00
Roan Horning	9d0e8d403d	Fix importing of template date plugin Add USE directive to import date plugin. Worked locally with out it in this file, but was needed when trying on a different machine.	2022-08-18 17:39:17 -04:00
Roan Horning	5af4d93c8c	Update links to HPR total feeds	2022-08-17 23:42:45 -04:00
Roan Horning	cf001df9ec	Add feed hpr_total This includes all three audio type feeds	2022-08-17 22:41:59 -04:00
Roan Horning	6d4f5f28c9	Refactor main feed to need fewer templates Add configuration properties to minimize the number of templates needed to generate the different audio format feeds.	2022-08-17 22:32:32 -04:00
Roan Horning	17ef26642a	Add page Will my show be of interest to hackers	2022-08-17 21:30:54 -04:00
Roan Horning	91349eb504	Update links to main RSS feeds in page.tpl.html	2022-08-17 19:20:22 -04:00
Roan Horning	83c188465d	Fix setting of RSS feed enclosures mime-type Mime-type does not always match file extension.	2022-08-17 19:16:22 -04:00
Roan Horning	41a18300eb	Allow page to configure root_template in configuration file RSS commits will be broken before this commit.	2022-08-17 19:13:42 -04:00
Roan Horning	5b48b91e99	Add main HPR SPX feed	2022-08-17 18:08:45 -04:00
Roan Horning	507b7db4a1	Add main HPR MP3 feed	2022-08-17 17:56:56 -04:00
Roan Horning	162d8c6703	Initial implementation of HPR RSS feeds template Add templates and macros to create main HPR OGG feed.	2022-08-17 17:12:47 -04:00
Roan Horning	582f155ca1	Add MACRO format_feed_date Display publication date in preferred format for feeds.	2022-08-17 15:50:03 -04:00
Roan Horning	dba0ec8485	Add MACRO display_explicit_feed The explicit value for RSS feeds is yes or no versus Clean or Explicit used in the html pages.	2022-08-17 15:47:39 -04:00
Roan Horning	af86b7114a	Remove references to Report missing tags page This project is finished, and no longer relevant.	2022-08-16 18:39:05 -04:00
Roan Horning	1df2db62b1	Add HPR favicon	2022-08-16 18:29:06 -04:00
Roan Horning	d53d4fc36c	Add page sitemap	2022-08-13 13:12:45 -04:00
Roan Horning	46ebfe2305	Fix links to static pages	2022-08-13 13:11:30 -04:00
Roan Horning	e855344118	Make URL direct call to HPR for non static pages	2022-08-13 12:29:46 -04:00