#1313 Explicitely call a full wipe & rescan on wizard completion.

Signed-off-by: Michael Herger <michael@herger.net>
LMS-Community · Feb 4, 2025 · 845e9f2 · 845e9f2
1 parent 4278a23
commit 845e9f2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/Slim/Music/Import.pm b/Slim/Music/Import.pm
@@ -795,14 +795,12 @@ sub initScanQueue {
 sub nextScanTask {
 	return if main::SCANNER || __PACKAGE__->stillScanning;
 
-	# first parameter would be either the class, or the request object (if triggered by a subscription)
-	my $force = $_[1];
 	my @keys = keys %scanQueue;
 
 	my $k    = shift @keys;
 	my $next = delete $scanQueue{$k};
 
-	if (!$force && $recentlyScanned{$k}++) {
+	if ($recentlyScanned{$k}++) {
 		main::INFOLOG && $log->is_info && $log->info("Skipping scan, as we run it recently: $k");
 		return;
 	}

diff --git a/Slim/Web/Settings/Server/Wizard.pm b/Slim/Web/Settings/Server/Wizard.pm
@@ -180,6 +180,7 @@ sub handler {
 				main::DEBUGLOG && $log->is_debug() && $log->debug('Setting music folder: ' . Data::Dump::dump($dirs));
 
 				$serverPrefs->set($pref, $dirs);
+				Slim::Control::Request::executeRequest(undef, ['wipecache', 'queue']);
 			}
 			else {
 				main::DEBUGLOG && $log->is_debug() && $log->debug("Setting $pref folder: $paramRef->{$pref}");
@@ -223,8 +224,7 @@ sub handler {
 
 		if (Slim::Utils::PluginDownloader->downloading) {
 			$finalizeCb = sub {
-				Slim::Music::Import->doQueueScanTasks(0);
-				Slim::Music::Import->nextScanTask(1);
+				_triggerScan();
 
 				Slim::Web::HTTP::filltemplatefile($class->page, $paramRef);
 				$pageSetup->( $client, $paramRef, Slim::Web::HTTP::filltemplatefile($class->page, $paramRef), $httpClient, $response );
@@ -234,8 +234,7 @@ sub handler {
 		}
 	}
 
-	Slim::Music::Import->doQueueScanTasks(0);
-	Slim::Music::Import->nextScanTask(1);
+	_triggerScan();
 
 	if ($client) {
 		$paramRef->{playericon} = Slim::Web::Settings::Player::Basic->getPlayerIcon($client,$paramRef);
@@ -245,6 +244,12 @@ sub handler {
 	return Slim::Web::HTTP::filltemplatefile($class->page, $paramRef);
 }
 
+sub _triggerScan {
+	main::DEBUGLOG && $log->is_debug && $log->debug('Now finally run a full wipe & resacan.');
+	Slim::Music::Import->doQueueScanTasks(0);
+	Slim::Music::Import->nextScanTask();
+}
+
 sub _checkPluginDownloads {
 	Slim::Utils::Timers::killTimers(undef, \&_checkPluginDownloads);