Compare commits
23 Commits
1dec9996f8
...
i316_Have-
| Author | SHA1 | Date | |
|---|---|---|---|
|
0a5dea473b
|
|||
| de316e7f6b | |||
|
7161b99eb0
|
|||
| 84e89a53ad | |||
|
5004f4fe88
|
|||
|
6520bdac8b
|
|||
| 2eece012fa | |||
|
3d74b6f084
|
|||
| 24f2b5f9ee | |||
|
020d6395c1
|
|||
| a40774b1e8 | |||
|
face5e1fbe
|
|||
|
7b9e8a94f0
|
|||
| 3ca1a903df | |||
|
ae5bfc12b4
|
|||
|
21c664ecf9
|
|||
|
c17ce1bf74
|
|||
|
c922ea6281
|
|||
|
98c51ee9fe
|
|||
| 904d14d083 | |||
|
7170015a0e
|
|||
|
23f91a0410
|
|||
|
2be718287f
|
1
_sql/sqlite/Rename_twt_table.sql
Normal file
1
_sql/sqlite/Rename_twt_table.sql
Normal file
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE twat_eps RENAME TO twt_eps;
|
||||||
@@ -736,10 +736,13 @@ fieldset > table td input[type="radio"] {
|
|||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
.series-description {
|
.series-description {
|
||||||
margin: 0;
|
margin: 0 0 1rem 0;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
}
|
}
|
||||||
|
.series-desciption > *:last-child {
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
.sr-only {
|
.sr-only {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
width: 1px;
|
width: 1px;
|
||||||
@@ -755,9 +758,12 @@ fieldset > table td input[type="radio"] {
|
|||||||
}
|
}
|
||||||
#show_notes pre
|
#show_notes pre
|
||||||
{
|
{
|
||||||
|
overflow: auto;
|
||||||
|
}
|
||||||
|
#show_notes code {
|
||||||
|
display: inline-block;
|
||||||
background-color: var(--show-notes-pre-background);
|
background-color: var(--show-notes-pre-background);
|
||||||
border: 1px solid #ddd;
|
border: 1px solid #ddd;
|
||||||
overflow: scroll;
|
|
||||||
padding: 0.1em 0;
|
padding: 0.1em 0;
|
||||||
}
|
}
|
||||||
nav.episodes {
|
nav.episodes {
|
||||||
|
|||||||
6
site.cfg
6
site.cfg
@@ -177,3 +177,9 @@ root_template: m3u.tpl.m3u8
|
|||||||
content: m3u-correspondent.tpl.m3u8
|
content: m3u-correspondent.tpl.m3u8
|
||||||
filename: correspondents/[id]/playlist.m3u8
|
filename: correspondents/[id]/playlist.m3u8
|
||||||
multipage: true
|
multipage: true
|
||||||
|
|
||||||
|
[series_episodes_m3u]
|
||||||
|
root_template: m3u.tpl.m3u8
|
||||||
|
content: m3u-series_episodes.tpl.m3u8
|
||||||
|
filename: series/[id].m3u8
|
||||||
|
multipage: true
|
||||||
|
|||||||
@@ -29,9 +29,10 @@
|
|||||||
<p><label>email:</label> <u><!--% this_host.email %--></u></p>
|
<p><label>email:</label> <u><!--% this_host.email %--></u></p>
|
||||||
<div><label>profile:</label> <!--% this_host.profile %--></div>
|
<div><label>profile:</label> <!--% this_host.profile %--></div>
|
||||||
<p><label>episodes:</label> <strong><!--% hpr_show_count + twt_show_count %--></strong></p>
|
<p><label>episodes:</label> <strong><!--% hpr_show_count + twt_show_count %--></strong></p>
|
||||||
|
<p><a href="<!--% absolute_url(baseurl,'//correspondents') %-->/<!--% zero_pad_left(this_host.hostid) %-->/playlist.m3u8">Download the M3U playlist</a>.</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="lane stack">
|
<div id="episodes" class="lane stack">
|
||||||
<!--% FOREACH hpr_show IN hpr_shows; %-->
|
<!--% FOREACH hpr_show IN hpr_shows; %-->
|
||||||
<article>
|
<article>
|
||||||
<!--% show_summary(hpr_show, 'hide_host') %-->
|
<!--% show_summary(hpr_show, 'hide_host') %-->
|
||||||
|
|||||||
@@ -61,11 +61,11 @@ Subscribe to the comments <a href="<!--% absolute_path(baseurl) %-->comments.rss
|
|||||||
<h2>Leave Comment</h2>
|
<h2>Leave Comment</h2>
|
||||||
<p>
|
<p>
|
||||||
<strong>Note to Verbose Commenters</strong><br />
|
<strong>Note to Verbose Commenters</strong><br />
|
||||||
If you can't fit everything you want to say in the comment below then you really should <a href="<!--% absolute_url(baseurl) %-->about.html#so_you_want_to_record_a_podcast">record</a> a response show instead.
|
If you can't fit everything you want to say in the comment below then you really should <a href="<!--% absolute_url(baseurl) %-->../../about.html#so_you_want_to_record_a_podcast">record</a> a response show instead.
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
<strong>Note to Spammers</strong><br />
|
<strong>Note to Spammers</strong><br />
|
||||||
All comments are moderated. All links are checked by humans. We strip out all html. Feel free to <a href="<!--% absolute_url(baseurl) %-->about.html#so_you_want_to_record_a_podcast">record</a> a show about yourself, or your industry, or any other topic we may find interesting. <em>We also check shows for spam :)</em>.
|
All comments are moderated. All links are checked by humans. We strip out all html. Feel free to <a href="<!--% absolute_url(baseurl) %-->../../about.html#so_you_want_to_record_a_podcast">record</a> a show about yourself, or your industry, or any other topic we may find interesting. <em>We also check shows for spam :)</em>.
|
||||||
</p>
|
</p>
|
||||||
<form method="POST" action="<!--% hub_baseurl %-->comment_confirm.php">
|
<form method="POST" action="<!--% hub_baseurl %-->comment_confirm.php">
|
||||||
<fieldset>
|
<fieldset>
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
hosts.hostid,
|
hosts.hostid,
|
||||||
hosts.host, hosts.email, hosts.local_image,
|
hosts.host, hosts.email, hosts.local_image,
|
||||||
miniseries.name AS series, miniseries.id AS seriesid
|
miniseries.name AS series, miniseries.id AS seriesid
|
||||||
FROM twat_eps as eps
|
FROM twt_eps as eps
|
||||||
INNER JOIN hosts ON eps.hostid = hosts.hostid
|
INNER JOIN hosts ON eps.hostid = hosts.hostid
|
||||||
INNER JOIN miniseries ON eps.series = miniseries.id
|
INNER JOIN miniseries ON eps.series = miniseries.id
|
||||||
ORDER BY eps.id DESC
|
ORDER BY eps.id DESC
|
||||||
|
|||||||
@@ -104,6 +104,7 @@
|
|||||||
<!--% host_cnt = host_cnt + 1 %-->
|
<!--% host_cnt = host_cnt + 1 %-->
|
||||||
<!--% END %-->
|
<!--% END %-->
|
||||||
</dl>
|
</dl>
|
||||||
|
<p><a href="<!--% absolute_path(baseurl) %-->eps/index.html">More Episodes…</a></p>
|
||||||
</section>
|
</section>
|
||||||
<section id="latest_comments">
|
<section id="latest_comments">
|
||||||
<header><h2>Latest Comments</h2></header>
|
<header><h2>Latest Comments</h2></header>
|
||||||
@@ -138,5 +139,6 @@
|
|||||||
<dd>on hpr<!--% item.eps_id %--> (<!--% item.episode_date %-->) "<!--% item.episode_title %-->" by <!--% item.host %--></dd>
|
<dd>on hpr<!--% item.eps_id %--> (<!--% item.episode_date %-->) "<!--% item.episode_title %-->" by <!--% item.host %--></dd>
|
||||||
<!--% END %-->
|
<!--% END %-->
|
||||||
</dl>
|
</dl>
|
||||||
|
<p><a href="<!--% absolute_path(baseurl) %-->comments_viewer.html">More Comments…</a></p>
|
||||||
</section>
|
</section>
|
||||||
</section>
|
</section>
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
<li>Date of earliest show: <!--% series.earliest_show %--></li>
|
<li>Date of earliest show: <!--% series.earliest_show %--></li>
|
||||||
<li>Date of latest show: <!--% series.latest_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>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>
|
</ul>
|
||||||
<div class="series-description"><!--% series.description %--></div>
|
<div class="series-description"><!--% series.description %--></div>
|
||||||
</article>
|
</article>
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
<li>Date of earliest show: <!--% series.earliest_show %--></li>
|
<li>Date of earliest show: <!--% series.earliest_show %--></li>
|
||||||
<li>Date of latest show: <!--% series.latest_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>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>
|
</ul>
|
||||||
<p><em><!--% series.description %--></em></p>
|
<p><em><!--% series.description %--></em></p>
|
||||||
<section id="series_episodes" class="lane stack">
|
<section id="series_episodes" class="lane stack">
|
||||||
|
|||||||
@@ -6,23 +6,23 @@
|
|||||||
<!--% query_episodes = DBI.prepare('
|
<!--% query_episodes = DBI.prepare('
|
||||||
WITH episode_maxmin AS (
|
WITH episode_maxmin AS (
|
||||||
SELECT MAX(id) AS \'latest\', MIN(id) AS \'earliest\', ? AS \'id\'
|
SELECT MAX(id) AS \'latest\', MIN(id) AS \'earliest\', ? AS \'id\'
|
||||||
FROM twat_eps AS eps
|
FROM twt_eps AS eps
|
||||||
),
|
),
|
||||||
episode_date AS (
|
episode_date AS (
|
||||||
SELECT eps.date
|
SELECT eps.date
|
||||||
FROM twat_eps AS eps
|
FROM twt_eps AS eps
|
||||||
WHERE eps.id = ?
|
WHERE eps.id = ?
|
||||||
),
|
),
|
||||||
episode_previous AS (
|
episode_previous AS (
|
||||||
SELECT MAX(id) AS \'previous\', ? AS \'id\'
|
SELECT MAX(id) AS \'previous\', ? AS \'id\'
|
||||||
FROM twat_eps AS eps
|
FROM twt_eps AS eps
|
||||||
INNER JOIN episode_date
|
INNER JOIN episode_date
|
||||||
ON eps.date < episode_date.date
|
ON eps.date < episode_date.date
|
||||||
WHERE eps.id > 1
|
WHERE eps.id > 1
|
||||||
),
|
),
|
||||||
episode_next AS (
|
episode_next AS (
|
||||||
SELECT MIN(id) AS \'next\', ? AS \'id\'
|
SELECT MIN(id) AS \'next\', ? AS \'id\'
|
||||||
FROM twat_eps AS eps
|
FROM twt_eps AS eps
|
||||||
INNER JOIN episode_date
|
INNER JOIN episode_date
|
||||||
ON eps.date > episode_date.date
|
ON eps.date > episode_date.date
|
||||||
)
|
)
|
||||||
@@ -34,7 +34,7 @@
|
|||||||
hosts.hostid, hosts.host,
|
hosts.hostid, hosts.host,
|
||||||
miniseries.name AS \'series\', miniseries.id AS \'seriesid\',
|
miniseries.name AS \'series\', miniseries.id AS \'seriesid\',
|
||||||
miniseries.description AS \'series_description\'
|
miniseries.description AS \'series_description\'
|
||||||
FROM twat_eps AS eps
|
FROM twt_eps AS eps
|
||||||
INNER JOIN hosts ON eps.hostid = hosts.hostid
|
INNER JOIN hosts ON eps.hostid = hosts.hostid
|
||||||
INNER JOIN miniseries ON eps.series = miniseries.id
|
INNER JOIN miniseries ON eps.series = miniseries.id
|
||||||
INNER JOIN episode_maxmin ON eps.id = episode_maxmin.id
|
INNER JOIN episode_maxmin ON eps.id = episode_maxmin.id
|
||||||
|
|||||||
7
templates/ids-series_episodes_m3u.tpl.html
Normal file
7
templates/ids-series_episodes_m3u.tpl.html
Normal file
@@ -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 %-->
|
||||||
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
<!--% USE DBI(constants.driver) %-->
|
<!--% USE DBI(constants.driver) %-->
|
||||||
<!--% FOREACH episode IN DBI.query(
|
<!--% FOREACH episode IN DBI.query(
|
||||||
'select eps.id from twat_eps AS eps'
|
'select eps.id from twt_eps AS eps'
|
||||||
) %-->
|
) %-->
|
||||||
,<!--% episode.id %-->
|
,<!--% episode.id %-->
|
||||||
<!--% END %-->
|
<!--% END %-->
|
||||||
|
|||||||
13
templates/m3u-series_episodes.tpl.m3u8
Normal file
13
templates/m3u-series_episodes.tpl.m3u8
Normal file
@@ -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 %-->
|
||||||
@@ -33,7 +33,7 @@
|
|||||||
%-->
|
%-->
|
||||||
<!--% query_twt_show_count = '
|
<!--% query_twt_show_count = '
|
||||||
SELECT COUNT(id) as Tally
|
SELECT COUNT(id) as Tally
|
||||||
FROM twat_eps AS eps
|
FROM twt_eps AS eps
|
||||||
WHERE eps.hostid = ?
|
WHERE eps.hostid = ?
|
||||||
'
|
'
|
||||||
%-->
|
%-->
|
||||||
@@ -48,7 +48,7 @@
|
|||||||
hosts.hostid,
|
hosts.hostid,
|
||||||
hosts.host, hosts.email, hosts.profile,
|
hosts.host, hosts.email, hosts.profile,
|
||||||
miniseries.name AS series, miniseries.id AS seriesid
|
miniseries.name AS series, miniseries.id AS seriesid
|
||||||
FROM twat_eps AS eps
|
FROM twt_eps AS eps
|
||||||
INNER JOIN hosts ON eps.hostid = hosts.hostid
|
INNER JOIN hosts ON eps.hostid = hosts.hostid
|
||||||
INNER JOIN miniseries ON eps.series = miniseries.id
|
INNER JOIN miniseries ON eps.series = miniseries.id
|
||||||
WHERE hosts.hostid = ?
|
WHERE hosts.hostid = ?
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
<!--% query_tags = 'SELECT id, tags FROM eps' %-->
|
<!--% query_tags = 'SELECT id, tags FROM eps WHERE eps.date <= date(\'now\')' %-->
|
||||||
|
|||||||
Reference in New Issue
Block a user