temple/Suwayomi-Server
1
0
Fork 0
mirror of https://github.com/Suwayomi/Suwayomi-Server.git synced 2026-06-30 09:24:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Manual Extension Fixes (#2139)

Browse Source 
* Fix manual extension icons

* Delete extension where APK Url is null
This commit is contained in:
Mitchell Syer
2026-06-28 02:08:53 -04:00
committed by GitHub
parent e2fd15158c
commit c79486b8be
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/Extension.kt
View File

@@ -165,7 +165,7 @@ object Extension {
dex2jar(apkFilePath, jarFilePath, fileNameWithoutType) dex2jar(apkFilePath, jarFilePath, fileNameWithoutType)
extractAssetsFromApk(apkFilePath, jarFilePath) extractAssetsFromApk(apkFilePath, jarFilePath)
extractAndCacheApkIcon(apkFilePath, apkName) extractAndCacheApkIcon(apkFilePath, packageInfo.packageName)
// clean up // clean up
File(apkFilePath).delete() File(apkFilePath).delete()
@@ -257,7 +257,7 @@ object Extension {
private fun extractAndCacheApkIcon( private fun extractAndCacheApkIcon(
apkFilePath: String, apkFilePath: String,
apkName: String, pkgName: String,
) { ) {
val iconCacheDir = "${applicationDirs.extensionsRoot}/icon" val iconCacheDir = "${applicationDirs.extensionsRoot}/icon"
try { try {
@@ -270,15 +270,15 @@ object Extension {
?.first ?.first
} }
if (iconData == null) { if (iconData == null) {
logger.warn { "No icon found in APK $apkName" } logger.warn { "No icon found in APK $pkgName" }
return return
} }
File(iconCacheDir).mkdirs() File(iconCacheDir).mkdirs()
clearCachedImage(iconCacheDir, apkName) clearCachedImage(iconCacheDir, pkgName)
saveImage("$iconCacheDir/$apkName", iconData.inputStream(), null) saveImage("$iconCacheDir/$pkgName", iconData.inputStream(), null)
} catch (e: Exception) { } catch (e: Exception) {
logger.warn(e) { "Failed to extract icon from APK $apkName" } logger.warn(e) { "Failed to extract icon from APK $pkgName" }
} }
} }
@@ -371,7 +371,7 @@ object Extension {
SourceTable.deleteWhere { SourceTable.extension eq extensionId } SourceTable.deleteWhere { SourceTable.extension eq extensionId }
if (extensionRecord[ExtensionTable.isObsolete]) { if (extensionRecord[ExtensionTable.isObsolete] || extensionRecord[ExtensionTable.apkUrl] == null) {
ExtensionTable.deleteWhere { ExtensionTable.pkgName eq pkgName } ExtensionTable.deleteWhere { ExtensionTable.pkgName eq pkgName }
} else { } else {
ExtensionTable.update({ ExtensionTable.pkgName eq pkgName }) { ExtensionTable.update({ ExtensionTable.pkgName eq pkgName }) {

2
server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/ExtensionTable.kt
View File

@@ -23,7 +23,7 @@ object ExtensionTable : IntIdTable() {
val name = varchar("name", 128) val name = varchar("name", 128)
val pkgName = varchar("pkg_name", 128) val pkgName = varchar("pkg_name", 128)
val apkUrl = varchar("apk_url", 2048) val apkUrl = varchar("apk_url", 2048).nullable()
val extensionLib = varchar("extension_lib", 16).nullable() val extensionLib = varchar("extension_lib", 16).nullable()
val versionName = varchar("version_name", 16) val versionName = varchar("version_name", 16)
val versionCode = long("version_code") val versionCode = long("version_code")