yusheng/QieKan-3.0
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases 2 Wiki Activity

优化

Browse Source
This commit is contained in:
kunfei
2022-03-18 17:37:20 +08:00
parent b7a14e6194
commit 6e90ac64d1
11 changed files with 99 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt
+24 -27
View File
@@ -102,41 +102,38 @@ class FileAssociationActivity :
private fun importBook(treeUri: Uri, uri: Uri) { private fun importBook(treeUri: Uri, uri: Uri) {
launch { launch {
runCatching { runCatching {
if (treeUri.isContentScheme()) { withContext(IO) {
val treeDoc = DocumentFile.fromTreeUri(this@FileAssociationActivity, treeUri) if (treeUri.isContentScheme()) {
val bookDoc = DocumentFile.fromSingleUri(this@FileAssociationActivity, uri) val treeDoc =
withContext(IO) { DocumentFile.fromTreeUri(this@FileAssociationActivity, treeUri)
val name = bookDoc?.name!! readUri(uri) { fileDoc, inputStream ->
var doc = treeDoc!!.findFile(name) val name = fileDoc.name
if (doc == null || bookDoc.lastModified() > doc.lastModified()) { var doc = treeDoc!!.findFile(name)
if (doc == null) { if (doc == null || fileDoc.lastModified > doc.lastModified()) {
doc = treeDoc.createFile(FileUtils.getMimeType(name), name) if (doc == null) {
?: throw SecurityException("Permission Denial") doc = treeDoc.createFile(FileUtils.getMimeType(name), name)
} ?: throw SecurityException("Permission Denial")
contentResolver.openOutputStream(doc.uri)!!.use { oStream -> }
contentResolver.openInputStream(bookDoc.uri)!!.use { iStream -> contentResolver.openOutputStream(doc.uri)!!.use { oStream ->
iStream.copyTo(oStream) inputStream.copyTo(oStream)
oStream.flush() oStream.flush()
} }
} }
viewModel.importBook(doc.uri)
} }
viewModel.importBook(doc.uri) } else {
} val treeFile = File(treeUri.path ?: treeUri.toString())
} else { readUri(uri) { fileDoc, inputStream ->
val treeFile = File(treeUri.path!!) val name = fileDoc.name
val bookDoc = DocumentFile.fromSingleUri(this@FileAssociationActivity, uri) val file = treeFile.getFile(name)
withContext(IO) { if (!file.exists() || fileDoc.lastModified > file.lastModified()) {
val name = bookDoc?.name!! FileOutputStream(file).use { oStream ->
val file = treeFile.getFile(name) inputStream.copyTo(oStream)
if (!file.exists() || file.lastModified() < bookDoc.lastModified()) {
FileOutputStream(file).use { oStream ->
contentResolver.openInputStream(bookDoc.uri)!!.use { iStream ->
iStream.copyTo(oStream)
oStream.flush() oStream.flush()
} }
} }
viewModel.importBook(Uri.fromFile(file))
} }
viewModel.importBook(Uri.fromFile(file))
} }
} }
}.onFailure { }.onFailure {
app/src/main/java/io/legado/app/ui/book/group/GroupEditDialog.kt
+6 -3
View File
@@ -13,6 +13,7 @@ import io.legado.app.lib.theme.primaryColor
import io.legado.app.utils.* import io.legado.app.utils.*
import io.legado.app.utils.viewbindingdelegate.viewBinding import io.legado.app.utils.viewbindingdelegate.viewBinding
import splitties.views.onClick import splitties.views.onClick
import java.io.FileOutputStream
class GroupEditDialog() : BaseDialogFragment(R.layout.dialog_book_group_edit) { class GroupEditDialog() : BaseDialogFragment(R.layout.dialog_book_group_edit) {
@@ -26,10 +27,12 @@ class GroupEditDialog() : BaseDialogFragment(R.layout.dialog_book_group_edit) {
private val viewModel by viewModels<GroupViewModel>() private val viewModel by viewModels<GroupViewModel>()
private var bookGroup: BookGroup? = null private var bookGroup: BookGroup? = null
val selectImage = registerForActivityResult(SelectImageContract()) { val selectImage = registerForActivityResult(SelectImageContract()) {
readUri(it?.uri) { name, bytes -> readUri(it?.uri) { fileDoc, inputStream ->
var file = requireContext().externalFiles var file = requireContext().externalFiles
file = FileUtils.createFileIfNotExist(file, "covers", name) file = FileUtils.createFileIfNotExist(file, "covers", fileDoc.name)
file.writeBytes(bytes) FileOutputStream(file).use { outputStream ->
inputStream.copyTo(outputStream)
}
binding.ivCover.load(file.absolutePath) binding.ivCover.load(file.absolutePath)
} }
} }
app/src/main/java/io/legado/app/ui/book/info/edit/BookInfoEditActivity.kt
+10 -5
View File
@@ -13,6 +13,7 @@ import io.legado.app.databinding.ActivityBookInfoEditBinding
import io.legado.app.ui.book.changecover.ChangeCoverDialog import io.legado.app.ui.book.changecover.ChangeCoverDialog
import io.legado.app.utils.* import io.legado.app.utils.*
import io.legado.app.utils.viewbindingdelegate.viewBinding import io.legado.app.utils.viewbindingdelegate.viewBinding
import java.io.FileOutputStream
class BookInfoEditActivity : class BookInfoEditActivity :
VMBaseActivity<ActivityBookInfoEditBinding, BookInfoEditViewModel>(), VMBaseActivity<ActivityBookInfoEditBinding, BookInfoEditViewModel>(),
@@ -101,11 +102,15 @@ class BookInfoEditActivity :
} }
private fun coverChangeTo(uri: Uri) { private fun coverChangeTo(uri: Uri) {
readUri(uri) { name, bytes -> readUri(uri) { fileDoc, inputStream ->
var file = this.externalFiles inputStream.use {
file = FileUtils.createFileIfNotExist(file, "covers", name) var file = this.externalFiles
file.writeBytes(bytes) file = FileUtils.createFileIfNotExist(file, "covers", fileDoc.name)
coverChangeTo(file.absolutePath) FileOutputStream(file).use { outputStream ->
inputStream.copyTo(outputStream)
}
coverChangeTo(file.absolutePath)
}
} }
} }
app/src/main/java/io/legado/app/ui/book/local/ImportBookAdapter.kt
+1 -1
View File
@@ -52,7 +52,7 @@ class ImportBookAdapter(context: Context, val callBack: CallBack) :
llBrief.visible() llBrief.visible()
tvTag.text = item.name.substringAfterLast(".") tvTag.text = item.name.substringAfterLast(".")
tvSize.text = ConvertUtils.formatFileSize(item.size) tvSize.text = ConvertUtils.formatFileSize(item.size)
tvDate.text = AppConst.dateFormat.format(item.date) tvDate.text = AppConst.dateFormat.format(item.lastModified)
cbSelect.isChecked = selectedUris.contains(item.toString()) cbSelect.isChecked = selectedUris.contains(item.toString())
} }
tvName.text = item.name tvName.text = item.name
app/src/main/java/io/legado/app/ui/book/local/ImportBookViewModel.kt
+1 -1
View File
@@ -59,7 +59,7 @@ class ImportBookViewModel(application: Application) : BaseViewModel(application)
}.map { docList -> }.map { docList ->
when (sort) { when (sort) {
2 -> docList.sortedWith( 2 -> docList.sortedWith(
compareBy({ !it.isDir }, { it.date }, { it.name }) compareBy({ !it.isDir }, { it.lastModified }, { it.name })
) )
1 -> docList.sortedWith( 1 -> docList.sortedWith(
compareBy({ !it.isDir }, { it.size }, { it.name }) compareBy({ !it.isDir }, { it.size }, { it.name })
app/src/main/java/io/legado/app/ui/book/read/config/BgTextConfigDialog.kt
+6 -3
View File
@@ -35,6 +35,7 @@ import io.legado.app.utils.*
import io.legado.app.utils.viewbindingdelegate.viewBinding import io.legado.app.utils.viewbindingdelegate.viewBinding
import java.io.File import java.io.File
import java.io.FileOutputStream
class BgTextConfigDialog : BaseDialogFragment(R.layout.dialog_read_bg_text) { class BgTextConfigDialog : BaseDialogFragment(R.layout.dialog_read_bg_text) {
@@ -350,10 +351,12 @@ class BgTextConfigDialog : BaseDialogFragment(R.layout.dialog_read_bg_text) {
} }
private fun setBgFromUri(uri: Uri) { private fun setBgFromUri(uri: Uri) {
readUri(uri) { name, bytes -> readUri(uri) { fileDoc, inputStream ->
var file = requireContext().externalFiles var file = requireContext().externalFiles
file = FileUtils.createFileIfNotExist(file, "bg", name) file = FileUtils.createFileIfNotExist(file, "bg", fileDoc.name)
file.writeBytes(bytes) FileOutputStream(file).use { outputStream ->
inputStream.copyTo(outputStream)
}
ReadBookConfig.durConfig.setCurBg(2, file.absolutePath) ReadBookConfig.durConfig.setCurBg(2, file.absolutePath)
ReadBookConfig.upBg() ReadBookConfig.upBg()
postEvent(EventBus.UP_CONFIG, false) postEvent(EventBus.UP_CONFIG, false)
app/src/main/java/io/legado/app/ui/config/CoverConfigFragment.kt
+6 -3
View File
@@ -14,6 +14,7 @@ import io.legado.app.lib.theme.primaryColor
import io.legado.app.model.BookCover import io.legado.app.model.BookCover
import io.legado.app.ui.widget.prefs.SwitchPreference import io.legado.app.ui.widget.prefs.SwitchPreference
import io.legado.app.utils.* import io.legado.app.utils.*
import java.io.FileOutputStream
class CoverConfigFragment : BasePreferenceFragment(), class CoverConfigFragment : BasePreferenceFragment(),
SharedPreferences.OnSharedPreferenceChangeListener { SharedPreferences.OnSharedPreferenceChangeListener {
@@ -138,10 +139,12 @@ class CoverConfigFragment : BasePreferenceFragment(),
} }
private fun setCoverFromUri(preferenceKey: String, uri: Uri) { private fun setCoverFromUri(preferenceKey: String, uri: Uri) {
readUri(uri) { name, bytes -> readUri(uri) { fileDoc, inputStream ->
var file = requireContext().externalFiles var file = requireContext().externalFiles
file = FileUtils.createFileIfNotExist(file, "covers", name) file = FileUtils.createFileIfNotExist(file, "covers", fileDoc.name)
file.writeBytes(bytes) FileOutputStream(file).use {
inputStream.copyTo(it)
}
putPrefString(preferenceKey, file.absolutePath) putPrefString(preferenceKey, file.absolutePath)
BookCover.upDefaultCover() BookCover.upDefaultCover()
} }
app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt
+6 -3
View File
@@ -29,6 +29,7 @@ import io.legado.app.ui.widget.number.NumberPickerDialog
import io.legado.app.ui.widget.prefs.ColorPreference import io.legado.app.ui.widget.prefs.ColorPreference
import io.legado.app.ui.widget.seekbar.SeekBarChangeListener import io.legado.app.ui.widget.seekbar.SeekBarChangeListener
import io.legado.app.utils.* import io.legado.app.utils.*
import java.io.FileOutputStream
@Suppress("SameParameterValue") @Suppress("SameParameterValue")
@@ -298,10 +299,12 @@ class ThemeConfigFragment : BasePreferenceFragment(),
} }
private fun setBgFromUri(uri: Uri, preferenceKey: String, success: () -> Unit) { private fun setBgFromUri(uri: Uri, preferenceKey: String, success: () -> Unit) {
readUri(uri) { name, bytes -> readUri(uri) { fileDoc, inputStream ->
var file = requireContext().externalFiles var file = requireContext().externalFiles
file = FileUtils.createFileIfNotExist(file, preferenceKey, name) file = FileUtils.createFileIfNotExist(file, preferenceKey, fileDoc.name)
file.writeBytes(bytes) FileOutputStream(file).use {
inputStream.copyTo(it)
}
putPrefString(preferenceKey, file.absolutePath) putPrefString(preferenceKey, file.absolutePath)
success() success()
} }
app/src/main/java/io/legado/app/ui/config/WelcomeConfigFragment.kt
+6 -3
View File
@@ -13,6 +13,7 @@ import io.legado.app.lib.dialogs.selector
import io.legado.app.lib.theme.primaryColor import io.legado.app.lib.theme.primaryColor
import io.legado.app.model.BookCover import io.legado.app.model.BookCover
import io.legado.app.utils.* import io.legado.app.utils.*
import java.io.FileOutputStream
class WelcomeConfigFragment : BasePreferenceFragment(), class WelcomeConfigFragment : BasePreferenceFragment(),
SharedPreferences.OnSharedPreferenceChangeListener { SharedPreferences.OnSharedPreferenceChangeListener {
@@ -118,10 +119,12 @@ class WelcomeConfigFragment : BasePreferenceFragment(),
} }
private fun setCoverFromUri(preferenceKey: String, uri: Uri) { private fun setCoverFromUri(preferenceKey: String, uri: Uri) {
readUri(uri) { name, bytes -> readUri(uri) { fileDoc, inputStream ->
var file = requireContext().externalFiles var file = requireContext().externalFiles
file = FileUtils.createFileIfNotExist(file, "covers", name) file = FileUtils.createFileIfNotExist(file, "covers", fileDoc.name)
file.writeBytes(bytes) FileOutputStream(file).use {
inputStream.copyTo(it)
}
putPrefString(preferenceKey, file.absolutePath) putPrefString(preferenceKey, file.absolutePath)
} }
} }
app/src/main/java/io/legado/app/utils/DocumentExtensions.kt
+5 -6
View File
@@ -9,7 +9,6 @@ import io.legado.app.exception.NoStackTraceException
import splitties.init.appCtx import splitties.init.appCtx
import java.io.File import java.io.File
import java.nio.charset.Charset import java.nio.charset.Charset
import java.util.*
@Suppress("MemberVisibilityCanBePrivate") @Suppress("MemberVisibilityCanBePrivate")
@@ -125,7 +124,7 @@ object DocumentUtils {
name = cursor.getString(nci), name = cursor.getString(nci),
isDir = cursor.getString(mci) == DocumentsContract.Document.MIME_TYPE_DIR, isDir = cursor.getString(mci) == DocumentsContract.Document.MIME_TYPE_DIR,
size = cursor.getLong(sci), size = cursor.getLong(sci),
date = Date(cursor.getLong(dci)), lastModified = cursor.getLong(dci),
uri = DocumentsContract uri = DocumentsContract
.buildDocumentUriUsingTree(uri, cursor.getString(ici)) .buildDocumentUriUsingTree(uri, cursor.getString(ici))
) )
@@ -150,7 +149,7 @@ object DocumentUtils {
it.name, it.name,
it.isDirectory, it.isDirectory,
it.length(), it.length(),
Date(it.lastModified()), it.lastModified(),
Uri.fromFile(it) Uri.fromFile(it)
) )
if (filter == null || filter.invoke(item)) { if (filter == null || filter.invoke(item)) {
@@ -166,7 +165,7 @@ data class FileDoc(
val name: String, val name: String,
val isDir: Boolean, val isDir: Boolean,
val size: Long, val size: Long,
val date: Date, val lastModified: Long,
val uri: Uri val uri: Uri
) { ) {
@@ -187,7 +186,7 @@ data class FileDoc(
name = doc.name ?: "", name = doc.name ?: "",
isDir = doc.isDirectory, isDir = doc.isDirectory,
size = doc.length(), size = doc.length(),
date = Date(doc.lastModified()), lastModified = doc.lastModified(),
uri = doc.uri uri = doc.uri
) )
} }
@@ -197,7 +196,7 @@ data class FileDoc(
name = file.name, name = file.name,
isDir = file.isDirectory, isDir = file.isDirectory,
size = file.length(), size = file.length(),
date = Date(file.lastModified()), lastModified = file.lastModified(),
uri = Uri.fromFile(file) uri = Uri.fromFile(file)
) )
} }
app/src/main/java/io/legado/app/utils/UriExtensions.kt
+28 -14
View File
@@ -10,32 +10,41 @@ import io.legado.app.exception.NoStackTraceException
import io.legado.app.lib.permission.Permissions import io.legado.app.lib.permission.Permissions
import io.legado.app.lib.permission.PermissionsCompat import io.legado.app.lib.permission.PermissionsCompat
import java.io.File import java.io.File
import java.io.FileInputStream
import java.io.InputStream
fun Uri.isContentScheme() = this.scheme == "content" fun Uri.isContentScheme() = this.scheme == "content"
/** /**
* 读取URI * 读取URI
*/ */
fun AppCompatActivity.readUri(uri: Uri?, success: (name: String, bytes: ByteArray) -> Unit) { fun AppCompatActivity.readUri(
uri: Uri?,
success: (fileDoc: FileDoc, inputStream: InputStream) -> Unit
) {
uri ?: return uri ?: return
try { try {
if (uri.isContentScheme()) { if (uri.isContentScheme()) {
val doc = DocumentFile.fromSingleUri(this, uri) val doc = DocumentFile.fromSingleUri(this, uri)
doc ?: throw NoStackTraceException("未获取到文件") doc ?: throw NoStackTraceException("未获取到文件")
val name = doc.name ?: throw NoStackTraceException("未获取到文件名") val fileDoc = FileDoc.fromDocumentFile(doc)
val fileBytes = DocumentUtils.readBytes(this, doc.uri) contentResolver.openInputStream(uri)!!.use { inputStream ->
success.invoke(name, fileBytes) success.invoke(fileDoc, inputStream)
}
} else { } else {
PermissionsCompat.Builder(this) PermissionsCompat.Builder(this)
.addPermissions( .addPermissions(
Permissions.READ_EXTERNAL_STORAGE, Permissions.READ_EXTERNAL_STORAGE,
Permissions.WRITE_EXTERNAL_STORAGE Permissions.WRITE_EXTERNAL_STORAGE
) )
.rationale(R.string.bg_image_per) .rationale(R.string.get_storage_per)
.onGranted { .onGranted {
RealPathUtil.getPath(this, uri)?.let { path -> RealPathUtil.getPath(this, uri)?.let { path ->
val imgFile = File(path) val file = File(path)
success.invoke(imgFile.name, imgFile.readBytes()) val fileDoc = FileDoc.fromFile(file)
FileInputStream(file).use { inputStream ->
success.invoke(fileDoc, inputStream)
}
} }
} }
.request() .request()
@@ -49,26 +58,31 @@ fun AppCompatActivity.readUri(uri: Uri?, success: (name: String, bytes: ByteArra
/** /**
* 读取URI * 读取URI
*/ */
fun Fragment.readUri(uri: Uri?, success: (name: String, bytes: ByteArray) -> Unit) { fun Fragment.readUri(uri: Uri?, success: (fileDoc: FileDoc, inputStream: InputStream) -> Unit) {
uri ?: return uri ?: return
try { try {
if (uri.isContentScheme()) { if (uri.isContentScheme()) {
val doc = DocumentFile.fromSingleUri(requireContext(), uri) val doc = DocumentFile.fromSingleUri(requireContext(), uri)
doc ?: throw NoStackTraceException("未获取到文件") doc ?: throw NoStackTraceException("未获取到文件")
val name = doc.name ?: throw NoStackTraceException("未获取到文件名") val fileDoc = FileDoc.fromDocumentFile(doc)
val fileBytes = DocumentUtils.readBytes(requireContext(), doc.uri) requireContext().contentResolver.openInputStream(uri)!!.use { inputStream ->
success.invoke(name, fileBytes) success.invoke(fileDoc, inputStream)
}
} else { } else {
PermissionsCompat.Builder(this) PermissionsCompat.Builder(this)
.addPermissions( .addPermissions(
Permissions.READ_EXTERNAL_STORAGE, Permissions.READ_EXTERNAL_STORAGE,
Permissions.WRITE_EXTERNAL_STORAGE Permissions.WRITE_EXTERNAL_STORAGE
) )
.rationale(R.string.bg_image_per) .rationale(R.string.get_storage_per)
.onGranted { .onGranted {
RealPathUtil.getPath(requireContext(), uri)?.let { path -> RealPathUtil.getPath(requireContext(), uri)?.let { path ->
val imgFile = File(path) val file = File(path)
success.invoke(imgFile.name, imgFile.readBytes()) val fileDoc = FileDoc.fromFile(file)
FileInputStream(file).use { inputStream ->
success.invoke(fileDoc, inputStream)
}
} }
} }
.request() .request()