added check in clean for catalog path readability, if unreadable stop clean and do not remove files

2 files changed, 14 insertions, 0 deletions

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 494a0a97..7d257840 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,8 @@
 
 --------------------------------------------------------------------------
   v.3.4-Alpha2 
+  	- Added check on clean to see if Root path is readable, if not
+		stop clean (mount point failures) 
   	- Fixed now playing, hopefully once and for all
   	- Added distinct sessions for each stream action, also allows
 		for independent session lengths between interface
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index 61bc19fa..11d69781 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -34,6 +34,7 @@ class Catalog {
 	public $rename_pattern;
 	public $sort_pattern;
 	public $catalog_type;
+	public $path; 
 
 	/* This is a private var that's used during catalog builds */
 	private $_playlists = array();
@@ -1235,6 +1236,17 @@ class Catalog {
 		require_once Config::get('prefix') . '/templates/show_clean_catalog.inc.php';
 		flush(); 
 
+		/* Do a quick check to make sure that the root of the catalog is readable, error if not 
+		 * this will minimize the loss of catalog data if mount points fail
+		 */
+		if (!is_readable($this->path)) { 
+			debug_event('catalog','Catalog path:' . $this->path . ' unreadable, clean failed','1'); 
+			Error::add('general',_('Catalog Root unreadable, stopping clean')); 
+			Error::display('general'); 
+			return false; 
+		} 
+
+
 		/* Get all songs in this catalog */
 		$sql = "SELECT `id`,`file` FROM `song` WHERE `catalog`='$this->id' AND enabled='1'";
 		$db_results = Dba::query($sql);