[Slim-Checkins] r33694 - in /7.7/trunk/platforms/win32/installer: SqueezeCenter.iss strings.iss

Author: mherger
Date: Fri Nov 11 06:01:59 2011
New Revision: 33694

URL: http://svn.slimdevices.com/slim?rev=33694&view=rev
Log:
Bug: 17734
Description: let the installer remove the legacy FileCache folder. Add message with a warning to the user - this can take several minutes.

Modified:
    7.7/trunk/platforms/win32/installer/SqueezeCenter.iss
    7.7/trunk/platforms/win32/installer/strings.iss

Modified: 7.7/trunk/platforms/win32/installer/SqueezeCenter.iss
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/win32/installer/SqueezeCenter.iss?rev=33694&r1=33693&r2=33694&view=diff
==============================================================================
--- 7.7/trunk/platforms/win32/installer/SqueezeCenter.iss (original)
+++ 7.7/trunk/platforms/win32/installer/SqueezeCenter.iss Fri Nov 11 06:01:59 2011
@@ -131,9 +131,6 @@
 
 [InstallDelete]
 Type: filesandordirs; Name: {group}
-; bug 9698: remove old (<=7.5) artwork cache, as it can take a loooong time to check permissions and we don't use it any more
-Type: filesandordirs; Name: {commonappdata}\Squeezebox\Cache\Artwork;
-Type: filesandordirs; Name: {commonappdata}\Squeezebox\Cache\ArtworkCache;
 
 [UninstallDelete]
 Type: dirifempty; Name: {app}
@@ -603,6 +600,14 @@
 	// Remove other defunct pieces
 	DeleteFile(ServerDir + 'psapi.dll');
 	DeleteFile(ServerDir + 'SlimServer.exe');
+
+	// bug 9698: remove old (<=7.5) artwork cache, as it can take a loooong time to check permissions and we don't use it any more
+	DelDir := AddBackslash(GetWritablePath('')) + AddBackslash('Cache');
+	Deltree(DelDir + AddBackslash('Artwork'), true, true, true);
+	Deltree(DelDir + AddBackslash('ArtworkCache'), true, true, true);
+	
+	// bug 17734: dito for the FileCache folder. Under certain circumstances this can have grown to tens of thousands of files
+	Deltree(DelDir + AddBackslash('FileCache'), true, true, true);
 end;
 
 procedure GetStartupMode();
@@ -697,6 +702,9 @@
 
 						RemoveServices('SB');
 	
+						ProgressPage.setProgress(0, 0);
+						ProgressPage.SetText(CustomMessage('RemoveLegacyFiles'), CustomMessage('RemoveLegacyFilesWarning'));
+
 						RemoveLegacyFiles();
 	
 					finally

Modified: 7.7/trunk/platforms/win32/installer/strings.iss
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/win32/installer/strings.iss?rev=33694&r1=33693&r2=33694&view=diff
==============================================================================
--- 7.7/trunk/platforms/win32/installer/strings.iss (original)
+++ 7.7/trunk/platforms/win32/installer/strings.iss Fri Nov 11 06:01:59 2011
@@ -1,4 +1,4 @@
-
+
 cz.AppConflict=Nalezen možný konflikt softwaru
 da.AppConflict=Der er fundet en mulig softwarekonflikt
 de.AppConflict=Möglicher Software-Konflikt gefunden
@@ -797,6 +797,10 @@
 ru.UninstallPrefs=Удалить все настройки и файлы журналов?
 sv.UninstallPrefs=Vill du ta bort alla inställningar och loggfiler?
 
+en.RemoveLegacyFiles=Removing legacy files from earlier installations...
+
+en.RemoveLegacyFilesWarning=Please be patient - this task can take several minutes!
+
 cz.UninstallSqueezeCenter=Odinstalovat Logitech Media Server
 da.UninstallSqueezeCenter=Afinstaller Logitech Media Server
 de.UninstallSqueezeCenter=Logitech Media Server deinstallieren

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