Merge branch 'gedoor:master' into master

pull/2395/head
Xwite 3 years ago committed by GitHub
commit a086fa688a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      app/src/main/assets/web/source/css/app.c7518ca7.css
  2. 2
      app/src/main/assets/web/source/index.html
  3. 1
      app/src/main/assets/web/source/js/app.142ed0b9.js
  4. 1
      app/src/main/assets/web/source/js/app.1f813059.js
  5. 13
      app/src/main/assets/web/source/js/chunk-vendors.4787cb7f.js
  6. 13
      app/src/main/assets/web/source/js/chunk-vendors.ad620a44.js
  7. 2
      app/src/main/java/io/legado/app/model/localBook/LocalBook.kt
  8. 3
      app/src/main/java/io/legado/app/model/remote/RemoteBookWebDav.kt

@ -1 +1 @@
.editor{display:flex;align-items:stretch;height:100vh}.left{width:calc(50% - 55px);min-width:500px;display:inline-block}.main{width:100%;height:calc(100vh - 64px);overflow-y:auto}textarea{min-height:20px;flex:1;outline:none;border-radius:4px;border:1px solid #ccc;font-size:14px;font-family:Cascadia,Microsoft YaHei UI,Arial,serif;line-height:20px;padding:10px 10px 10px}.fixed[data-v-ab8a8a34]{position:fixed;top:100px;left:50%;transform:translateX(-50%)}.half-circle-spinner [data-v-ab8a8a34],.half-circle-spinner[data-v-ab8a8a34]{box-sizing:border-box}.half-circle-spinner[data-v-ab8a8a34]{width:60px;height:60px;border-radius:100%;position:relative}.half-circle-spinner .circle[data-v-ab8a8a34]{content:"";position:absolute;width:100%;height:100%;border-radius:100%;border:6px solid transparent}.half-circle-spinner .circle.circle-1[data-v-ab8a8a34]{border-top-color:#ff1d5e;animation:half-circle-spinner-animation-ab8a8a34 1s infinite}.half-circle-spinner .circle.circle-2[data-v-ab8a8a34]{border-bottom-color:#ff1d5e;animation:half-circle-spinner-animation-ab8a8a34 1s infinite alternate}@keyframes half-circle-spinner-animation-ab8a8a34{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.warm[data-v-de5a7c30]{position:fixed;top:100px;left:50%;transform:translateX(-50%);color:#eee;background-color:#ff1d5e;padding:20px;border-radius:8px;font-size:18px;z-index:100}button[data-v-de5a7c30]{float:right;width:70px;height:35px;outline:none;border:unset;border-radius:8px;font-size:14px;transition:background-color .3s ease}.success[data-v-bef92f74],button[data-v-de5a7c30]:hover{color:#333;background-color:#7fffd4}.success[data-v-bef92f74]{z-index:3;position:fixed;top:100px;left:50%;transform:translateX(-50%);padding:10px;border-radius:8px}p[data-v-bef92f74]{margin:0}.menu{display:flex;flex-direction:column;justify-content:center}button[data-v-7878178f]{width:100px;height:50px;margin:5px;outline:none;padding:10px;font-size:16px;border-radius:4px;box-sizing:border-box;border:1px solid #333;background-color:transparent;transition:all .3s ease;overflow:hidden}button span[data-v-7878178f]{display:inline-block;transform:translateY(20px);opacity:0;font-size:12px;transition:all .3s ease}button[data-v-7878178f]:hover{color:#fff;background-color:gray}button:hover span[data-v-7878178f]{transform:translateY(0);opacity:1}textarea[data-v-554d8227]{font-size:14px}input[data-v-28b882dd]{outline:none;height:25px;font-size:16px}textarea[data-v-28b882dd]{font-size:14px}.search[data-v-5c2b9492]{border:1px solid #ddd;border-radius:4px}input[data-v-5c2b9492]{text-align:center;font-size:16px;height:25px;outline:none}.tool[data-v-5c2b9492]{display:flex;justify-content:space-around;padding:4px 0}.tool button[data-v-5c2b9492]{border-radius:4px;padding:5px;outline:none;border:none;flex:1;margin:0 2px}.tool button[data-v-5c2b9492]:hover{background-color:#ddd}input[type=checkbox][data-v-5c2b9492]{transform:scale(2);margin:0 15px 0}.book_item[data-v-5c2b9492]{overflow:hidden;display:flex;align-items:center;margin-top:10px;padding:10px;cursor:pointer;background-color:#eee}.book_active[data-v-5c2b9492]{background-color:#32cd32}.book_index[data-v-5c2b9492]{width:auto;height:30px;text-align:center;line-height:30px;border-radius:8px;padding:0 10px;background-color:#ffb6c1}.book_info[data-v-5c2b9492]{display:flex;justify-content:space-between}.source_list[data-v-5c2b9492]{height:calc(100vh - 125px);overflow-y:auto}a[data-v-7ac1e65e]{display:block;height:25px;transition:margin-left .3s ease}a[data-v-7ac1e65e]:hover{color:red;margin-left:10px}code[data-v-7ac1e65e]{display:inline-block;font-size:16px;font-family:Cascadia Mono,JetBrains Mono,Microsoft YaHei UI,serif;background-color:#f3f4f4;border-radius:4px}.author[data-v-7ac1e65e]{position:fixed;right:20px;bottom:20px}.author a[data-v-7ac1e65e]{padding:5px 10px;border-radius:4px}.author a[data-v-7ac1e65e]:hover{box-shadow:0 0 3px 3px #ccc;background-color:#ddd}.out{min-width:620px}.out,.out .box{flex:1;display:flex;flex-flow:column}span[data-v-915519b0]{display:flex;justify-content:space-around;width:70px;white-space:nowrap}span i[data-v-915519b0]{font-style:normal}.edit_input[data-v-915519b0]{display:flex;justify-content:space-between;align-items:center;margin:10px 5px}a{text-decoration:none;color:#333}body,ul{margin:0;padding:0}ul{width:100%;height:40px;display:flex}ul li{display:block;text-align:center;line-height:40px;width:16%;list-style:none;cursor:pointer}ul li:hover{color:red}.active{color:#fff!important;background-color:hsla(0,0%,50%,.459);border-bottom:unset!important}ul li[data-v-ac6d92b6]{border-bottom:2px solid #333}a[data-v-ac6d92b6]{font-size:18px;color:blue}
.editor{display:flex;align-items:stretch;height:100vh}.left{width:calc(50% - 55px);min-width:500px;display:inline-block}.main{width:100%;height:calc(100vh - 64px);overflow-y:auto}textarea{min-height:20px;flex:1;outline:none;border-radius:4px;border:1px solid #ccc;font-size:14px;font-family:Cascadia,Microsoft YaHei UI,Arial,serif;line-height:20px;padding:10px 10px 10px}.fixed[data-v-ab8a8a34]{position:fixed;top:100px;left:50%;transform:translateX(-50%)}.half-circle-spinner [data-v-ab8a8a34],.half-circle-spinner[data-v-ab8a8a34]{box-sizing:border-box}.half-circle-spinner[data-v-ab8a8a34]{width:60px;height:60px;border-radius:100%;position:relative}.half-circle-spinner .circle[data-v-ab8a8a34]{content:"";position:absolute;width:100%;height:100%;border-radius:100%;border:6px solid transparent}.half-circle-spinner .circle.circle-1[data-v-ab8a8a34]{border-top-color:#ff1d5e;animation:half-circle-spinner-animation-ab8a8a34 1s infinite}.half-circle-spinner .circle.circle-2[data-v-ab8a8a34]{border-bottom-color:#ff1d5e;animation:half-circle-spinner-animation-ab8a8a34 1s infinite alternate}@keyframes half-circle-spinner-animation-ab8a8a34{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.warm[data-v-de5a7c30]{position:fixed;top:100px;left:50%;transform:translateX(-50%);color:#eee;background-color:#ff1d5e;padding:20px;border-radius:8px;font-size:18px;z-index:100}button[data-v-de5a7c30]{float:right;width:70px;height:35px;outline:none;border:unset;border-radius:8px;font-size:14px;transition:background-color .3s ease}.success[data-v-bef92f74],button[data-v-de5a7c30]:hover{color:#333;background-color:#7fffd4}.success[data-v-bef92f74]{z-index:3;position:fixed;top:100px;left:50%;transform:translateX(-50%);padding:10px;border-radius:8px}p[data-v-bef92f74]{margin:0}.menu{display:flex;flex-direction:column;justify-content:center}button[data-v-c2bd491a]{width:100px;height:50px;margin:5px;outline:none;padding:10px;font-size:16px;border-radius:4px;box-sizing:border-box;border:1px solid #333;background-color:transparent;transition:all .3s ease;overflow:hidden}button span[data-v-c2bd491a]{display:inline-block;transform:translateY(20px);opacity:0;font-size:12px;transition:all .3s ease}button[data-v-c2bd491a]:hover{color:#fff;background-color:gray}button:hover span[data-v-c2bd491a]{transform:translateY(0);opacity:1}textarea[data-v-554d8227]{font-size:14px}input[data-v-28b882dd]{outline:none;height:25px;font-size:16px}textarea[data-v-28b882dd]{font-size:14px}.search[data-v-5c2b9492]{border:1px solid #ddd;border-radius:4px}input[data-v-5c2b9492]{text-align:center;font-size:16px;height:25px;outline:none}.tool[data-v-5c2b9492]{display:flex;justify-content:space-around;padding:4px 0}.tool button[data-v-5c2b9492]{border-radius:4px;padding:5px;outline:none;border:none;flex:1;margin:0 2px}.tool button[data-v-5c2b9492]:hover{background-color:#ddd}input[type=checkbox][data-v-5c2b9492]{transform:scale(2);margin:0 15px 0}.book_item[data-v-5c2b9492]{overflow:hidden;display:flex;align-items:center;margin-top:10px;padding:10px;cursor:pointer;background-color:#eee}.book_active[data-v-5c2b9492]{background-color:#32cd32}.book_index[data-v-5c2b9492]{width:auto;height:30px;text-align:center;line-height:30px;border-radius:8px;padding:0 10px;background-color:#ffb6c1}.book_info[data-v-5c2b9492]{display:flex;justify-content:space-between}.source_list[data-v-5c2b9492]{height:calc(100vh - 125px);overflow-y:auto}a[data-v-7ac1e65e]{display:block;height:25px;transition:margin-left .3s ease}a[data-v-7ac1e65e]:hover{color:red;margin-left:10px}code[data-v-7ac1e65e]{display:inline-block;font-size:16px;font-family:Cascadia Mono,JetBrains Mono,Microsoft YaHei UI,serif;background-color:#f3f4f4;border-radius:4px}.author[data-v-7ac1e65e]{position:fixed;right:20px;bottom:20px}.author a[data-v-7ac1e65e]{padding:5px 10px;border-radius:4px}.author a[data-v-7ac1e65e]:hover{box-shadow:0 0 3px 3px #ccc;background-color:#ddd}.out{min-width:620px}.out,.out .box{flex:1;display:flex;flex-flow:column}span[data-v-915519b0]{display:flex;justify-content:space-around;width:70px;white-space:nowrap}span i[data-v-915519b0]{font-style:normal}.edit_input[data-v-915519b0]{display:flex;justify-content:space-between;align-items:center;margin:10px 5px}a{text-decoration:none;color:#333}body,ul{margin:0;padding:0}ul{width:100%;height:40px;display:flex}ul li{display:block;text-align:center;line-height:40px;width:16%;list-style:none;cursor:pointer}ul li:hover{color:red}.active{color:#fff!important;background-color:hsla(0,0%,50%,.459);border-bottom:unset!important}ul li[data-v-ac6d92b6]{border-bottom:2px solid #333}a[data-v-ac6d92b6]{font-size:18px;color:blue}

@ -1 +1 @@
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="./favicon.ico"><title>legado_web_source_editor</title><script defer="defer" src="./js/chunk-vendors.ad620a44.js"></script><script defer="defer" src="./js/app.1f813059.js"></script><link href="./css/app.1ae8e521.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but legado_web_source_editor doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="./favicon.ico"><title>legado_web_source_editor</title><script defer="defer" src="./js/chunk-vendors.4787cb7f.js"></script><script defer="defer" src="./js/app.142ed0b9.js"></script><link href="./css/app.c7518ca7.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but legado_web_source_editor doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -308,6 +308,8 @@ object LocalBook {
val webDavUrl = localBook.getRemoteUrl()
if (webDavUrl.isNullOrBlank()) return null
try {
AppConfig.defaultBookTreeUri
?: throw NoStackTraceException("没有设置书籍保存位置!")
val uri = AppWebDav.authorization?.let {
val webdav = WebDav(webDavUrl, it)
runBlocking {

@ -6,6 +6,7 @@ import io.legado.app.constant.BookType
import io.legado.app.data.entities.Book
import io.legado.app.exception.NoStackTraceException
import io.legado.app.help.AppWebDav
import io.legado.app.help.config.AppConfig
import io.legado.app.lib.webdav.WebDav
import io.legado.app.lib.webdav.WebDavFile
import io.legado.app.model.localBook.LocalBook
@ -58,6 +59,8 @@ object RemoteBookWebDav : RemoteBookManager() {
}
override suspend fun downloadRemoteBook(remoteBook: RemoteBook): Uri {
AppConfig.defaultBookTreeUri
?: throw NoStackTraceException("没有设置书籍保存位置!")
return AppWebDav.authorization?.let {
val webdav = WebDav(remoteBook.path, it)
webdav.downloadInputStream().let { inputStream ->

Loading…
Cancel
Save