Add parameters to OnSendWhoLine hook, fixes "/who * o" returning opers with +H

[user/henk/code/inspircd.git] / modulemanager

diff --git a/modulemanager b/modulemanager
index 96d58834d8024caeb0d78fb4f7c651504201e826..0e978977abdc098d17f1b202c8af2e31ff450dba 100755 (executable)
--- a/modulemanager
+++ b/modulemanager
@@ -24,6 +24,7 @@ my %url_seen;
 
 sub parse_url;
 
+# retrieve and parse entries from sources.list
 sub parse_url {
        my $src = shift;
        return if $url_seen{$src};
@@ -65,6 +66,29 @@ sub parse_url {
        }
 }
 
+# hash of installed module versions from our mini-database, key (m_foobar) to version (00abacca..).
+my %mod_versions;
+
+# useless helper stub
+sub getmodversion {
+       my ($file) = @_;
+       return $mod_versions{$file};
+}
+
+# read in installed versions
+if (-e '.modulemanager')
+{
+       open SRC, '.modulemanager' or die ".modulemanager exists but i can't read it: $!";
+       while (<SRC>)
+       {
+               s/\n//;
+               (my $mod, my $ver) = split(/ /, $_);
+               $mod_versions{$mod} = $ver;
+       }
+       close SRC;
+}
+
+# read in external URL sources
 open SRC, 'sources.list' or die "Could not open sources.list: $!";
 while (<SRC>) {
        next if /^\s*#/;
@@ -74,6 +98,7 @@ close SRC;
 
 getmodules(1);
 
+# determine core version
 `./src/version.sh` =~ /InspIRCd-([0-9.]+)/ or die "Cannot determine inspircd version";
 $installed{core} = $1;
 $modules{core}{$1} = {
@@ -83,10 +108,11 @@ $modules{core}{$1} = {
        from => 'local file',
 };
 
+# set up core module list
 for my $modname (@modlist) {
        my $mod = "m_$modname";
        my $modfile = "src/modules/$mod.cpp";
-       my $ver = getmodversion($modfile) || '0.0';
+       my $ver = getmodversion($mod) || '0.0';
        $ver =~ s/\$Rev: (.*) \$/$1/; # for storing revision in SVN
        $installed{$mod} = $ver;
        next if $modules{$mod}{$ver};
@@ -159,7 +185,7 @@ sub resolve_deps {
                        my $ver = $todo{$mod};
                        my $info = $modules{$mod}{$ver} or die "no dependency information on $mod $ver";
                        for my $dep (@{$info->{depends}}) {
-                               $dep =~ /^(\S+)(?: ([-0-9.]+))?/ or die "Bad dependency $dep from $info->{from}";
+                               $dep =~ /^(\S+)(?: (\S+))?/ or die "Bad dependency $dep from $info->{from}";
                                my($depmod, $depvers) = ($1,$2);
                                next if $todo{$depmod} && ver_in_range($todo{$depmod}, $depvers);
                                # need to install a dependency
@@ -172,7 +198,7 @@ sub resolve_deps {
                                }
                        }
                        for my $dep (@{$info->{conflicts}}) {
-                               $dep =~ /^(\S+)(?: ([-0-9.]+))?/ or die "Bad dependency $dep from $info->{from}";
+                               $dep =~ /^(\S+)(?: (\S+))?/ or die "Bad dependency $dep from $info->{from}";
                                my($depmod, $depvers) = ($1,$2);
                                next unless $todo{$depmod} && ver_in_range($todo{$depmod}, $depvers);
                                # if there are changes this round, maybe the conflict won't come up after they are resolved.
@@ -252,11 +278,15 @@ resolve_deps(0);
 
 $| = 1; # immediate print of lines without \n
 
+print "Processing changes for $action...\n";
 for my $mod (keys %installed) {
        next if $todo{$mod};
        print "Uninstalling $mod $installed{$mod}\n";
        unlink "src/modules/$mod.cpp";
 }
+
+my $count = scalar keys %todo;
+print "Checking $count items...\n";
 for my $mod (sort keys %todo) {
        my $ver = $todo{$mod};
        my $oldver = $installed{$mod};
@@ -270,6 +300,8 @@ for my $mod (sort keys %todo) {
        } else {
                print "Installing $mod $ver from $url";
        }
+       $mod_versions{$mod} = $ver;
+
        my $stat = getstore($url, "src/modules/$mod.cpp");
        if ($stat == 200) {
                print " - done\n";
@@ -277,3 +309,13 @@ for my $mod (sort keys %todo) {
                print " - HTTP $stat\n";
        }
 }
+
+# write database of installed versions
+open SRC, '>.modulemanager' or die "can't write installed versions to .modulemanager, won't be able to track upgrades properly: $!";
+foreach my $key (keys %mod_versions)
+{
+       print SRC "$key $mod_versions{$key}\n";
+}
+close SRC;
+
+print "Finished!\n";