Put caches in a folder per user.

Fixes possible album name conflicts.

TODO

@@ -1,8 +1,6 @@
 
 - Refine installation instructions a bit with examples and cmdlines
 
-- make a cache folder per user: $cache_base/$user/$album/$object
-
 - check input size against allowed list
 
 - use ffmpeg to get "Date Created" from video files in bg daemon. Somehow

album-watch.php

@@ -27,11 +27,13 @@ function do_file($path, $album, $user)
 	}
 
 	# might need to mkdir first
-	if (!is_dir($cache_base . "/" . $album))
-		mkdir($cache_base . "/" . $album);
+	if (!is_dir($cache_base . "/" . $user))
+		mkdir($cache_base . "/" . $user);
+	if (!is_dir($cache_base . "/" . $user . "/" . $album))
+		mkdir($cache_base . "/" . $user . "/" . $album);
 
 	# thumbnail
-	$t = $cache_base . "/" . $album . "/" . $i['filename'] . ".thm";
+	$t = $cache_base . "/" . $user . "/" . $album . "/" . $i['filename'] . ".thm";
 	if (!is_file($t)) {
 		echo 'ffmpeg -i "' . $path . '" -ss 0 -vframes 1 -f mjpeg -an "' . $t . '.in"' . "\n";
 		system('ffmpeg -i "' . $path . '" -ss 0 -vframes 1 -f mjpeg -an "' . $t . '.in" > /dev/null 2>&1');
@@ -61,7 +63,7 @@ function do_file($path, $album, $user)
 	}
 
 	# mp4
-	$t = $cache_base . "/" . $album . "/" . $i['filename'] . ".mp4";
+	$t = $cache_base . "/" . $user . "/" . $album . "/" . $i['filename'] . ".mp4";
 	if (!is_file($t)) {
 		# most of my stuff is in AVI or MP4 format, and doesn't need any tuning to come out OK
 		# with mp4 format recoding
@@ -70,7 +72,7 @@ function do_file($path, $album, $user)
 	}
 
 	# ogv
-	$t = $cache_base . "/" . $album . "/" . $i['filename'] . ".ogv";
+	$t = $cache_base . "/" . $user . "/" . $album . "/" . $i['filename'] . ".ogv";
 	if (!is_file($t)) {
 		# with -sameq or no params, OGV's come out very pixelated and small. Instead
 		# code these at -qscale 6, which is small but plenty res for the web.
@@ -135,8 +137,6 @@ function do_file($path, $album, $user)
 			continue;
 		}
 
-		$cd = $cache_base . "/" . $album;
-
 		$ih = opendir($d . "/" . $album);
 		$image = readdir($ih);
 		while ($image) {

db.php

@@ -59,7 +59,7 @@
 		unset($date);
 		unset($albumdate);
 
-		$cd = $cache_base . "/" . $album;
+		$cd = $cache_base . "/" . $users[$x] . "/" . $album;
 		$ca = $cd . "/" . "db.js";
 
 		# cache intercept
@@ -168,9 +168,10 @@
 		echo $a;
 
 		# write cache entry
-		if (!is_dir($cd)) {
+		if (!is_dir($cache_base . "/" . $users[$x]))
+			mkdir($cache_base . "/" . $users[$x]);
+		if (!is_dir($cd))
 			mkdir($cd);
-		}
 
 		$fp = fopen($ca, "w");
 		if ($fp) {

image.php

@@ -134,7 +134,7 @@ function pass_file_and_exit($file) {
 #header('Last-Modified: ' . gmdate('D, d M Y H:i:s', filemtime($obj)).' GMT', true, 200);
 header('Expires: ' . gmdate('D, d M Y H:i:s', time() + (80640 * 180)) . ' GMT', true, 200);
 
-$cache_path = $cache_base . "/" . $album;
+$cache_path = $cache_base . "/" . $user . "/" . $album;
 
 if (!is_dir($cache_path))
 	mkdir($cache_path);