From 3ee198faa9cc7124d8682431727397b103f475e4 Mon Sep 17 00:00:00 2001 From: Stefan Schallerl Date: Sun, 2 Feb 2025 23:58:22 +0100 Subject: [PATCH] Fixes dateGuesser bug and css path in Frame. --- app/src/main/kotlin/net/h34t/filemure/DateGuesser.kt | 6 +++--- app/src/main/tpl/net.h34t.filemure.tpl/Frame.tpl.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/net/h34t/filemure/DateGuesser.kt b/app/src/main/kotlin/net/h34t/filemure/DateGuesser.kt index 73b6e6e..eebfdae 100644 --- a/app/src/main/kotlin/net/h34t/filemure/DateGuesser.kt +++ b/app/src/main/kotlin/net/h34t/filemure/DateGuesser.kt @@ -41,11 +41,11 @@ object DateGuesser { ) fun guessDateTime(filename: String) = dateTimePatterns.asSequence().mapNotNull { - it.first.find(filename)?.let { mr -> LocalDateTime.parse(mr.groups[1]?.value!!, it.second) } + it.first.find(filename)?.let { mr -> LocalDateTime.parse(mr.groups[0]?.value!!, it.second) } }.firstOrNull() - fun guessDate(filename: String) = dateTimePatterns.asSequence().mapNotNull { - it.first.find(filename)?.let { mr -> LocalDate.parse(mr.groups[1]?.value!!, it.second) } + fun guessDate(filename: String) = datePatterns.asSequence().mapNotNull { + it.first.find(filename)?.let { mr -> LocalDate.parse(mr.groups[0]?.value!!, it.second) } }.firstOrNull() fun guess(filename: String): LocalDateTime? { diff --git a/app/src/main/tpl/net.h34t.filemure.tpl/Frame.tpl.html b/app/src/main/tpl/net.h34t.filemure.tpl/Frame.tpl.html index 54bfe1a..8c9a826 100644 --- a/app/src/main/tpl/net.h34t.filemure.tpl/Frame.tpl.html +++ b/app/src/main/tpl/net.h34t.filemure.tpl/Frame.tpl.html @@ -4,7 +4,7 @@ {*$title} - +