summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2011-11-18 23:33:29 +0200
committerVille Skyttä <ville.skytta@iki.fi>2011-11-18 23:33:29 +0200
commitf41397dca6bb5d141402f33bedb8e1bcde3016ed (patch)
tree27352deb65cde97daae452fec4c90c9fb226f2cd
parentcba90e70de5a4a297ccd8c8fd2e42ab577f51027 (diff)
downloadvdradmin-am-f41397dca6bb5d141402f33bedb8e1bcde3016ed.tar.gz
vdradmin-am-f41397dca6bb5d141402f33bedb8e1bcde3016ed.tar.bz2
Make EPG data and recording info parsing a bit more efficient.
-rwxr-xr-xvdradmind.pl28
1 files changed, 14 insertions, 14 deletions
diff --git a/vdradmind.pl b/vdradmind.pl
index 3f57e25..2d1d09f 100755
--- a/vdradmind.pl
+++ b/vdradmind.pl
@@ -1283,23 +1283,23 @@ sub EPG_buildTree {
# if(/^S (.*)/) { $subtitle = $1; $subtitle =~ s/\|/<br \/>/sig }
# if(/^D (.*)/) { $summary = $1; $summary =~ s/\|/<br \/>/sig }
if (/^T (.*)/) { $title = $1; }
- if (/^S (.*)/) { $subtitle = $1; }
- if (/^D (.*)/) { $summary = $1; }
- if (/^X 1 ([^ ]*) (.*)/) {
+ elsif (/^S (.*)/) { $subtitle = $1; }
+ elsif (/^D (.*)/) { $summary = $1; }
+ elsif (/^X 1 ([^ ]*) (.*)/) {
push (@video_raw, sprintf "X 1 $1 $2");
my ($lang, $format) = split(" ", $2, 2);
$video .= ", " if($video);
$video .= $format;
$video .= " (" . $lang . ")";
}
- if (/^X 2 ([^ ]*) (.*)/) {
+ elsif (/^X 2 ([^ ]*) (.*)/) {
push (@audio_raw, sprintf "X 2 $1 $2");
my ($lang, $descr) = split(" ", $2, 2);
$audio .= ", " if ($audio);
$audio .= ($descr ? $descr . " (" . $lang . ")" : $lang);
}
- if (/^V (.*)/) { $vps = $1; }
- if (/^e/) {
+ elsif (/^V (.*)/) { $vps = $1; }
+ elsif (/^e/) {
#
$low_time = $time if ($time < $low_time);
@@ -6261,23 +6261,23 @@ sub getRecInfo {
$SVDRP->command("lstr $id");
my ($channel_name, $subtitle, $text, $video, $audio);
while ($_ = $SVDRP->readoneline) {
- if(/^C (.*)/) { $channel_name = get_name_from_uniqid($1); }
- #if(/^E (.*)/) { $epg = $1; }
- if (/^T (.*)/) { $title = $1; }
- if (/^S (.*)/) { $subtitle = $1; }
- if (/^D (.*)/) { $text = $1; }
- if(/^X 1 [^ ]* (.*)/) {
+ if (/^C (.*)/) { $channel_name = get_name_from_uniqid($1); }
+ #elsif (/^E (.*)/) { $epg = $1; }
+ elsif (/^T (.*)/) { $title = $1; }
+ elsif (/^S (.*)/) { $subtitle = $1; }
+ elsif (/^D (.*)/) { $text = $1; }
+ elsif (/^X 1 [^ ]* (.*)/) {
my ($lang, $format) = split(" ", $1, 2);
$video .= ", " if($video);
$video .= $format;
$video .= " (" . $lang . ")";
}
- if(/^X 2 [^ ]* (.*)/) {
+ elsif (/^X 2 [^ ]* (.*)/) {
my ($lang, $descr) = split(" ", $1, 2);
$audio .= ", " if ($audio);
$audio .= ($descr ? $descr. " (" . $lang . ")" : $lang);
}
- #if(/^V (.*)/) { $vps = $1; }
+ #elsif (/^V (.*)/) { $vps = $1; }
}
my $displaytext = CGI::escapeHTML($text) || "";