X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/674f6d3f070bcd8a08b725619e80fac0c9f72f1e..c651a52a158ad0ab99ca837dc1f661e4d8be5ae7:/article.inc.php diff --git a/article.inc.php b/article.inc.php index a39b897..53102ba 100644 --- a/article.inc.php +++ b/article.inc.php @@ -23,20 +23,26 @@ class ArchiveArticle { $this->page = preg_replace('{^\.(?:/|$)}', '', $path); $this->link = preg_replace('{(?:/index)?\.html$}', '', $this->page); - if (file_exists($this->page)) { - $this->raw = file_get_contents($this->page); - - if (preg_match_all('{ - \G \s* - }x', $this->raw, $meta)) { - $matchlen = array_sum(array_map('strlen', $meta[0])); - $this->raw = substr($this->raw, $matchlen); # delete matched contents - $this->meta = array_combine($meta[1], $meta[2]); # [property => content] - } + $this->raw($this->page); + } - @list ($this->preface, $this->title, $this->body) = - preg_split('{
|
\s* (.*?)
}sx', $this->raw, $bodyp, PREG_OFFSET_CAPTURE)) { # fallback paragraph contents following the page header - if ($bodyp[1][1] < 256) { + if ($bodyp[1][1] < 512) { return $bodyp[1][0]; } } # starting paragraph for documents without title (assumed simple/partial) if (strpos($this->raw, '\s* (.*?)
}sx', $this->raw, $bodyp)) { return $bodyp[1]; } @@ -157,9 +187,12 @@ class PageSearch # ignore symlinks, original contents only return FALSE; } + if ($current->isDir()) { + # traverse subdirectories unless untracked in any amount + return !file_exists("$current/.gitignore"); + } # match **/*.html - return $current->isDir() - || preg_match('/\.html$/', $current->getFilename()); + return preg_match('/(?getFilename()); } ); }