Cookies_Github_mirror/AquaDX
4
0
Fork 1
mirror of https://github.com/MewoLab/AquaDX.git synced 2026-02-10 06:27:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

[F] Fix upload paths

Browse Source
This commit is contained in:
Azalea
2024-03-06 00:16:53 -05:00
parent ef00cfbddd
commit 38367279ff
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/ext/Ext.kt
View File

@@ -79,4 +79,4 @@ suspend fun <T> async(block: suspend kotlinx.coroutines.CoroutineScope.() -> T):
fun path(part1: Str, vararg parts: Str) = Path.of(part1, *parts) fun path(part1: Str, vararg parts: Str) = Path.of(part1, *parts)
fun Str.path() = Path.of(this) fun Str.path() = Path.of(this)
operator fun Path.div(part: Str) = resolve(part) operator fun Path.div(part: Str) = resolve(part)
fun Str.ensureEndingSlash() = if (endsWith('/')) this else "$this/"

12
src/main/java/icu/samnyan/aqua/net/utils/PathProps.kt
View File

@@ -1,11 +1,13 @@
package icu.samnyan.aqua.net.utils package icu.samnyan.aqua.net.utils
import ext.ensureEndingSlash
import ext.path import ext.path
import jakarta.annotation.PostConstruct import jakarta.annotation.PostConstruct
import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.boot.context.properties.ConfigurationProperties
import org.springframework.context.annotation.Configuration import org.springframework.context.annotation.Configuration
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
import org.springframework.web.servlet.resource.PathResourceResolver
@Configuration @Configuration
@ConfigurationProperties(prefix = "paths") @ConfigurationProperties(prefix = "paths")
@@ -25,12 +27,14 @@ class PathProps {
@Configuration @Configuration
class UploadStatic(val paths: PathProps): WebMvcConfigurer { class UploadStatic(val paths: PathProps): WebMvcConfigurer {
override fun addResourceHandlers(registry: ResourceHandlerRegistry) { override fun addResourceHandlers(registry: ResourceHandlerRegistry) {
println("Adding resource handlers")
mapOf( mapOf(
"/uploads/net/portrait/**" to paths.aquaNetPortrait, "/uploads/net/portrait/**" to paths.aquaNetPortrait.ensureEndingSlash(),
"/uploads/mai2/portrait/**" to paths.mai2Portrait, "/uploads/mai2/portrait/**" to paths.mai2Portrait.ensureEndingSlash(),
"/uploads/mai2/plays/**" to paths.mai2Plays "/uploads/mai2/plays/**" to paths.mai2Plays.ensureEndingSlash()
).forEach { (k, v) -> ).forEach { (k, v) ->
registry.addResourceHandler(k).addResourceLocations("file:$v").setCachePeriod(10).resourceChain(true) registry.addResourceHandler(k).addResourceLocations("file:$v")
.setCachePeriod(10).resourceChain(true).addResolver(PathResourceResolver())
} }
} }
} }