From 3d514a3544a0822c77bb36f33c3e4b6fa93140c3 Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Tue, 1 Dec 2009 21:53:46 -0500
Subject: [PATCH] directory reading and more cleanup

---
 classes/ComicPressMediaHandling.inc  | 38 ++++++++++++++++++++++++----
 test/ComicPressMediaHandlingTest.php | 23 +++++++++++++++++
 2 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/classes/ComicPressMediaHandling.inc b/classes/ComicPressMediaHandling.inc
index d3892b1..926d827 100644
--- a/classes/ComicPressMediaHandling.inc
+++ b/classes/ComicPressMediaHandling.inc
@@ -43,17 +43,17 @@ class ComicPressMediaHandling {
 		return $old;
 	}
 
-	function _expand_filter($filter, $type_filter, $override_post = null) {
+	function _expand_filter($filter, $type_folder, $override_post = null) {
 		global $post;
 		$this->post_to_use = !is_null($override_post) ? $override_post : $post;
-		$this->type_filter = $type_filter;
+		$this->type_folder = $type_folder;
 
 		$result = preg_replace_callback('#%([a-z0-9-]+)%#i', array(&$this, '_expand_filter_callback'), $filter);
 		$result = str_replace('.', '\.', $result);
 		$result = str_replace('*', '.*', $result);
 
 		unset($this->post_to_use);
-		unset($this->type_filter);
+		unset($this->type_folder);
 
 		return $result;
 	}
@@ -73,7 +73,7 @@ class ComicPressMediaHandling {
 				}
 				break;
 			case 'type-folder':
-				$value = $this->type_filter;
+				$value = $this->type_folder;
 				break;
 			default:
 				if (preg_match('#^date-(.*)$#', $matches[1], $date_matches) > 0) {
@@ -83,10 +83,38 @@ class ComicPressMediaHandling {
 				$value = $matches[0];
 				break;
 		}
-		return $value;
+		return apply_filters('comicpress_expand_filter_callback', $value, $matches);
+	}
+
+	function _read_directory($pattern) {
+		$dirname = dirname($pattern);
+		$results = false;
+		if (is_dir($dirname)) {
+			$results = array();
+			if (($dh = opendir($dirname)) !== false) {
+				$filename_pattern = str_replace('#', '\#', basename($pattern));
+				while (($file = readdir($dh)) !== false) {
+					$target = $dirname . '/' . $file;
+					if (is_file($target)) {
+						if (preg_match("#${filename_pattern}#", $file) > 0) {
+							$results[] = $target;
+						}
+					}
+				}
+			}
+		}
+		return $results;
 	}
 
 	function get_comic_path($type = 'comic', $override_post = null, $filter = 'default', $multi = false) {
+		global $post;
+		$post_to_use = !is_null($override_post) ? $override_post : $post;
+
 		$filter = $this->get_filter($filter);
+		$globals = $this->_bundle_global_variables();
+
+		if (isset($globals[$type])) {
+			$filter = $this->_expand_filter($filter, $globals[$type], $post_to_use);
+		}
 	}
 }
diff --git a/test/ComicPressMediaHandlingTest.php b/test/ComicPressMediaHandlingTest.php
index 4a88e9e..2e30ae4 100644
--- a/test/ComicPressMediaHandlingTest.php
+++ b/test/ComicPressMediaHandlingTest.php
@@ -102,4 +102,27 @@ class ComicPressMediaHandlingTest extends PHPUnit_Framework_TestCase {
 
 		$this->assertEquals($expected_result, $cpmh->_expand_filter($filter, 'comic', (object)array('ID' => 1, 'post_date' => '2009-01-01 15:00:00')));
 	}
+
+	function providerTestReadDirectory() {
+		return array(
+			array(vfsStream::url('root2/.*'), false),
+			array(vfsStream::url('root/.*'), array('2009-01-01.jpg', '2009-01-02.jpg', '2009-02-02-two.jpg', '2008-01-01.jpg')),
+			array(vfsStream::url('root/2009.*'), array('2009-01-01.jpg', '2009-01-02.jpg', '2009-02-02-two.jpg')),
+			array(vfsStream::url('root/2009-01.*'), array('2009-01-01.jpg', '2009-01-02.jpg')),
+			array(vfsStream::url('root/2009-01-01.*'), array('2009-01-01.jpg')),
+		);
+	}
+
+	/**
+	 * @dataProvider providerTestReadDirectory
+	 */
+	function testReadDirectory($pattern, $expected_results) {
+		foreach (array('2009-01-01.jpg', '2009-01-02.jpg', '2009-02-02-two.jpg', '2008-01-01.jpg') as $file) {
+			file_put_contents(vfsStream::url("root/${file}"), 'file');
+		}
+		if (is_array($expected_results)) {
+			foreach ($expected_results as &$result) { $result = vfsStream::url("root/${result}"); }
+		}
+	 	$this->assertEquals($expected_results, $this->cpmh->_read_directory($pattern));
+	}
 }