Skip to content

Commit

Permalink
Add widgets to edit season, episode, and inetref to MythWeb.
Browse files Browse the repository at this point in the history
Also add a line to show this information on existing recordings.  Patch by Doug Haber, fixes #9923.
  • Loading branch information
Robert McNamara committed Jul 17, 2011
1 parent 8483799 commit b4e6d25
Show file tree
Hide file tree
Showing 22 changed files with 70 additions and 3 deletions.
2 changes: 2 additions & 0 deletions modules/_shared/lang/Catalan.lang
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -424,6 +424,7 @@
"IMDBTYPE" "IMDBTYPE"
"Inactive" "Inactive"
Inactiu Inactiu
"inetref"
"info: activate recording" "info: activate recording"
"info: default recording" "info: default recording"
"info: dont record" "info: dont record"
Expand All @@ -449,6 +450,7 @@
"info:jumppoints" "info:jumppoints"
"info:never record" "info:never record"
"Insert" "Insert"
"Internet Reference #"
"Jump" "Jump"
Saltar Saltar
"Jump Points" "Jump Points"
Expand Down
2 changes: 2 additions & 0 deletions modules/_shared/lang/Czech.lang
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -532,6 +532,7 @@
"IMDBTYPE" "IMDBTYPE"
"Inactive" "Inactive"
Neaktivní Neaktivní
"inetref"
"info: activate recording" "info: activate recording"
"info: default recording" "info: default recording"
"info: dont record" "info: dont record"
Expand All @@ -557,6 +558,7 @@
"info:never record" "info:never record"
"Insert" "Insert"
Vložit Vložit
"Internet Reference #"
"Jump" "Jump"
Skočit Skočit
"Jump Points" "Jump Points"
Expand Down
2 changes: 2 additions & 0 deletions modules/_shared/lang/Danish.lang
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -583,6 +583,7 @@
"IMDBTYPE" "IMDBTYPE"
"Inactive" "Inactive"
Inaktiv Inaktiv
"inetref"
"info: activate recording" "info: activate recording"
Tving denne specifikke visning til at optage. Tving denne specifikke visning til at optage.
"info: default recording" "info: default recording"
Expand Down Expand Up @@ -614,6 +615,7 @@
Optag aldrig denne udsendelse. Optag aldrig denne udsendelse.
"Insert" "Insert"
Insert Insert
"Internet Reference #"
"Jump" "Jump"
"Jump Points" "Jump Points"
Expand Down
2 changes: 2 additions & 0 deletions modules/_shared/lang/Dutch.lang
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -413,6 +413,7 @@
"IMDBTYPE" "IMDBTYPE"
"Inactive" "Inactive"
Niet actief Niet actief
"inetref"
"info: activate recording" "info: activate recording"
"info: default recording" "info: default recording"
"info: dont record" "info: dont record"
Expand All @@ -438,6 +439,7 @@
"info:jumppoints" "info:jumppoints"
"info:never record" "info:never record"
"Insert" "Insert"
"Internet Reference #"
"Jump" "Jump"
Ga Ga
"Jump Points" "Jump Points"
Expand Down
2 changes: 2 additions & 0 deletions modules/_shared/lang/English.lang
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@
"IMDBTYPE" "IMDBTYPE"
Imdb Imdb
"Inactive" "Inactive"
"inetref"
"info: activate recording" "info: activate recording"
Force this specific showing to record. Force this specific showing to record.
"info: default recording" "info: default recording"
Expand Down Expand Up @@ -348,6 +349,7 @@
"info:never record" "info:never record"
Falsify a previous recording of this show so that it won't record. Falsify a previous recording of this show so that it won't record.
"Insert" "Insert"
"Internet Reference #"
"Jump" "Jump"
"Jump Points" "Jump Points"
"Jump to" "Jump to"
Expand Down
2 changes: 2 additions & 0 deletions modules/_shared/lang/English_CA.lang
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@
"IMDBTYPE" "IMDBTYPE"
Imdb Imdb
"Inactive" "Inactive"
"inetref"
"info: activate recording" "info: activate recording"
Force this specific showing to record. Force this specific showing to record.
"info: default recording" "info: default recording"
Expand Down Expand Up @@ -348,6 +349,7 @@
"info:never record" "info:never record"
Falsify a previous recording of this show so that it won't record. Falsify a previous recording of this show so that it won't record.
"Insert" "Insert"
"Internet Reference #"
"Jump" "Jump"
"Jump Points" "Jump Points"
"Jump to" "Jump to"
Expand Down
2 changes: 2 additions & 0 deletions modules/_shared/lang/English_GB.lang
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@
"IMDB" "IMDB"
"IMDBTYPE" "IMDBTYPE"
"Inactive" "Inactive"
"inetref"
"info: activate recording" "info: activate recording"
Force this specific showing to record. Force this specific showing to record.
"info: default recording" "info: default recording"
Expand Down Expand Up @@ -346,6 +347,7 @@
"info:never record" "info:never record"
Falsify a previous recording of this show so that it won't record. Falsify a previous recording of this show so that it won't record.
"Insert" "Insert"
"Internet Reference #"
"Jump" "Jump"
"Jump Points" "Jump Points"
"Jump to" "Jump to"
Expand Down
2 changes: 2 additions & 0 deletions modules/_shared/lang/Finnish.lang
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -582,6 +582,7 @@
IMBDTYPE IMBDTYPE
"Inactive" "Inactive"
Ei aktiivinen Ei aktiivinen
"inetref"
"info: activate recording" "info: activate recording"
Pakota tämän ohjelman tallennus Pakota tämän ohjelman tallennus
"info: default recording" "info: default recording"
Expand Down Expand Up @@ -620,6 +621,7 @@
Luo väärennös vanhemmasta tallennuksesta, jotta tätä esitystä ei tallenneta. Luo väärennös vanhemmasta tallennuksesta, jotta tätä esitystä ei tallenneta.
"Insert" "Insert"
Syötä Syötä
"Internet Reference #"
"Jump" "Jump"
Hyppy Hyppy
"Jump Points" "Jump Points"
Expand Down
2 changes: 2 additions & 0 deletions modules/_shared/lang/French.lang
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -587,6 +587,7 @@
Imdb Imdb
"Inactive" "Inactive"
Inactif Inactif
"inetref"
"info: activate recording" "info: activate recording"
Forcer l'enregistrement de cette diffusion. Forcer l'enregistrement de cette diffusion.
"info: default recording" "info: default recording"
Expand Down Expand Up @@ -625,6 +626,7 @@
Simule un enregistrement précédent de cette émission pour qu'elle ne soit pas enregistrée. Simule un enregistrement précédent de cette émission pour qu'elle ne soit pas enregistrée.
"Insert" "Insert"
Inser Inser
"Internet Reference #"
"Jump" "Jump"
Aller Aller
"Jump Points" "Jump Points"
Expand Down
2 changes: 2 additions & 0 deletions modules/_shared/lang/French_CA.lang
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -587,6 +587,7 @@
Imdb Imdb
"Inactive" "Inactive"
Inactif Inactif
"inetref"
"info: activate recording" "info: activate recording"
Forcer l'enregistrement de cette diffusion. Forcer l'enregistrement de cette diffusion.
"info: default recording" "info: default recording"
Expand Down Expand Up @@ -625,6 +626,7 @@
Simule un enregistrement précédent de cette émission pour qu'elle ne soit pas enregistrée. Simule un enregistrement précédent de cette émission pour qu'elle ne soit pas enregistrée.
"Insert" "Insert"
Inser Inser
"Internet Reference #"
"Jump" "Jump"
Aller Aller
"Jump Points" "Jump Points"
Expand Down
2 changes: 2 additions & 0 deletions modules/_shared/lang/German.lang
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -582,6 +582,7 @@
IMDBTYPE IMDBTYPE
"Inactive" "Inactive"
Inaktiv Inaktiv
"inetref"
"info: activate recording" "info: activate recording"
"info: default recording" "info: default recording"
"info: dont record" "info: dont record"
Expand Down Expand Up @@ -609,6 +610,7 @@
"info:never record" "info:never record"
"Insert" "Insert"
Einfügen Einfügen
"Internet Reference #"
"Jump" "Jump"
Springen Springen
"Jump Points" "Jump Points"
Expand Down
2 changes: 2 additions & 0 deletions modules/_shared/lang/Hungarian.lang
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -558,6 +558,7 @@
Imdb Imdb
"Inactive" "Inactive"
Inkaktív Inkaktív
"inetref"
"info: activate recording" "info: activate recording"
Ezen műsor rögzítésének kényszerítése. Ezen műsor rögzítésének kényszerítése.
"info: default recording" "info: default recording"
Expand Down Expand Up @@ -592,6 +593,7 @@
Meghamisítja ezen műsor korábbi felvételeit, igy nem lesz rögzítve. Meghamisítja ezen műsor korábbi felvételeit, igy nem lesz rögzítve.
"Insert" "Insert"
Beszúrás Beszúrás
"Internet Reference #"
"Jump" "Jump"
Ugrás Ugrás
"Jump Points" "Jump Points"
Expand Down
2 changes: 2 additions & 0 deletions modules/_shared/lang/Japanese.lang
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -409,6 +409,7 @@
"IMDBTYPE" "IMDBTYPE"
"Inactive" "Inactive"
無効 無効
"inetref"
"info: activate recording" "info: activate recording"
"info: default recording" "info: default recording"
"info: dont record" "info: dont record"
Expand All @@ -434,6 +435,7 @@
"info:jumppoints" "info:jumppoints"
"info:never record" "info:never record"
"Insert" "Insert"
"Internet Reference #"
"Jump" "Jump"
移動 移動
"Jump Points" "Jump Points"
Expand Down
2 changes: 2 additions & 0 deletions modules/_shared/lang/Norwegian_NB.lang
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -584,6 +584,7 @@
IMDB-type IMDB-type
"Inactive" "Inactive"
Inaktiv Inaktiv
"inetref"
"info: activate recording" "info: activate recording"
Tving opptak av denne spesifikke sendingen. Tving opptak av denne spesifikke sendingen.
"info: default recording" "info: default recording"
Expand Down Expand Up @@ -615,6 +616,7 @@
Ta aldri opp denne sendingen. Ta aldri opp denne sendingen.
"Insert" "Insert"
Legg til Legg til
"Internet Reference #"
"Jump" "Jump"
"Jump Points" "Jump Points"
Expand Down
2 changes: 2 additions & 0 deletions modules/_shared/lang/Polish.lang
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -383,6 +383,7 @@
"IMDBTYPE" "IMDBTYPE"
"Inactive" "Inactive"
Bezczynny Bezczynny
"inetref"
"info: activate recording" "info: activate recording"
"info: default recording" "info: default recording"
"info: dont record" "info: dont record"
Expand All @@ -393,6 +394,7 @@
"info:jumppoints" "info:jumppoints"
"info:never record" "info:never record"
"Insert" "Insert"
"Internet Reference #"
"Jump" "Jump"
Skocz Skocz
"Jump Points" "Jump Points"
Expand Down
2 changes: 2 additions & 0 deletions modules/_shared/lang/Slovenian.lang
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -530,6 +530,7 @@
IMDB tip IMDB tip
"Inactive" "Inactive"
Neaktiven Neaktiven
"inetref"
"info: activate recording" "info: activate recording"
Vsili snemanje te oddaje. Vsili snemanje te oddaje.
"info: default recording" "info: default recording"
Expand Down Expand Up @@ -563,6 +564,7 @@
Prikaži prejšnje posnetke te oddaje tako, da se ne bo več posnela. Prikaži prejšnje posnetke te oddaje tako, da se ne bo več posnela.
"Insert" "Insert"
Vstavi Vstavi
"Internet Reference #"
"Jump" "Jump"
Skoči Skoči
"Jump Points" "Jump Points"
Expand Down
2 changes: 2 additions & 0 deletions modules/_shared/lang/Spanish.lang
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -493,6 +493,7 @@
"IMDBTYPE" "IMDBTYPE"
"Inactive" "Inactive"
Inactivo Inactivo
"inetref"
"info: activate recording" "info: activate recording"
"info: default recording" "info: default recording"
"info: dont record" "info: dont record"
Expand All @@ -518,6 +519,7 @@
"info:jumppoints" "info:jumppoints"
"info:never record" "info:never record"
"Insert" "Insert"
"Internet Reference #"
"Jump" "Jump"
Saltar Saltar
"Jump Points" "Jump Points"
Expand Down
2 changes: 2 additions & 0 deletions modules/_shared/lang/Swedish.lang
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -585,6 +585,7 @@
IMDBTYP IMDBTYP
"Inactive" "Inactive"
Inaktiv Inaktiv
"inetref"
"info: activate recording" "info: activate recording"
aktivera inspelning aktivera inspelning
"info: default recording" "info: default recording"
Expand Down Expand Up @@ -624,6 +625,7 @@
Spela aldrig in Spela aldrig in
"Insert" "Insert"
Sätta in Sätta in
"Internet Reference #"
"Jump" "Jump"
"Jump Points" "Jump Points"
Expand Down
9 changes: 6 additions & 3 deletions modules/tv/classes/Schedule.php
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -236,10 +236,10 @@ public function save($new_type) {
findday,findtime,findid,autotranscode,parentid,transcoder, findday,findtime,findid,autotranscode,parentid,transcoder,
autouserjob1,autouserjob2,autouserjob3,autouserjob4,autometadata, autouserjob1,autouserjob2,autouserjob3,autouserjob4,autometadata,
playgroup,storagegroup,prefinput, playgroup,storagegroup,prefinput,
next_record,last_record,last_delete) next_record,last_record,last_delete,inetref,season,episode)
VALUES (?,?,?, VALUES (?,?,?,
FROM_UNIXTIME(?),FROM_UNIXTIME(?),FROM_UNIXTIME(?),FROM_UNIXTIME(?), FROM_UNIXTIME(?),FROM_UNIXTIME(?),FROM_UNIXTIME(?),FROM_UNIXTIME(?),
?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)', ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)',
_or($this->recordid, 0, true), _or($this->recordid, 0, true),
_or($this->type, 0, true), _or($this->type, 0, true),
$this->chanid, $this->chanid,
Expand Down Expand Up @@ -283,7 +283,10 @@ public function save($new_type) {
_or($this->prefinput, 0, true), _or($this->prefinput, 0, true),
_or($this->next_record, '00:00:00' ), _or($this->next_record, '00:00:00' ),
_or($this->last_record, '00:00:00' ), _or($this->last_record, '00:00:00' ),
_or($this->last_delete, '00:00:00' ) _or($this->last_delete, '00:00:00' ),
_or($this->inetref, '' ),
_or($this->season, 0 ),
_or($this->episode, 0 )
); );
// Get the id that was returned // Get the id that was returned
$recordid = $sh->insert_id(); $recordid = $sh->insert_id();
Expand Down
4 changes: 4 additions & 0 deletions modules/tv/detail.php
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -231,6 +231,10 @@
$schedule->autotranscode = $_POST['autotranscode'] ? 1 : 0; $schedule->autotranscode = $_POST['autotranscode'] ? 1 : 0;
$schedule->transcoder = $_POST['transcoder']; $schedule->transcoder = $_POST['transcoder'];
$schedule->prefinput = $_POST['prefinput']; $schedule->prefinput = $_POST['prefinput'];
$schedule->inetref = intval($_POST['inetref']);
$schedule->season = intval($_POST['season']);
$schedule->episode = intval($_POST['episode']);

