pull/1238/head^2
gedoor 3 years ago
parent 5bbd453d9f
commit e6e6df4fe2
  1. 4
      app/src/main/assets/updateLog.md
  2. 9
      app/src/main/assets/web/uploadBook/js/html5_fun.js
  3. 23
      app/src/main/java/io/legado/app/api/controller/BookController.kt
  4. 2
      app/src/main/java/io/legado/app/web/HttpServer.kt

@ -14,6 +14,10 @@
**2021/08/09**
1. web传书可以使用
**2021/08/09**
1. 修复选择文字不能选择单个文字的bug
2. 分组可选择封面

@ -123,9 +123,13 @@ try {
//正在上传
isUploading = true;
//设置上传的数据
var reader = new FileReader();
reader.readAsDataURL(file);
reader.onload = function (e) {
var data = e.target.result;
var fd = new FormData();
fd.append("Filename", file.name);
fd.append("Filedata", file);
fd.append("fileName", file.name);
fd.append("fileData", data);
//设置当前的上传对象
currUploadfile = file;
@ -157,6 +161,7 @@ try {
nextUpload()
}
};
}
}

@ -1,7 +1,7 @@
package io.legado.app.api.controller
import android.util.Base64
import androidx.core.graphics.drawable.toBitmap
import fi.iki.elonen.NanoHTTPD
import io.legado.app.R
import io.legado.app.api.ReturnData
import io.legado.app.constant.PreferKey
@ -19,7 +19,6 @@ import io.legado.app.ui.widget.image.CoverImageView
import io.legado.app.utils.*
import kotlinx.coroutines.runBlocking
import splitties.init.appCtx
import java.io.FileOutputStream
object BookController {
@ -192,22 +191,16 @@ object BookController {
}
}
fun addLocalBook(session: NanoHTTPD.IHTTPSession): ReturnData {
fun addLocalBook(parameters: Map<String, List<String>>): ReturnData {
val returnData = ReturnData()
try {
val fileName = session.parameters["file"]?.firstOrNull()
val contentLength = session.headers["content-length"]?.toInt()
fileName ?: let {
return returnData.setErrorMsg("文件名为空")
}
contentLength ?: let {
return returnData.setErrorMsg("文件长度为空")
}
val fileName = parameters["fileName"]?.firstOrNull()
?: return returnData.setErrorMsg("fileName 不能为空")
val fileData = parameters["fileData"]?.firstOrNull()
?: return returnData.setErrorMsg("fileData 不能为空")
val file = FileUtils.createFileIfNotExist(LocalBook.cacheFolder, fileName)
val outputStream = FileOutputStream(file)
session.inputStream.copyTo(outputStream, contentLength)
outputStream.close()
session.inputStream.close()
val fileBytes = Base64.decode(fileData.substringAfter("base64,"), Base64.DEFAULT)
file.writeBytes(fileBytes)
val nameAuthor = LocalBook.analyzeNameAuthor(fileName)
val book = Book(
bookUrl = file.absolutePath,

@ -42,7 +42,7 @@ class HttpServer(port: Int) : NanoHTTPD(port) {
"/saveSources" -> SourceController.saveSources(postData)
"/saveBook" -> BookController.saveBook(postData)
"/deleteSources" -> SourceController.deleteSources(postData)
"/addLocalBook" -> BookController.addLocalBook(session)
"/addLocalBook" -> BookController.addLocalBook(session.parameters)
else -> null
}
}

Loading…
Cancel
Save