rho_n/hpr_generator
Archived
4
2
Fork 1
Code Releases Wiki Activity

Compare commits

base: rho_n:0edf9cc5a2cca63daaa0b0106e84b3633b76664a
Branches Tags
rho_n:main
rho_n:I132_tags_index_issues
rho_n:I188_fix-correspondent-page-episode-count
rho_n:I164_check-for-perl-module-dependencies
rho_n:167_Several_templates_use_non-existent_absolute_url
rho_n:I145_Various_bug_fixes
rho_n:I123_Future_episodes_are_not_being_produced
rho_n:I30-Series_name_for_filename
rho_n:2023-03
rho_n:2023-02
...
compare: rho_n:3054d6519e97e0173753e63c0cd5aab4cc16b322
Branches Tags
rho_n:main
rho_n:I132_tags_index_issues
rho_n:I188_fix-correspondent-page-episode-count
rho_n:I164_check-for-perl-module-dependencies
rho_n:167_Several_templates_use_non-existent_absolute_url
rho_n:I145_Various_bug_fixes
rho_n:I123_Future_episodes_are_not_being_produced
rho_n:I30-Series_name_for_filename
rho_n:2023-03
rho_n:2023-02

4 Commits
0edf9cc5a2 ... 3054d6519e

Author SHA1 Message Date
Roan Horning
3054d6519e
Refactor template to use media_baseurl MACRO 2022-09-18 16:27:47 -04:00
Roan Horning
c6e7a3c239
Refactor templates to use listen_now MACRO 2022-09-18 16:23:35 -04:00
Roan Horning
dbf011395c
Add MACRO listen_now 2022-09-18 16:21:00 -04:00
Roan Horning
c817e3a17a
Add MACRO media_baseurl 
Allow the audio files to be served from a different host
 2022-09-18 16:18:05 -04:00
7 changed files with 38 additions and 34 deletions
Show Stats Expand all files Collapse all files

6
site-generator
View File

