beenull/nextcloud-dlna
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix generating content paths

Browse source
This commit is contained in:
xis 2023-10-10 15:46:02 +02:00
parent 4e8ddbb5bf
commit 2b212b9607
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/kotlin/net/schowek/nextclouddlna/nextcloud/MediaDB.kt
View file

@ -19,7 +19,7 @@ class MediaDB(
private val mimetypeRepository: MimetypeRepository,
private val filecacheRepository: FilecacheRepository,
private val groupFolderRepository: GroupFolderRepository
) {
) {
private val thumbStorageId: Int = filecacheRepository.findFirstByPath(nextcloudConfig.appDataDir).storage
private val mimetypes: Map<Int, String> = mimetypeRepository.findAll().associate { it.id to it.mimetype }
private val folderMimeType: Int = mimetypes.entries.find { it.value == FOLDER_MIME_TYPE }!!.key
@ -32,9 +32,10 @@ class MediaDB(
@Transactional(readOnly = true)
fun processThumbnails(thumbConsumer: Consumer<ContentItem>) {
filecacheRepository.findThumbnails("${nextcloudConfig.appDataDir}/preview/%", thumbStorageId, folderMimeType).use { files ->
files.map { f: Filecache -> asItem(f) }.forEach(thumbConsumer)
}
filecacheRepository.findThumbnails("${nextcloudConfig.appDataDir}/preview/%", thumbStorageId, folderMimeType)
.use { files ->
files.map { f: Filecache -> asItem(f) }.forEach(thumbConsumer)
}
}
fun mainNodes(): List<ContentNode> =
@ -95,12 +96,12 @@ class MediaDB(
private fun buildPath(f: Filecache): String {
return if (storageUsersMap.containsKey(f.storage)) {
val userName: String? = storageUsersMap[f.storage]
nextcloudConfig.appDataDir + "/" + userName + "/" + f.path
"${nextcloudConfig.nextcloudDir}/$userName/${f.path}"
} else {
nextcloudConfig.appDataDir + "/" + f.path
"${nextcloudConfig.nextcloudDir}/${f.path}"
}
}
companion object: KLogging()
companion object : KLogging()
}

8
src/main/kotlin/net/schowek/nextclouddlna/nextcloud/NextcloudConfigDiscovery.kt
View file

@ -20,11 +20,6 @@ class NextcloudConfigDiscovery(
final val appDataDir: String = findAppDataDir()
final val supportsGroupFolders: Boolean = checkGroupFoldersSupport()
@PostConstruct
fun init() {
logger.info("Found appdata dir: {}", appDataDir)
}
private fun checkGroupFoldersSupport(): Boolean {
return "yes" == appConfigRepository.getValue("groupfolders", "enabled")
}
@ -33,6 +28,9 @@ class NextcloudConfigDiscovery(
return stream(requireNonNull(File(nextcloudDir).listFiles { f ->
f.isDirectory && f.name.matches(APPDATA_NAME_PATTERN.toRegex())
})).findFirst().orElseThrow().name
.also {
logger.info { "Found appdata dir: $it" }
}
}
companion object : KLogging() {