Changeset 403

Timestamp:

15/08/08 15:56:49 (2 years ago)

Author:

stuarth

Message:

Initial support for Windows!

Location:

trunk

Files:

• INSTALL (modified) (1 diff)
• Makefile (modified) (1 diff)
• Monitor_Linux.pm (modified) (1 diff)
• Monitor_Windows.pm (added)
• Plugin.pm (modified) (7 diffs)
• install.xml (modified) (1 diff)

trunk/INSTALL

@@ -39 +39 @@
 @@HOWTO install@@
 
+
+WINDOWS SPECIALS
+Must be running the ActiveState perl version (ie run slimserver.pl directly).
+
 Copyright © Stuart Hickinbottom 2007-2008

trunk/Makefile

@@ -21 +21 @@
 
 VERSION=1.0b5
-PERLSOURCE=Plugin.pm Settings.pm Monitor_Linux.pm
+PERLSOURCE=Plugin.pm Settings.pm Monitor_Linux.pm Monitor_Windows.pm
 HTMLSOURCE=HTML/EN/plugins/AutoRescan/settings/basic.html
 SOURCE=$(PERLSOURCE) $(HTMLSOURCE) INSTALL strings.txt install.xml LICENSE

trunk/Monitor_Linux.pm

@@ -51 +51 @@
         my $invocant = shift;
         my $class = ref($invocant) || $invocant;
-        my $self = { };
+        my $self = {
+                poll_each => 0,
+        };
         bless($self, $class);
 

trunk/Plugin.pm

@@ -26 +26 @@
 # instructions on the kernel configuration.
 #
+# @@TODO@@
+#
 # For further details see:
 # http://www.hickinbottom.com
@@ -38 +40 @@
 use utf8;
 use Plugins::AutoRescan::Settings;
-use Plugins::AutoRescan::Monitor_Linux;
 use Slim::Utils::Strings qw (string);
 use Slim::Utils::Timers;
@@ -124 +125 @@
         if ($os eq 'unix') {
                 $log->debug('Linux monitoring method selected');
+                eval 'use Plugins::AutoRescan::Monitor_Linux';
                 $monitor = Plugins::AutoRescan::Monitor_Linux->new($class);
-        } elsif ($os eq 'windows') {
+        } elsif ($os eq 'win') {
                 $log->debug('Windows monitoring method selected');
-                #@@TODO@@
+                eval 'use Plugins::AutoRescan::Monitor_Windows';
+                $monitor = Plugins::AutoRescan::Monitor_Windows->new($class);
         } else {
                 $log->warn("Unsupported operating system type '$os' - will not monitor for changes");
@@ -173 +176 @@
 }
 
-# Add an inotify watch to the music folder.
+# Add a watch to the music folder.
 sub addWatch() {
         my $audioDir = $serverPrefs->get('audiodir');
 
         if (defined $audioDir && -d $audioDir) {
-                $log->debug("Adding inotify monitor to music directory: $audioDir");
+                $log->debug("Adding monitor to music directory: $audioDir");
 
                 # Add the watch callback. This will also watch all subordinate folders.
@@ -216 +219 @@
                 # it's already being monitored later on.
                 $monitors{$dir} = $monitor->addWatch($dir);
-        } else {
-                $log->debug("Not adding monitor, one is already present for: $dir");
         }
 }
@@ -224 +225 @@
 sub poller() {
 
-        # Pump that poller - let the monitors decide how to do that.
-        $monitor->poll if $monitor;
+        # Pump that poller - let the monitors decide how to do that. We support
+        # pumping for each monitored directory, or only once in total, depending
+        # on what the monitor type wants to do.
+        if ($monitor && $monitor->{poll_each}) {
+                # Loop through the monitored directories and poll each.
+                for my $dir (keys %monitors) {
+                        $monitor->poll($dir, $monitors{$dir});
+                }
+        } else {
+                # Pump the poller once.
+                $monitor->poll if $monitor;
+        }
 
         # Flag of whether any rescanning was performed.
@@ -264 +275 @@
                                 
                                 delete $touchedDirs{$dir};
+
+                                # Make sure we are monitoring any new subdirectories under here.
+                                addNotifierRecursive($dir);
                         }
                 }

trunk/install.xml

@@ -44 +44 @@
         </targetApplication>
 
-        <targetPlatform>Linux</targetPlatform>
+<!--    <targetPlatform>Linux</targetPlatform> -->
+<!--    <targetPlatform>Windows</targetPlatform> -->
 </extension>