- update for 2.1.9

[packages/clive.git] / clive-reporter.patch

diff --git a/clive-reporter.patch b/clive-reporter.patch
index c8063cb24ae9b8fdf94f13a6c158999ca400591f..6f95b4c29a97569796828d06a205330acb29e2e0 100644 (file)
--- a/clive-reporter.patch
+++ b/clive-reporter.patch
@@ -1,22 +1,22 @@
---- clive-2.1.0/clive  2008-12-11 23:42:37.000000000 +0200
-+++ clive-2.1.0-reporter/clive 2008-12-11 23:43:19.000000000 +0200
-@@ -85,6 +85,7 @@
-     IsLastfm    => qr|\Qlast.fm\E|i,
-     IsLiveleak  => qr|\Qliveleak.com\E|i,
-     IsDelfi     => qr|\Q.delfi.\E|i,
-+    IsReporter  => qr|\Qwww.reporter.ee\E|i,
-     #IsMetacafe => qr|\Qmetacafe.com\E|i,
- );
- 
-@@ -306,6 +307,8 @@
-         ($xurl, $id) = handle_liveleak($response_ref, $response_fh);
+--- clive-2.1.9/clive~  2009-03-30 12:13:37.000000000 +0200
++++ clive-2.1.9/clive   2009-03-30 12:15:01.000000000 +0200
+@@ -86,6 +86,7 @@
+                  IsEvisor    => qr|evisor.tv|i,
+                  IsDmotion   => qr|dailymotion.com|i,
+                  IsDelfi     => qr|.delfi.|i,
++                IsReporter  => qr|www.reporter.ee|i,
+                );
+
+ # Parse config
+@@ -328,6 +328,8 @@
+         ($xurl, $id) = handle_dmotion($response_ref);
      } elsif ( $url =~ /$re_hosts{IsDelfi}/ ) {
-         ($xurl, $id) = handle_delfi($response_ref, $response_fh);
+        ($xurl, $id) = handle_delfi($response_ref, $response_fh);
 +    } elsif ( $url =~ /$re_hosts{IsReporter}/ ) {
-+        ($xurl, $id) = handle_reporter($response_ref, $response_fh);
++       ($xurl, $id) = handle_reporter($response_ref, $response_fh);
      }
- #    elsif ( $url =~ /$re_hosts{IsMetacafe}/ ) {
- #        ($xurl, $id) = handle_metacafe($response_ref);
+     return -1
+         if !$xurl or !$id or !$title;
 @@ -369,6 +372,14 @@
                          $content_ok = 1;
                      }
@@ -32,16 +32,7 @@
              }
              $errmsg = "expected different content-type, "
                  . "received \"$content_type\"" unless $content_ok;
-@@ -727,7 +738,7 @@
-         GrabVideoSalt   => qr|_delfiVideoSalt\s*=\s*"([^"]+)";|,
-         GrabVideoSite   => qr|src="(\S+://[^/]+)/js/embed.js"|,
-       # videoproject
--      # http://video.delfi.ee/video/CzurzqNz/
-+      # http://video.delfi.ee/video/Uu4gF58g/
-               GrabVideoURL   => qr|\.addVariable\('file',\s*'([^']+)'|,
-     );
- 
-@@ -773,6 +784,27 @@
+@@ -1061,6 +1062,28 @@
      return ($xurl, $id);
  }
  
@@ -49,23 +40,24 @@
 +    my ($response_ref, $response_fh) = @_;
 +
 +    my %re = (
-+      # http://www.reporter.ee/index.php/2008/04/21/soiduopetaja-vorpis-poiste-nupeldamisest-videoklippe/
-+              GrabVideoPrefix => qr|obj\s+=\s+{type:"video",file:"(\w+://[^"]+)|,
-+              GrabVideoID     => qr|attributes\s+=\s+{id:\s+"video([^"]+)"|,
++    # http://www.reporter.ee/index.php/2008/04/21/soiduopetaja-vorpis-poiste-nupeldamisest-videoklippe/
++        GrabVideoPrefix => qr|obj\s+=\s+{type:"video",file:"(\w+://[^"]+)|,
++        GrabVideoID     => qr|attributes\s+=\s+{id:\s+"video([^"]+)"|,
 +    );
 +
-+      my $xurl;
++    my $xurl;
 +    my $id     = $1 if $$response_ref =~ /$re{GrabVideoID}/;
 +    my $prefix = $1 if $$response_ref =~ /$re{GrabVideoPrefix}/;
 +
-+      if ($id and $prefix) {
++    if ($id and $prefix) {
 +        $xurl = $prefix . $id . '.flv';
-+      } else {
++    } else {
 +        print STDERR "error: url not found\n";
 +    }
 +
 +    return ($xurl, $id);
 +}
- 
++
  # Subroutines: Progress
  # NOTE: the 'dot' progress copies much from wget.
+