SVN: toys/rsget.pl/Video/Kanal2

[glen]

Author: glen
Date: Sun Apr 13 17:33:56 2014
New Revision: 12745

Modified:
   toys/rsget.pl/Video/Kanal2
Log:
kanal2: add support for pluss videos

Modified: toys/rsget.pl/Video/Kanal2
==============================================================================
--- toys/rsget.pl/Video/Kanal2	(original)
+++ toys/rsget.pl/Video/Kanal2	Sun Apr 13 17:33:56 2014
@@ -9,27 +9,33 @@
 short: V:Kanal2
 web: "http://kanal2.ee/"
 uri: qr{kanal(?:2|11).ee/vaatasaateid/.+\?videoid=\d+}
+uri: qr{kanal2.ee/pluss/video/\?id=\d+}
 # limit slots bacause rtmp support is very bad
 slots: 3
-status: OK 2013-12-21
+status: OK 2014-04-13
 
 start:
 	GET( $-{_uri} );
 
-	! m{<title>(.+?) - Vaata saateid - .+</title>} or m{<div class="title"><a href=".+">(.+?)</a></div>};
+	! m{<title>(.+?) - Vaata saateid - .+</title>}
+	   	or m{<div class="title"><a href=".+">(.+?)</a></div>}
+		or m{<title>(.+?) - </title>};
 	my $title = $1;
+	my ($domain) = $-{_uri} =~ m{^(https?://[^/]+)};
+
+	$-{file_name} = de_ml($title);
+	$-{file_name} =~ s{/}{_}g;
 
-	! m{<div class="time" id="closed_time_block">(.+)</div>};
-	my $time = $1;
-	# strip <b>..</b> tags
-	$time =~ s#</?\w+>##g;
+	if (m{<div class="time" id="closed_time_block">(.+)</div>}) {
+		my $time = $1;
+		# strip <b>..</b> tags
+		$time =~ s#</?\w+>##g;
+		$-{file_name} .= " - ".de_ml($time);
+	}
 
 	! m{videoId: '(\d+)'};
 	my $videoId = $1;
 
-	$-{file_name} = de_ml("$title - $time");
-    $-{file_name} =~ s{/}{_}g;
-	my ($domain) = $-{_uri} =~ m{^(https?://[^/]+)};
 	$-{api_uri} = "$domain/video/playerPlaylistApi?id=$videoId";
 
 	GET($-{api_uri}, keep_referer => 1 );