From bc5048f5eda3e20f3a4109a99552ae1e3b147ee9 Mon Sep 17 00:00:00 2001 From: Toni Gundogdu Date: Sat, 11 Dec 2010 18:45:13 +0200 Subject: [PATCH] Remove broken ehrensenf support --- MANIFEST | 1 - lib/clive/Host/Ehrensenf.pm | 71 -------------------------------------------- lib/clive/HostFactory.pm | 2 -- t/support-ehrensenf.t | 16 ---------- url_collection/ehrensenf.url | 1 - 5 files changed, 91 deletions(-) delete mode 100644 lib/clive/Host/Ehrensenf.pm delete mode 100644 t/support-ehrensenf.t delete mode 100644 url_collection/ehrensenf.url diff --git a/MANIFEST b/MANIFEST index fb65341..69fb038 100644 --- a/MANIFEST +++ b/MANIFEST @@ -15,7 +15,6 @@ lib/clive/Exec.pm lib/clive/Host/Break.pm lib/clive/Host/Clipfish.pm lib/clive/Host/Dailymotion.pm -lib/clive/Host/Ehrensenf.pm lib/clive/Host/Evisor.pm lib/clive/Host/Funnyhub.pm lib/clive/Host/Golem.pm diff --git a/lib/clive/Host/Ehrensenf.pm b/lib/clive/Host/Ehrensenf.pm deleted file mode 100644 index 9392462..0000000 --- a/lib/clive/Host/Ehrensenf.pm +++ /dev/null @@ -1,71 +0,0 @@ -# -*- coding: ascii -*- -########################################################################### -# clive, command line video extraction utility. -# -# Copyright 2009 Toni Gundogdu. -# -# This file is part of clive. -# -# clive is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation, either version 3 of the License, or (at your option) -# any later version. -# -# clive is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -########################################################################### -package clive::Host::Ehrensenf; - -use warnings; -use strict; - -use clive::Error qw(CLIVE_MARKEDBROKEN); - -sub new { - return bless( {}, shift ); -} - -use constant MARKEDBROKEN_ERRMSG => - "support marked as 'broken'. consider whipping up a patch to earn fame -error: and other users' undying gratitude."; - -sub parsePage { - my ( $self, $content, $props ) = @_; - - # Marked as "broken." - - clive::Log->instance->err( CLIVE_MARKEDBROKEN, MARKEDBROKEN_ERRMSG ); - return 1; - - $$props->video_host("ehrensenf"); - - my %re = ( data => qr|

(.*?)

| ); - - my $tmp; - if ( clive::Util::matchRegExps( \%re, \$tmp, $content ) == 0 ) { - if ( $tmp->{data} =~ /(\d\d).(\d\d).(\d\d\d\d)/ ) { - my $id = "$3-$2-$1"; - - my $xurl = "http://www.ehrensenf.de/misc/load-balancing/lb.php?" - . "file=$id.flv"; - - $$props->video_id($id); - $$props->video_link($xurl); - - return (0); - } - else { - clive::Log->instance->errn("could not match date string"); - } - } - return (1); -} - -1; - -# All along the watchtower. diff --git a/lib/clive/HostFactory.pm b/lib/clive/HostFactory.pm index 3214c09..455d532 100644 --- a/lib/clive/HostFactory.pm +++ b/lib/clive/HostFactory.pm @@ -43,10 +43,8 @@ my @_hosts = ( [ "Spiegel", qr|spiegel.de|i, "default|vp6_928|vp6_576|vp6_64|h264_1400" ], [ "Golem", qr|golem.de|i, "default|ipod|high" ], - [ "Ehrensenf", qr|ehrensenf.de|i, "default" ], [ "Clipfish", qr|clipfish.de|i, "default" ], [ "Funnyhub", qr|funnyhub.com|i, "default" ], - [ "Myubo", qr|myubo.com|i, "default" ], [ "Buzzhumor", qr|buzzhumor.com|i, "default" ], ); diff --git a/t/support-ehrensenf.t b/t/support-ehrensenf.t deleted file mode 100644 index 68bb89e..0000000 --- a/t/support-ehrensenf.t +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env perl -I./t/lib - -use warnings; -use strict; - -use Test::More; -if ( $ENV{NO_INTERNET} ) { - plan skip_all => "No internet during package build"; -} -else { - plan skip_all => "Marked as broken."; -# plan tests => 1; -} - -use Test::clive; -Test::clive::host(qq|http://www.ehrensenf.de/?p=1716|); diff --git a/url_collection/ehrensenf.url b/url_collection/ehrensenf.url deleted file mode 100644 index ed246c8..0000000 --- a/url_collection/ehrensenf.url +++ /dev/null @@ -1 +0,0 @@ -http://www.ehrensenf.de/?p=1716 -- 2.11.4.GIT