[Slim-Checkins] r33647 - in /7.7/trunk/server: HTML/EN/settings/server/performance.html Slim/Utils/Scanner/LMS.pm strings.txt

Author: mherger
Date: Wed Nov  2 15:13:04 2011
New Revision: 33647

URL: http://svn.slimdevices.com/slim?rev=33647&view=rev
Log:
Bug: n/a
Description: change default behaviour re. pre-caching of artwork. Make pre-caching of images and video previews for SB devices and the web UI optional. Default to pre-caching album covers only. This should help keeping the artwork cache size reasonable.

Modified:
    7.7/trunk/server/HTML/EN/settings/server/performance.html
    7.7/trunk/server/Slim/Utils/Scanner/LMS.pm
    7.7/trunk/server/strings.txt

Modified: 7.7/trunk/server/HTML/EN/settings/server/performance.html
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/HTML/EN/settings/server/performance.html?rev=33647&r1=33646&r2=33647&view=diff
==============================================================================
--- 7.7/trunk/server/HTML/EN/settings/server/performance.html (original)
+++ 7.7/trunk/server/HTML/EN/settings/server/performance.html Wed Nov  2 15:13:04 2011
@@ -21,7 +21,8 @@
 	[% WRAPPER setting title="SETUP_PRECACHEARTWORK" desc="SETUP_PRECACHEARTWORK_DESC" %]
 		<select class="stdedit" name="pref_precacheArtwork" id="precacheArtwork">
 
-			<option [% IF prefs.pref_precacheArtwork %]selected [% END %]value="1">[% 'SETUP_PRECACHEARTWORK_ENABLED' | getstring %]</option>
+			<option [% IF prefs.pref_precacheArtwork == 1 %]selected [% END %]value="1">[% 'SETUP_PRECACHEARTWORK_ENABLED' | getstring %]</option>
+			<option [% IF prefs.pref_precacheArtwork == 2 %]selected [% END %]value="2">[% 'SETUP_PRECACHEARTWORK_ALL' | getstring %]</option>
 			<option [% IF NOT prefs.pref_precacheArtwork %]selected [% END %]value="0">[% 'SETUP_PRECACHEARTWORK_DISABLED' | getstring %]</option>
 		
 		</select>

Modified: 7.7/trunk/server/Slim/Utils/Scanner/LMS.pm
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Slim/Utils/Scanner/LMS.pm?rev=33647&r1=33646&r2=33647&view=diff
==============================================================================
--- 7.7/trunk/server/Slim/Utils/Scanner/LMS.pm (original)
+++ 7.7/trunk/server/Slim/Utils/Scanner/LMS.pm Wed Nov  2 15:13:04 2011
@@ -201,6 +201,22 @@
 		                                          # and notify us of files that have been deleted
 	}
 	
+	my $thumbnails = [
+		# DLNA
+		{ format => 'JPEG', width => 160, height => 160 }, # for JPEG_TN
+		{ format => 'PNG', width => 160, height => 160 },  # for PNG_TN
+	];
+	
+	if ( $prefs->get('precacheArtwork') == 2 ) {
+		push @$thumbnails, (
+			# SP
+			{ format => 'PNG', width => 41, height => 41 },    # jive/baby
+			{ format => 'PNG', width => 40, height => 40 },    # fab4 touch
+			# Web UI large thumbnails
+			{ format => 'PNG', width => $prefs->get('thumbSize') || 100, height => $prefs->get('thumbSize') || 100 },
+		);
+	}
+	
 	# Begin scan
 	$s = Media::Scan->new( $paths, {
 		loglevel => $log->is_debug ? MS_LOG_DEBUG : MS_LOG_ERR, # Set to MS_LOG_MEMORY for very verbose logging
@@ -209,16 +225,7 @@
 		cachedir => $prefs->get('librarycachedir'),
 		ignore => $ignore,
 		ignore_dirs => $ignore_dirs,
-		thumbnails => [
-			# DLNA
-			{ format => 'JPEG', width => 160, height => 160 }, # for JPEG_TN
-			{ format => 'PNG', width => 160, height => 160 },  # for PNG_TN
-			# SP
-			{ format => 'PNG', width => 41, height => 41 },    # jive/baby
-			{ format => 'PNG', width => 40, height => 40 },    # fab4 touch
-			# Web UI large thumbnails
-			{ format => 'PNG', width => $prefs->get('thumbSize') || 100, height => $prefs->get('thumbSize') || 100 },
-		],
+		thumbnails => $thumbnails,
 		on_result => sub {
 			my $result = shift;
 			

Modified: 7.7/trunk/server/strings.txt
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/strings.txt?rev=33647&r1=33646&r2=33647&view=diff
==============================================================================
--- 7.7/trunk/server/strings.txt (original)
+++ 7.7/trunk/server/strings.txt Wed Nov  2 15:13:04 2011
@@ -18815,11 +18815,15 @@
 	RU	По умолчанию все обложки, обнаруженные в ходе сканирования, автоматически изменяют размер и кэшируются, чтобы улучшить производительность при работе в Squeezebox Controller или веб-интерфейсе. Поскольку данная функция может замедлить сканирование, ее можно отключить.
 	SV	Som standard storleksanpassas och cachelagras alla albumomslag som hittas i genomsökningsfasen för högre prestanda när Squeezebox Controller eller webbgränssnittet används. Detta gör dock att sökningen tar längre tid, och därför kan du avaktivera funktionen här.
 
+SETUP_PRECACHEARTWORK_ALL
+	DE	Plattenhüllen, Fotos und Videos zwischenspeichern
+	EN	Pre-cache album, photo and video artwork
+
 SETUP_PRECACHEARTWORK_ENABLED
 	CS	Ukládat obaly alb do odkládací paměti
 	DA	Gem coverbilleder i cachelager
 	DE	Plattenhüllen zwischenspeichern
-	EN	Pre-cache artwork
+	EN	Pre-cache album artwork
 	ES	Guardar carátula en caché previamente
 	FI	Tallenna levykannet valmiiksi välimuistiin
 	FR	Mettre la pochette en pré-cache

_______________________________________________
checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/checkins