Changes in perl/lib/BarnOwl/ModuleLoader.pm [965e14d:41bbb8a]

File:

• perl/lib/BarnOwl/ModuleLoader.pm (modified) (4 diffs)

perl/lib/BarnOwl/ModuleLoader.pm

@@ -8 +8 @@
 use PAR (BarnOwl::get_config_dir() . "/modules/*.par");
 
+our %modules;
+
 sub load_all {
+    my $class = shift;
+    $class->rescan_modules;
     PAR::reload_libs();
+
+    for my $mod (keys %modules) {
+        if(!defined eval "use BarnOwl::Module::$mod") {
+            BarnOwl::error("Unable to load module $mod: \n$@\n") if $@;
+        }
+    }
+
+    $BarnOwl::Hooks::startup->add(\&register_keybindings);
+}
+
+sub rescan_modules {
     PAR->import(BarnOwl::get_data_dir() . "/modules/*.par");
     PAR->import(BarnOwl::get_config_dir() . "/modules/*.par");
-    my %modules;
     my @modules;
+
+    %modules = ();
 
     my @moddirs = ();
@@ -37 +53 @@
         }
     }
-    for my $class (keys %modules) {
-        if(!defined eval "use BarnOwl::Module::$class") {
-            # BarnOwl::error("Unable to load module $class: $!") if $!;
-            BarnOwl::error("Unable to load module $class: \n$@\n") if $@;
+}
+
+sub reload_module {
+    my $class = shift;
+    my $module = shift;
+
+    $class->rescan_modules();
+
+    for my $m (keys %INC) {
+        delete $INC{$m} if $m =~ m{^BarnOwl/Module/$module};
+    }
+
+    my $parfile;
+    for my $p (@PAR::PAR_INC) {
+        if($p =~ m/\Q$module\E[.]par$/) {
+            $parfile = $p;
+            last;
         }
     }
 
-    $BarnOwl::Hooks::startup->add(\&register_keybindings);
+    local $SIG{__WARN__} = \&squelch_redefine;
+
+    if(defined $parfile) {
+        PAR::reload_libs($parfile);
+        $class->run_startup_hooks();
+    } elsif(!defined eval "use BarnOwl::Module::$module") {
+        BarnOwl::error("Unable to load module $module: \n$@\n") if $@;
+    }
+}
+
+sub reload_module_cmd {
+    my $class = shift;
+    shift; # Command
+    my $module = shift;
+    unless(defined($module)) {
+        die("Usage: reload-module [MODULE]");
+    };
+    $class->reload_module($module);
 }
 
@@ -52 +98 @@
                            usage   => 'reload-modules',
                            description => q{Reloads all modules located in ~/.owl/modules and the system modules directory}
+                          });
+    BarnOwl::new_command('reload-module', sub {BarnOwl::ModuleLoader->reload_module_cmd(@_)}, {
+                           summary => 'Reload one module',
+                           usage   => 'reload-module [MODULE]',
+                           description => q{Reloads a single module located in ~/.owl/modules or the system modules directory}
                           });
 }
@@ -63 +114 @@
     $INC{$_} = 1 for (qw(BarnOwl.pm BarnOwl/Hooks.pm
                          BarnOwl/Message.pm BarnOwl/Style.pm));
+    $class->run_startup_hooks();
+}
 
-    $BarnOwl::Hooks::startup->clear;
-    $BarnOwl::Hooks::getBuddyList->clear;
-    $BarnOwl::Hooks::mainLoop->clear;
-    $BarnOwl::Hooks::shutdown->clear;
-    $BarnOwl::Hooks::receiveMessage->clear;
+sub run_startup_hooks {
+    my $class = shift;
     local $SIG{__WARN__} = \&squelch_redefine;
     $class->load_all;