Index: C:/slim/server/Slim/Plugin/iTunes/Common.pm =================================================================== --- C:/slim/server/Slim/Plugin/iTunes/Common.pm (revision 13067) +++ C:/slim/server/Slim/Plugin/iTunes/Common.pm (working copy) @@ -103,7 +103,10 @@ $path = Slim::Utils::Misc::pathFromFileURL($1); last; } - } + if (/(.*iTunes%20Library.xml)<\/string>$/) { + $path = Slim::Utils::Misc::pathFromFileURL($1); + last; + } } close PLIST; @@ -131,6 +134,11 @@ if ($folder->QueryValueEx("My Music", $type, $value)) { $path = $value . '\\iTunes\\iTunes Music Library.xml'; + + if (! -r $path) { + $path = $value . '\\My Music\\iTunes\\iTunes Library.xml'; + } + $log->info("Found 'My Music' here: $value for $path"); } @@ -140,6 +148,11 @@ } elsif ($folder->QueryValueEx("Personal", $type, $value)) { $path = $value . '\\My Music\\iTunes\\iTunes Music Library.xml'; + + if (! -r $path) { + $path = $value . '\\My Music\\iTunes\\iTunes Library.xml'; + } + $log->info("Found 'Personal' here: $value for $path"); } } @@ -159,6 +172,10 @@ $explicit_xml_path = catfile(($explicit_xml_path), 'iTunes Music Library.xml'); } + if (!-r $explicit_xml_path) { + $explicit_xml_path = catfile(($explicit_xml_path), 'iTunes Library.xml'); + } + if (-r $explicit_xml_path) { return $explicit_xml_path; } @@ -211,6 +228,11 @@ for my $dir (@searchdirs) { $path = catfile(($dir), 'iTunes Music Library.xml'); + if (!($path && -r $path)) { + + $path = catfile(($dir), 'iTunes Library.xml'); + } + if ($path && -r $path) { $log->info("Found path via directory search at: $path");