Merge branch 'public/9.1' of https://github.com/SamInPgh/slimserver into public/9.1

Author: SamInPgh

Changelog9.html

@@ -8,6 +8,7 @@ <h2><a name="v9.1.0" id="v9.1.0"></a>Version 9.1.0</h2>
 		<li>Optionally navigate playlists by folders, allowing you to organise your playlists hierarchically.</li>
 		<li>Implement an artist portrait picture handler. This will read images from folders where you've stored them under the artist's name, or from the artist folder in a typical artist/album/track hierarchy.</li>
 		<li>Add a plugin to try to fetch artwork for radio stations which don't provide track artwork.</li>
+		<li>Add new scan modes "album" and "track" to re-scan individual albums or tracks. Album scan is available from an album's Info menu.</li>
 		<li><a href="https://github.com/LMS-Community/slimserver/pull/1425">#1425</a> - Add playlist drag and drop support to the Classic skin (thanks @oreillymj)</li>
 		<li><a href="https://github.com/LMS-Community/slimserver/pull/1426">#1426</a> - add support for ListenBrainz to AudioScrobbler plugin (thanks @vysmaty & AI)</li>
 		<li>Allow GETting the JSONRPC.js handler with a "request" parameter to simplify access by limited clients.</li>

Slim/Control/Commands.pm

@@ -28,7 +28,7 @@ use strict;
 
 use Scalar::Util qw(blessed looks_like_number);
 use File::Spec::Functions qw(catfile);
-use File::Basename qw(basename);
+use File::Basename qw(basename dirname);
 use Digest::MD5 qw(md5_hex);
 use JSON::XS::VersionOneAndTwo;
 