@ -125,6 +125,8 @@ sub main {
# from the generated list of pages.
@page_args= grep { $_ ne 'DBI' } @page_args;
@page_args= grep { $_ ne 'root_template' } @page_args;
@page_args= grep { $_ ne 'media_hostname' } @page_args;
};
foreach my $page_arg (@page_args) {
my %parsed_arg = parse_page_arg($page_arg);
@ -142,6 +144,10 @@ sub main {
$page_config->{'baseurl'} = $config{root_template}{baseurl};
}
if (exists $config{root_template}{media_hostname}) {
$page_config->{'media_hostname'} = $config{root_template}{media_hostname};
}
if ($page_config->{'multipage'} && $page_config->{'multipage'} eq 'true') {
if (scalar @{$parsed_arg{'ids'}} == 1) {
@{$parsed_arg{'ids'}} = get_ids_from_db($tt, \$page_config);

13
templates/content-episode.tpl.html
View File

@ -1,6 +1,7 @@
<!--% PROCESS 'shared-episode-summary.tpl.html' %-->
<!--% PROCESS 'shared-avatar.tpl.html' %-->
<!--% PROCESS 'shared-utils.tpl.html' %-->
<!--% PROCESS 'shared-listen-now.tpl.html' %-->
<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
<!--% query_episodes = DBI.prepare('
WITH episode_maxmin AS (
@ -74,17 +75,7 @@ Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pa
</header>
<div><!--% episode.notes %--></div>
<footer>
<h2>Listen Now</h2>
<p>Duration: <!--% display_episode_duration(episode.duration) %--></p>
<audio controls preload="none">
<source src="<!--% absolute_path(baseurl) %-->local/hpr<!--% episode.id %-->.ogg" type="audio/ogg" >
<source src="<!--% absolute_path(baseurl) %-->local/hpr<!--% episode.id %-->.mp3" type="audio/mpeg" >
</audio>
<ul>
<li>ogg: <a href="<!--% absolute_path(baseurl) %-->local/hpr<!--% episode.id %-->.ogg">https://www.hackerpublicradio.org/local/hpr<!--% episode.id %-->.ogg</a></li>
<li>spx: <a href="<!--% absolute_path(baseurl) %-->local/hpr<!--% episode.id %-->.spx">https://www.hackerpublicradio.org/local/hpr<!--% episode.id %-->.spx</a></li>
<li>mp3: <a href="<!--% absolute_path(baseurl) %-->local/hpr<!--% episode.id %-->.mp3">https://www.hackerpublicradio.org/local/hpr<!--% episode.id %-->.mp3</a></li>
</ul>
<!--% listen_now(episode, "hpr", baseurl, media_hostname) %-->
<p>
<!--% episode_navigation %-->
</p>

13
templates/content-index.tpl.html
View File

@ -1,5 +1,6 @@
<!--% PROCESS 'shared-avatar.tpl.html' %-->
<!--% PROCESS 'shared-utils.tpl.html' %-->
<!--% PROCESS 'shared-listen-now.tpl.html' %-->
<hr>
<article>
<header>
@ -83,17 +84,7 @@
</header>
<!--% latest_episodes.notes %-->
<footer>
<h2>listen now</h2>
<p>Duration: <!--% display_episode_duration(latest_episodes.duration) %--></p>
<audio controls preload="none">
<source src="local/hpr<!--% latest_episodes.id %-->.ogg" type="audio/ogg" >
<source src="local/hpr<!--% latest_episodes.id %-->.mp3" type="audio/mpeg" >
</audio>
<ul>
<li>ogg: <a href="local/hpr<!--% latest_episodes.id %-->.ogg">/local/hpr<!--% latest_episodes.id %-->.ogg</a></li>
<li>spx: <a href="local/hpr<!--% latest_episodes.id %-->.spx">/local/hpr<!--% latest_episodes.id %-->.spx</a></li>
<li>mp3: <a href="local/hpr<!--% latest_episodes.id %-->.mp3">/local/hpr<!--% latest_episodes.id %-->.mp3</a></li>
</ul>
<!--% listen_now(latest_episodes, "hpr", baseurl, media_hostname) %-->
</footer>
</article>
<!--% END %-->

13
templates/content-twat_episode.tpl.html
View File

@ -1,6 +1,7 @@
<!--% PROCESS 'shared-episode-summary.tpl.html' %-->
<!--% PROCESS 'shared-avatar.tpl.html' %-->
<!--% PROCESS 'shared-utils.tpl.html' %-->
<!--% PROCESS 'shared-listen-now.tpl.html' %-->
<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
<!--% query_episodes = DBI.prepare('
WITH episode_maxmin AS (
@ -64,17 +65,7 @@ Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pa
</header>
<div><!--% episode.notes %--></div>
<footer>
<h2>Listen Now</h2>
<p>Duration: <!--% display_episode_duration(episode.duration) %--></p>
<audio controls preload="none">
<source src="<!--% absolute_path(baseurl) %-->local/twat<!--% episode.id %-->.ogg" type="audio/ogg" >
<source src="<!--% absolute_path(baseurl) %-->local/twat<!--% episode.id %-->.mp3" type="audio/mpeg" >
</audio>
<ul>
<li>ogg: <a href="<!--% absolute_path(baseurl) %-->local/twat<!--% episode.id %-->.ogg">https://www.hackerpublicradio.org/local/hpr<!--% episode.id %-->.ogg</a></li>
<li>spx: <a href="<!--% absolute_path(baseurl) %-->local/twat<!--% episode.id %-->.spx">https://www.hackerpublicradio.org/local/hpr<!--% episode.id %-->.spx</a></li>
<li>mp3: <a href="<!--% absolute_path(baseurl) %-->local/twat<!--% episode.id %-->.mp3">https://www.hackerpublicradio.org/local/hpr<!--% episode.id %-->.mp3</a></li>
</ul>
<!--% listen_now(episode, "twat", baseurl, media_hostname) %-->
<p>
<!--% episode_navigation %-->
</p>

2
templates/shared-episode-summary.tpl.html
View File

@ -12,7 +12,7 @@
<!--% END %-->
<!--% MACRO display_listen_in(eps_id) BLOCK %-->
Listen in <a href="<!--% absolute_path(baseurl) %-->local/hpr<!--% eps_id %-->.ogg">ogg</a>, <a href="<!--% absolute_path(baseurl) %-->local/hpr<!--% eps_id %-->.spx">spx</a>, or <a href="<!--% absolute_path(baseurl) %-->local/hpr<!--% eps_id %-->.mp3">mp3</a> format.
Listen in <a href="<!--% media_baseurl(baseurl, media_hostname) %-->local/hpr<!--% eps_id %-->.ogg">ogg</a>, <a href="<!--% media_baseurl(baseurl, media_hostname) %-->local/hpr<!--% eps_id %-->.spx">spx</a>, or <a href="<!--% media_baseurl(baseurl, media_hostname) %-->local/hpr<!--% eps_id %-->.mp3">mp3</a> format.
<!--% END %-->
<!--% MACRO display_comments_tally(eps_id, tally) BLOCK %-->

19
templates/shared-listen-now.tpl.html Normal file
View File

@ -0,0 +1,19 @@
<!--% MACRO listen_now(episode, episode_type, baseurl, media_hostname) BLOCK %-->
<!--% IF episode_type == "twat" %-->
<!--% media_folder = "eps" %--><!--% ELSE %--><!--% media_folder = "local" %-->
<!--% END %-->
<h2>Listen Now</h2>
<p>Duration: <!--% display_episode_duration(episode.duration) %--></p>
<audio controls preload="none">
<source src="<!--% media_baseurl(baseurl, media_hostname) %--><!--% media_folder %-->/<!--% episode_type %--><!--% episode.id %-->.ogg" type="audio/ogg" >
<source src="<!--% media_baseurl(baseurl, media_hostname) %--><!--% media_folder %-->/<!--% episode_type %--><!--% episode.id %-->.mp3" type="audio/mpeg" >
</audio>
<ul>
<!--% IF episode_type != "twat" %-->
<li>ogg: <a href="<!--% media_baseurl(baseurl, media_hostname) %--><!--% media_folder %-->/<!--% episode_type %--><!--% episode.id %-->.ogg"><!--% media_baseurl(baseurl, media_hostname) %--><!--% media_folder %-->/<!--% episode_type %--><!--% episode.id %-->.ogg</a></li>
<li>spx: <a href="<!--% media_baseurl(baseurl, media_hostname) %--><!--% media_folder %-->/<!--% episode_type %--><!--% episode.id %-->.spx"><!--% media_baseurl(baseurl, media_hostname) %--><!--% media_folder %-->/<!--% episode_type %--><!--% episode.id %-->.spx</a></li>
<!--% END %-->
<li>mp3: <a href="<!--% media_baseurl(baseurl, media_hostname) %--><!--% media_folder %-->/<!--% episode_type %--><!--% episode.id %-->.mp3"><!--% media_baseurl(baseurl, media_hostname) %--><!--% media_folder %-->/<!--% episode_type %--><!--% episode.id %-->.mp3</a></li>
</ul>
<!--% END %-->

6
templates/shared-utils.tpl.html
View File

@ -39,6 +39,12 @@
<!--% IF baseurl %-->./<!--% ELSE %-->/<!--% END %-->
<!--% END %-->
<!--% MACRO media_baseurl(baseurl, media_hostname) BLOCK %-->
<!--% IF media_hostname %-->
https://<!--% media_hostname %-->/<!--% ELSE %-->
<!--% baseurl %--><!--% END %-->
<!--% END %-->
<!--% MACRO step_navigation(baseurl, links, folder) BLOCK %-->
<!--% IF folder == "" %-->
<!--% folder = hpr %-->