Tweak purge script

PhpGt · Oct 31, 2014 · 7f5a839 · 7f5a839
1 parent bef4344
commit 7f5a839
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/ClientSide/FileOrganiser.php b/src/ClientSide/FileOrganiser.php
@@ -119,9 +119,10 @@ public function purgeStaticWwwFiles() {
 	foreach(new \DirectoryIterator(Path::get(Path::WWW)) as $item) {
 		$filename = $item->getFilename();
 
+
 		if($filename === $assetDirName
-		|| strpos($filename, $scriptDirName) . "-" === 0
-		|| strpos($filename, $styleDirName) . "-" === 0) {
+		|| strpos($filename, $scriptDirName . "-") === 0
+		|| strpos($filename, $styleDirName . "-") === 0) {
 			DirectoryRecursor::purge($item->getPathname());
 		}
 	}
@@ -189,13 +190,13 @@ public function checkStaticValid() {
 	// Recursive fingerprint whole source directory.
 	$staticWwwFingerprint = file_get_contents($this->staticFingerprintFile);
 
-	$assetSrcFingerprint = $this->recursiveFingerprint([
+	$staticSrcFingerprint = $this->recursiveFingerprint([
 		$assetSrcDir,
 		$scriptSrcDir,
 		$styleSrcDir,
 	]);
 
-	return ($staticWwwFingerprint === $assetSrcFingerprint);
+	return ($staticWwwFingerprint === $staticSrcFingerprint);
 }
 
 /**
@@ -297,7 +298,7 @@ private function recursiveFingerprint($dir) {
 		return $this->emptyHash;
 	}
 
-	return $hash;
+	return md5($hash);
 }
 
 }#
diff --git a/src/Core/DirectoryRecursor.php b/src/Core/DirectoryRecursor.php
@@ -66,8 +66,9 @@ private static function hashFile($file, $iterator) {
 public static function purge($path) {
 	$count = 0;
 
-	self::walk($path, ["self::purgeFile"], $count,
+	self::walk($path, "self::purgeFile", $count,
 		\RecursiveIteratorIterator::CHILD_FIRST);
+	rmdir($path);
 
 	return $count;
 }

diff --git a/test/Unit/ClientSide/FileOrganiser.test.php b/test/Unit/ClientSide/FileOrganiser.test.php
@@ -174,6 +174,10 @@ public function testAssetDoesNotCopyIfNoSourceDirectory() {
 		"shouldn't copy any files if no source directory present");
 }
 
+public function testStaticSourceFileEditInvalidates() {
+	// TODO.
+}
+
 public function testOrganiseFunctionCopiesAssets() {
 	$dir = $this->getPath(Path::ASSET);
 	$fileArray = [