diff --git a/addon/yacy-xchat-plugin.py b/addon/yacy-xchat-plugin.py deleted file mode 100644 index e0a04cf66..000000000 --- a/addon/yacy-xchat-plugin.py +++ /dev/null @@ -1,19 +0,0 @@ -import xchat -import urllib -import re -import string - -__module_name__ = "yacy" -__module_version__ = "0.1" -__module_description__ = "Shows yacys current PPM" - -user = "admin" -password = "password" -host = "localhost:8080" -def yacy_ppm(word, word_eol, userdata): - for line in urllib.urlopen("http://"+user+":"+password+"@"+host+"/xml/status_p.xml").readlines(): - if re.compile("").search(line): - xchat.command("me 's YaCy is crawling at "+line.strip().strip("")+" pages per minute.") - return xchat.EAT_ALL - -xchat.hook_command("YACY_SHOW",yacy_ppm,help="/yacy_show - shows the current ppm") diff --git a/addon/yacy_chatscript.pl b/addon/yacy_chatscript.pl new file mode 100644 index 000000000..cb6cbd9c2 --- /dev/null +++ b/addon/yacy_chatscript.pl @@ -0,0 +1,176 @@ +#!/usr/bin/perl + +$VERSION = "0.05"; +%IRSSI = ( + authors => "Alexander Schier & Robert Weidlich", + contact => "", + name => "YaCy Script", + description => "A script to monitor and control YaCy", + license => "GPL", + url => "http://www.yacy-websuche.de", + changed => "Wed Apr 05 2006" + ); + +#use Irssi; +use strict; +use XML::Simple; +use LWP::Simple; +use Data::Dumper; +use vars qw($VERSION %IRSSI); + +my $help = "/yacy show ppm|peer|version|network\n". + " set host|port|user|pass value\n". + " get host|port|user|pass\n". + " help"; +our %cmds = +( + show => ["ppm","peer","version","network"], + set => ["user","pass","host","port"], + help => [] +); +my $prog; + +if ( defined(&Xchat::print) ) { + $prog = "xchat"; + Xchat::register($IRSSI{'name'},$VERSION,$IRSSI{'description'}); +} elsif ( defined(&Irssi::print) ) { + $prog = "irssi"; +} + +sub setting_init() { + if ($prog eq "irssi") { + Irssi::settings_add_str("yacy_script.pl", "yacy_host", "localhost"); + Irssi::settings_add_int("yacy_script.pl", "yacy_port", 8080); + Irssi::settings_add_str("yacy_script.pl", "yacy_user", "admin"); + Irssi::settings_add_str("yacy_script.pl", "yacy_pass", ""); + } elsif ($prog eq "xchat") { + if ( ! -e Xchat::get_info('xchatdir')."/yacy.xml" ) { + my $data = { + host => "localhost", + port => "8080", + user => "admin", + pass => "" + }; + XMLout($data, NoAttr => 1, OutputFile => Xchat::get_info('xchatdir')."/yacy.xml"); + } + + } +} + +sub setting_set($$) { + if ($prog eq "xchat") { + my $data = XMLin(Xchat::get_info('xchatdir')."/yacy.xml"); + $data->{$_[0]} = $_[1]; + open my $fh, '>', Xchat::get_info('xchatdir')."/yacy.xml"; + XMLout($data, NoAttr => 1, OutputFile => $fh); + close $fh; + } elsif ($prog eq "irssi") { + Irssi::settings_set_str("yacy_".$_[0],$_[1]); + } +} + +sub setting_get($) { + if ($prog eq "xchat") { + my $data = XMLin(Xchat::get_info('xchatdir')."/yacy.xml"); + return $data->{$_[0]}; + } elsif ($prog eq "irssi") { + return Irssi::settings_get_str("yacy_".$_[0]); + } +} + +sub yacy($$$) { + my ($host, $port, $user, $pass, $cmd, $arg, $arg2, $prnt, $output); + if ($prog eq "irssi") { + ($cmd,$arg,$arg2)=split / /, shift; + } elsif ($prog eq "xchat") { + $cmd = $_[0][1]; + $arg = $_[0][2]; + $arg2 = $_[0][3]; + } + $host = setting_get("host"); + $port = setting_get("port"); + $user = setting_get("user"); + $pass = setting_get("pass"); + if ($cmd eq "show") { + my $doc=get('http://'.$user.':'.$pass.'@'.$host.':'.$port.'/Network.xml'); + if ( ! $doc ) { + $prnt = "Peer is not running."; + } else { + my $data = XMLin($doc); + if ($arg eq "ppm") { + $output = "is now crawling with YaCy at $data->{'your'}->{'ppm'} pages per minute."; + } elsif ($arg eq "peer") { + $output = "operates the $data->{'your'}->{'type'} YaCy peer $data->{'your'}->{'name'}, which is running $data->{'your'}->{'uptime'}"; + } elsif ($arg eq "version") { + $output = "uses YaCy version $data->{'your'}->{'version'}"; + } elsif ($arg eq "network") { + $output = "'s peer currently knows $data->{'active'}->{'count'} senior and $data->{'potential'}->{'count'} junior peers"; + } else { + $prnt="Unknown argument: \"$arg\"\n$help"; + } + } + } elsif ($cmd eq "set") { + if ($arg) { + if ($arg2) { + setting_set($arg,$arg2); + } else { + $prnt = "$arg is currently set to \"".setting_get($arg)."\""; + } + } else { + $prnt = "Argument required\n$help"; + } + } elsif ($cmd eq "help") { + $prnt=$help; + } else { + $prnt="Unknown command: \"$cmd\"\n$help"; + } + if ( $prog eq "irssi" ) { + Irssi::active_win->command("/me $output") if ($output); + Irssi::active_win->print($prnt) if ($prnt); + } elsif ( $prog eq "xchat" ) { + Xchat::print($prnt) if ($prnt); + Xchat::command("me $output") if ($output); + return 3; + } +} + +sub cmd_help() { + my ($arg) = @_; + if ( $arg =~ /(yacy)/ ) { + Irssi::print($help); + Irssi::signal_stop(); + } +} + +sub signal_complete_word { + my ($list, $window, $word, $linestart, $want_space) = @_; + if($linestart =~ /\/yacy/){ + Irssi::signal_stop(); + my @words=split(/ /, $linestart); + if(@words == 1){ + my @cmds2=keys(%cmds); + foreach (@cmds2){ + if($_ =~/^$word/i){ + push(@$list, $_); + } + } + }elsif(@words == 2){ + my @cmds2=$cmds{@words[1]}; + for my $i (0 .. $#{$cmds2[0]} ) { + if($cmds2[0][$i] =~/^$word/i){ + push(@$list, $cmds2[0][$i]); + } + } + } + + } +} + +setting_init(); +if ( $prog eq "irssi" ) { + Irssi::command_bind("help","cmd_help", "Irssi commands"); + Irssi::command_bind('yacy', \&yacy); + Irssi::signal_add('complete word', 'signal_complete_word'); +} elsif ( $prog eq "xchat") { + Xchat::hook_command("yacy","yacy",{help_text => $help}); +} diff --git a/addon/yacy_irssi.pl b/addon/yacy_irssi.pl deleted file mode 100755 index c65d324ed..000000000 --- a/addon/yacy_irssi.pl +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/perl - -use LWP::UserAgent; - -$VERSION = "0.01"; -%IRSSI = ( - authors => "Alexander Schier", - contact => "", - name => "yacy_script", - description => "A Yacy Script for Irssi", - license => "GPL", - url => "http://www.yacy-websuche.de", - changed => "Thu Mar 16 2006" - ); - -use Irssi; -use strict; - -Irssi::settings_add_str("yacy_script.pl", "yacy_host", "localhost"); -Irssi::settings_add_int("yacy_script.pl", "yacy_port", 8080); -Irssi::settings_add_str("yacy_script.pl", "yacy_user", "admin"); -Irssi::settings_add_str("yacy_script.pl", "yacy_password", ""); - -my $ua = LWP::UserAgent->new; -$ua->timeout(10); -$ua->env_proxy; - -sub yacy_show($$$){ - my $host=Irssi::settings_get_str("yacy_host"); - my $port=Irssi::settings_get_int("yacy_port"); - my $user=Irssi::settings_get_str("yacy_user"); - my $pass=Irssi::settings_get_str("yacy_password"); - - my $BASEURL="http://".$user.":".$pass."@".$host.":".$port; - my $response = $ua->get($BASEURL."/xml/status_p.xml"); - my @content=$response->content; - my $PPM=0; - foreach my $line (@content){ - if($line=~/(.*?)<\/ppm>/){ - $PPM=$1; - } - } - #Irssi::active_win->command("/me is now crawling with YaCy at $PPM pages per minute."); - Irssi::active_win->command("/me 's YaCy is crawling at $PPM pages per minute."); -} - -Irssi::command_bind('yacy_show', \&yacy_show); diff --git a/htroot/ConfigAdvanced_p.html b/htroot/ConfigAdvanced_p.html index 936a629bd..b2cb01068 100644 --- a/htroot/ConfigAdvanced_p.html +++ b/htroot/ConfigAdvanced_p.html @@ -19,8 +19,8 @@ document.getElementById("value").value=element.value;

Advanced Config

Here are all configuration options from YaCy.
-You can change anything, but some options need a restart, and some options can crash YaCy, if wrong values are used. -For explanation please look into yacy.init +You can change anything, but some options need a restart, and some options can crash YaCy, if wrong values are used.
+For an explanation of the available options please look into yacy.init