iktdev/MediaProcessing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates

Browse Source
This commit is contained in:
Brage 2023-08-01 01:13:55 +02:00
parent 6d80644c73
commit e2d5ef03eb
7 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CommonCode/src/main/java/no/iktdev/streamit/content/common/Naming.kt
View File

@ -41,11 +41,18 @@ class Naming(val fileName: String) {
fun guessDesiredTitle(): String { fun guessDesiredTitle(): String {
val desiredFileName = guessDesiredFileName() val desiredFileName = guessDesiredFileName()
val result = if (desiredFileName.contains(" - ")) { val seasonRegex = Regex("\\sS[0-9]+(\\s- [0-9]+|\\s[0-9]+)", RegexOption.IGNORE_CASE)
return desiredFileName.split(" - ").firstOrNull() ?: desiredFileName if (seasonRegex.matches(desiredFileName)) {
} else desiredFileName return seasonRegex.replace(desiredFileName, "").trim()
} else {
val result = if (desiredFileName.contains(" - ")) {
return desiredFileName.split(" - ").firstOrNull() ?: desiredFileName
} else desiredFileName
return result.trim()
return result.trim()
}
} }

4
Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/EncodeDaemon.kt
View File

@ -54,10 +54,10 @@ class EncodeDaemon(val referenceId: String, val work: EncodeWork, val daemonInte
if (!outFile.parentFile.exists()) { if (!outFile.parentFile.exists()) {
outFile.parentFile.mkdirs() outFile.parentFile.mkdirs()
} }
val adjustedArgs = listOf( val adjustedArgs = (if (EncodeEnv.allowOverwrite) listOf("-y") else listOf("-nostdin")) + listOf(
"-hide_banner", "-i", File(work.inFile).absolutePath, *work.arguments.toTypedArray(), outFile.absolutePath, "-hide_banner", "-i", File(work.inFile).absolutePath, *work.arguments.toTypedArray(), outFile.absolutePath,
"-progress", "pipe:1" "-progress", "pipe:1"
) + if (EncodeEnv.allowOverwrite) listOf("-y") else listOf("-nostdin") )
logger.info { "$referenceId @ ${work.workId} ${adjustedArgs.joinToString(" ")}" } logger.info { "$referenceId @ ${work.workId} ${adjustedArgs.joinToString(" ")}" }
return Daemon(EncodeEnv.ffmpeg, this).run(adjustedArgs) return Daemon(EncodeEnv.ffmpeg, this).run(adjustedArgs)
} }

6
Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/ExtractDaemon.kt
View File

@ -19,9 +19,9 @@ class ExtractDaemon(val referenceId: String, val work: ExtractWork, val daemonIn
if (!outFile.parentFile.exists()) { if (!outFile.parentFile.exists()) {
outFile.parentFile.mkdirs() outFile.parentFile.mkdirs()
} }
val adjustedArgs = listOf( val adjustedArgs = (if (EncodeEnv.allowOverwrite) listOf("-y") else emptyList()) + listOf(
"-hide_banner", "-i", File(work.inFile).absolutePath, *work.arguments.toTypedArray(), outFile.absolutePath "-i", File(work.inFile).absolutePath, *work.arguments.toTypedArray(), outFile.absolutePath
) + if (EncodeEnv.allowOverwrite) listOf("-y") else listOf() )
logger.info { "$referenceId @ ${work.workId} ${adjustedArgs.joinToString(" ")}" } logger.info { "$referenceId @ ${work.workId} ${adjustedArgs.joinToString(" ")}" }
return Daemon(EncodeEnv.ffmpeg, this).run(adjustedArgs) return Daemon(EncodeEnv.ffmpeg, this).run(adjustedArgs)
} }

3
pyMetadata/sources/anii.py
View File

@ -19,7 +19,8 @@ class metadata():
cover = result.get("cover_image", None), cover = result.get("cover_image", None),
summary = result.get("desc", None), summary = result.get("desc", None),
type = 'movie' if result.get('airing_format', '').lower() == 'movie' else 'serie', type = 'movie' if result.get('airing_format', '').lower() == 'movie' else 'serie',
genres = result.get('genres', []) genres = result.get('genres', []),
source="anii"
) )
if (meta.title is None) or (meta.type is None): if (meta.title is None) or (meta.type is None):
return DataResult("IGNORE", None, None) return DataResult("IGNORE", None, None)

3
pyMetadata/sources/imdb.py
View File

@ -21,7 +21,8 @@ class metadata():
cover = result.get("cover url", None), cover = result.get("cover url", None),
summary = result.get("plot outline", None), summary = result.get("plot outline", None),
type = 'movie' if result.get('kind', '').lower() == 'movie' else 'serie', type = 'movie' if result.get('kind', '').lower() == 'movie' else 'serie',
genres = result.get('genres', []) genres = result.get('genres', []),
source="imdb"
) )
if (meta.title is None) or (meta.type is None): if (meta.title is None) or (meta.type is None):
return DataResult("IGNORE", None, None) return DataResult("IGNORE", None, None)

1
pyMetadata/sources/mal.py
View File

@ -20,6 +20,7 @@ class metadata():
summary = anime.synopsis, summary = anime.synopsis,
type = 'movie' if anime.type.lower() == 'movie' else 'serie', type = 'movie' if anime.type.lower() == 'movie' else 'serie',
genres = anime.genres, genres = anime.genres,
source="mal"
) )
if (meta.title is None) or (meta.type is None): if (meta.title is None) or (meta.type is None):
return DataResult("IGNORE", None, None) return DataResult("IGNORE", None, None)

1
pyMetadata/sources/result.py
View File

@ -9,6 +9,7 @@ class Metadata:
type: str # Serie/Movie type: str # Serie/Movie
summary: str summary: str
genres: List[str] genres: List[str]
source: str
def to_dict(self): def to_dict(self):
return asdict(self) return asdict(self)