- Introduce a proper namespace for videosite modules.

  This change will break all external modules

diff --git a/videosite.pl b/videosite.pl
index bf14b95..d4d50c7 100644 (file)
--- a/videosite.pl
+++ b/videosite.pl
@@ -19,7 +19,8 @@ my @getters;
 my $getter;
 my $conf;
 my $conffile = File::Spec->catfile(Irssi::get_irssi_dir(), 'videosite.xml');
-my $plugindir = File::Spec->catfile(Irssi::get_irssi_dir(), 'scripts', 'videosite');
+my $scriptdir = File::Spec->catfile(Irssi::get_irssi_dir(), 'scripts');
+my $plugindir = File::Spec->catfile($scriptdir, 'videosite');
 
 my $PARAMS = {
     'getter' => '',
@@ -346,13 +347,13 @@ sub ploader {
     foreach $p (@list) {
         write_debug(undef, "Trying to load $p:");
         $p =~ s/\.pm$//;
-        eval qq{ require $p; };
+        eval qq{ require videosite::$p; };
         if ($@) {
             write_irssi(undef, "Failed to load plugin: $@");
             next;
         }
 
-        $g = eval $p.q{->new();};
+        $g = eval qq{ videosite::$p->new(); };
         if ($@) {
             write_irssi(undef, "Failed to instanciate: $@");
             delete($INC{$p});
@@ -492,5 +493,5 @@ sub cmdhandler {
     }
 }
 
-unshift(@INC, $plugindir);
+unshift(@INC, $scriptdir);
 init_videosite(1);

diff --git a/videosite/AsyncFileGetter.pm b/videosite/AsyncFileGetter.pm
index 3610584..679f280 100644 (file)
--- a/videosite/AsyncFileGetter.pm
+++ b/videosite/AsyncFileGetter.pm
@@ -7,10 +7,10 @@
 # in the background
 #
 
-package AsyncFileGetter;
+package videosite::AsyncFileGetter;
 
-use FileGetter;
-@ISA = qw(FileGetter);
+use videosite::FileGetter;
+@ISA = qw(videosite::FileGetter);
 
 use strict;
 use LWP::Simple qw(!get);

diff --git a/videosite/Base.pm b/videosite/Base.pm
index f0fa439..5d796d8 100644 (file)
--- a/videosite/Base.pm
+++ b/videosite/Base.pm
@@ -1,7 +1,7 @@
 # (c) 2007 by Ralf Ertzinger <ralf@camperquake.de>
 # licensed under GNU GPL v2
 
-package Base;
+package videosite::Base;
 
 use strict;
 use Data::Dumper;

diff --git a/videosite/BlipTVGrabber.pm b/videosite/BlipTVGrabber.pm
index 64be252..5a53d2c 100644 (file)
--- a/videosite/BlipTVGrabber.pm
+++ b/videosite/BlipTVGrabber.pm
@@ -3,10 +3,10 @@
 #
 # Grabber for blip.tv
 
-package BlipTVGrabber;
+package videosite::BlipTVGrabber;
 
-use GrabberBase;
-@ISA = qw(GrabberBase);
+use videosite::GrabberBase;
+@ISA = qw(videosite::GrabberBase);
 
 use LWP::Simple qw(!get);
 use LWP::UserAgent;

diff --git a/videosite/BreakGrabber.pm b/videosite/BreakGrabber.pm
index 0619da5..2c44d90 100644 (file)
--- a/videosite/BreakGrabber.pm
+++ b/videosite/BreakGrabber.pm
@@ -3,12 +3,12 @@
 # (c) 2007 by Ralf Ertzinger <ralf@camperquake.de>
 # licensed under GNU GPL v2
 
-package BreakGrabber;
+package videosite::BreakGrabber;
 
-use GrabberBase;
-@ISA = qw(GrabberBase);
+use videosite::GrabberBase;
+@ISA = qw(videosite::GrabberBase);
 
-use HTMLHelper;
+use videosite::HTMLHelper;
 use Data::Dumper;
 
 use strict;

diff --git a/videosite/BroadcasterGrabber.pm b/videosite/BroadcasterGrabber.pm
index 52d893d..51f3685 100644 (file)
--- a/videosite/BroadcasterGrabber.pm
+++ b/videosite/BroadcasterGrabber.pm
@@ -3,12 +3,12 @@
 #
 # Grabber for broadcaster.com
 
-package BroadcasterGrabber;
+package videosite::BroadcasterGrabber;
 
-use GrabberBase;
-@ISA = qw(GrabberBase);
+use videosite::GrabberBase;
+@ISA = qw(videosite::GrabberBase);
 
-use HTMLHelper;
+use videosite::HTMLHelper;
 use Data::Dumper;
 
 use strict;

diff --git a/videosite/CollegeHumorGrabber.pm b/videosite/CollegeHumorGrabber.pm
index 4388a31..192ece5 100644 (file)
--- a/videosite/CollegeHumorGrabber.pm
+++ b/videosite/CollegeHumorGrabber.pm
@@ -3,12 +3,12 @@
 # (c) 2007 by Ralf Ertzinger <ralf@camperquake.de>
 # licensed under GNU GPL v2
 
-package CollegeHumorGrabber;
+package videosite::CollegeHumorGrabber;
 
-use GrabberBase;
-@ISA = qw(GrabberBase);
+use videosite::GrabberBase;
+@ISA = qw(videosite::GrabberBase);
 
-use HTMLHelper;
+use videosite::HTMLHelper;
 use LWP::Simple qw(!get);
 use XML::Simple;
 use Data::Dumper;

diff --git a/videosite/DailyMotionGrabber.pm b/videosite/DailyMotionGrabber.pm
index 5e4f10e..903c610 100644 (file)
--- a/videosite/DailyMotionGrabber.pm
+++ b/videosite/DailyMotionGrabber.pm
@@ -3,10 +3,10 @@
 # (c) 2007 by Ralf Ertzinger <ralf@camperquake.de>
 # licensed under GNU GPL v2
 
-package DailyMotionGrabber;
+package videosite::DailyMotionGrabber;
 
-use GrabberBase;
-@ISA = qw(GrabberBase);
+use videosite::GrabberBase;
+@ISA = qw(videosite::GrabberBase);
 
 use LWP::Simple qw(!get);
 use HTML::Parser;

diff --git a/videosite/DoubleVikingGrabber.pm b/videosite/DoubleVikingGrabber.pm
index 89e181e..322e75e 100644 (file)
--- a/videosite/DoubleVikingGrabber.pm
+++ b/videosite/DoubleVikingGrabber.pm
@@ -3,10 +3,10 @@
 # (c) 2007 by Ralf Ertzinger <ralf@camperquake.de>
 # licensed under GNU GPL v2
 
-package DoubleVikingGrabber;
+package videosite::DoubleVikingGrabber;
 
-use GrabberBase;
-@ISA = qw(GrabberBase);
+use videosite::GrabberBase;
+@ISA = qw(videosite::GrabberBase);
 
 use LWP::Simple qw(!get);
 use HTML::TokeParser;

diff --git a/videosite/FileGetter.pm b/videosite/FileGetter.pm
index b3c2660..66f5f0d 100644 (file)
--- a/videosite/FileGetter.pm
+++ b/videosite/FileGetter.pm
@@ -4,10 +4,10 @@
 # A getter which will download the media to a local file storage
 #
 
-package FileGetter;
+package videosite::FileGetter;
 
-use GetterBase;
-@ISA = qw(GetterBase);
+use videosite::GetterBase;
+@ISA = qw(videosite::GetterBase);
 
 use strict;
 use LWP::Simple qw(!get);

diff --git a/videosite/GetterBase.pm b/videosite/GetterBase.pm
index a8130db..c7d56de 100644 (file)
--- a/videosite/GetterBase.pm
+++ b/videosite/GetterBase.pm
@@ -1,10 +1,10 @@
 # (c) 2007 by Ralf Ertzinger <ralf@camperquake.de>
 # licensed under GNU GPL v2
 
-package GetterBase;
+package videosite::GetterBase;
 
-use Base;
-@ISA = qw(Base);
+use videosite::Base;
+@ISA = qw(videosite::Base);
 
 use strict;
 

diff --git a/videosite/GoogleGrabber.pm b/videosite/GoogleGrabber.pm
index 0bcb71f..a33f027 100644 (file)
--- a/videosite/GoogleGrabber.pm
+++ b/videosite/GoogleGrabber.pm
@@ -3,10 +3,10 @@
 #
 # Grabber for video.google.com
 
-package GoogleGrabber;
+package videosite::GoogleGrabber;
 
-use GrabberBase;
-@ISA = qw(GrabberBase);
+use videosite::GrabberBase;
+@ISA = qw(videosite::GrabberBase);
 
 use LWP::Simple qw(!get);
 use HTML::TokeParser;

diff --git a/videosite/GrabberBase.pm b/videosite/GrabberBase.pm
index 6a1c70a..b0bf480 100644 (file)
--- a/videosite/GrabberBase.pm
+++ b/videosite/GrabberBase.pm
@@ -1,9 +1,9 @@
 # (c) 2007 by Ralf Ertzinger <ralf@camperquake.de>
 # licensed under GNU GPL v2
 
-package GrabberBase;
-use Base;
-@ISA = qw(Base);
+package videosite::GrabberBase;
+use videosite::Base;
+@ISA = qw(videosite::Base);
 
 use strict;
 

diff --git a/videosite/HTMLHelper.pm b/videosite/HTMLHelper.pm
index e86b193..5546976 100644 (file)
--- a/videosite/HTMLHelper.pm
+++ b/videosite/HTMLHelper.pm
@@ -2,7 +2,7 @@
 # A helper class for getting values out of a HTML document
 #
 
-package HTMLHelper;
+package videosite::HTMLHelper;
 
 use HTML::TreeBuilder;
 @ISA = qw(HTML::TreeBuilder);

diff --git a/videosite/HTTPRPCGetter.pm b/videosite/HTTPRPCGetter.pm
index 2b92406..16ef726 100644 (file)
--- a/videosite/HTTPRPCGetter.pm
+++ b/videosite/HTTPRPCGetter.pm
@@ -4,10 +4,10 @@
 # A getter which calls a remote URL in order to trigger a 
 # download.
 
-package HTTPRPCGetter;
+package videosite::HTTPRPCGetter;
 
-use GetterBase;
-@ISA = qw(GetterBase);
+use videosite::GetterBase;
+@ISA = qw(videosite::GetterBase);
 
 use strict;
 use LWP::Simple qw(!get);

diff --git a/videosite/LiveLeakGrabber.pm b/videosite/LiveLeakGrabber.pm
index 4e49d44..d640e68 100644 (file)
--- a/videosite/LiveLeakGrabber.pm
+++ b/videosite/LiveLeakGrabber.pm
@@ -3,10 +3,10 @@
 #
 # Grabber for liveleak.com
 
-package LiveLeakGrabber;
+package videosite::LiveLeakGrabber;
 
-use GrabberBase;
-@ISA = qw(GrabberBase);
+use videosite::GrabberBase;
+@ISA = qw(videosite::GrabberBase);
 
 use LWP::Simple qw(!get);
 use HTML::TokeParser;

diff --git a/videosite/MNCastGrabber.pm b/videosite/MNCastGrabber.pm
index 55c5e2c..563d9c7 100644 (file)
--- a/videosite/MNCastGrabber.pm
+++ b/videosite/MNCastGrabber.pm
@@ -3,10 +3,10 @@
 #
 # Grabber for mncast.com
 
-package MNCastGrabber;
+package videosite::MNCastGrabber;
 
-use GrabberBase;
-@ISA = qw(GrabberBase);
+use videosite::GrabberBase;
+@ISA = qw(videosite::GrabberBase);
 
 use LWP::Simple qw(!get);
 use XML::Simple;

diff --git a/videosite/MetaCafeGrabber.pm b/videosite/MetaCafeGrabber.pm
index fe68855..5f14049 100644 (file)
--- a/videosite/MetaCafeGrabber.pm
+++ b/videosite/MetaCafeGrabber.pm
@@ -3,10 +3,10 @@
 #
 # Grabber for metacafe.com
 
-package MetaCafeGrabber;
+package videosite::MetaCafeGrabber;
 
-use GrabberBase;
-@ISA = qw(GrabberBase);
+use videosite::GrabberBase;
+@ISA = qw(videosite::GrabberBase);
 
 use LWP::Simple qw(!get);
 use HTML::Parser;

diff --git a/videosite/MyVideoGrabber.pm b/videosite/MyVideoGrabber.pm
index bd0282b..4b41387 100644 (file)
--- a/videosite/MyVideoGrabber.pm
+++ b/videosite/MyVideoGrabber.pm
@@ -3,10 +3,10 @@
 #
 # Grabber for myvideo.de
 
-package MyVideoGrabber;
+package videosite::MyVideoGrabber;
 
-use GrabberBase;
-@ISA = qw(GrabberBase);
+use videosite::GrabberBase;
+@ISA = qw(videosite::GrabberBase);
 
 use LWP::Simple qw(!get);
 use HTML::Parser;

diff --git a/videosite/NullGetter.pm b/videosite/NullGetter.pm
index 4cd56d8..28e62f5 100644 (file)
--- a/videosite/NullGetter.pm
+++ b/videosite/NullGetter.pm
@@ -4,10 +4,10 @@
 #
 # A getter which does not do anything useful.
 
-package NullGetter;
+package videosite::NullGetter;
 
-use GetterBase;
-@ISA = qw(GetterBase);
+use videosite::GetterBase;
+@ISA = qw(videosite::GetterBase);
 
 use strict;
 use LWP::Simple qw(!get);

diff --git a/videosite/RedTubeGrabber.pm b/videosite/RedTubeGrabber.pm
index 2dda60c..d461c45 100644 (file)
--- a/videosite/RedTubeGrabber.pm
+++ b/videosite/RedTubeGrabber.pm
@@ -6,10 +6,10 @@
 # Algorithm for the file name hash reverse engineered by
 # Maximilian Rehkopf  <otakon at gmx dot net>
 
-package RedTubeGrabber;
+package videosite::RedTubeGrabber;
 
-use GrabberBase;
-@ISA = qw(GrabberBase);
+use videosite::GrabberBase;
+@ISA = qw(videosite::GrabberBase);
 
 use LWP::UserAgent;
 use HTTP::Cookies;

diff --git a/videosite/SevenloadGrabber.pm b/videosite/SevenloadGrabber.pm
index 0aa54db..59e113b 100644 (file)
--- a/videosite/SevenloadGrabber.pm
+++ b/videosite/SevenloadGrabber.pm
@@ -3,10 +3,10 @@
 #
 # Grabber for sevenload.com/de
 
-package SevenloadGrabber;
+package videosite::SevenloadGrabber;
 
-use GrabberBase;
-@ISA = qw(GrabberBase);
+use videosite::GrabberBase;
+@ISA = qw(videosite::GrabberBase);
 
 use LWP::Simple qw(!get);
 use XML::Simple;

diff --git a/videosite/SnotrGrabber.pm b/videosite/SnotrGrabber.pm
index 3e40ff6..1f56838 100644 (file)
--- a/videosite/SnotrGrabber.pm
+++ b/videosite/SnotrGrabber.pm
@@ -3,12 +3,12 @@
 #
 # Grabber for snotr.com
 
-package SnotrGrabber;
+package videosite::SnotrGrabber;
 
-use GrabberBase;
-@ISA = qw(GrabberBase);
+use videosite::GrabberBase;
+@ISA = qw(videosite::GrabberBase);
 
-use HTMLHelper;
+use videosite::HTMLHelper;
 use Data::Dumper;
 
 use strict;

diff --git a/videosite/SpikedHumorGrabber.pm b/videosite/SpikedHumorGrabber.pm
index 9925a30..7e763ca 100644 (file)
--- a/videosite/SpikedHumorGrabber.pm
+++ b/videosite/SpikedHumorGrabber.pm
@@ -3,10 +3,10 @@
 #
 # Grabber for spikedhumor.com
 
-package SpikedHumorGrabber;
+package videosite::SpikedHumorGrabber;
 
-use GrabberBase;
-@ISA = qw(GrabberBase);
+use videosite::GrabberBase;
+@ISA = qw(videosite::GrabberBase);
 
 use LWP::Simple qw(!get);
 use XML::Simple;

diff --git a/videosite/VimeoGrabber.pm b/videosite/VimeoGrabber.pm
index 951e014..4b06bfe 100644 (file)
--- a/videosite/VimeoGrabber.pm
+++ b/videosite/VimeoGrabber.pm
@@ -3,10 +3,10 @@
 #
 # Grabber for vimeo.com
 
-package VimeoGrabber;
+package videosite::VimeoGrabber;
 
-use GrabberBase;
-@ISA = qw(GrabberBase);
+use videosite::GrabberBase;
+@ISA = qw(videosite::GrabberBase);
 
 use LWP::Simple qw(!get);
 use XML::Simple;

diff --git a/videosite/YahooGrabber.pm b/videosite/YahooGrabber.pm
index ee91109..c209351 100644 (file)
--- a/videosite/YahooGrabber.pm
+++ b/videosite/YahooGrabber.pm
@@ -3,10 +3,10 @@
 #
 # Grabber for video.yahoo.com
 
-package YahooGrabber;
+package videosite::YahooGrabber;
 
-use GrabberBase;
-@ISA = qw(GrabberBase);
+use videosite::GrabberBase;
+@ISA = qw(videosite::GrabberBase);
 
 use LWP::Simple qw(!get);
 use XML::Simple;

diff --git a/videosite/YouTubeGrabber.pm b/videosite/YouTubeGrabber.pm
index ce326ea..174f76d 100644 (file)
--- a/videosite/YouTubeGrabber.pm
+++ b/videosite/YouTubeGrabber.pm
@@ -6,10 +6,10 @@
 # download strategy revised using
 # http://www.kde-apps.org/content/show.php?content=41456
 
-package YouTubeGrabber;
+package videosite::YouTubeGrabber;
 
-use GrabberBase;
-@ISA = qw(GrabberBase);
+use videosite::GrabberBase;
+@ISA = qw(videosite::GrabberBase);
 
 use LWP::UserAgent;
 use HTTP::Cookies;

diff --git a/videosite/ZeroPunctuationGrabber.pm b/videosite/ZeroPunctuationGrabber.pm
index 2a93840..fbad1fd 100644 (file)
--- a/videosite/ZeroPunctuationGrabber.pm
+++ b/videosite/ZeroPunctuationGrabber.pm
@@ -3,10 +3,10 @@
 #
 # Grabber for www.escapistmagazine.com/articles/view/editorials/zeropunctuation
 
-package ZeroPunctuationGrabber;
+package videosite::ZeroPunctuationGrabber;
 
-use GrabberBase;
-@ISA = qw(GrabberBase);
+use videosite::GrabberBase;
+@ISA = qw(videosite::GrabberBase);
 
 use LWP::Simple qw(!get);
 use HTML::TokeParser;