// Keep track of the parent recording for overrides // Keep track of the parent recording for overrides
if ($_POST['record'] == rectype_override) { if ($_POST['record'] == rectype_override) {
$schedule->parentid = $schedule->recordid; $schedule->parentid = $schedule->recordid;
Expand Down
6 changes: 6 additions & 0 deletions modules/tv/tmpl/default/_advanced_options.php
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -132,6 +132,12 @@ function toggle_advanced(show) {
?></select></dd> ?></select></dd>
<dt><?php echo t('Preferred Input') ?>:</dt> <dt><?php echo t('Preferred Input') ?>:</dt>
<dd><?php input_select($schedule->prefinput, 'prefinput') ?></dd> <dd><?php input_select($schedule->prefinput, 'prefinput') ?></dd>
<dt><?php echo t('Internet Reference #') ?>:</dt>
<dd><input type="text" name="inetref" value="<?php echo html_entities($schedule->inetref) ?>"></dd>
<dt><?php echo t('Season') ?>:</dt>
<dd><input type="text" class="quantity" name="season" value="<?php echo html_entities($schedule->season) ?>"></dd>
<dt><?php echo t('Episode') ?>:</dt>
<dd><input type="text" class="quantity" name="episode" value="<?php echo html_entities($schedule->episode) ?>"></dd>
<dt><label for="autometadata"><?php echo t('Look up Metadata') ?>:</label></dt> <dt><label for="autometadata"><?php echo t('Look up Metadata') ?>:</label></dt>
<dd><input type="checkbox" class="radio" id="autometadata" name="autometadata"<?php if ($schedule->autometadata) echo ' CHECKED' ?> value="1"></dd> <dd><input type="checkbox" class="radio" id="autometadata" name="autometadata"<?php if ($schedule->autometadata) echo ' CHECKED' ?> value="1"></dd>
<dt><label for="autocommflag"><?php echo t('Auto-flag commercials') ?>:</label></dt> <dt><label for="autocommflag"><?php echo t('Auto-flag commercials') ?>:</label></dt>
Expand Down
18 changes: 18 additions & 0 deletions modules/tv/tmpl/default/detail.php
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -209,6 +209,24 @@ function watchShow(host, chanid, starttime) {
?><tr class="x-extras"> ?><tr class="x-extras">
<th><?php echo t('Episode Number') ?>:</th> <th><?php echo t('Episode Number') ?>:</th>
<td><?php echo $program->syndicatedepisodenumber ?></td> <td><?php echo $program->syndicatedepisodenumber ?></td>
</tr><?php
}
if (strlen($program->inetref) > 0) {
?><tr class="x-extras">
<th><?php echo t('inetref') ?>:</th>
<td><?php echo $program->inetref ?></td>
</tr><?php
}
if ($program->season > 0) {
?><tr class="x-extras">
<th><?php echo t('Season') ?>:</th>
<td><?php echo $program->season ?></td>
</tr><?php
}
if ($program->episode > 0) {
?><tr class="x-extras">
<th><?php echo t('Episode') ?>:</th>
<td><?php echo $program->episode ?></td>
</tr><?php </tr><?php
} }
if (strlen($program->airdate)) { if (strlen($program->airdate)) {
Expand Down

0 comments on commit b4e6d25

Please sign in to comment.