Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cleanup with Kotlin extension functions

Browse source
This commit is contained in:
Prathamesh More 2022-04-13 14:33:36 +05:30
parent fc4f0396a4
commit e0f345b616
37 changed files with 183 additions and 291 deletions
Download patch file Download diff file Expand all files Collapse all files

60
app/src/main/java/code/name/monkey/retromusic/helper/BackupHelper.kt
View file

@ -2,11 +2,11 @@ package code.name.monkey.retromusic.helper
import android.content.Context
import android.os.Environment
import android.widget.Toast
import code.name.monkey.retromusic.App
import code.name.monkey.retromusic.BuildConfig
import code.name.monkey.retromusic.db.PlaylistEntity
import code.name.monkey.retromusic.db.toSongEntity
import code.name.monkey.retromusic.extensions.showToast
import code.name.monkey.retromusic.extensions.zipOutputStream
import code.name.monkey.retromusic.helper.BackupContent.*
import code.name.monkey.retromusic.model.Song
import code.name.monkey.retromusic.repository.Repository
@ -15,12 +15,12 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import java.io.*
import java.io.File
import java.io.InputStream
import java.text.SimpleDateFormat
import java.util.*
import java.util.zip.ZipEntry
import java.util.zip.ZipInputStream
import java.util.zip.ZipOutputStream
object BackupHelper : KoinComponent {
private val repository by inject<Repository>()
@ -37,38 +37,30 @@ object BackupHelper : KoinComponent {
zipItems.addAll(getSettingsZipItems(context))
getUserImageZipItems(context)?.let { zipItems.addAll(it) }
zipItems.addAll(getCustomArtistZipItems(context))
zipAll(zipItems, backupFile)
zipAll(context, zipItems, backupFile)
// Clean Cache Playlist Directory
File(context.filesDir, PLAYLISTS_PATH).deleteRecursively()
}
private suspend fun zipAll(zipItems: List<ZipItem>, backupFile: File) =
private suspend fun zipAll(context: Context, zipItems: List<ZipItem>, backupFile: File) =
withContext(Dispatchers.IO) {
runCatching {
ZipOutputStream(BufferedOutputStream(FileOutputStream(backupFile))).use { out ->
backupFile.outputStream().buffered().zipOutputStream().use { out ->
for (zipItem in zipItems) {
FileInputStream(zipItem.filePath).use { fi ->
BufferedInputStream(fi).use { origin ->
val entry = ZipEntry(zipItem.zipPath)
out.putNextEntry(entry)
origin.copyTo(out)
}
File(zipItem.filePath).inputStream().buffered().use { origin ->
val entry = ZipEntry(zipItem.zipPath)
out.putNextEntry(entry)
origin.copyTo(out)
}
}
}
}.onFailure {
withContext(Dispatchers.Main) {
Toast.makeText(App.getContext(), "Couldn't create backup", Toast.LENGTH_SHORT)
.show()
context.showToast("Couldn't create backup")
}
}.onSuccess {
withContext(Dispatchers.Main) {
Toast.makeText(
App.getContext(),
"Backup created successfully",
Toast.LENGTH_SHORT
)
.show()
context.showToast("Backup created successfully")
}
}
}
@ -167,7 +159,7 @@ object BackupHelper : KoinComponent {
}
}
withContext(Dispatchers.Main) {
Toast.makeText(context, "Restore Completed Successfully", Toast.LENGTH_SHORT).show()
context.showToast("Restore Completed Successfully")
}
}
}
@ -176,7 +168,7 @@ object BackupHelper : KoinComponent {
val file = File(
context.filesDir.path, zipEntry.getFileName()
)
BufferedOutputStream(FileOutputStream(file)).use { bos ->
file.outputStream().buffered().use { bos ->
zipIn.copyTo(bos)
}
}
@ -188,7 +180,7 @@ object BackupHelper : KoinComponent {
if (file.exists()) {
file.delete()
}
BufferedOutputStream(FileOutputStream(file)).use { bos ->
file.outputStream().buffered().use { bos ->
zipIn.copyTo(bos)
}
}
@ -233,16 +225,14 @@ object BackupHelper : KoinComponent {
if (!parentFolder.exists()) {
parentFolder.mkdirs()
}
BufferedOutputStream(
FileOutputStream(
File(
parentFolder,
zipEntry.getFileName()
)
)
).use { bos ->
zipIn.copyTo(bos)
}
val file = File(
parentFolder,
zipEntry.getFileName()
)
file.outputStream().buffered()
.use { bos ->
zipIn.copyTo(bos)
}
}
private fun restoreCustomArtistPrefs(
@ -252,7 +242,7 @@ object BackupHelper : KoinComponent {
) {
val file =
File(context.filesDir.parentFile, "shared_prefs".child(zipEntry.getFileName()))
BufferedOutputStream(FileOutputStream(file)).use { bos ->
file.outputStream().buffered().use { bos ->
zipIn.copyTo(bos)
}
}

17
app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt
View file

@ -25,6 +25,7 @@ import android.provider.DocumentsContract
import android.widget.Toast
import androidx.core.content.ContextCompat
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.extensions.showToast
import code.name.monkey.retromusic.model.Song
import code.name.monkey.retromusic.repository.SongRepository
import code.name.monkey.retromusic.service.MusicService
@ -317,11 +318,7 @@ object MusicPlayerRemote : KoinComponent {
queue.add(song)
openQueue(queue, 0, false)
}
Toast.makeText(
musicService,
musicService!!.resources.getString(R.string.added_title_to_playing_queue),
Toast.LENGTH_SHORT
).show()
musicService?.showToast(R.string.added_title_to_playing_queue)
return true
}
return false
@ -340,7 +337,7 @@ object MusicPlayerRemote : KoinComponent {
R.string.added_x_titles_to_playing_queue,
songs.size
)
Toast.makeText(musicService, toast, Toast.LENGTH_SHORT).show()
musicService?.showToast(toast, Toast.LENGTH_SHORT)
return true
}
return false
@ -355,11 +352,7 @@ object MusicPlayerRemote : KoinComponent {
queue.add(song)
openQueue(queue, 0, false)
}
Toast.makeText(
musicService,
musicService!!.resources.getString(R.string.added_title_to_playing_queue),
Toast.LENGTH_SHORT
).show()
musicService?.showToast(R.string.added_title_to_playing_queue)
return true
}
return false
@ -377,7 +370,7 @@ object MusicPlayerRemote : KoinComponent {
R.string.added_x_titles_to_playing_queue,
songs.size
)
Toast.makeText(musicService, toast, Toast.LENGTH_SHORT).show()
musicService?.showToast(toast)
return true
}
return false