Doghole/doghouse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化主题服务部分代码复用性。sketch 归档页适配

Browse Source
This commit is contained in:
Doghole
2026-01-06 01:02:22 +08:00
parent 6bfebcce4b
commit 4cab0a0475
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/me/qwq/doghouse/service/ThemeService.java
View File

@@ -215,16 +215,12 @@ public class ThemeService {
}
/**
* 获取当前主题
* 获取当前主题，若为配置或不存在则取读取到的第一个主题
* @return
*/
public ThemeInfo getCurrentTheme() {
String identity = siteConfig.getThemeIdentity();
Optional<ThemeInfo> optionalTheme = cachedThemes.stream().filter(theme -> {
return theme.isInternal() || OSUtils.isCaseSensitiveFS() ?
theme.getIdentity().equals(identity):
theme.getIdentity().equalsIgnoreCase(identity);
}).findAny();
Optional<ThemeInfo> optionalTheme = Optional.ofNullable(getThemeInfo(identity));
return optionalTheme.orElseGet(() -> {
ThemeInfo defaultTheme = cachedThemes.get(0);
@@ -233,6 +229,11 @@ public class ThemeService {
});
}
/**
* 根据 identity 获取指定主题
* @param identity
* @return
*/
public ThemeInfo getThemeInfo(String identity) {
Optional<ThemeInfo> optionalTheme = cachedThemes.stream().filter(theme -> {
return theme.isInternal() || OSUtils.isCaseSensitiveFS() ?

6
src/main/resources/templates/blog/sketch/template/archives.html
View File

@@ -20,8 +20,8 @@
</div>
</header>
<th:block th:each="post, i : ${posts}">
<th:block th:with="postYear=${#dates.year(post.createTime)}">
<th:block th:if="${i.first or postYear != #dates.year(posts[i.index - 1].createTime)}" >
<th:block th:with="postYear=${post.createTime.year}">
<th:block th:if="${i.first or postYear != posts[i.index - 1].createTime.year}" >
<div class="year" th:with="year=${postYear}" th:text="${postYear}"></div>
<th:block th:utext="'<ul>'"></th:block>
</th:block>
@@ -39,7 +39,7 @@
</a></td>
</tr></tbody></table>
</li>
<th:block th:if="${i.last or postYear != #dates.year(posts[i.index + 1].createTime)}" th:utext="'</ul>'"></th:block>
<th:block th:if="${i.last or postYear != posts[i.index + 1].createTime.year}" th:utext="'</ul>'"></th:block>
</th:block>
</div>
</article>