Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-16 12:08:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 S3/WebDAV 数据同步支持设置超时时间 Fix https://github.com/siyuan-note/siyuan/issues/6781

Browse source
This commit is contained in:
Liang Ding 2022-12-04 20:42:35 +08:00
parent 4629e15f57
commit faa2d2d655
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
9 changed files with 72 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

45
app/src/config/repos.ts
View file

@ -85,7 +85,13 @@ const renderProvider = (provider: number) => {
<option ${window.siyuan.config.sync.s3.skipTlsVerify ? "" : "selected"} value="false">Verify</option>
<option ${window.siyuan.config.sync.s3.skipTlsVerify ? "selected" : ""} value="true">Skip</option>
</select>
</div>`;
</div>
<div class="b3-label b3-label--noborder">
<div>Timeout (s)</div>
<div class="fn__hr"></div>
<input id="timeout" class="b3-text-field fn__block" type="number" min="7" max="300" value="${window.siyuan.config.sync.s3.timeout}">
</div>
`;
}
return `${tip}
<label class="b3-label b3-label--noborder fn__flex">
@ -128,6 +134,11 @@ const renderProvider = (provider: number) => {
<option ${window.siyuan.config.sync.s3.skipTlsVerify ? "" : "selected"} value="false">Verify</option>
<option ${window.siyuan.config.sync.s3.skipTlsVerify ? "selected" : ""} value="true">Skip</option>
</select>
</label>
<label class="b3-label b3-label--noborder fn__flex">
<div class="fn__flex-center fn__size200">Timeout (s)</div>
<div class="fn__space"></div>
<input id="timeout" class="b3-text-field fn__flex-1" type="number" min="7" max="300" value="${window.siyuan.config.sync.s3.timeout}">
</label>`;
} else if (provider === 3) {
const tip = `<div class="b3-label b3-label--inner">
@ -161,6 +172,11 @@ const renderProvider = (provider: number) => {
<option ${window.siyuan.config.sync.webdav.skipTlsVerify ? "" : "selected"} value="false">Verify</option>
<option ${window.siyuan.config.sync.webdav.skipTlsVerify ? "selected" : ""} value="true">Skip</option>
</select>
</div>
<div class="b3-label b3-label--noborder">
<div>Timeout (s)</div>
<div class="fn__hr"></div>
<input id="timeout" class="b3-text-field fn__block" type="number" min="7" max="300" value="${window.siyuan.config.sync.webdav.timeout}">
</div>`;
}
return `${tip}
@ -186,6 +202,11 @@ const renderProvider = (provider: number) => {
<option ${window.siyuan.config.sync.webdav.skipTlsVerify ? "" : "selected"} value="false">Verify</option>
<option ${window.siyuan.config.sync.webdav.skipTlsVerify ? "selected" : ""} value="true">Skip</option>
</select>
</label>
<label class="b3-label b3-label--noborder fn__flex">
<div class="fn__flex-center fn__size200">Timeout (s)</div>
<div class="fn__space"></div>
<input id="timeout" class="b3-text-field fn__flex-1" type="number" min="7" max="300" value="${window.siyuan.config.sync.webdav.timeout}">
</label>`;
}
return "";
@ -247,6 +268,18 @@ const bindProviderEvent = () => {
providerPanelElement.querySelectorAll(".b3-text-field, .b3-select").forEach(item => {
item.addEventListener("blur", () => {
if (window.siyuan.config.sync.provider === 2) {
let timeout = parseInt((providerPanelElement.querySelector("#timeout") as HTMLInputElement).value, 10);
if (7 > timeout) {
if (1 > timeout) {
timeout = 30
} else {
timeout = 7;
}
}
if (300 < timeout) {
timeout = 300;
}
(providerPanelElement.querySelector("#timeout") as HTMLInputElement).value = timeout.toString();
const s3 = {
endpoint: (providerPanelElement.querySelector("#endpoint") as HTMLInputElement).value,
accessKey: (providerPanelElement.querySelector("#accessKey") as HTMLInputElement).value,
@ -255,16 +288,26 @@ const bindProviderEvent = () => {
pathStyle: (providerPanelElement.querySelector("#pathStyle") as HTMLInputElement).value === "true",
region: (providerPanelElement.querySelector("#region") as HTMLInputElement).value,
skipTlsVerify: (providerPanelElement.querySelector("#s3SkipTlsVerify") as HTMLInputElement).value === "true",
timeout: timeout,
};
fetchPost("/api/sync/setSyncProviderS3", {s3}, () => {
window.siyuan.config.sync.s3 = s3;
});
} else if (window.siyuan.config.sync.provider === 3) {
let timeout = parseInt((providerPanelElement.querySelector("#timeout") as HTMLInputElement).value, 10)
if (7 > timeout) {
timeout = 7;
}
if (300 < timeout) {
timeout = 300;
}
(providerPanelElement.querySelector("#timeout") as HTMLInputElement).value = timeout.toString();
const webdav = {
endpoint: (providerPanelElement.querySelector("#endpoint") as HTMLInputElement).value,
username: (providerPanelElement.querySelector("#username") as HTMLInputElement).value,
password: (providerPanelElement.querySelector("#password") as HTMLInputElement).value,
skipTlsVerify: (providerPanelElement.querySelector("#webdavSkipTlsVerify") as HTMLInputElement).value === "true",
timeout: timeout,
};
fetchPost("/api/sync/setSyncProviderWebDAV", {webdav}, () => {
window.siyuan.config.sync.webdav = webdav;

2
app/src/types/index.d.ts vendored
View file

@ -372,12 +372,14 @@ declare interface IConfig {
bucket: string
region: string
skipTlsVerify: boolean
timeout: number
}
webdav: {
endpoint: string
username: string
password: string
skipTlsVerify: boolean
timeout: number
}
},
lang: string