Minor cleanups

Pulling out some of the smaller changes that aren't related to the manga controller changes in #7244
This commit is contained in:
arkon
2022-06-04 16:01:49 -04:00
parent 5ea03fad87
commit 7fdbf40cd2
25 changed files with 94 additions and 79 deletions
@@ -34,11 +34,11 @@ class CoverCache(private val context: Context) {
/**
* Returns the cover from cache.
*
* @param manga the manga.
* @param mangaThumbnailUrl thumbnail url for the manga.
* @return cover image.
*/
fun getCoverFile(manga: Manga): File? {
return manga.thumbnail_url?.let {
fun getCoverFile(mangaThumbnailUrl: String?): File? {
return mangaThumbnailUrl?.let {
File(cacheDir, DiskUtil.hashKeyForDisk(it))
}
}
@@ -46,11 +46,11 @@ class CoverCache(private val context: Context) {
/**
* Returns the custom cover from cache.
*
* @param manga the manga.
* @param mangaId the manga id.
* @return cover image.
*/
fun getCustomCoverFile(manga: Manga): File {
return File(customCoverCacheDir, DiskUtil.hashKeyForDisk(manga.id.toString()))
fun getCustomCoverFile(mangaId: Long?): File {
return File(customCoverCacheDir, DiskUtil.hashKeyForDisk(mangaId.toString()))
}
/**
@@ -62,7 +62,7 @@ class CoverCache(private val context: Context) {
*/
@Throws(IOException::class)
fun setCustomCoverToCache(manga: Manga, inputStream: InputStream) {
getCustomCoverFile(manga).outputStream().use {
getCustomCoverFile(manga.id).outputStream().use {
inputStream.copyTo(it)
}
}
@@ -77,12 +77,12 @@ class CoverCache(private val context: Context) {
fun deleteFromCache(manga: Manga, deleteCustomCover: Boolean = false): Int {
var deleted = 0
getCoverFile(manga)?.let {
getCoverFile(manga.thumbnail_url)?.let {
if (it.exists() && it.delete()) ++deleted
}
if (deleteCustomCover) {
if (deleteCustomCover(manga)) ++deleted
if (deleteCustomCover(manga.id)) ++deleted
}
return deleted
@@ -91,11 +91,11 @@ class CoverCache(private val context: Context) {
/**
* Delete custom cover of the manga from the cache
*
* @param manga the manga.
* @param mangaId the manga id.
* @return whether the cover was deleted.
*/
fun deleteCustomCover(manga: Manga): Boolean {
return getCustomCoverFile(manga).let {
fun deleteCustomCover(mangaId: Long?): Boolean {
return getCustomCoverFile(mangaId).let {
it.exists() && it.delete()
}
}