From 81a874f8a617d83fb263818eb10c6df7bb829ff7 Mon Sep 17 00:00:00 2001 From: filesite Date: Wed, 17 Apr 2024 15:04:00 +0800 Subject: [PATCH] bug fix for empty tag file can not be parsed --- lib/DirScanner.php | 36 ++++++++++++++++------------- themes/tajian/views/layout/main.php | 17 +++++++------- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/lib/DirScanner.php b/lib/DirScanner.php index 64bf95b..d5e95d6 100644 --- a/lib/DirScanner.php +++ b/lib/DirScanner.php @@ -92,31 +92,35 @@ Class DirScanner { //解析描述文件内容 //snapshot相对路径完善，支持secure_link + //bug fix: 允许空内容文件，如：刚创建的分类文件 private function parseDescriptionFiles($realpath) { $filename = $this->getFilenameWithoutExtension($realpath); $pathinfo = pathinfo($realpath); $tmp = explode('_', $filename); - $field = array_pop($tmp); + $field = array_pop($tmp); //['title', 'snapshot'] $content = @file_get_contents($realpath); - if (empty($content)) {return [];} - $content = trim($content); + if (!empty($content)) { + $content = trim($content); + } $data = array(); - if (in_array($field, ['title', 'snapshot'])) { - if ($field == 'snapshot') { - $img_realpath = realpath("{$pathinfo['dirname']}/{$content}"); - if (file_exists($img_realpath)) { - $id = $this->getId($img_realpath); - $fp = fopen($img_realpath, 'r'); - $fstat = fstat($fp); - fclose($fp); - $img_filename = $this->getFilenameWithoutExtension($img_realpath); - $img_pathinfo = pathinfo($img_realpath); - $extension = strtolower($img_pathinfo['extension']); - $content = $this->getFilePath( $id, $this->getRelativeDirname($img_pathinfo['dirname']), $img_filename, $extension, $fstat['mtime'] ); - } + + //如果是快照图片，获取图片相对路径 + if (!empty($content) && $field == 'snapshot') { + $img_realpath = realpath("{$pathinfo['dirname']}/{$content}"); + if (file_exists($img_realpath)) { + $id = $this->getId($img_realpath); + $fp = fopen($img_realpath, 'r'); + $fstat = fstat($fp); + fclose($fp); + $img_filename = $this->getFilenameWithoutExtension($img_realpath); + $img_pathinfo = pathinfo($img_realpath); + $extension = strtolower($img_pathinfo['extension']); + $content = $this->getFilePath( $id, $this->getRelativeDirname($img_pathinfo['dirname']), $img_filename, $extension, $fstat['mtime'] ); } } + + //返回文件数据 $data[$field] = $content; return $data; diff --git a/themes/tajian/views/layout/main.php b/themes/tajian/views/layout/main.php index 8a020d1..9c008fe 100644 --- a/themes/tajian/views/layout/main.php +++ b/themes/tajian/views/layout/main.php @@ -2,6 +2,11 @@ //常用方法 require_once __DIR__ . '/../../../../plugins/Html.php'; +$linkPrefix = ''; +//多用户路径支持 +if (!empty(FSC::$app['config']['multipleUserUriParse']) && !empty(FSC::$app['user_id'])) { + $linkPrefix = '/' . FSC::$app['user_id']; +} ?> @@ -34,11 +39,11 @@ require_once __DIR__ . '/../../../../plugins/Html.php';
- + 星星图标 推荐 - + 添加图标 添加 @@ -53,16 +58,10 @@ require_once __DIR__ . '/../../../../plugins/Html.php'; $selectedId = !empty($viewData['cateId']) ? $viewData['cateId'] : ''; $breadcrumbs = !empty($viewData['breadcrumbs']) ? $viewData['breadcrumbs'] : []; if (!empty($viewData['tags'])) { //显示tags分类 - $tagLink = '/list/'; - //多用户路径支持 - if (!empty(FSC::$app['config']['multipleUserUriParse']) && !empty(FSC::$app['user_id'])) { - $tagLink = '/' . FSC::$app['user_id'] . '/list/'; - } - foreach($viewData['tags'] as $id => $item) { $selected = $item['id'] == $selectedId || (!empty($breadcrumbs) && $item['id'] == $breadcrumbs[0]['id']) ? 'this_set' : ''; echo << + 菜单图标 {$item['name']}