@@ -2684,10 +2684,18 @@ sub rescanCommand {
 	# get our parameters
 	my $originalMode;
 	my $mode = $originalMode = $request->getParam('_mode') || 'full';
-	my $singledir = $request->getParam('_singledir');
+	my $target = $request->getParam('_target');
+	my $singledir;
 
-	if ($singledir) {
-		$singledir = Slim::Utils::Misc::pathFromFileURL($singledir);
+	if ($mode =~ /album|track/) {
+		if (!$target) {
+			$log->error("Album or Tracks scan modes need an album or track ID.");
+			$request->setStatusBadDispatch();
+			return;
+		}
+	}
+	elsif ($target) {
+		$singledir = Slim::Utils::Misc::pathFromFileURL($target);
 
 		# don't run scan if newly added entry is disabled for all media types
 		if ( grep { /\Q$singledir\E/ } @{ Slim::Utils::Misc::getInactiveAudioDirs() }) {
@@ -2709,12 +2717,13 @@ sub rescanCommand {
 	}
 
 	# Bug 17358, if any plugin importers are enabled such as iTunes/MusicIP, run an old-style external rescan
-	# XXX Rewrite iTunes and MusicIP to support async rescan
-	my $importers = Slim::Music::Import->importers();
-	while ( my ($class, $config) = each %{$importers} ) {
-		if ( $class =~ /(?:Plugin|Slim::Music::VirtualLibraries)/ && $config->{use} ) {
-			$mode = 'external';
-			last;
+	if ($mode !~ /album|track/) {
+		my $importers = Slim::Music::Import->importers();
+		while ( my ($class, $config) = each %{$importers} ) {
+			if ( $class =~ /(?:Plugin|Slim::Music::VirtualLibraries)/ && $config->{use} ) {
+				$mode = 'external';
+				last;
+			}
 		}
 	}
 
@@ -2733,6 +2742,44 @@ sub rescanCommand {
 
 		Slim::Music::Import->launchScan(\%args);
 	}
+	elsif ($mode =~ /album|track/) {
+		# quick in-process scan of an individual object's (album or track) folder
+		my @tracks;
+		if ($mode eq 'track') {
+			my $track = Slim::Schema->rs('Track')->single( { id => $target } );
+			push @tracks, $track if $track;
+		}
+		elsif ($mode eq 'album') {
+			my $album = Slim::Schema->rs('Album')->single( { id => $target } );
+			push @tracks, $album->tracks if $album;
+		}
+
+		my $dbh = Slim::Schema->dbh;
+		my $sth = $dbh->prepare_cached('DELETE FROM scanned_files WHERE url = ?');
+		my @paths = Slim::Utils::Misc::uniq(
+			map {
+				# reset the track's timestamp so changes are certainly picked up
+				$_->timestamp(0);
+				$_->update;
+
+				# delete entry in scanned_files - otherwise rescan doesn't handle deletions for non-recursive scans
+				$sth->execute($_->url);
+
+				dirname(Slim::Utils::Misc::pathFromFileURL($_->url));
+			} @tracks
+		);
+
+		# need to delete the entry for the folder, too
+		foreach (@paths) {
+			$sth->execute(Slim::Utils::Misc::fileURLFromPath($_));
+		}
+
+		Slim::Utils::Scanner::Local->rescan(\@paths, {
+			no_async  => 1,
+			types     => 'audio',
+			recursive => 0,
+		} ) if scalar @paths;
+	}
 	else {
 		# In-process scan
 

Slim/Control/Request.pm

@@ -604,7 +604,7 @@ sub init {
 	addDispatch(['pref',           '_prefname',      '_newvalue'],                                     [0, 0, 1, \&Slim::Control::Commands::prefCommand]);
 	addDispatch(['remote',         '?'],                                                               [1, 1, 0, \&Slim::Control::Queries::cursonginfoQuery]);
 	addDispatch(['rescan',         '?'],                                                               [0, 1, 0, \&Slim::Control::Queries::rescanQuery]);
-	addDispatch(['rescan',         '_mode',          '_singledir'],                                    [0, 0, 0, \&Slim::Control::Commands::rescanCommand]);
+	addDispatch(['rescan',         '_mode',          '_target'],                                       [0, 0, 0, \&Slim::Control::Commands::rescanCommand]);
 	addDispatch(['rescanprogress'],                                                                    [0, 1, 1, \&Slim::Control::Queries::rescanprogressQuery]);
 	addDispatch(['restartserver'],                                                                     [0, 0, 0, \&Slim::Control::Commands::stopServer]);
 	addDispatch(['search',         '_index',         '_quantity'],                                     [0, 1, 1, \&Slim::Control::Queries::searchQuery]);

Slim/Menu/AlbumInfo.pm

@@ -124,6 +124,11 @@ sub registerDefaultInfoProviders {
 		after => 'compilation',
 		func  => \&infoExternalId,
 	) );
+
+	$class->registerInfoProvider( rescan => (
+		after => 'bottom',
+		func  => \&rescanAlbum,
+	) );
 }
 
 sub menu {
@@ -568,6 +573,33 @@ sub addAlbum {
 	};
 }
 
+sub rescanAlbum {
+	my ( $client, $url, $album ) = @_;
+
+	return unless blessed($album) && !$album->extid;
+
+	return {
+		name        => cstring($client, 'RESCAN_ALBUM'),
+		type        => 'link',
+		passthrough => [ $album->id ],
+		url         => sub {
+			my ( $client, $callback, undef, $albumId ) = @_;
+
+			return unless $albumId;
+
+			Slim::Control::Request::executeRequest(undef, [ 'rescan', 'album', $albumId ]);
+
+			$callback->( {
+				type        => 'text',
+				nextWindow  => 'parent',
+				name        => $client->string('RESCAN_ALBUM'),
+				showBriefly => 1,
+			} );
+		},
+		favourites  => 0,
+	};
+}
+
 sub infoReplayGain {
 	my ( $client, $url, $album ) = @_;
 

strings.txt

@@ -6895,6 +6895,13 @@ SETUP_PLAYLISTRESCAN
 	SV	Sök bara igenom spellistorna på nytt
 	ZH_CN	重新扫描播放表而已。
 
+RESCAN_ALBUM
+	CS	Znovu naskenovat album
+	DE	Album neu einlesen
+	EN	Rescan Album
+	FR	Réanalyser l'album
+	NL	Album opnieuw scannen
+
 SETUP_AUTO_RESCAN
 	CS	Automaticky detekovat změny
 	DA	Registrer automatisk ændringer