implement remove() and support for .no-auto-expiry

1 files changed, 8 insertions, 1 deletions

diff --git a/init.php b/init.php
index 464d493..95de7aa 100644
--- a/init.php
+++ b/init.php
@@ -16,6 +16,10 @@ class Cache_S3 extends Plugin implements Cache_Adapter {
 	const CACHE_S3_ACCESS_KEY = "CACHE_S3_ACCESS_KEY";
 	const CACHE_S3_SECRET_KEY = "CACHE_S3_SECRET_KEY";
 
+	public function remove(string $filename): bool {
+		return unlink($this->get_full_path($filename));
+	}
+
 	function about() {
 		return array(null,
 			"File cache backend using S3 protocol (experimental)",
@@ -110,7 +114,9 @@ class Cache_S3 extends Plugin implements Cache_Adapter {
 
 		if ($dh) {
 			while (($file = readdir($dh)) !== false) {
-				if (is_dir($this->get_full_path($file))) {
+				$full_path = $this->get_full_path($file);
+
+				if (is_dir($full_path) && !file_exists("$full_path/.no-auto-expiry")) {
 					array_push($rules,
 						[
 							'ID' => $file,
@@ -125,6 +131,7 @@ class Cache_S3 extends Plugin implements Cache_Adapter {
 					);
 				}
 			}
+			closedir($dh);
 		}
 
 		try {