From a948c81c6bd1f2a941c155ed78c872cbe1c1af37 Mon Sep 17 00:00:00 2001 From: Eyre_S Date: Thu, 25 Nov 2021 03:36:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BFid=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E5=87=BAbug=EF=BC=8C=E6=95=B4=E7=90=86?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E7=BC=A9=E8=BF=9B=E5=AF=B9=E9=BD=90=E4=B8=8E?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=A3=8E=E6=A0=BC=EF=BC=88=E4=B9=A6=E7=9B=AE?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9B=AE=E5=BD=95=E7=BC=A9=E8=BF=9B=E5=AF=B9?= =?UTF-8?q?=E9=BD=90=E8=BF=98=E6=B2=A1=E5=81=9A=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .htaccess | 6 +++--- constant.php | 2 +- index.php | 12 +++++++++--- src/Element/Book.php | 16 ++++++++++++++-- src/Element/BookCollection.php | 19 +++++++++++++++---- src/Element/BookContent/Chapter.php | 9 ++++++++- src/Element/BookContent/Page.php | 20 ++++++++++++++++++-- src/Element/Link.php | 8 ++++++-- src/Element/LinkCollection.php | 19 +++++++++++++++---- template/footer.php | 10 +++++----- template/header.php | 5 +++-- template/main.php | 7 ++++++- template/nav.php | 8 ++++---- template/raw-article.php | 1 + 14 files changed, 108 insertions(+), 34 deletions(-) diff --git a/.htaccess b/.htaccess index 068e7a2..a349997 100644 --- a/.htaccess +++ b/.htaccess @@ -1,6 +1,6 @@ # URL Rewrite RewriteEngine On -RewriteCond $0 !^index.php.* -RewriteCond $0 !^debug.php.* -RewriteCond $0 !^assets.* +RewriteCond $0 !index.php.* +RewriteCond $0 !debug.php.* +RewriteCond $0 !assets.* RewriteRule .* index.php?p=$0 [QSA] diff --git a/constant.php b/constant.php index 76df633..6bc618e 100644 --- a/constant.php +++ b/constant.php @@ -2,6 +2,6 @@ const APP_NAME = "ph-Bookshelf"; -const VERSION = "0.3.0.11"; +const VERSION = "0.3.0.12"; const CHANNEL = "suk-ws"; const BRANCH = "master"; diff --git a/index.php b/index.php index 2db5b29..eeee0a2 100644 --- a/index.php +++ b/index.php @@ -24,9 +24,15 @@ try { if (sizeof($uri) > 0 && $uri[0] != null) { // 非主页面，判定当前定义的 book - $tmp = SiteMeta::getBookshelf()->getBook($uri[0]); - if ($tmp == null) throw new RequestNotExistException("Book required \"$uri[0]\" not found!"); - PageMeta::$book = $tmp->getContentedNode(); + if ($uri[0] == "%root") { + PageMeta::$book = SiteMeta::getBookshelf()->getRootBook(); + } else { + $tmp = SiteMeta::getBookshelf()->getBook($uri[0]); + if ($tmp == null) + throw new RequestNotExistException("Book required \"$uri[0]\" not found!"); + PageMeta::$book = $tmp->getContentedNode(); + } + // 判定当前页面 if (sizeof($uri) > 1 && $uri[1] != null) { $tmp = PageMeta::$book->getPage($uri[1]); diff --git a/src/Element/Book.php b/src/Element/Book.php index d6e1d29..da50a7a 100644 --- a/src/Element/Book.php +++ b/src/Element/Book.php @@ -54,8 +54,20 @@ class Book { return $this->parent; } - public function getHtml (): string { - return "$this->name"; + public function getHtml (int $indent = 0): string { + return sprintf(<<%s + EOF, + str_repeat("\t", $indent), $this->id, $this->id, + str_repeat("\t", $indent), PageMeta::$book->getId()==$this->id ? " current" : "", + str_repeat("\t", $indent), PageMeta::$book->getId()==$this->id ? "javascript:void(0)" : $this->encodeUrl(), $this->name + ); + } + + public function encodeUrl (): string { + return "/" . urlencode($this->id); } /** diff --git a/src/Element/BookCollection.php b/src/Element/BookCollection.php index 74b03f9..788082e 100644 --- a/src/Element/BookCollection.php +++ b/src/Element/BookCollection.php @@ -73,13 +73,24 @@ class BookCollection { return $this->parent; } - public function getHtml (): string { + public function getHtml (int $indent = 0): string { $str = ""; - if ($this->name != self::ROOT) $str .= "
$this->name
"; + $isRoot = $this->name == self::ROOT; + if (!$isRoot) $str .= sprintf(<< + %s%s + %s
+ EOL, + str_repeat("\t", $indent), $this->getBook(PageMeta::$book->getId())==null?"":" active", + str_repeat("\t", $indent), $this->name, + str_repeat("\t", $indent) + ); + $str .= "\n"; foreach ($this->array as $node) { - $str .= $node->getHtml(); + $str .= $node->getHtml($isRoot ? $indent : $indent + 2); + $str .= "\n"; } - if ($this->name != self::ROOT) $str .= "
"; + if (!$isRoot) $str .= str_repeat("\t", $indent) . "
"; return $str; } diff --git a/src/Element/BookContent/Chapter.php b/src/Element/BookContent/Chapter.php index 8029230..43036b7 100644 --- a/src/Element/BookContent/Chapter.php +++ b/src/Element/BookContent/Chapter.php @@ -68,7 +68,14 @@ class Chapter { public function getSummaryHtml (): string { $str = ""; - if ($this->parent != null) $str .= "
$this->name
"; + if ($this->parent != null) $str .= sprintf(<< + %s +
+ EOL, + $this->getPage(PageMeta::$page->getId())==null?"":" active", + $this->name + ); foreach ($this->childs as $node) { $str .= $node->getSummaryHtml(); } diff --git a/src/Element/BookContent/Page.php b/src/Element/BookContent/Page.php index 592cc1c..2cee6f9 100644 --- a/src/Element/BookContent/Page.php +++ b/src/Element/BookContent/Page.php @@ -85,11 +85,27 @@ class Page { // } // $str .= ""; // return $str; - return "$this->name"; + return sprintf(<<%s + EOF, + $this->id, $this->id, + PageMeta::$page->getId()==$this->id ? " current" : "", + PageMeta::$page->getId()==$this->id ? "#" : $this->encodeUrl(), + $this->name + ); + } + + public function encodeUrl (): string { + return str_replace( + "%2F", "/", + sprintf("/%s/%s", urlencode(PageMeta::$book->getId()), urlencode($this->id)) + ); } public function getMarkdownContent (): string { - return file_get_contents("./data/".PageMeta::$book->getId()."/".$this->id.".md"); + return file_get_contents(sprintf("./data/%s/%s.md", PageMeta::$book->getId(), $this->id)); } } diff --git a/src/Element/Link.php b/src/Element/Link.php index e40c02e..46aab9d 100644 --- a/src/Element/Link.php +++ b/src/Element/Link.php @@ -52,8 +52,12 @@ class Link { return $this->parent; } - public function getHtml (): string { - return "$this->name"; + public function getHtml (int $indent = 0): string { + return sprintf( + "%s%s", + str_repeat("\t", $indent), + $this->href, $this->name + ); } } diff --git a/src/Element/LinkCollection.php b/src/Element/LinkCollection.php index 11c3c50..589e47f 100644 --- a/src/Element/LinkCollection.php +++ b/src/Element/LinkCollection.php @@ -72,13 +72,24 @@ class LinkCollection { return $this->parent; } - public function getHtml (): string { + public function getHtml (int $indent = 0): string { $str = ""; - if ($this->name != self::ROOT) $str .= "
$this->name
"; + $isRoot = $this->name == self::ROOT; + if (!$isRoot) $str .= sprintf(<< + %s%s + %s
+ EOL, + str_repeat("\t", $indent), + str_repeat("\t", $indent), $this->name, + str_repeat("\t", $indent) + ); + $str .= "\n"; foreach ($this->array as $node) { - $str .= $node->getHtml(); + $str .= $node->getHtml($isRoot ? $indent : $indent + 2); + $str .= "\n"; } - if ($this->name != self::ROOT) $str .= "
"; + if (!$isRoot) $str .= str_repeat("\t", $indent) . "
"; return $str; } diff --git a/template/footer.php b/template/footer.php index 3608c3a..4f080df 100644 --- a/template/footer.php +++ b/template/footer.php @@ -1,20 +1,20 @@ - - "; } + echo "\n"; ?> diff --git a/template/header.php b/template/header.php index 7df7a74..d2d64b6 100644 --- a/template/header.php +++ b/template/header.php @@ -15,12 +15,13 @@ <?= PageMeta::getPageTitle() ?> - - "; } + echo "\n"; ?>