mirror of https://github.com/usbharu/Hideout.git
feat: リモートのメディア保存前に重複チェックを実施するように
This commit is contained in:
parent
717756deac
commit
4ab2fe1fa3
|
@ -1,17 +1,20 @@
|
||||||
package dev.usbharu.hideout.core.infrastructure.exposedquery
|
package dev.usbharu.hideout.core.infrastructure.exposedquery
|
||||||
|
|
||||||
import dev.usbharu.hideout.core.domain.model.media.Media
|
import dev.usbharu.hideout.core.domain.exception.FailedToGetResourcesException
|
||||||
|
import dev.usbharu.hideout.core.infrastructure.exposedrepository.Media
|
||||||
import dev.usbharu.hideout.core.infrastructure.exposedrepository.PostsMedia
|
import dev.usbharu.hideout.core.infrastructure.exposedrepository.PostsMedia
|
||||||
import dev.usbharu.hideout.core.infrastructure.exposedrepository.toMedia
|
import dev.usbharu.hideout.core.infrastructure.exposedrepository.toMedia
|
||||||
import dev.usbharu.hideout.core.query.MediaQueryService
|
import dev.usbharu.hideout.core.query.MediaQueryService
|
||||||
|
import dev.usbharu.hideout.util.singleOr
|
||||||
import org.jetbrains.exposed.sql.innerJoin
|
import org.jetbrains.exposed.sql.innerJoin
|
||||||
import org.jetbrains.exposed.sql.select
|
import org.jetbrains.exposed.sql.select
|
||||||
import org.springframework.stereotype.Repository
|
import org.springframework.stereotype.Repository
|
||||||
|
import dev.usbharu.hideout.core.domain.model.media.Media as MediaEntity
|
||||||
|
|
||||||
@Repository
|
@Repository
|
||||||
class MediaQueryServiceImpl : MediaQueryService {
|
class MediaQueryServiceImpl : MediaQueryService {
|
||||||
override suspend fun findByPostId(postId: Long): List<Media> {
|
override suspend fun findByPostId(postId: Long): List<MediaEntity> {
|
||||||
return dev.usbharu.hideout.core.infrastructure.exposedrepository.Media.innerJoin(
|
return Media.innerJoin(
|
||||||
PostsMedia,
|
PostsMedia,
|
||||||
onColumn = { id },
|
onColumn = { id },
|
||||||
otherColumn = { mediaId }
|
otherColumn = { mediaId }
|
||||||
|
@ -19,4 +22,10 @@ class MediaQueryServiceImpl : MediaQueryService {
|
||||||
.select { PostsMedia.postId eq postId }
|
.select { PostsMedia.postId eq postId }
|
||||||
.map { it.toMedia() }
|
.map { it.toMedia() }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override suspend fun findByRemoteUrl(remoteUrl: String): MediaEntity {
|
||||||
|
return Media.select { Media.remoteUrl eq remoteUrl }
|
||||||
|
.singleOr { FailedToGetResourcesException("remoteUrl: $remoteUrl is duplicate or not exist.", it) }
|
||||||
|
.toMedia()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -99,9 +99,9 @@ fun ResultRow.toMediaOrNull(): EntityMedia? {
|
||||||
object Media : Table("media") {
|
object Media : Table("media") {
|
||||||
val id = long("id")
|
val id = long("id")
|
||||||
val name = varchar("name", 255)
|
val name = varchar("name", 255)
|
||||||
val url = varchar("url", 255)
|
val url = varchar("url", 255).uniqueIndex()
|
||||||
val remoteUrl = varchar("remote_url", 255).nullable()
|
val remoteUrl = varchar("remote_url", 255).uniqueIndex().nullable()
|
||||||
val thumbnailUrl = varchar("thumbnail_url", 255).nullable()
|
val thumbnailUrl = varchar("thumbnail_url", 255).uniqueIndex().nullable()
|
||||||
val type = integer("type")
|
val type = integer("type")
|
||||||
val blurhash = varchar("blurhash", 255).nullable()
|
val blurhash = varchar("blurhash", 255).nullable()
|
||||||
val mimeType = varchar("mime_type", 255)
|
val mimeType = varchar("mime_type", 255)
|
||||||
|
|
|
@ -4,4 +4,5 @@ import dev.usbharu.hideout.core.domain.model.media.Media
|
||||||
|
|
||||||
interface MediaQueryService {
|
interface MediaQueryService {
|
||||||
suspend fun findByPostId(postId: Long): List<Media>
|
suspend fun findByPostId(postId: Long): List<Media>
|
||||||
|
suspend fun findByRemoteUrl(remoteUrl: String): Media
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
package dev.usbharu.hideout.core.service.media
|
package dev.usbharu.hideout.core.service.media
|
||||||
|
|
||||||
|
import dev.usbharu.hideout.core.domain.exception.FailedToGetResourcesException
|
||||||
import dev.usbharu.hideout.core.domain.exception.media.MediaSaveException
|
import dev.usbharu.hideout.core.domain.exception.media.MediaSaveException
|
||||||
import dev.usbharu.hideout.core.domain.exception.media.UnsupportedMediaException
|
import dev.usbharu.hideout.core.domain.exception.media.UnsupportedMediaException
|
||||||
import dev.usbharu.hideout.core.domain.model.media.Media
|
import dev.usbharu.hideout.core.domain.model.media.Media
|
||||||
import dev.usbharu.hideout.core.domain.model.media.MediaRepository
|
import dev.usbharu.hideout.core.domain.model.media.MediaRepository
|
||||||
|
import dev.usbharu.hideout.core.query.MediaQueryService
|
||||||
import dev.usbharu.hideout.core.service.media.converter.MediaProcessService
|
import dev.usbharu.hideout.core.service.media.converter.MediaProcessService
|
||||||
import dev.usbharu.hideout.mastodon.interfaces.api.media.MediaRequest
|
import dev.usbharu.hideout.mastodon.interfaces.api.media.MediaRequest
|
||||||
import dev.usbharu.hideout.util.withDelete
|
import dev.usbharu.hideout.util.withDelete
|
||||||
|
@ -22,7 +24,8 @@ class MediaServiceImpl(
|
||||||
private val mediaRepository: MediaRepository,
|
private val mediaRepository: MediaRepository,
|
||||||
private val mediaProcessServices: List<MediaProcessService>,
|
private val mediaProcessServices: List<MediaProcessService>,
|
||||||
private val remoteMediaDownloadService: RemoteMediaDownloadService,
|
private val remoteMediaDownloadService: RemoteMediaDownloadService,
|
||||||
private val renameService: MediaFileRenameService
|
private val renameService: MediaFileRenameService,
|
||||||
|
private val mediaQueryService: MediaQueryService
|
||||||
) : MediaService {
|
) : MediaService {
|
||||||
@Suppress("LongMethod", "NestedBlockDepth")
|
@Suppress("LongMethod", "NestedBlockDepth")
|
||||||
override suspend fun uploadLocalMedia(mediaRequest: MediaRequest): EntityMedia {
|
override suspend fun uploadLocalMedia(mediaRequest: MediaRequest): EntityMedia {
|
||||||
|
@ -99,6 +102,13 @@ class MediaServiceImpl(
|
||||||
override suspend fun uploadRemoteMedia(remoteMedia: RemoteMedia): Media {
|
override suspend fun uploadRemoteMedia(remoteMedia: RemoteMedia): Media {
|
||||||
logger.info("MEDIA Remote media. filename:${remoteMedia.name} url:${remoteMedia.url}")
|
logger.info("MEDIA Remote media. filename:${remoteMedia.name} url:${remoteMedia.url}")
|
||||||
|
|
||||||
|
try {
|
||||||
|
val findByRemoteUrl = mediaQueryService.findByRemoteUrl(remoteMedia.url)
|
||||||
|
logger.warn("DUPLICATED Remote media is duplicated. url: {}", remoteMedia.url)
|
||||||
|
return findByRemoteUrl
|
||||||
|
} catch (_: FailedToGetResourcesException) {
|
||||||
|
}
|
||||||
|
|
||||||
remoteMediaDownloadService.download(remoteMedia.url).withDelete().use {
|
remoteMediaDownloadService.download(remoteMedia.url).withDelete().use {
|
||||||
val mimeType = fileTypeDeterminationService.fileType(it.path, remoteMedia.name)
|
val mimeType = fileTypeDeterminationService.fileType(it.path, remoteMedia.name)
|
||||||
|
|
||||||
|
|
|
@ -46,9 +46,9 @@ create table if not exists media
|
||||||
(
|
(
|
||||||
id bigint primary key,
|
id bigint primary key,
|
||||||
"name" varchar(255) not null,
|
"name" varchar(255) not null,
|
||||||
url varchar(255) not null,
|
url varchar(255) not null unique,
|
||||||
remote_url varchar(255) null,
|
remote_url varchar(255) null unique,
|
||||||
thumbnail_url varchar(255) null,
|
thumbnail_url varchar(255) null unique,
|
||||||
"type" int not null,
|
"type" int not null,
|
||||||
blurhash varchar(255) null,
|
blurhash varchar(255) null,
|
||||||
mime_type varchar(255) not null,
|
mime_type varchar(255) not null,
|
||||||
|
|
Loading…
Reference in New Issue