[SCM] Video extraction utility for YouTube, Google Video and other video sites (Debian packaging) branch, master, updated. upstream/2.1.7-214-g6762190

[legatvs]

The following commit has been merged in the master branch:
commit 9a7d3dc99fb955761a5d5bb0901148c8d1dcfb16
Author: legatvs <legatvs at gmail.com>
Date:   Fri Jan 30 16:57:24 2009 +0200

    Removed metacafe remnants.

diff --git a/CHANGES b/CHANGES
index 62d7edc..3d216d0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,7 @@ Version 2.1.4
   * Tweaked --version output
 
  Developer-visible changes:
+  * Removed metacafe remnants
   * Fixed progressbar time2str subroutine
   * Updated INSTALL
   * removed genman (obsoleted by "make man")
diff --git a/clive b/clive
index 221edc6..5f03474 100755
--- a/clive
+++ b/clive
@@ -85,7 +85,6 @@ my %re_hosts = (    # Precompiled regex used to identify the host
     IsLastfm    => qr|\Qlast.fm\E|i,
     IsLiveleak  => qr|\Qliveleak.com\E|i,
     IsEvisor    => qr|\Qevisor.tv\E|i,
-    #IsMetacafe => qr|\Qmetacafe.com\E|i,
 );
 
 # Parse config
@@ -334,9 +333,6 @@ sub process_page {
     } elsif ( $url =~ /$re_hosts{IsEvisor}/ ) {
         ($xurl, $id) = handle_evisor($response_ref);
     }
-#    elsif ( $url =~ /$re_hosts{IsMetacafe}/ ) {
-#        ($xurl, $id) = handle_metacafe($response_ref);
-#    }
     return -1
         if !$xurl or !$id or !$title;
 
@@ -831,39 +827,6 @@ sub handle_evisor {
     return ($xurl, $id);
 }
 
-sub handle_metacafe {
-    my $response_ref = shift;
-
-    my %re = (
-        GrabID        => qr|itemID=(.*?)&|,
-        GrabVideoCDN  => qr|videoCDNURL=(.*?)&|,
-        GrabMediaURL  => qr|mediaURL=(.*?)&|,
-    );
-
-    my $id       = $1 if $$response_ref =~ /$re{GrabID}/;
-    my $videocdn = $1 if $$response_ref =~ /$re{GrabVideoCDN}/;
-    my $mediaurl = $1 if $$response_ref =~ /$re{GrabMediaURL}/;
-
-    my ($xurl, $errmsg);
-    if ( $videocdn and $mediaurl ) {
-        $xurl = uri_unescape($videocdn .'/'. $mediaurl);
-    } else {
-        $errmsg = "failed to extract videoCDNURL"
-            if !$videocdn;
-
-        $errmsg = "failed to extract mediaURL"
-            if !$errmsg and !$mediaurl;
-    }
-
-    $errmsg = "failed to extract itemID"
-        if !$id and !$errmsg;
-
-    print STDERR "\nerror: $errmsg\n"
-        if $errmsg;
-
-    return ($xurl, $id);
-}
-
 
 # Subroutines: Progress
 # NOTE: the 'dot' progress copies much from wget.
@@ -1943,7 +1906,7 @@ with L<ffmpeg(1)>.
 =item % clive -u myusername -t - -V /usr/bin/clivepass URL
 
 Create a new L<clivepass(1)> passwd login password "repository" file.
- 
+
 Add Youtube login "myusername" to the repo.
 
 Chain clive-clivepass: retrieve login password from the repo, login to
@@ -2021,22 +1984,6 @@ Formats: flv  Continue: Yes
 
 =back
 
-=begin :comment
-
-NOTE: Support removed until fixed. From begin .. end :comment.
-
-=over 4
-
-=item B<www.metacafe.com>
-
-Formats: flv
-
-The B<--continue> option works.
-
-=back
-
-=end :comment
-
 =head1 CACHE
 
 The cache has two purposes:

-- 
Video extraction utility for YouTube, Google Video and other video sites (Debian packaging)