Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d38ac34362 | ||
|
|
6a651b844f | ||
|
|
9e4d3826fd | ||
|
|
d7e034f070 | ||
|
|
79a0b9f44d | ||
|
|
81c79ab848 | ||
|
|
af71758ef7 | ||
|
|
ee8a3df0be | ||
|
|
f55fad0e29 | ||
|
|
15c163e73d | ||
|
|
d8f613bbb6 | ||
|
|
c8016b5f30 | ||
|
|
f66a7031b2 | ||
|
|
bbc69715e8 | ||
|
|
d6c39615d7 | ||
|
|
bbb909cda4 | ||
|
|
200d25de70 | ||
|
|
cd0a9a395f | ||
|
|
2deb3be8eb | ||
|
|
9519793860 | ||
|
|
2d7c33fb1a | ||
|
|
6a009b93cb | ||
|
|
ce8d8d1c62 | ||
|
|
881147e91a | ||
|
|
6e282c86af | ||
|
|
c689235ff0 | ||
|
|
b238988012 | ||
|
|
24fb9e1675 | ||
|
|
f6a1a7c032 | ||
|
|
cfe7ae9826 | ||
|
|
186cff9c36 | ||
|
|
44dbec175b | ||
|
|
7ecddf29fa | ||
|
|
d23183395c | ||
|
|
8dd7879c5d | ||
|
|
f0d2766f48 | ||
|
|
92183e0fb6 | ||
|
|
28bd861c9e | ||
|
|
4e8bec9511 | ||
|
|
c98d91ab60 | ||
|
|
8bd456b08e | ||
|
|
a5c25aecd0 | ||
|
|
806438964c | ||
|
|
069e993fb0 | ||
|
|
7c2a17c404 | ||
|
|
f26e491922 | ||
|
|
dbf80c3359 | ||
|
|
9ddb840077 | ||
|
|
17135abbd4 | ||
|
|
af8357ba6e | ||
|
|
bfa23eb8a5 | ||
|
|
d3d26bfe49 | ||
|
|
f6f7d83a35 | ||
|
|
9e29405103 |
@@ -26,12 +26,13 @@ This is yet another unofficial sync plugin for Obsidian. If you like it or find
|
|||||||
- **[End-to-end encryption](./docs/encryption.md) supported.** Files would be encrypted using openssl format before being sent to the cloud **if** user specify a password.
|
- **[End-to-end encryption](./docs/encryption.md) supported.** Files would be encrypted using openssl format before being sent to the cloud **if** user specify a password.
|
||||||
- **Scheduled auto sync supported.** You can also manually trigger the sync using sidebar ribbon, or using the command from the command palette (or even bind the hot key combination to the command then press the hot key combination).
|
- **Scheduled auto sync supported.** You can also manually trigger the sync using sidebar ribbon, or using the command from the command palette (or even bind the hot key combination to the command then press the hot key combination).
|
||||||
- **[Minimal Intrusive](./docs/minimal_intrusive_design.md).**
|
- **[Minimal Intrusive](./docs/minimal_intrusive_design.md).**
|
||||||
|
- **Skip Large files and skip paths by custom regex conditions!
|
||||||
- **Fully open source under [Apache-2.0 License](./LICENSE).**
|
- **Fully open source under [Apache-2.0 License](./LICENSE).**
|
||||||
- **[Sync Algorithm open](./docs/sync_algorithm_v2.md) for discussion.**
|
- **[Sync Algorithm open](./docs/sync_algorithm_v2.md) for discussion.**
|
||||||
|
|
||||||
## Limitations
|
## Limitations
|
||||||
|
|
||||||
- **To support deltions sync, extra metadata will also be uploaded.** See [Minimal Intrusive](./docs/minimal_intrusive_design.md).
|
- **To support deletions sync, extra metadata will also be uploaded.** See [Minimal Intrusive](./docs/minimal_intrusive_design.md).
|
||||||
- **No Conflict resolution. No content-diff-and-patch algorithm.** All files and folders are compared using their local and remote "last modified time" and those with later "last modified time" wins.
|
- **No Conflict resolution. No content-diff-and-patch algorithm.** All files and folders are compared using their local and remote "last modified time" and those with later "last modified time" wins.
|
||||||
- **Cloud services cost you money.** Always be aware of the costs and pricing. Specifically, all the operations, including but not limited to downloading, uploading, listing all files, calling any api, storage sizes, may or may not cost you money.
|
- **Cloud services cost you money.** Always be aware of the costs and pricing. Specifically, all the operations, including but not limited to downloading, uploading, listing all files, calling any api, storage sizes, may or may not cost you money.
|
||||||
- **Some limitations from the browser environment.** More technical details are [in the doc](./docs/browser_env.md).
|
- **Some limitations from the browser environment.** More technical details are [in the doc](./docs/browser_env.md).
|
||||||
@@ -60,6 +61,9 @@ Additionally, the plugin author may occasionally visit Obsidian official forum a
|
|||||||
|
|
||||||
### S3
|
### S3
|
||||||
|
|
||||||
|
- Tutorials / Examples:
|
||||||
|
- [Cloudflare R2](./docs/remote_services/s3_cloudflare_r2/README.md)
|
||||||
|
- [MinIO](./docs/remote_services/s3_minio/README.md)
|
||||||
- Prepare your S3 (-compatible) service information: [endpoint, region](https://docs.aws.amazon.com/general/latest/gr/s3.html), [access key id, secret access key](https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/getting-your-credentials.html), bucket name. The bucket should be empty and solely for syncing a vault.
|
- Prepare your S3 (-compatible) service information: [endpoint, region](https://docs.aws.amazon.com/general/latest/gr/s3.html), [access key id, secret access key](https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/getting-your-credentials.html), bucket name. The bucket should be empty and solely for syncing a vault.
|
||||||
- About CORS:
|
- About CORS:
|
||||||
- If you are using Obsidian desktop >= 0.13.25 or mobile >= 1.1.1, you can skip this CORS part.
|
- If you are using Obsidian desktop >= 0.13.25 or mobile >= 1.1.1, you can skip this CORS part.
|
||||||
@@ -87,6 +91,10 @@ Additionally, the plugin author may occasionally visit Obsidian official forum a
|
|||||||
|
|
||||||
### webdav
|
### webdav
|
||||||
|
|
||||||
|
- Tutorials / Examples:
|
||||||
|
- [ownCloud](./docs/remote_services/webdav_owncloud/README.md)
|
||||||
|
- [InfiniCloud](./docs/remote_services/webdav_infinicloud_teracloud/README.md)
|
||||||
|
- [坚果云 JianGuoYun/NutStore](./docs/remote_services/webdav_jianguoyun/README.md)
|
||||||
- About CORS:
|
- About CORS:
|
||||||
- If you are using Obsidian desktop >= 0.13.25 or iOS >= 1.1.1, you can skip this CORS part.
|
- If you are using Obsidian desktop >= 0.13.25 or iOS >= 1.1.1, you can skip this CORS part.
|
||||||
- If you are using Obsidian desktop < 0.13.25 or iOS < 1.1.1 or any Android version:
|
- If you are using Obsidian desktop < 0.13.25 or iOS < 1.1.1 or any Android version:
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
# Cloudflare R2
|
||||||
|
|
||||||
|
## Links
|
||||||
|
|
||||||
|
<https://www.cloudflare.com/developer-platform/r2/>
|
||||||
|
|
||||||
|
## Steps
|
||||||
|
|
||||||
|
1. **Be aware that it may cost you money.**
|
||||||
|
2. Create a Cloudflare account and enable R2 feature. **Credit card info might be required by Cloudflare**, though Cloudflare provides generous free tier and zero egress fee.
|
||||||
|
3. Create a bucket.
|
||||||
|

|
||||||
|
4. Create an Access Key with "Object Read & Write" permission, and add specify to your created bucket. During the creation, you will also get the auto-generated secret key, and the endpoint address.
|
||||||
|

|
||||||
|
5. In remotely-save setting page, input the address / bucket / access key / secret key. **Region being set to `us-east-1` is sufficient.** Enable "Bypass CORS", because usually that's what you want.
|
||||||
|
|
||||||
|
Click "check connectivity". (If you encounter an issue and sure the info are correct, please upgrade remotely-save to **version >= 0.3.29** and try again.)
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
6. Sync!
|
||||||
|
|
||||||
|
## And Issue Related To "Check Connectivity"
|
||||||
|
|
||||||
|
If you encounter an issue and sure the info are correct, please upgrade remotely-save to **version >= 0.3.29** and try again.
|
||||||
|
|
||||||
|
Cloudflare doesn't allow `HeadBucket` for access keys with "Object Read & Write". So it may be possible that checking connectivity is not ok but actual syncing is ok. New version >= 0.3.29 of the plugin fix this problem by using `ListObjects` instead of `HeadBucket`.
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:49a5cd07e538205ba733dc3ccb30e4e7da1290a4a80aefe08afac19fd2db2232
|
||||||
|
size 467448
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:61fc0812fe96871eed507d2f6b7bbad790ab70e95ff5fe764f8f8b2ab8ce82c2
|
||||||
|
size 153015
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:02f9c0fea36679e54c8c3fac979bc41d15ae4f7992b269bc2b67255059af1d2f
|
||||||
|
size 579889
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
# MinIO
|
||||||
|
|
||||||
|
## Links
|
||||||
|
|
||||||
|
<https://min.io/>
|
||||||
|
|
||||||
|
## Steps
|
||||||
|
|
||||||
|
1. Configure your minio instance and get an account.
|
||||||
|
2. Create an Access Key (during the creation, you will also get the auto-generated secret key).
|
||||||
|

|
||||||
|
3. Check or set the region.
|
||||||
|

|
||||||
|
4. Create a bucket.
|
||||||
|

|
||||||
|
5. In remotely-save setting page, input the address / bucket / access key / secret key. **Usually minio instances may need "S3 URL style"="Path Style".** Enable "Bypass CORS", because usually that's what you want.
|
||||||
|

|
||||||
|
6. Sync!
|
||||||
|

|
||||||
|
|
||||||
|
## Ports In Address
|
||||||
|
|
||||||
|
Just type in the full address with `http(s)://` and `:port` in remotely-save settings, for example `http://192.168.31.198:9000`.
|
||||||
|
|
||||||
|
It's verified that everything is ok.
|
||||||
|
|
||||||
|

|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:c384ec32a43fcac1e63dbc81d4fbb7fbfaffcd67d0f5a66104482a39475ad639
|
||||||
|
size 323050
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:894a6a10b7f41754936d77a935b4a5a4ae722796fa5680c9c6d0dd53c3cdc1a2
|
||||||
|
size 269705
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:b25c1209875ad781a29d3ac1cde5bd9c2137622e3919987c4d4e5f77dc8e3ec7
|
||||||
|
size 68997
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:bfcc526281d2c6a9f1261f489603f3dd768f8b94f099a1b26649fa37c9318575
|
||||||
|
size 315030
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:83615a6c2fbf7ff74679b480d29d222db8835bc067aee33a646e4b8d500c3aca
|
||||||
|
size 467575
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:fd1bb9a6e285a1e63b545d714ca269eb714e980a5177392b967556f1f1754afe
|
||||||
|
size 147218
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
# AList
|
||||||
|
|
||||||
|
## 链接 Links
|
||||||
|
|
||||||
|
- English official website: <https://alist.nn.ci/> and <https://alist.nn.ci/guide/webdav.html>
|
||||||
|
- 中文官网:<https://alist.nn.ci/zh/> 和 <https://alist.nn.ci/zh/guide/webdav.html>
|
||||||
|
|
||||||
|
## 步骤 Steps
|
||||||
|
|
||||||
|
1. 安装和使用 AList。获取账号名和密码。在网页上登录。Install and run AList. Get the account and password. Login using the web page.
|
||||||
|
2. 新建挂载,检查挂载路径。如图所示是 `/alisttest davpath`。Add new storage. Pay attention to the mount path. The screenshot shows the mount path as `/alisttest davpath`.
|
||||||
|

|
||||||
|

|
||||||
|
3. 从而构建 webdav 网址如下,**http(s)://域名** + **端口** + **`/dav`** + **挂载路径**,其中挂载路径中假如有空格,换成 `%20`:Construct the webdav address as: **http(s)://domain** + **port** + **`/dav`** + **mount path**, and the space inside the mount path should be replaced with `%20`:
|
||||||
|
```
|
||||||
|
http[s]://domain:port/dav/[mountpath url encoded]
|
||||||
|
http://127.0.0.1:5244/dav/alisttest%20davpath
|
||||||
|
```
|
||||||
|
4. 在 remotely-save 设置,输入**带域名端口`/dav`和挂载路径的网址**、账号、密码。In remotely-save setting page, select webdav type, then input the **full address with mount path**/account/password.
|
||||||
|

|
||||||
|
5. 在 remotely-save 设置,检查连接。In remotely-save setting page, click "Check Connectivity".
|
||||||
|
6. 同步文件!Sync!
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:ea05f67782b8f84518f13cf5587df719bdaa15f9e35b79f2801f91e695de6480
|
||||||
|
size 46798
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:dcaaa5e64e894f0e9c8b0242b64bf4dd364c16d7314b09bc004f7ed0a0f1e0e5
|
||||||
|
size 60853
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:0b792320e2a4aaa16a17d82e80225ab35da05fd1f407fe067de72651beca088e
|
||||||
|
size 426289
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
# InfiniCLOUD (formally TeraCLOUD) Webdav
|
||||||
|
|
||||||
|
## Link
|
||||||
|
|
||||||
|
<https://infini-cloud.net/en/>
|
||||||
|
|
||||||
|
## Steps
|
||||||
|
|
||||||
|
1. Register an acount.
|
||||||
|
2. Go to <https://infini-cloud.net/en/modules/mypage/usage/>, in section "Apps Connection", enable "Turn on Apps Connection". Here you get the address and account and webdav password (different from your account password):
|
||||||
|

|
||||||
|
3. In remotely-save setting page, select webdav type, then input the address/account/**webdav password**(not your account password).
|
||||||
|

|
||||||
|
4. In remotely-save setting page, click "Check Connectivity".
|
||||||
|
5. Sync!
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:0e16bc9d86b30ab907fc176087701474f4ca2b8d887f649302f2e184f69d0cbc
|
||||||
|
size 373845
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:8d707f6997df57b9c6b74d72bcfd567995d15062269761ee404e6596a266a241
|
||||||
|
size 91012
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
# 坚果云 JianGuoYun/NutStore
|
||||||
|
|
||||||
|
## 链接 Link
|
||||||
|
|
||||||
|
<https://www.jianguoyun.com/>
|
||||||
|
|
||||||
|
## 注意!!!Attentions!!!
|
||||||
|
|
||||||
|
坚果云有限制 api 数量等设定。本插件会产生若干查询,如果文件较多很容易触发 api 上限,从而工作不正常。这不是插件 bug,也没有办法解决。
|
||||||
|
|
||||||
|
JianGuoYun/NutStore has api limits. The plugin may generate many queries, and it's possible to reach the api limits if there are many files, then do not work properly. It's not a bug and there's no way to fix this situation.
|
||||||
|
|
||||||
|
## 步骤 Steps
|
||||||
|
|
||||||
|
1. **知悉坚果云有 api 限制,本插件可能因此工作不正常。Be aware that JianGuoYun/NutStore has api limits, and the plugin may not work properly because of this.**
|
||||||
|
2. 注册账号,登录。Register an account.
|
||||||
|
3. 去“个人信息”->“安全”,“添加应用”,从而获取了 webDAV 账号(应该是 email)和 WebDAV 密码(一串特殊的字符,不等于网站密码)。Go to "settings"->"Security", click "Add Application", then obtain the WebDAV account (email), and WebDAV password (a string different from web site password).
|
||||||
|

|
||||||
|
4. 在 remotely-save 设置,输入网址、账号、密码、**“发送到服务器的 Depth Header”设置为“只支持 depth='1'”**。Input the WebDAV address, account, password, **Depth Header Sent To Servers="only supports depth='1'"** in remotely-save settings.
|
||||||
|

|
||||||
|
5. 在 remotely-save 设置,检查连接。In remotely-save setting page, click "Check Connectivity".
|
||||||
|
6. 同步文件!Sync!
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:fd5aaab1e1ac0ea8996517c819bf5ac0d2a828483037419ba289b538957f4752
|
||||||
|
size 515913
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:112778176af954e16c93c582d968e7c14e5b950d64facce8593855f5fb75fbcc
|
||||||
|
size 431527
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
# ownCloud Webdav
|
||||||
|
|
||||||
|
## Link
|
||||||
|
|
||||||
|
<https://owncloud.com/>
|
||||||
|
|
||||||
|
# Steps
|
||||||
|
|
||||||
|
1. Create an account.
|
||||||
|
2. Login.
|
||||||
|
3. In the Settings position, enable the "Show hidden files" and find out the WebDAV address.
|
||||||
|

|
||||||
|
4. Input the WebDAV address, account, password, **Depth Header Sent To Servers="only supports depth='1'"** in remotely-save settings.
|
||||||
|

|
||||||
|
5. In remotely-save setting page, click "Check Connectivity".
|
||||||
|
6. Sync!
|
||||||
|

|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:e0d025b4ccf1be7fa2cc74e914e9a1a89a8d8f12a1b917bd4b26b975bf208294
|
||||||
|
size 27796
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:b3d24d416016b2676a86166fcc35fa89f8befb7a872503b8da2be4374ef360ce
|
||||||
|
size 53503
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:2e8bf9a51e5d5bed66fb45fe085f37943bd90a51b33ef752d898c5b2caa71c2d
|
||||||
|
size 448797
|
||||||
@@ -18,7 +18,7 @@ The list is for information purposes only.
|
|||||||
| [MinIO](https://min.io/) | ? | ? | | | | |
|
| [MinIO](https://min.io/) | ? | ? | | | | |
|
||||||
| [WsgiDAV](https://github.com/mar10/wsgidav) | Yes | | Yes | | Yes | CORS rules can be set. |
|
| [WsgiDAV](https://github.com/mar10/wsgidav) | Yes | | Yes | | Yes | CORS rules can be set. |
|
||||||
| [Nginx `ngx_http_dav_module`](http://nginx.org/en/docs/http/ngx_http_dav_module.html) | Yes? | | Yes? | | Yes? | ? |
|
| [Nginx `ngx_http_dav_module`](http://nginx.org/en/docs/http/ngx_http_dav_module.html) | Yes? | | Yes? | | Yes? | ? |
|
||||||
| NextCloud | Yes? | | Yes? | | Yes? | No CORS config by default. |
|
| NextCloud | Yes | | Yes | | Yes? | No CORS config by default. |
|
||||||
| OwnCloud | Yes? | | Yes? | | Yes? | No CORS config by default. |
|
| OwnCloud | Yes? | | Yes? | | Yes? | No CORS config by default. |
|
||||||
| Seafile | Yes | | Yes | | Yes? | No CORS config by default. |
|
| Seafile | Yes | | Yes | | Yes? | No CORS config by default. |
|
||||||
| `rclone serve webdav` | Yes | | Yes | | Yes | No CORS support. |
|
| `rclone serve webdav` | Yes | | Yes | | Yes | No CORS support. |
|
||||||
@@ -26,7 +26,7 @@ The list is for information purposes only.
|
|||||||
| [TeraCLOUD](https://teracloud.jp/en/) | Yes | | Yes | | Yes | No CORS support. |
|
| [TeraCLOUD](https://teracloud.jp/en/) | Yes | | Yes | | Yes | No CORS support. |
|
||||||
| Dropbox | Yes | | | Yes | | |
|
| Dropbox | Yes | | | Yes | | |
|
||||||
| OneDrive for personal | Yes | | | Yes | | |
|
| OneDrive for personal | Yes | | | Yes | | |
|
||||||
| OneDrive for Business | In the plan | | | ? | | |
|
| OneDrive for Business | Yes | | | ? | | |
|
||||||
| Google Drive | In the plan | | | ? | | |
|
| Google Drive | In the plan | | | ? | | |
|
||||||
| [Box](https://www.box.com/) | ? | | | May be possible but needs further development. | | |
|
| [Box](https://www.box.com/) | ? | | | May be possible but needs further development. | | |
|
||||||
| Google Cloud Storage | ? | | | May be possible but needs further development. | | |
|
| Google Cloud Storage | ? | | | May be possible but needs further development. | | |
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
# Sync Ignoring Large Files
|
||||||
|
|
||||||
|
Initially, the plugin does not ignore large files.
|
||||||
|
|
||||||
|
From the new version in May 2022, it can ignore all files with some sizes. But we need some rules to make the function compatible with existing conditions.
|
||||||
|
|
||||||
|
1. If users are using E2E password mode, then the file sizes are compared on the **encrypted sizes**, rather than the original unencripted file sizes. The reasons are: the encrypted ones are in transferations, and the encrypted sizes can be computed from unencrypted sizes but not the reverse.
|
||||||
|
|
||||||
|
2. Assuming the file A, is already synced between local device and remote service before.
|
||||||
|
|
||||||
|
- If the local size and remote size are both below the threshold, then the file can be synced normally.
|
||||||
|
- If the local size and remote size are both above the threshold, then the file will be ignored normally.
|
||||||
|
- If the local size is below the threshold, and the remote size is above the threshold, then the plugin **rejects** the sync, and throws the error to the user.
|
||||||
|
- If the local size is above the threshold, and the remote size is below the threshold, then the plugin **rejects** the sync, and throws the error to the user.
|
||||||
|
- When it somes to deletions, the same rules apply.
|
||||||
|
|
||||||
|
The main point is that, if the file sizes "cross the line", the plugin does not introduce any further trouble and just reject to work for this file.
|
||||||
+15
-2
@@ -18,7 +18,7 @@ const DEFAULT_ONEDRIVE_CLIENT_ID = process.env.ONEDRIVE_CLIENT_ID || "";
|
|||||||
const DEFAULT_ONEDRIVE_AUTHORITY = process.env.ONEDRIVE_AUTHORITY || "";
|
const DEFAULT_ONEDRIVE_AUTHORITY = process.env.ONEDRIVE_AUTHORITY || "";
|
||||||
|
|
||||||
esbuild
|
esbuild
|
||||||
.build({
|
.context({
|
||||||
banner: {
|
banner: {
|
||||||
js: banner,
|
js: banner,
|
||||||
},
|
},
|
||||||
@@ -33,11 +33,13 @@ esbuild
|
|||||||
"fs",
|
"fs",
|
||||||
"tls",
|
"tls",
|
||||||
"net",
|
"net",
|
||||||
|
"http",
|
||||||
|
"https",
|
||||||
// ...builtins
|
// ...builtins
|
||||||
],
|
],
|
||||||
inject: ["./esbuild.injecthelper.mjs"],
|
inject: ["./esbuild.injecthelper.mjs"],
|
||||||
format: "cjs",
|
format: "cjs",
|
||||||
watch: !prod,
|
// watch: !prod, // no longer valid in esbuild 0.17
|
||||||
target: "es2016",
|
target: "es2016",
|
||||||
logLevel: "info",
|
logLevel: "info",
|
||||||
sourcemap: prod ? false : "inline",
|
sourcemap: prod ? false : "inline",
|
||||||
@@ -53,4 +55,15 @@ esbuild
|
|||||||
"process.env.DEBUG": `undefined`, // ugly fix
|
"process.env.DEBUG": `undefined`, // ugly fix
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
.then((context) => {
|
||||||
|
if (process.argv.includes("--watch")) {
|
||||||
|
// Enable watch mode
|
||||||
|
context.watch();
|
||||||
|
} else {
|
||||||
|
// Build once and exit if not in watch mode
|
||||||
|
context.rebuild().then((result) => {
|
||||||
|
context.dispose();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
})
|
||||||
.catch(() => process.exit(1));
|
.catch(() => process.exit(1));
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"id": "remotely-save",
|
||||||
|
"name": "Remotely Save",
|
||||||
|
"version": "0.3.29",
|
||||||
|
"minAppVersion": "0.13.21",
|
||||||
|
"description": "Yet another unofficial plugin allowing users to synchronize notes between local device and the cloud service.",
|
||||||
|
"author": "fyears",
|
||||||
|
"authorUrl": "https://github.com/fyears",
|
||||||
|
"isDesktopOnly": false
|
||||||
|
}
|
||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"id": "remotely-save",
|
"id": "remotely-save",
|
||||||
"name": "Remotely Save",
|
"name": "Remotely Save",
|
||||||
"version": "0.3.21",
|
"version": "0.3.25",
|
||||||
"minAppVersion": "0.13.21",
|
"minAppVersion": "0.13.21",
|
||||||
"description": "Yet another unofficial plugin allowing users to synchronize notes between local device and the cloud service.",
|
"description": "Yet another unofficial plugin allowing users to synchronize notes between local device and the cloud service.",
|
||||||
"author": "fyears",
|
"author": "fyears",
|
||||||
|
|||||||
+56
-55
@@ -1,13 +1,13 @@
|
|||||||
{
|
{
|
||||||
"name": "remotely-save",
|
"name": "remotely-save",
|
||||||
"version": "0.3.21",
|
"version": "0.3.25",
|
||||||
"description": "This is yet another sync plugin for Obsidian app.",
|
"description": "This is yet another sync plugin for Obsidian app.",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev2": "node esbuild.config.mjs",
|
"dev2": "node esbuild.config.mjs --watch",
|
||||||
"build2": "tsc -noEmit -skipLibCheck && node esbuild.config.mjs production",
|
"build2": "tsc -noEmit -skipLibCheck && node esbuild.config.mjs production",
|
||||||
"build": "webpack --mode production",
|
"build": "webpack --mode production",
|
||||||
"dev": "webpack --mode development --watch",
|
"dev": "webpack --mode development --watch",
|
||||||
"format": "npx prettier --write .",
|
"format": "npx prettier --trailing-comma es5 --write .",
|
||||||
"clean": "npx rimraf main.js",
|
"clean": "npx rimraf main.js",
|
||||||
"test": "cross-env TS_NODE_COMPILER_OPTIONS={\\\"module\\\":\\\"commonjs\\\"} mocha -r ts-node/register 'tests/**/*.ts'"
|
"test": "cross-env TS_NODE_COMPILER_OPTIONS={\\\"module\\\":\\\"commonjs\\\"} mocha -r ts-node/register 'tests/**/*.ts'"
|
||||||
},
|
},
|
||||||
@@ -23,73 +23,74 @@
|
|||||||
"author": "",
|
"author": "",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@microsoft/microsoft-graph-types": "^2.19.0",
|
"@microsoft/microsoft-graph-types": "^2.40.0",
|
||||||
"@types/chai": "^4.3.1",
|
"@types/chai": "^4.3.11",
|
||||||
"@types/chai-as-promised": "^7.1.5",
|
"@types/chai-as-promised": "^7.1.8",
|
||||||
"@types/jsdom": "^16.2.14",
|
"@types/jsdom": "^21.1.6",
|
||||||
"@types/lodash": "^4.14.182",
|
"@types/lodash": "^4.14.202",
|
||||||
"@types/mime-types": "^2.1.1",
|
"@types/mime-types": "^2.1.4",
|
||||||
"@types/mocha": "^9.1.1",
|
"@types/mocha": "^10.0.6",
|
||||||
"@types/mustache": "^4.1.2",
|
"@types/mustache": "^4.2.5",
|
||||||
"@types/node": "^17.0.30",
|
"@types/node": "^20.10.4",
|
||||||
"@types/qrcode": "^1.4.2",
|
"@types/qrcode": "^1.5.5",
|
||||||
"builtin-modules": "^3.2.0",
|
"builtin-modules": "^3.3.0",
|
||||||
"chai": "^4.3.6",
|
"chai": "^4.3.10",
|
||||||
"chai-as-promised": "^7.1.1",
|
"chai-as-promised": "^7.1.1",
|
||||||
"cross-env": "^7.0.3",
|
"cross-env": "^7.0.3",
|
||||||
"dotenv": "^16.0.0",
|
"dotenv": "^16.3.1",
|
||||||
"esbuild": "^0.14.38",
|
"esbuild": "^0.19.9",
|
||||||
"jsdom": "^19.0.0",
|
"jsdom": "^23.0.1",
|
||||||
"mocha": "^9.2.2",
|
"mocha": "^10.2.0",
|
||||||
"prettier": "^2.6.2",
|
"npm-check-updates": "^16.14.12",
|
||||||
"ts-loader": "^9.2.9",
|
"obsidian": "^1.4.11",
|
||||||
"ts-node": "^10.7.0",
|
"prettier": "^3.1.1",
|
||||||
"tslib": "^2.4.0",
|
"ts-loader": "^9.5.1",
|
||||||
"typescript": "^4.6.4",
|
"ts-node": "^10.9.2",
|
||||||
|
"tslib": "^2.6.2",
|
||||||
|
"typescript": "^5.3.3",
|
||||||
"webdav-server": "^2.6.2",
|
"webdav-server": "^2.6.2",
|
||||||
"webpack": "^5.72.0",
|
"webpack": "^5.89.0",
|
||||||
"webpack-cli": "^4.9.2"
|
"webpack-cli": "^5.1.4"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@aws-sdk/client-s3": "^3.81.0",
|
"@aws-sdk/client-s3": "^3.474.0",
|
||||||
"@aws-sdk/fetch-http-handler": "^3.78.0",
|
"@aws-sdk/lib-storage": "^3.474.0",
|
||||||
"@aws-sdk/lib-storage": "^3.81.0",
|
"@aws-sdk/signature-v4-crt": "^3.474.0",
|
||||||
"@aws-sdk/protocol-http": "^3.78.0",
|
"@aws-sdk/types": "^3.468.0",
|
||||||
"@aws-sdk/querystring-builder": "^3.78.0",
|
"@azure/msal-node": "^2.6.0",
|
||||||
"@aws-sdk/signature-v4-crt": "^3.78.0",
|
|
||||||
"@aws-sdk/types": "^3.78.0",
|
|
||||||
"@azure/msal-node": "^1.8.0",
|
|
||||||
"@fyears/tsqueue": "^1.0.1",
|
"@fyears/tsqueue": "^1.0.1",
|
||||||
"@microsoft/microsoft-graph-client": "^3.0.2",
|
"@microsoft/microsoft-graph-client": "^3.0.7",
|
||||||
"acorn": "^8.7.1",
|
"@smithy/fetch-http-handler": "^2.3.1",
|
||||||
"aggregate-error": "^4.0.0",
|
"@smithy/protocol-http": "^3.0.11",
|
||||||
"assert": "^2.0.0",
|
"@smithy/querystring-builder": "^2.0.15",
|
||||||
"aws-crt": "^1.12.1",
|
"acorn": "^8.11.2",
|
||||||
|
"aggregate-error": "^5.0.0",
|
||||||
|
"assert": "^2.1.0",
|
||||||
|
"aws-crt": "^1.20.0",
|
||||||
"buffer": "^6.0.3",
|
"buffer": "^6.0.3",
|
||||||
"crypto-browserify": "^3.12.0",
|
"crypto-browserify": "^3.12.0",
|
||||||
"delay": "^5.0.0",
|
"delay": "^6.0.0",
|
||||||
"dropbox": "^10.28.0",
|
"dropbox": "^10.34.0",
|
||||||
"emoji-regex": "^10.1.0",
|
"emoji-regex": "^10.3.0",
|
||||||
"http-status-codes": "^2.2.0",
|
"http-status-codes": "^2.3.0",
|
||||||
"localforage": "^1.10.0",
|
"localforage": "^1.10.0",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"loglevel": "^1.8.0",
|
"loglevel": "^1.8.1",
|
||||||
"lucide": "^0.35.0",
|
"lucide": "^0.298.0",
|
||||||
"mime-types": "^2.1.35",
|
"mime-types": "^2.1.35",
|
||||||
"mustache": "^4.2.0",
|
"mustache": "^4.2.0",
|
||||||
"nanoid": "^3.3.3",
|
"nanoid": "^5.0.4",
|
||||||
"obsidian": "^0.14.6",
|
"p-queue": "^8.0.1",
|
||||||
"p-queue": "^7.2.0",
|
|
||||||
"path-browserify": "^1.0.1",
|
"path-browserify": "^1.0.1",
|
||||||
"process": "^0.11.10",
|
"process": "^0.11.10",
|
||||||
"qrcode": "^1.5.0",
|
"qrcode": "^1.5.3",
|
||||||
"rfc4648": "^1.5.1",
|
"rfc4648": "^1.5.3",
|
||||||
"rimraf": "^3.0.2",
|
"rimraf": "^5.0.5",
|
||||||
"stream-browserify": "^3.0.0",
|
"stream-browserify": "^3.0.0",
|
||||||
"url": "^0.11.0",
|
"url": "^0.11.3",
|
||||||
"util": "^0.12.4",
|
"util": "^0.12.5",
|
||||||
"webdav": "^4.9.0",
|
"webdav": "^5.3.1",
|
||||||
"webdav-fs": "^4.0.1",
|
"webdav-fs": "^4.0.1",
|
||||||
"xregexp": "^5.1.0"
|
"xregexp": "^5.1.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+16
-1
@@ -85,6 +85,8 @@ export interface RemotelySavePluginSettings {
|
|||||||
syncUnderscoreItems?: boolean;
|
syncUnderscoreItems?: boolean;
|
||||||
lang?: LangTypeAndAuto;
|
lang?: LangTypeAndAuto;
|
||||||
logToDB?: boolean;
|
logToDB?: boolean;
|
||||||
|
skipSizeLargerThan?: number;
|
||||||
|
ignorePaths?: string[];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated
|
* @deprecated
|
||||||
@@ -122,13 +124,24 @@ type DecisionTypeForFile =
|
|||||||
| "uploadLocalToRemote" // "skipLocal && uploadLocalToRemote && cleanLocalDelHist && cleanRemoteDelHist"
|
| "uploadLocalToRemote" // "skipLocal && uploadLocalToRemote && cleanLocalDelHist && cleanRemoteDelHist"
|
||||||
| "downloadRemoteToLocal"; // "downloadRemoteToLocal && skipRemote && cleanLocalDelHist && cleanRemoteDelHist"
|
| "downloadRemoteToLocal"; // "downloadRemoteToLocal && skipRemote && cleanLocalDelHist && cleanRemoteDelHist"
|
||||||
|
|
||||||
|
type DecisionTypeForFileSize =
|
||||||
|
| "skipUploadingTooLarge"
|
||||||
|
| "skipDownloadingTooLarge"
|
||||||
|
| "skipUsingLocalDelTooLarge"
|
||||||
|
| "skipUsingRemoteDelTooLarge"
|
||||||
|
| "errorLocalTooLargeConflictRemote"
|
||||||
|
| "errorRemoteTooLargeConflictLocal";
|
||||||
|
|
||||||
type DecisionTypeForFolder =
|
type DecisionTypeForFolder =
|
||||||
| "createFolder"
|
| "createFolder"
|
||||||
| "uploadLocalDelHistToRemoteFolder"
|
| "uploadLocalDelHistToRemoteFolder"
|
||||||
| "keepRemoteDelHistFolder"
|
| "keepRemoteDelHistFolder"
|
||||||
| "skipFolder";
|
| "skipFolder";
|
||||||
|
|
||||||
export type DecisionType = DecisionTypeForFile | DecisionTypeForFolder;
|
export type DecisionType =
|
||||||
|
| DecisionTypeForFile
|
||||||
|
| DecisionTypeForFileSize
|
||||||
|
| DecisionTypeForFolder;
|
||||||
|
|
||||||
export interface FileOrFolderMixedState {
|
export interface FileOrFolderMixedState {
|
||||||
key: string;
|
key: string;
|
||||||
@@ -139,7 +152,9 @@ export interface FileOrFolderMixedState {
|
|||||||
deltimeLocal?: number;
|
deltimeLocal?: number;
|
||||||
deltimeRemote?: number;
|
deltimeRemote?: number;
|
||||||
sizeLocal?: number;
|
sizeLocal?: number;
|
||||||
|
sizeLocalEnc?: number;
|
||||||
sizeRemote?: number;
|
sizeRemote?: number;
|
||||||
|
sizeRemoteEnc?: number;
|
||||||
changeRemoteMtimeUsingMapping?: boolean;
|
changeRemoteMtimeUsingMapping?: boolean;
|
||||||
changeLocalMtimeUsingMapping?: boolean;
|
changeLocalMtimeUsingMapping?: boolean;
|
||||||
decision?: DecisionType;
|
decision?: DecisionType;
|
||||||
|
|||||||
@@ -26,11 +26,13 @@ const turnSyncPlanToTable = (record: string) => {
|
|||||||
"remoteEncryptedKey",
|
"remoteEncryptedKey",
|
||||||
"existLocal",
|
"existLocal",
|
||||||
"sizeLocal",
|
"sizeLocal",
|
||||||
|
"sizeLocalEnc",
|
||||||
"mtimeLocal",
|
"mtimeLocal",
|
||||||
"deltimeLocal",
|
"deltimeLocal",
|
||||||
"changeLocalMtimeUsingMapping",
|
"changeLocalMtimeUsingMapping",
|
||||||
"existRemote",
|
"existRemote",
|
||||||
"sizeRemote",
|
"sizeRemote",
|
||||||
|
"sizeRemoteEnc",
|
||||||
"mtimeRemote",
|
"mtimeRemote",
|
||||||
"deltimeRemote",
|
"deltimeRemote",
|
||||||
"changeRemoteMtimeUsingMapping",
|
"changeRemoteMtimeUsingMapping",
|
||||||
|
|||||||
+7
-5
@@ -166,18 +166,20 @@ export const decryptBase64urlToString = async (
|
|||||||
};
|
};
|
||||||
|
|
||||||
export const getSizeFromOrigToEnc = (x: number) => {
|
export const getSizeFromOrigToEnc = (x: number) => {
|
||||||
if (x < 0 || !Number.isInteger(x)) {
|
if (x < 0 || Number.isNaN(x) || !Number.isInteger(x)) {
|
||||||
throw Error(`x=${x} is not a valid size`);
|
throw Error(`getSizeFromOrigToEnc: x=${x} is not a valid size`);
|
||||||
}
|
}
|
||||||
return (Math.floor(x / 16) + 1) * 16 + 16;
|
return (Math.floor(x / 16) + 1) * 16 + 16;
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getSizeFromEncToOrig = (x: number) => {
|
export const getSizeFromEncToOrig = (x: number) => {
|
||||||
if (x < 32 || !Number.isInteger(x)) {
|
if (x < 32 || Number.isNaN(x) || !Number.isInteger(x)) {
|
||||||
throw Error(`${x} is not a valid size`);
|
throw Error(`getSizeFromEncToOrig: ${x} is not a valid size`);
|
||||||
}
|
}
|
||||||
if (x % 16 !== 0) {
|
if (x % 16 !== 0) {
|
||||||
throw Error(`${x} is not a valid encrypted file size`);
|
throw Error(
|
||||||
|
`getSizeFromEncToOrig: ${x} is not a valid encrypted file size`
|
||||||
|
);
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
minSize: ((x - 16) / 16 - 1) * 16,
|
minSize: ((x - 16) / 16 - 1) * 16,
|
||||||
|
|||||||
+2
-2
@@ -5,7 +5,7 @@ import { LANGS } from "./langs";
|
|||||||
|
|
||||||
export type LangType = keyof typeof LANGS;
|
export type LangType = keyof typeof LANGS;
|
||||||
export type LangTypeAndAuto = LangType | "auto";
|
export type LangTypeAndAuto = LangType | "auto";
|
||||||
export type TransItemType = keyof typeof LANGS["en"];
|
export type TransItemType = keyof (typeof LANGS)["en"];
|
||||||
|
|
||||||
export class I18n {
|
export class I18n {
|
||||||
lang: LangTypeAndAuto;
|
lang: LangTypeAndAuto;
|
||||||
@@ -31,7 +31,7 @@ export class I18n {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const res: string =
|
const res: string =
|
||||||
(LANGS[realLang] as typeof LANGS["en"])[key] || LANGS["en"][key] || key;
|
(LANGS[realLang] as (typeof LANGS)["en"])[key] || LANGS["en"][key] || key;
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
Submodule src/langs updated: eda77d12e2...c75336a2a5
+4
-5
@@ -5,7 +5,7 @@ import { requireApiVersion, TAbstractFile, TFile, TFolder } from "obsidian";
|
|||||||
|
|
||||||
import { API_VER_STAT_FOLDER, SUPPORTED_SERVICES_TYPE } from "./baseTypes";
|
import { API_VER_STAT_FOLDER, SUPPORTED_SERVICES_TYPE } from "./baseTypes";
|
||||||
import type { SyncPlanType } from "./sync";
|
import type { SyncPlanType } from "./sync";
|
||||||
import { toText, unixTimeToStr } from "./misc";
|
import { statFix, toText, unixTimeToStr } from "./misc";
|
||||||
|
|
||||||
import { log } from "./moreOnLog";
|
import { log } from "./moreOnLog";
|
||||||
|
|
||||||
@@ -312,9 +312,8 @@ export const clearDeleteRenameHistoryOfKeyAndVault = async (
|
|||||||
vaultRandomID: string
|
vaultRandomID: string
|
||||||
) => {
|
) => {
|
||||||
const fullKey = `${vaultRandomID}\t${key}`;
|
const fullKey = `${vaultRandomID}\t${key}`;
|
||||||
const item: FileFolderHistoryRecord | null = await db.fileHistoryTbl.getItem(
|
const item: FileFolderHistoryRecord | null =
|
||||||
fullKey
|
await db.fileHistoryTbl.getItem(fullKey);
|
||||||
);
|
|
||||||
if (
|
if (
|
||||||
item !== null &&
|
item !== null &&
|
||||||
(item.actionType === "delete" || item.actionType === "rename")
|
(item.actionType === "delete" || item.actionType === "rename")
|
||||||
@@ -417,7 +416,7 @@ export const insertRenameRecordByVault = async (
|
|||||||
if (requireApiVersion(API_VER_STAT_FOLDER)) {
|
if (requireApiVersion(API_VER_STAT_FOLDER)) {
|
||||||
// TAbstractFile does not contain these info
|
// TAbstractFile does not contain these info
|
||||||
// but from API_VER_STAT_FOLDER we can manually stat them by path.
|
// but from API_VER_STAT_FOLDER we can manually stat them by path.
|
||||||
const s = await fileOrFolder.vault.adapter.stat(fileOrFolder.path);
|
const s = await statFix(fileOrFolder.vault, fileOrFolder.path);
|
||||||
ctime = s.ctime;
|
ctime = s.ctime;
|
||||||
mtime = s.mtime;
|
mtime = s.mtime;
|
||||||
}
|
}
|
||||||
|
|||||||
+22
-4
@@ -10,6 +10,7 @@ import {
|
|||||||
import cloneDeep from "lodash/cloneDeep";
|
import cloneDeep from "lodash/cloneDeep";
|
||||||
import { createElement, RotateCcw, RefreshCcw, FileText } from "lucide";
|
import { createElement, RotateCcw, RefreshCcw, FileText } from "lucide";
|
||||||
import type {
|
import type {
|
||||||
|
FileOrFolderMixedState,
|
||||||
RemotelySavePluginSettings,
|
RemotelySavePluginSettings,
|
||||||
SyncTriggerSourceType,
|
SyncTriggerSourceType,
|
||||||
} from "./baseTypes";
|
} from "./baseTypes";
|
||||||
@@ -64,6 +65,7 @@ import {
|
|||||||
exportVaultLoggerOutputToFiles,
|
exportVaultLoggerOutputToFiles,
|
||||||
exportVaultSyncPlansToFiles,
|
exportVaultSyncPlansToFiles,
|
||||||
} from "./debugMode";
|
} from "./debugMode";
|
||||||
|
import { SizesConflictModal } from "./syncSizesConflictNotice";
|
||||||
|
|
||||||
const DEFAULT_SETTINGS: RemotelySavePluginSettings = {
|
const DEFAULT_SETTINGS: RemotelySavePluginSettings = {
|
||||||
s3: DEFAULT_S3_CONFIG,
|
s3: DEFAULT_S3_CONFIG,
|
||||||
@@ -82,6 +84,8 @@ const DEFAULT_SETTINGS: RemotelySavePluginSettings = {
|
|||||||
syncUnderscoreItems: false,
|
syncUnderscoreItems: false,
|
||||||
lang: "auto",
|
lang: "auto",
|
||||||
logToDB: false,
|
logToDB: false,
|
||||||
|
skipSizeLargerThan: -1,
|
||||||
|
ignorePaths: [],
|
||||||
};
|
};
|
||||||
|
|
||||||
interface OAuth2Info {
|
interface OAuth2Info {
|
||||||
@@ -280,7 +284,7 @@ export default class RemotelySavePlugin extends Plugin {
|
|||||||
})
|
})
|
||||||
);
|
);
|
||||||
this.syncStatus = "generating_plan";
|
this.syncStatus = "generating_plan";
|
||||||
const { plan, sortedKeys, deletions } = await getSyncPlan(
|
const { plan, sortedKeys, deletions, sizesGoWrong } = await getSyncPlan(
|
||||||
remoteStates,
|
remoteStates,
|
||||||
local,
|
local,
|
||||||
localConfigDirContents,
|
localConfigDirContents,
|
||||||
@@ -292,6 +296,8 @@ export default class RemotelySavePlugin extends Plugin {
|
|||||||
this.settings.syncConfigDir,
|
this.settings.syncConfigDir,
|
||||||
this.app.vault.configDir,
|
this.app.vault.configDir,
|
||||||
this.settings.syncUnderscoreItems,
|
this.settings.syncUnderscoreItems,
|
||||||
|
this.settings.skipSizeLargerThan,
|
||||||
|
this.settings.ignorePaths,
|
||||||
this.settings.password
|
this.settings.password
|
||||||
);
|
);
|
||||||
log.info(plan.mixedStates); // for debugging
|
log.info(plan.mixedStates); // for debugging
|
||||||
@@ -317,10 +323,20 @@ export default class RemotelySavePlugin extends Plugin {
|
|||||||
sortedKeys,
|
sortedKeys,
|
||||||
metadataFile,
|
metadataFile,
|
||||||
origMetadataOnRemote,
|
origMetadataOnRemote,
|
||||||
|
sizesGoWrong,
|
||||||
deletions,
|
deletions,
|
||||||
(key: string) => self.trash(key),
|
(key: string) => self.trash(key),
|
||||||
this.settings.password,
|
this.settings.password,
|
||||||
this.settings.concurrency,
|
this.settings.concurrency,
|
||||||
|
(ss: FileOrFolderMixedState[]) => {
|
||||||
|
new SizesConflictModal(
|
||||||
|
self.app,
|
||||||
|
self,
|
||||||
|
this.settings.skipSizeLargerThan,
|
||||||
|
ss,
|
||||||
|
this.settings.password !== ""
|
||||||
|
).open();
|
||||||
|
},
|
||||||
(i: number, totalCount: number, pathName: string, decision: string) =>
|
(i: number, totalCount: number, pathName: string, decision: string) =>
|
||||||
self.setCurrSyncMsg(i, totalCount, pathName, decision)
|
self.setCurrSyncMsg(i, totalCount, pathName, decision)
|
||||||
);
|
);
|
||||||
@@ -779,6 +795,9 @@ export default class RemotelySavePlugin extends Plugin {
|
|||||||
if (this.settings.s3.forcePathStyle === undefined) {
|
if (this.settings.s3.forcePathStyle === undefined) {
|
||||||
this.settings.s3.forcePathStyle = false;
|
this.settings.s3.forcePathStyle = false;
|
||||||
}
|
}
|
||||||
|
if (this.settings.ignorePaths === undefined) {
|
||||||
|
this.settings.ignorePaths = [];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async checkIfPresetRulesFollowed() {
|
async checkIfPresetRulesFollowed() {
|
||||||
@@ -962,9 +981,8 @@ export default class RemotelySavePlugin extends Plugin {
|
|||||||
const pluginConfigDir =
|
const pluginConfigDir =
|
||||||
this.manifest.dir ||
|
this.manifest.dir ||
|
||||||
`${this.app.vault.configDir}/plugins/${this.manifest.dir}`;
|
`${this.app.vault.configDir}/plugins/${this.manifest.dir}`;
|
||||||
const pluginConfigDirExists = await this.app.vault.adapter.exists(
|
const pluginConfigDirExists =
|
||||||
pluginConfigDir
|
await this.app.vault.adapter.exists(pluginConfigDir);
|
||||||
);
|
|
||||||
if (!pluginConfigDirExists) {
|
if (!pluginConfigDirExists) {
|
||||||
// what happened?
|
// what happened?
|
||||||
return;
|
return;
|
||||||
|
|||||||
+23
-4
@@ -339,12 +339,9 @@ export const checkHasSpecialCharForDir = (x: string) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export const unixTimeToStr = (x: number | undefined | null) => {
|
export const unixTimeToStr = (x: number | undefined | null) => {
|
||||||
if (x === undefined) {
|
if (x === undefined || x === null || Number.isNaN(x)) {
|
||||||
return undefined;
|
return undefined;
|
||||||
}
|
}
|
||||||
if (x === null) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return window.moment(x).format() as string;
|
return window.moment(x).format() as string;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -408,3 +405,25 @@ export const toText = (x: any) => {
|
|||||||
return `${x}`;
|
return `${x}`;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* On Android the stat has bugs for folders. So we need a fixed version.
|
||||||
|
* @param vault
|
||||||
|
* @param path
|
||||||
|
*/
|
||||||
|
export const statFix = async (vault: Vault, path: string) => {
|
||||||
|
const s = await vault.adapter.stat(path);
|
||||||
|
if (s.ctime === undefined || s.ctime === null || Number.isNaN(s.ctime)) {
|
||||||
|
s.ctime = undefined;
|
||||||
|
}
|
||||||
|
if (s.mtime === undefined || s.mtime === null || Number.isNaN(s.mtime)) {
|
||||||
|
s.mtime = undefined;
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
(s.size === undefined || s.size === null || Number.isNaN(s.size)) &&
|
||||||
|
s.type === "folder"
|
||||||
|
) {
|
||||||
|
s.size = 0;
|
||||||
|
}
|
||||||
|
return s;
|
||||||
|
};
|
||||||
|
|||||||
+8
-2
@@ -4,14 +4,20 @@
|
|||||||
import { TAbstractFile, TFolder, TFile, Vault } from "obsidian";
|
import { TAbstractFile, TFolder, TFile, Vault } from "obsidian";
|
||||||
|
|
||||||
import * as origLog from "loglevel";
|
import * as origLog from "loglevel";
|
||||||
import type { LogLevelNumbers, Logger, LogLevel, LogLevelDesc } from "loglevel";
|
import type {
|
||||||
|
LogLevelNumbers,
|
||||||
|
Logger,
|
||||||
|
LogLevel,
|
||||||
|
LogLevelDesc,
|
||||||
|
LogLevelNames,
|
||||||
|
} from "loglevel";
|
||||||
const log2 = origLog.getLogger("rs-default");
|
const log2 = origLog.getLogger("rs-default");
|
||||||
|
|
||||||
const originalFactory = log2.methodFactory;
|
const originalFactory = log2.methodFactory;
|
||||||
|
|
||||||
export const applyLogWriterInplace = function (writer: (...msg: any[]) => any) {
|
export const applyLogWriterInplace = function (writer: (...msg: any[]) => any) {
|
||||||
log2.methodFactory = function (
|
log2.methodFactory = function (
|
||||||
methodName: string,
|
methodName: LogLevelNames,
|
||||||
logLevel: LogLevelNumbers,
|
logLevel: LogLevelNumbers,
|
||||||
loggerName: string | symbol
|
loggerName: string | symbol
|
||||||
) {
|
) {
|
||||||
|
|||||||
+11
-2
@@ -2,6 +2,7 @@ import { Vault, Stat, ListedFiles } from "obsidian";
|
|||||||
import { Queue } from "@fyears/tsqueue";
|
import { Queue } from "@fyears/tsqueue";
|
||||||
import chunk from "lodash/chunk";
|
import chunk from "lodash/chunk";
|
||||||
import flatten from "lodash/flatten";
|
import flatten from "lodash/flatten";
|
||||||
|
import { statFix } from "./misc";
|
||||||
|
|
||||||
export interface ObsConfigDirFileType {
|
export interface ObsConfigDirFileType {
|
||||||
key: string;
|
key: string;
|
||||||
@@ -12,7 +13,14 @@ export interface ObsConfigDirFileType {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const isFolderToSkip = (x: string) => {
|
const isFolderToSkip = (x: string) => {
|
||||||
let specialFolders = [".git", ".svn", "node_modules"];
|
let specialFolders = [
|
||||||
|
".git",
|
||||||
|
".github",
|
||||||
|
".gitlab",
|
||||||
|
".svn",
|
||||||
|
"node_modules",
|
||||||
|
".DS_Store",
|
||||||
|
];
|
||||||
for (const iterator of specialFolders) {
|
for (const iterator of specialFolders) {
|
||||||
if (
|
if (
|
||||||
x === iterator ||
|
x === iterator ||
|
||||||
@@ -75,7 +83,8 @@ export const listFilesInObsFolder = async (
|
|||||||
const itemsToFetchChunks = chunk(itemsToFetch, CHUNK_SIZE);
|
const itemsToFetchChunks = chunk(itemsToFetch, CHUNK_SIZE);
|
||||||
for (const singleChunk of itemsToFetchChunks) {
|
for (const singleChunk of itemsToFetchChunks) {
|
||||||
const r = singleChunk.map(async (x) => {
|
const r = singleChunk.map(async (x) => {
|
||||||
const statRes = await vault.adapter.stat(x);
|
const statRes = await statFix(vault, x);
|
||||||
|
|
||||||
const isFolder = statRes.type === "folder";
|
const isFolder = statRes.type === "folder";
|
||||||
let children: ListedFiles = undefined;
|
let children: ListedFiles = undefined;
|
||||||
if (isFolder) {
|
if (isFolder) {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import delay from "delay";
|
import { rangeDelay } from "delay";
|
||||||
import { Dropbox, DropboxAuth } from "dropbox";
|
import { Dropbox, DropboxAuth } from "dropbox";
|
||||||
import type { files, DropboxResponseError, DropboxResponse } from "dropbox";
|
import type { files, DropboxResponseError, DropboxResponse } from "dropbox";
|
||||||
import { Vault } from "obsidian";
|
import { Vault } from "obsidian";
|
||||||
@@ -340,7 +340,7 @@ async function retryReq<T>(
|
|||||||
2
|
2
|
||||||
)}`
|
)}`
|
||||||
);
|
);
|
||||||
await delay.range(secMin * 1000, secMax * 1000);
|
await rangeDelay(secMin * 1000, secMax * 1000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -371,9 +371,13 @@ export class WrappedDropboxClient {
|
|||||||
throw Error("The user has not manually auth yet.");
|
throw Error("The user has not manually auth yet.");
|
||||||
}
|
}
|
||||||
const currentTs = Date.now();
|
const currentTs = Date.now();
|
||||||
|
const customHeaders = {
|
||||||
|
"Cache-Control": "no-cache",
|
||||||
|
};
|
||||||
if (this.dropboxConfig.accessTokenExpiresAtTime > currentTs) {
|
if (this.dropboxConfig.accessTokenExpiresAtTime > currentTs) {
|
||||||
this.dropbox = new Dropbox({
|
this.dropbox = new Dropbox({
|
||||||
accessToken: this.dropboxConfig.accessToken,
|
accessToken: this.dropboxConfig.accessToken,
|
||||||
|
customHeaders: customHeaders,
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
if (this.dropboxConfig.refreshToken === "") {
|
if (this.dropboxConfig.refreshToken === "") {
|
||||||
@@ -393,6 +397,7 @@ export class WrappedDropboxClient {
|
|||||||
);
|
);
|
||||||
this.dropbox = new Dropbox({
|
this.dropbox = new Dropbox({
|
||||||
accessToken: this.dropboxConfig.accessToken,
|
accessToken: this.dropboxConfig.accessToken,
|
||||||
|
customHeaders: customHeaders,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -444,6 +444,7 @@ export class WrappedOnedriveClient {
|
|||||||
contentType: "application/json",
|
contentType: "application/json",
|
||||||
headers: {
|
headers: {
|
||||||
Authorization: `Bearer ${await this.authGetter.getAccessToken()}`,
|
Authorization: `Bearer ${await this.authGetter.getAccessToken()}`,
|
||||||
|
"Cache-Control": "no-cache",
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
@@ -565,6 +566,7 @@ export class WrappedOnedriveClient {
|
|||||||
headers: {
|
headers: {
|
||||||
// no "Content-Length" allowed here
|
// no "Content-Length" allowed here
|
||||||
"Content-Range": `bytes ${rangeStart}-${rangeEnd - 1}/${size}`,
|
"Content-Range": `bytes ${rangeStart}-${rangeEnd - 1}/${size}`,
|
||||||
|
/* "Cache-Control": "no-cache", not allowed here!!! */
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
return res.json as DriveItem | UploadSession;
|
return res.json as DriveItem | UploadSession;
|
||||||
@@ -576,6 +578,7 @@ export class WrappedOnedriveClient {
|
|||||||
"Content-Length": `${rangeEnd - rangeStart}`,
|
"Content-Length": `${rangeEnd - rangeStart}`,
|
||||||
"Content-Range": `bytes ${rangeStart}-${rangeEnd - 1}/${size}`,
|
"Content-Range": `bytes ${rangeStart}-${rangeEnd - 1}/${size}`,
|
||||||
"Content-Type": DEFAULT_CONTENT_TYPE,
|
"Content-Type": DEFAULT_CONTENT_TYPE,
|
||||||
|
/* "Cache-Control": "no-cache", not allowed here!!! */
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
return (await res.json()) as DriveItem | UploadSession;
|
return (await res.json()) as DriveItem | UploadSession;
|
||||||
@@ -809,10 +812,16 @@ const downloadFromRemoteRaw = async (
|
|||||||
);
|
);
|
||||||
const downloadUrl: string = rsp["@microsoft.graph.downloadUrl"];
|
const downloadUrl: string = rsp["@microsoft.graph.downloadUrl"];
|
||||||
if (VALID_REQURL) {
|
if (VALID_REQURL) {
|
||||||
const content = (await requestUrl({ url: downloadUrl })).arrayBuffer;
|
const content = (
|
||||||
|
await requestUrl({
|
||||||
|
url: downloadUrl,
|
||||||
|
headers: { "Cache-Control": "no-cache" },
|
||||||
|
})
|
||||||
|
).arrayBuffer;
|
||||||
return content;
|
return content;
|
||||||
} else {
|
} else {
|
||||||
const content = await (await fetch(downloadUrl)).arrayBuffer();
|
const content = await // cannot set no-cache here, will have cors error
|
||||||
|
(await fetch(downloadUrl)).arrayBuffer();
|
||||||
return content;
|
return content;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
+47
-17
@@ -11,19 +11,20 @@ import {
|
|||||||
S3Client,
|
S3Client,
|
||||||
} from "@aws-sdk/client-s3";
|
} from "@aws-sdk/client-s3";
|
||||||
import { Upload } from "@aws-sdk/lib-storage";
|
import { Upload } from "@aws-sdk/lib-storage";
|
||||||
import { HttpHandler, HttpRequest, HttpResponse } from "@aws-sdk/protocol-http";
|
import { HttpHandler, HttpRequest, HttpResponse } from "@smithy/protocol-http";
|
||||||
import {
|
import {
|
||||||
FetchHttpHandler,
|
FetchHttpHandler,
|
||||||
FetchHttpHandlerOptions,
|
FetchHttpHandlerOptions,
|
||||||
} from "@aws-sdk/fetch-http-handler";
|
} from "@smithy/fetch-http-handler";
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
import { requestTimeout } from "@aws-sdk/fetch-http-handler/dist-es/request-timeout";
|
import { requestTimeout } from "@smithy/fetch-http-handler/dist-es/request-timeout";
|
||||||
import { buildQueryString } from "@aws-sdk/querystring-builder";
|
import { buildQueryString } from "@smithy/querystring-builder";
|
||||||
import { HeaderBag, HttpHandlerOptions, Provider } from "@aws-sdk/types";
|
import { HeaderBag, HttpHandlerOptions, Provider } from "@aws-sdk/types";
|
||||||
import { Buffer } from "buffer";
|
import { Buffer } from "buffer";
|
||||||
import * as mime from "mime-types";
|
import * as mime from "mime-types";
|
||||||
import { Vault, requestUrl, RequestUrlParam } from "obsidian";
|
import { Vault, requestUrl, RequestUrlParam } from "obsidian";
|
||||||
import { Readable } from "stream";
|
import { Readable } from "stream";
|
||||||
|
import AggregateError from "aggregate-error";
|
||||||
import {
|
import {
|
||||||
DEFAULT_CONTENT_TYPE,
|
DEFAULT_CONTENT_TYPE,
|
||||||
RemoteItem,
|
RemoteItem,
|
||||||
@@ -97,11 +98,6 @@ class ObsHttpHandler extends FetchHttpHandler {
|
|||||||
contentType = transformedHeaders["content-type"];
|
contentType = transformedHeaders["content-type"];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (transformedHeaders["cache-control"] === undefined) {
|
|
||||||
// every time is a new request
|
|
||||||
transformedHeaders["cache-control"] = "no-cache";
|
|
||||||
}
|
|
||||||
|
|
||||||
let transformedBody: any = body;
|
let transformedBody: any = body;
|
||||||
if (ArrayBuffer.isView(body)) {
|
if (ArrayBuffer.isView(body)) {
|
||||||
transformedBody = bufferToArrayBuffer(body);
|
transformedBody = bufferToArrayBuffer(body);
|
||||||
@@ -200,8 +196,10 @@ export const getS3Client = (s3Config: S3Config) => {
|
|||||||
endpoint = `https://${endpoint}`;
|
endpoint = `https://${endpoint}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let s3Client: S3Client;
|
||||||
|
|
||||||
if (VALID_REQURL && s3Config.bypassCorsLocally) {
|
if (VALID_REQURL && s3Config.bypassCorsLocally) {
|
||||||
const s3Client = new S3Client({
|
s3Client = new S3Client({
|
||||||
region: s3Config.s3Region,
|
region: s3Config.s3Region,
|
||||||
endpoint: endpoint,
|
endpoint: endpoint,
|
||||||
forcePathStyle: s3Config.forcePathStyle,
|
forcePathStyle: s3Config.forcePathStyle,
|
||||||
@@ -211,9 +209,8 @@ export const getS3Client = (s3Config: S3Config) => {
|
|||||||
},
|
},
|
||||||
requestHandler: new ObsHttpHandler(),
|
requestHandler: new ObsHttpHandler(),
|
||||||
});
|
});
|
||||||
return s3Client;
|
|
||||||
} else {
|
} else {
|
||||||
const s3Client = new S3Client({
|
s3Client = new S3Client({
|
||||||
region: s3Config.s3Region,
|
region: s3Config.s3Region,
|
||||||
endpoint: endpoint,
|
endpoint: endpoint,
|
||||||
forcePathStyle: s3Config.forcePathStyle,
|
forcePathStyle: s3Config.forcePathStyle,
|
||||||
@@ -222,8 +219,19 @@ export const getS3Client = (s3Config: S3Config) => {
|
|||||||
secretAccessKey: s3Config.s3SecretAccessKey,
|
secretAccessKey: s3Config.s3SecretAccessKey,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
return s3Client;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
s3Client.middlewareStack.add(
|
||||||
|
(next, context) => (args) => {
|
||||||
|
(args.request as any).headers["cache-control"] = "no-cache";
|
||||||
|
return next(args);
|
||||||
|
},
|
||||||
|
{
|
||||||
|
step: "build",
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
return s3Client;
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getRemoteMeta = async (
|
export const getRemoteMeta = async (
|
||||||
@@ -501,6 +509,11 @@ export const deleteFromRemote = async (
|
|||||||
/**
|
/**
|
||||||
* Check the config of S3 by heading bucket
|
* Check the config of S3 by heading bucket
|
||||||
* https://stackoverflow.com/questions/50842835
|
* https://stackoverflow.com/questions/50842835
|
||||||
|
*
|
||||||
|
* Updated on 20240102:
|
||||||
|
* Users are not always have permission of heading bucket,
|
||||||
|
* so we need to use listing objects instead...
|
||||||
|
*
|
||||||
* @param s3Client
|
* @param s3Client
|
||||||
* @param s3Config
|
* @param s3Config
|
||||||
* @returns
|
* @returns
|
||||||
@@ -511,9 +524,15 @@ export const checkConnectivity = async (
|
|||||||
callbackFunc?: any
|
callbackFunc?: any
|
||||||
) => {
|
) => {
|
||||||
try {
|
try {
|
||||||
const results = await s3Client.send(
|
// const results = await s3Client.send(
|
||||||
new HeadBucketCommand({ Bucket: s3Config.s3BucketName })
|
// new HeadBucketCommand({ Bucket: s3Config.s3BucketName })
|
||||||
);
|
// );
|
||||||
|
// very simplified version of listing objects
|
||||||
|
const confCmd = {
|
||||||
|
Bucket: s3Config.s3BucketName,
|
||||||
|
} as ListObjectsV2CommandInput;
|
||||||
|
const results = await s3Client.send(new ListObjectsV2Command(confCmd));
|
||||||
|
|
||||||
if (
|
if (
|
||||||
results === undefined ||
|
results === undefined ||
|
||||||
results.$metadata === undefined ||
|
results.$metadata === undefined ||
|
||||||
@@ -530,8 +549,19 @@ export const checkConnectivity = async (
|
|||||||
} catch (err) {
|
} catch (err) {
|
||||||
log.debug(err);
|
log.debug(err);
|
||||||
if (callbackFunc !== undefined) {
|
if (callbackFunc !== undefined) {
|
||||||
callbackFunc(err);
|
if (s3Config.s3Endpoint.contains(s3Config.s3BucketName)) {
|
||||||
|
const err2 = new AggregateError([
|
||||||
|
err,
|
||||||
|
new Error(
|
||||||
|
"Maybe you've included the bucket name inside the endpoint setting. Please remove the bucket name and try again."
|
||||||
|
),
|
||||||
|
]);
|
||||||
|
callbackFunc(err2);
|
||||||
|
} else {
|
||||||
|
callbackFunc(err);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
+114
-83
@@ -15,21 +15,22 @@ import type {
|
|||||||
FileStat,
|
FileStat,
|
||||||
WebDAVClient,
|
WebDAVClient,
|
||||||
RequestOptionsWithState,
|
RequestOptionsWithState,
|
||||||
Response,
|
// Response,
|
||||||
ResponseDataDetailed,
|
// ResponseDataDetailed,
|
||||||
} from "webdav/web";
|
} from "webdav";
|
||||||
import { getPatcher } from "webdav/web";
|
|
||||||
|
// @ts-ignore
|
||||||
|
import { getPatcher } from "webdav/dist/web/index.js";
|
||||||
if (VALID_REQURL) {
|
if (VALID_REQURL) {
|
||||||
getPatcher().patch(
|
getPatcher().patch(
|
||||||
"request",
|
"request",
|
||||||
async (
|
async (options: RequestOptionsWithState): Promise<Response> => {
|
||||||
options: RequestOptionsWithState
|
|
||||||
): Promise<Response | ResponseDataDetailed<any>> => {
|
|
||||||
const transformedHeaders = { ...options.headers };
|
const transformedHeaders = { ...options.headers };
|
||||||
delete transformedHeaders["host"];
|
delete transformedHeaders["host"];
|
||||||
delete transformedHeaders["Host"];
|
delete transformedHeaders["Host"];
|
||||||
delete transformedHeaders["content-length"];
|
delete transformedHeaders["content-length"];
|
||||||
delete transformedHeaders["Content-Length"];
|
delete transformedHeaders["Content-Length"];
|
||||||
|
|
||||||
const r = await requestUrl({
|
const r = await requestUrl({
|
||||||
url: options.url,
|
url: options.url,
|
||||||
method: options.method,
|
method: options.method,
|
||||||
@@ -37,79 +38,100 @@ if (VALID_REQURL) {
|
|||||||
headers: transformedHeaders,
|
headers: transformedHeaders,
|
||||||
});
|
});
|
||||||
|
|
||||||
let r2: Response | ResponseDataDetailed<any> = undefined;
|
let contentType: string | undefined =
|
||||||
if (options.responseType === undefined) {
|
r.headers["Content-Type"] ||
|
||||||
r2 = {
|
r.headers["content-type"] ||
|
||||||
data: undefined,
|
options.headers["Content-Type"] ||
|
||||||
status: r.status,
|
options.headers["content-type"] ||
|
||||||
statusText: getReasonPhrase(r.status),
|
options.headers["Accept"] ||
|
||||||
headers: r.headers,
|
options.headers["accept"];
|
||||||
};
|
if (contentType !== undefined) {
|
||||||
} else if (options.responseType === "json") {
|
contentType = contentType.toLowerCase();
|
||||||
r2 = {
|
|
||||||
data: r.json,
|
|
||||||
status: r.status,
|
|
||||||
statusText: getReasonPhrase(r.status),
|
|
||||||
headers: r.headers,
|
|
||||||
};
|
|
||||||
} else if (options.responseType === "text") {
|
|
||||||
r2 = {
|
|
||||||
data: r.text,
|
|
||||||
status: r.status,
|
|
||||||
statusText: getReasonPhrase(r.status),
|
|
||||||
headers: r.headers,
|
|
||||||
};
|
|
||||||
} else if (options.responseType === "arraybuffer") {
|
|
||||||
r2 = {
|
|
||||||
data: r.arrayBuffer,
|
|
||||||
status: r.status,
|
|
||||||
statusText: getReasonPhrase(r.status),
|
|
||||||
headers: r.headers,
|
|
||||||
};
|
|
||||||
} else {
|
|
||||||
throw Error(
|
|
||||||
`do not know how to deal with responseType = ${options.responseType}`
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
const rspHeaders = { ...r.headers };
|
||||||
|
for (let key in rspHeaders) {
|
||||||
|
if (rspHeaders.hasOwnProperty(key)) {
|
||||||
|
if (key === "content-disposition" || key === "Content-Disposition") {
|
||||||
|
rspHeaders[key] = encodeURIComponent(rspHeaders[key]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// console.log(`requesting url=${options.url}`);
|
||||||
|
// console.log(`contentType=${contentType}`);
|
||||||
|
// console.log(`rspHeaders=${JSON.stringify(rspHeaders)}`)
|
||||||
|
|
||||||
|
// let r2: Response = undefined;
|
||||||
|
// if (contentType.includes("xml")) {
|
||||||
|
// r2 = new Response(r.text, {
|
||||||
|
// status: r.status,
|
||||||
|
// statusText: getReasonPhrase(r.status),
|
||||||
|
// headers: rspHeaders,
|
||||||
|
// });
|
||||||
|
// } else if (
|
||||||
|
// contentType.includes("json") ||
|
||||||
|
// contentType.includes("javascript")
|
||||||
|
// ) {
|
||||||
|
// console.log('inside json branch');
|
||||||
|
// // const j = r.json;
|
||||||
|
// // console.log(j);
|
||||||
|
// r2 = new Response(
|
||||||
|
// r.text, // yea, here is the text because Response constructor expects a text
|
||||||
|
// {
|
||||||
|
// status: r.status,
|
||||||
|
// statusText: getReasonPhrase(r.status),
|
||||||
|
// headers: rspHeaders,
|
||||||
|
// });
|
||||||
|
// } else if (contentType.includes("text")) {
|
||||||
|
// // avoid text/json,
|
||||||
|
// // so we split this out from the above xml or json branch
|
||||||
|
// r2 = new Response(r.text, {
|
||||||
|
// status: r.status,
|
||||||
|
// statusText: getReasonPhrase(r.status),
|
||||||
|
// headers: rspHeaders,
|
||||||
|
// });
|
||||||
|
// } else if (
|
||||||
|
// contentType.includes("octet-stream") ||
|
||||||
|
// contentType.includes("binary") ||
|
||||||
|
// contentType.includes("buffer")
|
||||||
|
// ) {
|
||||||
|
// // application/octet-stream
|
||||||
|
// r2 = new Response(r.arrayBuffer, {
|
||||||
|
// status: r.status,
|
||||||
|
// statusText: getReasonPhrase(r.status),
|
||||||
|
// headers: rspHeaders,
|
||||||
|
// });
|
||||||
|
// } else {
|
||||||
|
// throw Error(
|
||||||
|
// `do not know how to deal with requested content type = ${contentType}`
|
||||||
|
// );
|
||||||
|
// }
|
||||||
|
|
||||||
|
let r2: Response = undefined;
|
||||||
|
if ([101, 103, 204, 205, 304].includes(r.status)) {
|
||||||
|
// A null body status is a status that is 101, 103, 204, 205, or 304.
|
||||||
|
// https://fetch.spec.whatwg.org/#statuses
|
||||||
|
// fix this: Failed to construct 'Response': Response with null body status cannot have body
|
||||||
|
r2 = new Response(null, {
|
||||||
|
status: r.status,
|
||||||
|
statusText: getReasonPhrase(r.status),
|
||||||
|
headers: rspHeaders,
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
r2 = new Response(r.arrayBuffer, {
|
||||||
|
status: r.status,
|
||||||
|
statusText: getReasonPhrase(r.status),
|
||||||
|
headers: rspHeaders,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
return r2;
|
return r2;
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
// getPatcher().patch("request", (options: any) => {
|
|
||||||
// // console.log("using fetch");
|
// @ts-ignore
|
||||||
// const r = fetch(options.url, {
|
import { AuthType, BufferLike, createClient } from "webdav/dist/web/index.js";
|
||||||
// method: options.method,
|
export type { WebDAVClient } from "webdav";
|
||||||
// body: options.data as any,
|
|
||||||
// headers: options.headers,
|
|
||||||
// signal: options.signal,
|
|
||||||
// })
|
|
||||||
// .then((rsp) => {
|
|
||||||
// if (options.responseType === undefined) {
|
|
||||||
// return Promise.all([undefined, rsp]);
|
|
||||||
// }
|
|
||||||
// if (options.responseType === "json") {
|
|
||||||
// return Promise.all([rsp.json(), rsp]);
|
|
||||||
// }
|
|
||||||
// if (options.responseType === "text") {
|
|
||||||
// return Promise.all([rsp.text(), rsp]);
|
|
||||||
// }
|
|
||||||
// if (options.responseType === "arraybuffer") {
|
|
||||||
// return Promise.all([rsp.arrayBuffer(), rsp]);
|
|
||||||
// }
|
|
||||||
// })
|
|
||||||
// .then(([d, r]) => {
|
|
||||||
// return {
|
|
||||||
// data: d,
|
|
||||||
// status: r.status,
|
|
||||||
// statusText: r.statusText,
|
|
||||||
// headers: r.headers,
|
|
||||||
// };
|
|
||||||
// });
|
|
||||||
// // console.log("using fetch");
|
|
||||||
// return r;
|
|
||||||
// });
|
|
||||||
import { AuthType, BufferLike, createClient } from "webdav/web";
|
|
||||||
export type { WebDAVClient } from "webdav/web";
|
|
||||||
|
|
||||||
export const DEFAULT_WEBDAV_CONFIG = {
|
export const DEFAULT_WEBDAV_CONFIG = {
|
||||||
address: "",
|
address: "",
|
||||||
@@ -183,6 +205,9 @@ export class WrappedWebdavClient {
|
|||||||
|
|
||||||
init = async () => {
|
init = async () => {
|
||||||
// init client if not inited
|
// init client if not inited
|
||||||
|
const headers = {
|
||||||
|
"Cache-Control": "no-cache",
|
||||||
|
};
|
||||||
if (this.client === undefined) {
|
if (this.client === undefined) {
|
||||||
if (
|
if (
|
||||||
this.webdavConfig.username !== "" &&
|
this.webdavConfig.username !== "" &&
|
||||||
@@ -191,6 +216,7 @@ export class WrappedWebdavClient {
|
|||||||
this.client = createClient(this.webdavConfig.address, {
|
this.client = createClient(this.webdavConfig.address, {
|
||||||
username: this.webdavConfig.username,
|
username: this.webdavConfig.username,
|
||||||
password: this.webdavConfig.password,
|
password: this.webdavConfig.password,
|
||||||
|
headers: headers,
|
||||||
authType:
|
authType:
|
||||||
this.webdavConfig.authType === "digest"
|
this.webdavConfig.authType === "digest"
|
||||||
? AuthType.Digest
|
? AuthType.Digest
|
||||||
@@ -198,7 +224,9 @@ export class WrappedWebdavClient {
|
|||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
log.info("no password");
|
log.info("no password");
|
||||||
this.client = createClient(this.webdavConfig.address);
|
this.client = createClient(this.webdavConfig.address, {
|
||||||
|
headers: headers,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -226,9 +254,10 @@ export class WrappedWebdavClient {
|
|||||||
method: "PROPFIND",
|
method: "PROPFIND",
|
||||||
headers: {
|
headers: {
|
||||||
Depth: "infinity",
|
Depth: "infinity",
|
||||||
|
Accept: "text/plain,application/xml",
|
||||||
},
|
},
|
||||||
responseType: "text",
|
// responseType: "text",
|
||||||
});
|
} as any);
|
||||||
if (res.status === 403) {
|
if (res.status === 403) {
|
||||||
throw Error("not support Infinity, get 403");
|
throw Error("not support Infinity, get 403");
|
||||||
} else {
|
} else {
|
||||||
@@ -247,9 +276,10 @@ export class WrappedWebdavClient {
|
|||||||
method: "PROPFIND",
|
method: "PROPFIND",
|
||||||
headers: {
|
headers: {
|
||||||
Depth: "1",
|
Depth: "1",
|
||||||
|
Accept: "text/plain,application/xml",
|
||||||
},
|
},
|
||||||
responseType: "text",
|
// responseType: "text",
|
||||||
}
|
} as any
|
||||||
);
|
);
|
||||||
testPassed = true;
|
testPassed = true;
|
||||||
this.webdavConfig.depth = "auto_1";
|
this.webdavConfig.depth = "auto_1";
|
||||||
@@ -449,9 +479,9 @@ const downloadFromRemoteRaw = async (
|
|||||||
fileOrFolderPath: string
|
fileOrFolderPath: string
|
||||||
) => {
|
) => {
|
||||||
await client.init();
|
await client.init();
|
||||||
const buff = (await client.client.getFileContents(
|
const p = getWebdavPath(fileOrFolderPath, client.remoteBaseDir);
|
||||||
getWebdavPath(fileOrFolderPath, client.remoteBaseDir)
|
// console.log(`getWebdavPath=${p}`);
|
||||||
)) as BufferLike;
|
const buff = (await client.client.getFileContents(p)) as BufferLike;
|
||||||
if (buff instanceof ArrayBuffer) {
|
if (buff instanceof ArrayBuffer) {
|
||||||
return buff;
|
return buff;
|
||||||
} else if (buff instanceof Buffer) {
|
} else if (buff instanceof Buffer) {
|
||||||
@@ -490,6 +520,7 @@ export const downloadFromRemote = async (
|
|||||||
downloadFile = remoteEncryptedKey;
|
downloadFile = remoteEncryptedKey;
|
||||||
}
|
}
|
||||||
downloadFile = getWebdavPath(downloadFile, client.remoteBaseDir);
|
downloadFile = getWebdavPath(downloadFile, client.remoteBaseDir);
|
||||||
|
// console.log(`downloadFile=${downloadFile}`);
|
||||||
const remoteContent = await downloadFromRemoteRaw(client, downloadFile);
|
const remoteContent = await downloadFromRemoteRaw(client, downloadFile);
|
||||||
let localContent = remoteContent;
|
let localContent = remoteContent;
|
||||||
if (password !== "") {
|
if (password !== "") {
|
||||||
|
|||||||
+173
-137
@@ -675,104 +675,12 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
|||||||
containerEl.createEl("h1", { text: "Remotely Save" });
|
containerEl.createEl("h1", { text: "Remotely Save" });
|
||||||
|
|
||||||
//////////////////////////////////////////////////
|
//////////////////////////////////////////////////
|
||||||
// below for general
|
// below for service chooser (part 1/2)
|
||||||
//////////////////////////////////////////////////
|
|
||||||
|
|
||||||
const generalDiv = containerEl.createEl("div");
|
|
||||||
generalDiv.createEl("h2", { text: t("settings_general") });
|
|
||||||
|
|
||||||
const passwordDiv = generalDiv.createEl("div");
|
|
||||||
let newPassword = `${this.plugin.settings.password}`;
|
|
||||||
new Setting(passwordDiv)
|
|
||||||
.setName(t("settings_password"))
|
|
||||||
.setDesc(t("settings_password_desc"))
|
|
||||||
.addText((text) => {
|
|
||||||
wrapTextWithPasswordHide(text);
|
|
||||||
text
|
|
||||||
.setPlaceholder("")
|
|
||||||
.setValue(`${this.plugin.settings.password}`)
|
|
||||||
.onChange(async (value) => {
|
|
||||||
newPassword = value.trim();
|
|
||||||
});
|
|
||||||
})
|
|
||||||
.addButton(async (button) => {
|
|
||||||
button.setButtonText(t("confirm"));
|
|
||||||
button.onClick(async () => {
|
|
||||||
new PasswordModal(this.app, this.plugin, newPassword).open();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
const scheduleDiv = generalDiv.createEl("div");
|
|
||||||
new Setting(scheduleDiv)
|
|
||||||
.setName(t("settings_autorun"))
|
|
||||||
.setDesc(t("settings_autorun_desc"))
|
|
||||||
.addDropdown((dropdown) => {
|
|
||||||
dropdown.addOption("-1", t("settings_autorun_notset"));
|
|
||||||
dropdown.addOption(`${1000 * 60 * 1}`, t("settings_autorun_1min"));
|
|
||||||
dropdown.addOption(`${1000 * 60 * 5}`, t("settings_autorun_5min"));
|
|
||||||
dropdown.addOption(`${1000 * 60 * 10}`, t("settings_autorun_10min"));
|
|
||||||
dropdown.addOption(`${1000 * 60 * 30}`, t("settings_autorun_30min"));
|
|
||||||
|
|
||||||
dropdown
|
|
||||||
.setValue(`${this.plugin.settings.autoRunEveryMilliseconds}`)
|
|
||||||
.onChange(async (val: string) => {
|
|
||||||
const realVal = parseInt(val);
|
|
||||||
this.plugin.settings.autoRunEveryMilliseconds = realVal;
|
|
||||||
await this.plugin.saveSettings();
|
|
||||||
if (
|
|
||||||
(realVal === undefined || realVal === null || realVal <= 0) &&
|
|
||||||
this.plugin.autoRunIntervalID !== undefined
|
|
||||||
) {
|
|
||||||
// clear
|
|
||||||
window.clearInterval(this.plugin.autoRunIntervalID);
|
|
||||||
this.plugin.autoRunIntervalID = undefined;
|
|
||||||
} else if (
|
|
||||||
realVal !== undefined &&
|
|
||||||
realVal !== null &&
|
|
||||||
realVal > 0
|
|
||||||
) {
|
|
||||||
const intervalID = window.setInterval(() => {
|
|
||||||
this.plugin.syncRun("auto");
|
|
||||||
}, realVal);
|
|
||||||
this.plugin.autoRunIntervalID = intervalID;
|
|
||||||
this.plugin.registerInterval(intervalID);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
const runOnceStartUpDiv = generalDiv.createEl("div");
|
|
||||||
new Setting(runOnceStartUpDiv)
|
|
||||||
.setName(t("settings_runoncestartup"))
|
|
||||||
.setDesc(t("settings_runoncestartup_desc"))
|
|
||||||
.addDropdown((dropdown) => {
|
|
||||||
dropdown.addOption("-1", t("settings_runoncestartup_notset"));
|
|
||||||
dropdown.addOption(
|
|
||||||
`${1000 * 1 * 1}`,
|
|
||||||
t("settings_runoncestartup_1sec")
|
|
||||||
);
|
|
||||||
dropdown.addOption(
|
|
||||||
`${1000 * 10 * 1}`,
|
|
||||||
t("settings_runoncestartup_10sec")
|
|
||||||
);
|
|
||||||
dropdown.addOption(
|
|
||||||
`${1000 * 30 * 1}`,
|
|
||||||
t("settings_runoncestartup_30sec")
|
|
||||||
);
|
|
||||||
dropdown
|
|
||||||
.setValue(`${this.plugin.settings.initRunAfterMilliseconds}`)
|
|
||||||
.onChange(async (val: string) => {
|
|
||||||
const realVal = parseInt(val);
|
|
||||||
this.plugin.settings.initRunAfterMilliseconds = realVal;
|
|
||||||
await this.plugin.saveSettings();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
//////////////////////////////////////////////////
|
|
||||||
// below for general chooser (part 1/2)
|
|
||||||
//////////////////////////////////////////////////
|
//////////////////////////////////////////////////
|
||||||
|
|
||||||
// we need to create the div in advance of any other service divs
|
// we need to create the div in advance of any other service divs
|
||||||
const serviceChooserDiv = generalDiv.createEl("div");
|
const serviceChooserDiv = containerEl.createDiv();
|
||||||
|
serviceChooserDiv.createEl("h2", { text: t("settings_chooseservice") });
|
||||||
|
|
||||||
//////////////////////////////////////////////////
|
//////////////////////////////////////////////////
|
||||||
// below for s3
|
// below for s3
|
||||||
@@ -782,27 +690,29 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
|||||||
s3Div.toggleClass("s3-hide", this.plugin.settings.serviceType !== "s3");
|
s3Div.toggleClass("s3-hide", this.plugin.settings.serviceType !== "s3");
|
||||||
s3Div.createEl("h2", { text: t("settings_s3") });
|
s3Div.createEl("h2", { text: t("settings_s3") });
|
||||||
|
|
||||||
|
const s3LongDescDiv = s3Div.createEl("div", { cls: "settings-long-desc" });
|
||||||
|
|
||||||
for (const c of [
|
for (const c of [
|
||||||
t("settings_s3_disclaimer1"),
|
t("settings_s3_disclaimer1"),
|
||||||
t("settings_s3_disclaimer2"),
|
t("settings_s3_disclaimer2"),
|
||||||
]) {
|
]) {
|
||||||
s3Div.createEl("p", {
|
s3LongDescDiv.createEl("p", {
|
||||||
text: c,
|
text: c,
|
||||||
cls: "s3-disclaimer",
|
cls: "s3-disclaimer",
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!VALID_REQURL) {
|
if (!VALID_REQURL) {
|
||||||
s3Div.createEl("p", {
|
s3LongDescDiv.createEl("p", {
|
||||||
text: t("settings_s3_cors"),
|
text: t("settings_s3_cors"),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
s3Div.createEl("p", {
|
s3LongDescDiv.createEl("p", {
|
||||||
text: t("settings_s3_prod"),
|
text: t("settings_s3_prod"),
|
||||||
});
|
});
|
||||||
|
|
||||||
const s3LinksUl = s3Div.createEl("div").createEl("ul");
|
const s3LinksUl = s3LongDescDiv.createEl("ul");
|
||||||
|
|
||||||
s3LinksUl.createEl("li").createEl("a", {
|
s3LinksUl.createEl("li").createEl("a", {
|
||||||
href: "https://docs.aws.amazon.com/general/latest/gr/s3.html",
|
href: "https://docs.aws.amazon.com/general/latest/gr/s3.html",
|
||||||
@@ -935,8 +845,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const partsConcurrencyDiv = s3Div.createEl("div");
|
new Setting(s3Div)
|
||||||
new Setting(partsConcurrencyDiv)
|
|
||||||
.setName(t("settings_s3_parts"))
|
.setName(t("settings_s3_parts"))
|
||||||
.setDesc(t("settings_s3_parts_desc"))
|
.setDesc(t("settings_s3_parts_desc"))
|
||||||
.addDropdown((dropdown) => {
|
.addDropdown((dropdown) => {
|
||||||
@@ -988,16 +897,20 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
|||||||
this.plugin.settings.serviceType !== "dropbox"
|
this.plugin.settings.serviceType !== "dropbox"
|
||||||
);
|
);
|
||||||
dropboxDiv.createEl("h2", { text: t("settings_dropbox") });
|
dropboxDiv.createEl("h2", { text: t("settings_dropbox") });
|
||||||
|
|
||||||
|
const dropboxLongDescDiv = dropboxDiv.createEl("div", {
|
||||||
|
cls: "settings-long-desc",
|
||||||
|
});
|
||||||
for (const c of [
|
for (const c of [
|
||||||
t("settings_dropbox_disclaimer1"),
|
t("settings_dropbox_disclaimer1"),
|
||||||
t("settings_dropbox_disclaimer2"),
|
t("settings_dropbox_disclaimer2"),
|
||||||
]) {
|
]) {
|
||||||
dropboxDiv.createEl("p", {
|
dropboxLongDescDiv.createEl("p", {
|
||||||
text: c,
|
text: c,
|
||||||
cls: "dropbox-disclaimer",
|
cls: "dropbox-disclaimer",
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
dropboxDiv.createEl("p", {
|
dropboxLongDescDiv.createEl("p", {
|
||||||
text: t("settings_dropbox_folder", {
|
text: t("settings_dropbox_folder", {
|
||||||
pluginID: this.plugin.manifest.id,
|
pluginID: this.plugin.manifest.id,
|
||||||
remoteBaseDir:
|
remoteBaseDir:
|
||||||
@@ -1008,10 +921,10 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
|||||||
|
|
||||||
const dropboxSelectAuthDiv = dropboxDiv.createDiv();
|
const dropboxSelectAuthDiv = dropboxDiv.createDiv();
|
||||||
const dropboxAuthDiv = dropboxSelectAuthDiv.createDiv({
|
const dropboxAuthDiv = dropboxSelectAuthDiv.createDiv({
|
||||||
cls: "dropbox-auth-button-hide",
|
cls: "dropbox-auth-button-hide settings-auth-related",
|
||||||
});
|
});
|
||||||
const dropboxRevokeAuthDiv = dropboxSelectAuthDiv.createDiv({
|
const dropboxRevokeAuthDiv = dropboxSelectAuthDiv.createDiv({
|
||||||
cls: "dropbox-revoke-auth-button-hide",
|
cls: "dropbox-revoke-auth-button-hide settings-auth-related",
|
||||||
});
|
});
|
||||||
|
|
||||||
const dropboxRevokeAuthSetting = new Setting(dropboxRevokeAuthDiv)
|
const dropboxRevokeAuthSetting = new Setting(dropboxRevokeAuthDiv)
|
||||||
@@ -1174,17 +1087,20 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
|||||||
this.plugin.settings.serviceType !== "onedrive"
|
this.plugin.settings.serviceType !== "onedrive"
|
||||||
);
|
);
|
||||||
onedriveDiv.createEl("h2", { text: t("settings_onedrive") });
|
onedriveDiv.createEl("h2", { text: t("settings_onedrive") });
|
||||||
|
const onedriveLongDescDiv = onedriveDiv.createEl("div", {
|
||||||
|
cls: "settings-long-desc",
|
||||||
|
});
|
||||||
for (const c of [
|
for (const c of [
|
||||||
t("settings_onedrive_disclaimer1"),
|
t("settings_onedrive_disclaimer1"),
|
||||||
t("settings_onedrive_disclaimer2"),
|
t("settings_onedrive_disclaimer2"),
|
||||||
]) {
|
]) {
|
||||||
onedriveDiv.createEl("p", {
|
onedriveLongDescDiv.createEl("p", {
|
||||||
text: c,
|
text: c,
|
||||||
cls: "onedrive-disclaimer",
|
cls: "onedrive-disclaimer",
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
onedriveDiv.createEl("p", {
|
onedriveLongDescDiv.createEl("p", {
|
||||||
text: t("settings_onedrive_folder", {
|
text: t("settings_onedrive_folder", {
|
||||||
pluginID: this.plugin.manifest.id,
|
pluginID: this.plugin.manifest.id,
|
||||||
remoteBaseDir:
|
remoteBaseDir:
|
||||||
@@ -1193,16 +1109,16 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
|||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
|
|
||||||
onedriveDiv.createEl("p", {
|
onedriveLongDescDiv.createEl("p", {
|
||||||
text: t("settings_onedrive_nobiz"),
|
text: t("settings_onedrive_nobiz"),
|
||||||
});
|
});
|
||||||
|
|
||||||
const onedriveSelectAuthDiv = onedriveDiv.createDiv();
|
const onedriveSelectAuthDiv = onedriveDiv.createDiv();
|
||||||
const onedriveAuthDiv = onedriveSelectAuthDiv.createDiv({
|
const onedriveAuthDiv = onedriveSelectAuthDiv.createDiv({
|
||||||
cls: "onedrive-auth-button-hide",
|
cls: "onedrive-auth-button-hide settings-auth-related",
|
||||||
});
|
});
|
||||||
const onedriveRevokeAuthDiv = onedriveSelectAuthDiv.createDiv({
|
const onedriveRevokeAuthDiv = onedriveSelectAuthDiv.createDiv({
|
||||||
cls: "onedrive-revoke-auth-button-hide",
|
cls: "onedrive-revoke-auth-button-hide settings-auth-related",
|
||||||
});
|
});
|
||||||
|
|
||||||
const onedriveRevokeAuthSetting = new Setting(onedriveRevokeAuthDiv)
|
const onedriveRevokeAuthSetting = new Setting(onedriveRevokeAuthDiv)
|
||||||
@@ -1322,22 +1238,26 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
|||||||
|
|
||||||
webdavDiv.createEl("h2", { text: t("settings_webdav") });
|
webdavDiv.createEl("h2", { text: t("settings_webdav") });
|
||||||
|
|
||||||
webdavDiv.createEl("p", {
|
const webdavLongDescDiv = webdavDiv.createEl("div", {
|
||||||
|
cls: "settings-long-desc",
|
||||||
|
});
|
||||||
|
|
||||||
|
webdavLongDescDiv.createEl("p", {
|
||||||
text: t("settings_webdav_disclaimer1"),
|
text: t("settings_webdav_disclaimer1"),
|
||||||
cls: "webdav-disclaimer",
|
cls: "webdav-disclaimer",
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!VALID_REQURL) {
|
if (!VALID_REQURL) {
|
||||||
webdavDiv.createEl("p", {
|
webdavLongDescDiv.createEl("p", {
|
||||||
text: t("settings_webdav_cors_os"),
|
text: t("settings_webdav_cors_os"),
|
||||||
});
|
});
|
||||||
|
|
||||||
webdavDiv.createEl("p", {
|
webdavLongDescDiv.createEl("p", {
|
||||||
text: t("settings_webdav_cors"),
|
text: t("settings_webdav_cors"),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
webdavDiv.createEl("p", {
|
webdavLongDescDiv.createEl("p", {
|
||||||
text: t("settings_webdav_folder", {
|
text: t("settings_webdav_folder", {
|
||||||
remoteBaseDir:
|
remoteBaseDir:
|
||||||
this.plugin.settings.webdav.remoteBaseDir || this.app.vault.getName(),
|
this.plugin.settings.webdav.remoteBaseDir || this.app.vault.getName(),
|
||||||
@@ -1569,6 +1489,130 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
//////////////////////////////////////////////////
|
||||||
|
// below for basic settings
|
||||||
|
//////////////////////////////////////////////////
|
||||||
|
|
||||||
|
const basicDiv = containerEl.createEl("div");
|
||||||
|
basicDiv.createEl("h2", { text: t("settings_basic") });
|
||||||
|
|
||||||
|
let newPassword = `${this.plugin.settings.password}`;
|
||||||
|
new Setting(basicDiv)
|
||||||
|
.setName(t("settings_password"))
|
||||||
|
.setDesc(t("settings_password_desc"))
|
||||||
|
.addText((text) => {
|
||||||
|
wrapTextWithPasswordHide(text);
|
||||||
|
text
|
||||||
|
.setPlaceholder("")
|
||||||
|
.setValue(`${this.plugin.settings.password}`)
|
||||||
|
.onChange(async (value) => {
|
||||||
|
newPassword = value.trim();
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.addButton(async (button) => {
|
||||||
|
button.setButtonText(t("confirm"));
|
||||||
|
button.onClick(async () => {
|
||||||
|
new PasswordModal(this.app, this.plugin, newPassword).open();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
new Setting(basicDiv)
|
||||||
|
.setName(t("settings_autorun"))
|
||||||
|
.setDesc(t("settings_autorun_desc"))
|
||||||
|
.addDropdown((dropdown) => {
|
||||||
|
dropdown.addOption("-1", t("settings_autorun_notset"));
|
||||||
|
dropdown.addOption(`${1000 * 60 * 1}`, t("settings_autorun_1min"));
|
||||||
|
dropdown.addOption(`${1000 * 60 * 5}`, t("settings_autorun_5min"));
|
||||||
|
dropdown.addOption(`${1000 * 60 * 10}`, t("settings_autorun_10min"));
|
||||||
|
dropdown.addOption(`${1000 * 60 * 30}`, t("settings_autorun_30min"));
|
||||||
|
|
||||||
|
dropdown
|
||||||
|
.setValue(`${this.plugin.settings.autoRunEveryMilliseconds}`)
|
||||||
|
.onChange(async (val: string) => {
|
||||||
|
const realVal = parseInt(val);
|
||||||
|
this.plugin.settings.autoRunEveryMilliseconds = realVal;
|
||||||
|
await this.plugin.saveSettings();
|
||||||
|
if (
|
||||||
|
(realVal === undefined || realVal === null || realVal <= 0) &&
|
||||||
|
this.plugin.autoRunIntervalID !== undefined
|
||||||
|
) {
|
||||||
|
// clear
|
||||||
|
window.clearInterval(this.plugin.autoRunIntervalID);
|
||||||
|
this.plugin.autoRunIntervalID = undefined;
|
||||||
|
} else if (
|
||||||
|
realVal !== undefined &&
|
||||||
|
realVal !== null &&
|
||||||
|
realVal > 0
|
||||||
|
) {
|
||||||
|
const intervalID = window.setInterval(() => {
|
||||||
|
this.plugin.syncRun("auto");
|
||||||
|
}, realVal);
|
||||||
|
this.plugin.autoRunIntervalID = intervalID;
|
||||||
|
this.plugin.registerInterval(intervalID);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
new Setting(basicDiv)
|
||||||
|
.setName(t("settings_runoncestartup"))
|
||||||
|
.setDesc(t("settings_runoncestartup_desc"))
|
||||||
|
.addDropdown((dropdown) => {
|
||||||
|
dropdown.addOption("-1", t("settings_runoncestartup_notset"));
|
||||||
|
dropdown.addOption(
|
||||||
|
`${1000 * 1 * 1}`,
|
||||||
|
t("settings_runoncestartup_1sec")
|
||||||
|
);
|
||||||
|
dropdown.addOption(
|
||||||
|
`${1000 * 10 * 1}`,
|
||||||
|
t("settings_runoncestartup_10sec")
|
||||||
|
);
|
||||||
|
dropdown.addOption(
|
||||||
|
`${1000 * 30 * 1}`,
|
||||||
|
t("settings_runoncestartup_30sec")
|
||||||
|
);
|
||||||
|
dropdown
|
||||||
|
.setValue(`${this.plugin.settings.initRunAfterMilliseconds}`)
|
||||||
|
.onChange(async (val: string) => {
|
||||||
|
const realVal = parseInt(val);
|
||||||
|
this.plugin.settings.initRunAfterMilliseconds = realVal;
|
||||||
|
await this.plugin.saveSettings();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
new Setting(basicDiv)
|
||||||
|
.setName(t("settings_skiplargefiles"))
|
||||||
|
.setDesc(t("settings_skiplargefiles_desc"))
|
||||||
|
.addDropdown((dropdown) => {
|
||||||
|
dropdown.addOption("-1", t("settings_skiplargefiles_notset"));
|
||||||
|
|
||||||
|
const mbs = [1, 5, 10, 50, 100, 500, 1000];
|
||||||
|
for (const mb of mbs) {
|
||||||
|
dropdown.addOption(`${mb * 1000 * 1000}`, `${mb} MB`);
|
||||||
|
}
|
||||||
|
dropdown
|
||||||
|
.setValue(`${this.plugin.settings.skipSizeLargerThan}`)
|
||||||
|
.onChange(async (val) => {
|
||||||
|
this.plugin.settings.skipSizeLargerThan = parseInt(val);
|
||||||
|
await this.plugin.saveSettings();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
new Setting(basicDiv)
|
||||||
|
.setName(t("settings_ignorepaths"))
|
||||||
|
.setDesc(t("settings_ignorepaths_desc"))
|
||||||
|
.setClass("ignorepaths-settings")
|
||||||
|
|
||||||
|
.addTextArea((textArea) => {
|
||||||
|
textArea
|
||||||
|
.setValue(`${this.plugin.settings.ignorePaths.join("\n")}`)
|
||||||
|
.onChange(async (value) => {
|
||||||
|
this.plugin.settings.ignorePaths = value.trim().split("\n");
|
||||||
|
await this.plugin.saveSettings();
|
||||||
|
});
|
||||||
|
textArea.inputEl.rows = 10;
|
||||||
|
|
||||||
|
textArea.inputEl.addClass("ignorepaths-textarea");
|
||||||
|
});
|
||||||
|
|
||||||
//////////////////////////////////////////////////
|
//////////////////////////////////////////////////
|
||||||
// below for advanced settings
|
// below for advanced settings
|
||||||
//////////////////////////////////////////////////
|
//////////////////////////////////////////////////
|
||||||
@@ -1577,8 +1621,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
|||||||
text: t("settings_adv"),
|
text: t("settings_adv"),
|
||||||
});
|
});
|
||||||
|
|
||||||
const concurrencyDiv = advDiv.createEl("div");
|
new Setting(advDiv)
|
||||||
new Setting(concurrencyDiv)
|
|
||||||
.setName(t("settings_concurrency"))
|
.setName(t("settings_concurrency"))
|
||||||
.setDesc(t("settings_concurrency_desc"))
|
.setDesc(t("settings_concurrency_desc"))
|
||||||
.addDropdown((dropdown) => {
|
.addDropdown((dropdown) => {
|
||||||
@@ -1599,8 +1642,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
const syncUnderscoreItemsDiv = advDiv.createEl("div");
|
new Setting(advDiv)
|
||||||
new Setting(syncUnderscoreItemsDiv)
|
|
||||||
.setName(t("settings_syncunderscore"))
|
.setName(t("settings_syncunderscore"))
|
||||||
.setDesc(t("settings_syncunderscore_desc"))
|
.setDesc(t("settings_syncunderscore_desc"))
|
||||||
.addDropdown((dropdown) => {
|
.addDropdown((dropdown) => {
|
||||||
@@ -1616,8 +1658,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
const syncConfigDirDiv = advDiv.createEl("div");
|
new Setting(advDiv)
|
||||||
new Setting(syncConfigDirDiv)
|
|
||||||
.setName(t("settings_configdir"))
|
.setName(t("settings_configdir"))
|
||||||
.setDesc(
|
.setDesc(
|
||||||
t("settings_configdir_desc", {
|
t("settings_configdir_desc", {
|
||||||
@@ -1681,8 +1722,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
|||||||
const debugDiv = containerEl.createEl("div");
|
const debugDiv = containerEl.createEl("div");
|
||||||
debugDiv.createEl("h2", { text: t("settings_debug") });
|
debugDiv.createEl("h2", { text: t("settings_debug") });
|
||||||
|
|
||||||
const setConsoleLogLevelDiv = debugDiv.createDiv("div");
|
new Setting(debugDiv)
|
||||||
new Setting(setConsoleLogLevelDiv)
|
|
||||||
.setName(t("settings_debuglevel"))
|
.setName(t("settings_debuglevel"))
|
||||||
.setDesc(t("settings_debuglevel_desc"))
|
.setDesc(t("settings_debuglevel_desc"))
|
||||||
.addDropdown(async (dropdown) => {
|
.addDropdown(async (dropdown) => {
|
||||||
@@ -1697,8 +1737,8 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
|||||||
log.info(`the log level is changed to ${val}`);
|
log.info(`the log level is changed to ${val}`);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
const outputCurrSettingsDiv = debugDiv.createDiv("div");
|
|
||||||
new Setting(outputCurrSettingsDiv)
|
new Setting(debugDiv)
|
||||||
.setName(t("settings_outputsettingsconsole"))
|
.setName(t("settings_outputsettingsconsole"))
|
||||||
.setDesc(t("settings_outputsettingsconsole_desc"))
|
.setDesc(t("settings_outputsettingsconsole_desc"))
|
||||||
.addButton(async (button) => {
|
.addButton(async (button) => {
|
||||||
@@ -1709,8 +1749,8 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
|||||||
new Notice(t("settings_outputsettingsconsole_notice"));
|
new Notice(t("settings_outputsettingsconsole_notice"));
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
const syncPlanDiv = debugDiv.createEl("div");
|
|
||||||
new Setting(syncPlanDiv)
|
new Setting(debugDiv)
|
||||||
.setName(t("settings_syncplans"))
|
.setName(t("settings_syncplans"))
|
||||||
.setDesc(t("settings_syncplans_desc"))
|
.setDesc(t("settings_syncplans_desc"))
|
||||||
.addButton(async (button) => {
|
.addButton(async (button) => {
|
||||||
@@ -1737,7 +1777,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
|||||||
new Notice(t("settings_syncplans_notice"));
|
new Notice(t("settings_syncplans_notice"));
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
new Setting(syncPlanDiv)
|
new Setting(debugDiv)
|
||||||
.setName(t("settings_delsyncplans"))
|
.setName(t("settings_delsyncplans"))
|
||||||
.setDesc(t("settings_delsyncplans_desc"))
|
.setDesc(t("settings_delsyncplans_desc"))
|
||||||
.addButton(async (button) => {
|
.addButton(async (button) => {
|
||||||
@@ -1748,8 +1788,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
const logToDBDiv = debugDiv.createEl("div");
|
new Setting(debugDiv)
|
||||||
new Setting(logToDBDiv)
|
|
||||||
.setName(t("settings_logtodb"))
|
.setName(t("settings_logtodb"))
|
||||||
.setDesc(t("settings_logtodb_desc"))
|
.setDesc(t("settings_logtodb_desc"))
|
||||||
.addDropdown(async (dropdown) => {
|
.addDropdown(async (dropdown) => {
|
||||||
@@ -1776,7 +1815,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
new Setting(logToDBDiv)
|
new Setting(debugDiv)
|
||||||
.setName(t("settings_logtodbexport"))
|
.setName(t("settings_logtodbexport"))
|
||||||
.setDesc(
|
.setDesc(
|
||||||
t("settings_logtodbexport_desc", {
|
t("settings_logtodbexport_desc", {
|
||||||
@@ -1795,7 +1834,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
new Setting(logToDBDiv)
|
new Setting(debugDiv)
|
||||||
.setName(t("settings_logtodbclear"))
|
.setName(t("settings_logtodbclear"))
|
||||||
.setDesc(t("settings_logtodbclear_desc"))
|
.setDesc(t("settings_logtodbclear_desc"))
|
||||||
.addButton(async (button) => {
|
.addButton(async (button) => {
|
||||||
@@ -1806,8 +1845,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
const syncMappingDiv = debugDiv.createEl("div");
|
new Setting(debugDiv)
|
||||||
new Setting(syncMappingDiv)
|
|
||||||
.setName(t("settings_delsyncmap"))
|
.setName(t("settings_delsyncmap"))
|
||||||
.setDesc(t("settings_delsyncmap_desc"))
|
.setDesc(t("settings_delsyncmap_desc"))
|
||||||
.addButton(async (button) => {
|
.addButton(async (button) => {
|
||||||
@@ -1818,8 +1856,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
const outputCurrBasePathVaultIDDiv = debugDiv.createDiv("div");
|
new Setting(debugDiv)
|
||||||
new Setting(outputCurrBasePathVaultIDDiv)
|
|
||||||
.setName(t("settings_outputbasepathvaultid"))
|
.setName(t("settings_outputbasepathvaultid"))
|
||||||
.setDesc(t("settings_outputbasepathvaultid_desc"))
|
.setDesc(t("settings_outputbasepathvaultid_desc"))
|
||||||
.addButton(async (button) => {
|
.addButton(async (button) => {
|
||||||
@@ -1830,8 +1867,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
const dbsResetDiv = debugDiv.createEl("div");
|
new Setting(debugDiv)
|
||||||
new Setting(dbsResetDiv)
|
|
||||||
.setName(t("settings_resetcache"))
|
.setName(t("settings_resetcache"))
|
||||||
.setDesc(t("settings_resetcache_desc"))
|
.setDesc(t("settings_resetcache_desc"))
|
||||||
.addButton(async (button) => {
|
.addButton(async (button) => {
|
||||||
|
|||||||
+342
-43
@@ -7,6 +7,7 @@ import {
|
|||||||
} from "obsidian";
|
} from "obsidian";
|
||||||
import AggregateError from "aggregate-error";
|
import AggregateError from "aggregate-error";
|
||||||
import PQueue from "p-queue";
|
import PQueue from "p-queue";
|
||||||
|
import XRegExp from "xregexp";
|
||||||
import type {
|
import type {
|
||||||
RemoteItem,
|
RemoteItem,
|
||||||
SyncTriggerSourceType,
|
SyncTriggerSourceType,
|
||||||
@@ -19,6 +20,7 @@ import {
|
|||||||
decryptBase32ToString,
|
decryptBase32ToString,
|
||||||
decryptBase64urlToString,
|
decryptBase64urlToString,
|
||||||
encryptStringToBase64url,
|
encryptStringToBase64url,
|
||||||
|
getSizeFromOrigToEnc,
|
||||||
MAGIC_ENCRYPTED_PREFIX_BASE32,
|
MAGIC_ENCRYPTED_PREFIX_BASE32,
|
||||||
MAGIC_ENCRYPTED_PREFIX_BASE64URL,
|
MAGIC_ENCRYPTED_PREFIX_BASE64URL,
|
||||||
} from "./encrypt";
|
} from "./encrypt";
|
||||||
@@ -36,6 +38,7 @@ import {
|
|||||||
getParentFolder,
|
getParentFolder,
|
||||||
atWhichLevel,
|
atWhichLevel,
|
||||||
unixTimeToStr,
|
unixTimeToStr,
|
||||||
|
statFix,
|
||||||
} from "./misc";
|
} from "./misc";
|
||||||
import { RemoteClient } from "./remote";
|
import { RemoteClient } from "./remote";
|
||||||
import {
|
import {
|
||||||
@@ -217,22 +220,29 @@ export const parseRemoteItems = async (
|
|||||||
if (backwardMapping !== undefined) {
|
if (backwardMapping !== undefined) {
|
||||||
key = backwardMapping.localKey;
|
key = backwardMapping.localKey;
|
||||||
const mtimeRemote = backwardMapping.localMtime || entry.lastModified;
|
const mtimeRemote = backwardMapping.localMtime || entry.lastModified;
|
||||||
|
|
||||||
|
// the backwardMapping.localSize is the file BEFORE encryption
|
||||||
|
// we want to split two sizes for comparation later
|
||||||
|
|
||||||
r = {
|
r = {
|
||||||
key: key,
|
key: key,
|
||||||
existRemote: true,
|
existRemote: true,
|
||||||
mtimeRemote: mtimeRemote,
|
mtimeRemote: mtimeRemote,
|
||||||
mtimeRemoteFmt: unixTimeToStr(mtimeRemote),
|
mtimeRemoteFmt: unixTimeToStr(mtimeRemote),
|
||||||
sizeRemote: backwardMapping.localSize || entry.size,
|
sizeRemote: backwardMapping.localSize,
|
||||||
|
sizeRemoteEnc: password === "" ? undefined : entry.size,
|
||||||
remoteEncryptedKey: remoteEncryptedKey,
|
remoteEncryptedKey: remoteEncryptedKey,
|
||||||
changeRemoteMtimeUsingMapping: true,
|
changeRemoteMtimeUsingMapping: true,
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
|
// do not have backwardMapping
|
||||||
r = {
|
r = {
|
||||||
key: key,
|
key: key,
|
||||||
existRemote: true,
|
existRemote: true,
|
||||||
mtimeRemote: entry.lastModified,
|
mtimeRemote: entry.lastModified,
|
||||||
mtimeRemoteFmt: unixTimeToStr(entry.lastModified),
|
mtimeRemoteFmt: unixTimeToStr(entry.lastModified),
|
||||||
sizeRemote: entry.size,
|
sizeRemote: password === "" ? entry.size : undefined,
|
||||||
|
sizeRemoteEnc: password === "" ? undefined : entry.size,
|
||||||
remoteEncryptedKey: remoteEncryptedKey,
|
remoteEncryptedKey: remoteEncryptedKey,
|
||||||
changeRemoteMtimeUsingMapping: false,
|
changeRemoteMtimeUsingMapping: false,
|
||||||
};
|
};
|
||||||
@@ -284,8 +294,16 @@ const isSkipItem = (
|
|||||||
key: string,
|
key: string,
|
||||||
syncConfigDir: boolean,
|
syncConfigDir: boolean,
|
||||||
syncUnderscoreItems: boolean,
|
syncUnderscoreItems: boolean,
|
||||||
configDir: string
|
configDir: string,
|
||||||
|
ignorePaths: string[]
|
||||||
) => {
|
) => {
|
||||||
|
if (ignorePaths !== undefined && ignorePaths.length > 0) {
|
||||||
|
for (const r of ignorePaths) {
|
||||||
|
if (XRegExp(r, "A").test(key)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
if (syncConfigDir && isInsideObsFolder(key, configDir)) {
|
if (syncConfigDir && isInsideObsFolder(key, configDir)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -305,14 +323,24 @@ const ensembleMixedStates = async (
|
|||||||
localFileHistory: FileFolderHistoryRecord[],
|
localFileHistory: FileFolderHistoryRecord[],
|
||||||
syncConfigDir: boolean,
|
syncConfigDir: boolean,
|
||||||
configDir: string,
|
configDir: string,
|
||||||
syncUnderscoreItems: boolean
|
syncUnderscoreItems: boolean,
|
||||||
|
ignorePaths: string[],
|
||||||
|
password: string
|
||||||
) => {
|
) => {
|
||||||
const results = {} as Record<string, FileOrFolderMixedState>;
|
const results = {} as Record<string, FileOrFolderMixedState>;
|
||||||
|
|
||||||
for (const r of remoteStates) {
|
for (const r of remoteStates) {
|
||||||
const key = r.key;
|
const key = r.key;
|
||||||
|
|
||||||
if (isSkipItem(key, syncConfigDir, syncUnderscoreItems, configDir)) {
|
if (
|
||||||
|
isSkipItem(
|
||||||
|
key,
|
||||||
|
syncConfigDir,
|
||||||
|
syncUnderscoreItems,
|
||||||
|
configDir,
|
||||||
|
ignorePaths
|
||||||
|
)
|
||||||
|
) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
results[key] = r;
|
results[key] = r;
|
||||||
@@ -327,13 +355,15 @@ const ensembleMixedStates = async (
|
|||||||
// ignore
|
// ignore
|
||||||
continue;
|
continue;
|
||||||
} else if (entry instanceof TFile) {
|
} else if (entry instanceof TFile) {
|
||||||
const mtimeLocal = Math.max(entry.stat.mtime || 0, entry.stat.ctime || 0);
|
const mtimeLocal = Math.max(entry.stat.mtime ?? 0, entry.stat.ctime ?? 0);
|
||||||
r = {
|
r = {
|
||||||
key: entry.path,
|
key: entry.path,
|
||||||
existLocal: true,
|
existLocal: true,
|
||||||
mtimeLocal: mtimeLocal,
|
mtimeLocal: mtimeLocal,
|
||||||
mtimeLocalFmt: unixTimeToStr(mtimeLocal),
|
mtimeLocalFmt: unixTimeToStr(mtimeLocal),
|
||||||
sizeLocal: entry.stat.size,
|
sizeLocal: entry.stat.size,
|
||||||
|
sizeLocalEnc:
|
||||||
|
password === "" ? undefined : getSizeFromOrigToEnc(entry.stat.size),
|
||||||
};
|
};
|
||||||
} else if (entry instanceof TFolder) {
|
} else if (entry instanceof TFolder) {
|
||||||
key = `${entry.path}/`;
|
key = `${entry.path}/`;
|
||||||
@@ -343,12 +373,21 @@ const ensembleMixedStates = async (
|
|||||||
mtimeLocal: undefined,
|
mtimeLocal: undefined,
|
||||||
mtimeLocalFmt: undefined,
|
mtimeLocalFmt: undefined,
|
||||||
sizeLocal: 0,
|
sizeLocal: 0,
|
||||||
|
sizeLocalEnc: password === "" ? undefined : getSizeFromOrigToEnc(0),
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
throw Error(`unexpected ${entry}`);
|
throw Error(`unexpected ${entry}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isSkipItem(key, syncConfigDir, syncUnderscoreItems, configDir)) {
|
if (
|
||||||
|
isSkipItem(
|
||||||
|
key,
|
||||||
|
syncConfigDir,
|
||||||
|
syncUnderscoreItems,
|
||||||
|
configDir,
|
||||||
|
ignorePaths
|
||||||
|
)
|
||||||
|
) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -358,6 +397,7 @@ const ensembleMixedStates = async (
|
|||||||
results[key].mtimeLocal = r.mtimeLocal;
|
results[key].mtimeLocal = r.mtimeLocal;
|
||||||
results[key].mtimeLocalFmt = r.mtimeLocalFmt;
|
results[key].mtimeLocalFmt = r.mtimeLocalFmt;
|
||||||
results[key].sizeLocal = r.sizeLocal;
|
results[key].sizeLocal = r.sizeLocal;
|
||||||
|
results[key].sizeLocalEnc = r.sizeLocalEnc;
|
||||||
} else {
|
} else {
|
||||||
results[key] = r;
|
results[key] = r;
|
||||||
results[key].existRemote = false;
|
results[key].existRemote = false;
|
||||||
@@ -367,21 +407,39 @@ const ensembleMixedStates = async (
|
|||||||
if (syncConfigDir && localConfigDirContents !== undefined) {
|
if (syncConfigDir && localConfigDirContents !== undefined) {
|
||||||
for (const entry of localConfigDirContents) {
|
for (const entry of localConfigDirContents) {
|
||||||
const key = entry.key;
|
const key = entry.key;
|
||||||
const mtimeLocal = Math.max(entry.mtime, entry.ctime);
|
let mtimeLocal = Math.max(entry.mtime ?? 0, entry.ctime ?? 0);
|
||||||
|
if (Number.isNaN(mtimeLocal) || mtimeLocal === 0) {
|
||||||
|
mtimeLocal = undefined;
|
||||||
|
}
|
||||||
const r: FileOrFolderMixedState = {
|
const r: FileOrFolderMixedState = {
|
||||||
key: key,
|
key: key,
|
||||||
existLocal: true,
|
existLocal: true,
|
||||||
mtimeLocal: mtimeLocal,
|
mtimeLocal: mtimeLocal,
|
||||||
mtimeLocalFmt: unixTimeToStr(mtimeLocal),
|
mtimeLocalFmt: unixTimeToStr(mtimeLocal),
|
||||||
sizeLocal: entry.size,
|
sizeLocal: entry.size,
|
||||||
|
sizeLocalEnc:
|
||||||
|
password === "" ? undefined : getSizeFromOrigToEnc(entry.size),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if (
|
||||||
|
isSkipItem(
|
||||||
|
key,
|
||||||
|
syncConfigDir,
|
||||||
|
syncUnderscoreItems,
|
||||||
|
configDir,
|
||||||
|
ignorePaths
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (results.hasOwnProperty(key)) {
|
if (results.hasOwnProperty(key)) {
|
||||||
results[key].key = r.key;
|
results[key].key = r.key;
|
||||||
results[key].existLocal = r.existLocal;
|
results[key].existLocal = r.existLocal;
|
||||||
results[key].mtimeLocal = r.mtimeLocal;
|
results[key].mtimeLocal = r.mtimeLocal;
|
||||||
results[key].mtimeLocalFmt = r.mtimeLocalFmt;
|
results[key].mtimeLocalFmt = r.mtimeLocalFmt;
|
||||||
results[key].sizeLocal = r.sizeLocal;
|
results[key].sizeLocal = r.sizeLocal;
|
||||||
|
results[key].sizeLocalEnc = r.sizeLocalEnc;
|
||||||
} else {
|
} else {
|
||||||
results[key] = r;
|
results[key] = r;
|
||||||
results[key].existRemote = false;
|
results[key].existRemote = false;
|
||||||
@@ -397,7 +455,15 @@ const ensembleMixedStates = async (
|
|||||||
deltimeRemoteFmt: unixTimeToStr(entry.actionWhen),
|
deltimeRemoteFmt: unixTimeToStr(entry.actionWhen),
|
||||||
} as FileOrFolderMixedState;
|
} as FileOrFolderMixedState;
|
||||||
|
|
||||||
if (isSkipItem(key, syncConfigDir, syncUnderscoreItems, configDir)) {
|
if (
|
||||||
|
isSkipItem(
|
||||||
|
key,
|
||||||
|
syncConfigDir,
|
||||||
|
syncUnderscoreItems,
|
||||||
|
configDir,
|
||||||
|
ignorePaths
|
||||||
|
)
|
||||||
|
) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -425,7 +491,15 @@ const ensembleMixedStates = async (
|
|||||||
throw Error(`unexpected ${entry}`);
|
throw Error(`unexpected ${entry}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isSkipItem(key, syncConfigDir, syncUnderscoreItems, configDir)) {
|
if (
|
||||||
|
isSkipItem(
|
||||||
|
key,
|
||||||
|
syncConfigDir,
|
||||||
|
syncUnderscoreItems,
|
||||||
|
configDir,
|
||||||
|
ignorePaths
|
||||||
|
)
|
||||||
|
) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -452,10 +526,13 @@ const ensembleMixedStates = async (
|
|||||||
changeLocalMtimeUsingMapping: true,
|
changeLocalMtimeUsingMapping: true,
|
||||||
};
|
};
|
||||||
if (results.hasOwnProperty(key)) {
|
if (results.hasOwnProperty(key)) {
|
||||||
const mtimeLocal = Math.max(
|
let mtimeLocal = Math.max(
|
||||||
r.mtimeLocal || 0,
|
r.mtimeLocal ?? 0,
|
||||||
results[key].mtimeLocal || 0
|
results[key].mtimeLocal ?? 0
|
||||||
);
|
);
|
||||||
|
if (Number.isNaN(mtimeLocal) || mtimeLocal === 0) {
|
||||||
|
mtimeLocal = undefined;
|
||||||
|
}
|
||||||
results[key].mtimeLocal = mtimeLocal;
|
results[key].mtimeLocal = mtimeLocal;
|
||||||
results[key].mtimeLocalFmt = unixTimeToStr(mtimeLocal);
|
results[key].mtimeLocalFmt = unixTimeToStr(mtimeLocal);
|
||||||
results[key].changeLocalMtimeUsingMapping =
|
results[key].changeLocalMtimeUsingMapping =
|
||||||
@@ -484,6 +561,7 @@ const ensembleMixedStates = async (
|
|||||||
const assignOperationToFileInplace = (
|
const assignOperationToFileInplace = (
|
||||||
origRecord: FileOrFolderMixedState,
|
origRecord: FileOrFolderMixedState,
|
||||||
keptFolder: Set<string>,
|
keptFolder: Set<string>,
|
||||||
|
skipSizeLargerThan: number,
|
||||||
password: string = ""
|
password: string = ""
|
||||||
) => {
|
) => {
|
||||||
let r = origRecord;
|
let r = origRecord;
|
||||||
@@ -526,6 +604,18 @@ const assignOperationToFileInplace = (
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (
|
||||||
|
(r.existLocal && password !== "" && r.sizeLocalEnc === undefined) ||
|
||||||
|
(r.existRemote && password !== "" && r.sizeRemoteEnc === undefined)
|
||||||
|
) {
|
||||||
|
throw new Error(
|
||||||
|
`Error: No encryption sizes: ${JSON.stringify(r, null, 2)}`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const sizeLocalComp = password === "" ? r.sizeLocal : r.sizeLocalEnc;
|
||||||
|
const sizeRemoteComp = password === "" ? r.sizeRemote : r.sizeRemoteEnc;
|
||||||
|
|
||||||
// 1. mtimeLocal
|
// 1. mtimeLocal
|
||||||
if (r.existLocal) {
|
if (r.existLocal) {
|
||||||
const mtimeRemote = r.existRemote ? r.mtimeRemote : -1;
|
const mtimeRemote = r.existRemote ? r.mtimeRemote : -1;
|
||||||
@@ -536,26 +626,79 @@ const assignOperationToFileInplace = (
|
|||||||
r.mtimeLocal >= deltimeLocal &&
|
r.mtimeLocal >= deltimeLocal &&
|
||||||
r.mtimeLocal >= deltimeRemote
|
r.mtimeLocal >= deltimeRemote
|
||||||
) {
|
) {
|
||||||
|
if (sizeLocalComp === undefined) {
|
||||||
|
throw new Error(
|
||||||
|
`Error: no local size but has local mtime: ${JSON.stringify(
|
||||||
|
r,
|
||||||
|
null,
|
||||||
|
2
|
||||||
|
)}`
|
||||||
|
);
|
||||||
|
}
|
||||||
if (r.mtimeLocal === r.mtimeRemote) {
|
if (r.mtimeLocal === r.mtimeRemote) {
|
||||||
// mtime the same
|
// local and remote both exist and mtimes are the same
|
||||||
if (password === "") {
|
if (sizeLocalComp === sizeRemoteComp) {
|
||||||
// no password, we can also compare the sizes!
|
// do not need to consider skipSizeLargerThan in this case
|
||||||
if (r.sizeLocal === r.sizeRemote) {
|
r.decision = "skipUploading";
|
||||||
r.decision = "skipUploading";
|
r.decisionBranch = 1;
|
||||||
r.decisionBranch = 1;
|
} else {
|
||||||
} else {
|
if (skipSizeLargerThan <= 0) {
|
||||||
r.decision = "uploadLocalToRemote";
|
r.decision = "uploadLocalToRemote";
|
||||||
r.decisionBranch = 2;
|
r.decisionBranch = 2;
|
||||||
|
} else {
|
||||||
|
// limit the sizes
|
||||||
|
if (sizeLocalComp <= skipSizeLargerThan) {
|
||||||
|
if (sizeRemoteComp <= skipSizeLargerThan) {
|
||||||
|
r.decision = "uploadLocalToRemote";
|
||||||
|
r.decisionBranch = 18;
|
||||||
|
} else {
|
||||||
|
r.decision = "errorRemoteTooLargeConflictLocal";
|
||||||
|
r.decisionBranch = 19;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (sizeRemoteComp <= skipSizeLargerThan) {
|
||||||
|
r.decision = "errorLocalTooLargeConflictRemote";
|
||||||
|
r.decisionBranch = 20;
|
||||||
|
} else {
|
||||||
|
r.decision = "skipUploadingTooLarge";
|
||||||
|
r.decisionBranch = 21;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
// we have password, then the sizes are always unequal
|
|
||||||
// we can only rely on mtime
|
|
||||||
r.decision = "skipUploading";
|
|
||||||
r.decisionBranch = 3;
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
r.decision = "uploadLocalToRemote";
|
// we have local laregest mtime,
|
||||||
r.decisionBranch = 4;
|
// and the remote not existing or smaller mtime
|
||||||
|
if (skipSizeLargerThan <= 0) {
|
||||||
|
// no need to consider sizes
|
||||||
|
r.decision = "uploadLocalToRemote";
|
||||||
|
r.decisionBranch = 4;
|
||||||
|
} else {
|
||||||
|
// need to consider sizes
|
||||||
|
if (sizeLocalComp <= skipSizeLargerThan) {
|
||||||
|
if (sizeRemoteComp === undefined) {
|
||||||
|
r.decision = "uploadLocalToRemote";
|
||||||
|
r.decisionBranch = 22;
|
||||||
|
} else if (sizeRemoteComp <= skipSizeLargerThan) {
|
||||||
|
r.decision = "uploadLocalToRemote";
|
||||||
|
r.decisionBranch = 23;
|
||||||
|
} else {
|
||||||
|
r.decision = "errorRemoteTooLargeConflictLocal";
|
||||||
|
r.decisionBranch = 24;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (sizeRemoteComp === undefined) {
|
||||||
|
r.decision = "skipUploadingTooLarge";
|
||||||
|
r.decisionBranch = 25;
|
||||||
|
} else if (sizeRemoteComp <= skipSizeLargerThan) {
|
||||||
|
r.decision = "errorLocalTooLargeConflictRemote";
|
||||||
|
r.decisionBranch = 26;
|
||||||
|
} else {
|
||||||
|
r.decision = "skipUploadingTooLarge";
|
||||||
|
r.decisionBranch = 27;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
keptFolder.add(getParentFolder(r.key));
|
keptFolder.add(getParentFolder(r.key));
|
||||||
return r;
|
return r;
|
||||||
@@ -572,8 +715,49 @@ const assignOperationToFileInplace = (
|
|||||||
r.mtimeRemote >= deltimeLocal &&
|
r.mtimeRemote >= deltimeLocal &&
|
||||||
r.mtimeRemote >= deltimeRemote
|
r.mtimeRemote >= deltimeRemote
|
||||||
) {
|
) {
|
||||||
r.decision = "downloadRemoteToLocal";
|
// we have remote laregest mtime,
|
||||||
r.decisionBranch = 5;
|
// and the local not existing or smaller mtime
|
||||||
|
if (sizeRemoteComp === undefined) {
|
||||||
|
throw new Error(
|
||||||
|
`Error: no remote size but has remote mtime: ${JSON.stringify(
|
||||||
|
r,
|
||||||
|
null,
|
||||||
|
2
|
||||||
|
)}`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (skipSizeLargerThan <= 0) {
|
||||||
|
// no need to consider sizes
|
||||||
|
r.decision = "downloadRemoteToLocal";
|
||||||
|
r.decisionBranch = 5;
|
||||||
|
} else {
|
||||||
|
// need to consider sizes
|
||||||
|
if (sizeRemoteComp <= skipSizeLargerThan) {
|
||||||
|
if (sizeLocalComp === undefined) {
|
||||||
|
r.decision = "downloadRemoteToLocal";
|
||||||
|
r.decisionBranch = 28;
|
||||||
|
} else if (sizeLocalComp <= skipSizeLargerThan) {
|
||||||
|
r.decision = "downloadRemoteToLocal";
|
||||||
|
r.decisionBranch = 29;
|
||||||
|
} else {
|
||||||
|
r.decision = "errorLocalTooLargeConflictRemote";
|
||||||
|
r.decisionBranch = 30;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (sizeLocalComp === undefined) {
|
||||||
|
r.decision = "skipDownloadingTooLarge";
|
||||||
|
r.decisionBranch = 31;
|
||||||
|
} else if (sizeLocalComp <= skipSizeLargerThan) {
|
||||||
|
r.decision = "errorRemoteTooLargeConflictLocal";
|
||||||
|
r.decisionBranch = 32;
|
||||||
|
} else {
|
||||||
|
r.decision = "skipDownloadingTooLarge";
|
||||||
|
r.decisionBranch = 33;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
keptFolder.add(getParentFolder(r.key));
|
keptFolder.add(getParentFolder(r.key));
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
@@ -589,10 +773,44 @@ const assignOperationToFileInplace = (
|
|||||||
r.deltimeLocal >= mtimeRemote &&
|
r.deltimeLocal >= mtimeRemote &&
|
||||||
r.deltimeLocal >= deltimeRemote
|
r.deltimeLocal >= deltimeRemote
|
||||||
) {
|
) {
|
||||||
r.decision = "uploadLocalDelHistToRemote";
|
if (skipSizeLargerThan <= 0) {
|
||||||
r.decisionBranch = 6;
|
r.decision = "uploadLocalDelHistToRemote";
|
||||||
if (r.existLocal || r.existRemote) {
|
r.decisionBranch = 6;
|
||||||
// actual deletion would happen
|
if (r.existLocal || r.existRemote) {
|
||||||
|
// actual deletion would happen
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
const localTooLargeToDelete =
|
||||||
|
r.existLocal && sizeLocalComp > skipSizeLargerThan;
|
||||||
|
const remoteTooLargeToDelete =
|
||||||
|
r.existRemote && sizeRemoteComp > skipSizeLargerThan;
|
||||||
|
if (localTooLargeToDelete) {
|
||||||
|
if (remoteTooLargeToDelete) {
|
||||||
|
r.decision = "skipUsingLocalDelTooLarge";
|
||||||
|
r.decisionBranch = 34;
|
||||||
|
} else {
|
||||||
|
if (r.existRemote) {
|
||||||
|
r.decision = "errorLocalTooLargeConflictRemote";
|
||||||
|
r.decisionBranch = 35;
|
||||||
|
} else {
|
||||||
|
r.decision = "skipUsingLocalDelTooLarge";
|
||||||
|
r.decisionBranch = 36;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (remoteTooLargeToDelete) {
|
||||||
|
if (r.existLocal) {
|
||||||
|
r.decision = "errorLocalTooLargeConflictRemote";
|
||||||
|
r.decisionBranch = 37;
|
||||||
|
} else {
|
||||||
|
r.decision = "skipUsingLocalDelTooLarge";
|
||||||
|
r.decisionBranch = 38;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
r.decision = "uploadLocalDelHistToRemote";
|
||||||
|
r.decisionBranch = 39;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
@@ -608,10 +826,44 @@ const assignOperationToFileInplace = (
|
|||||||
r.deltimeRemote >= mtimeRemote &&
|
r.deltimeRemote >= mtimeRemote &&
|
||||||
r.deltimeRemote >= deltimeLocal
|
r.deltimeRemote >= deltimeLocal
|
||||||
) {
|
) {
|
||||||
r.decision = "keepRemoteDelHist";
|
if (skipSizeLargerThan <= 0) {
|
||||||
r.decisionBranch = 7;
|
r.decision = "keepRemoteDelHist";
|
||||||
if (r.existLocal || r.existRemote) {
|
r.decisionBranch = 7;
|
||||||
// actual deletion would happen
|
if (r.existLocal || r.existRemote) {
|
||||||
|
// actual deletion would happen
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
const localTooLargeToDelete =
|
||||||
|
r.existLocal && sizeLocalComp > skipSizeLargerThan;
|
||||||
|
const remoteTooLargeToDelete =
|
||||||
|
r.existRemote && sizeRemoteComp > skipSizeLargerThan;
|
||||||
|
if (localTooLargeToDelete) {
|
||||||
|
if (remoteTooLargeToDelete) {
|
||||||
|
r.decision = "skipUsingRemoteDelTooLarge";
|
||||||
|
r.decisionBranch = 40;
|
||||||
|
} else {
|
||||||
|
if (r.existRemote) {
|
||||||
|
r.decision = "errorLocalTooLargeConflictRemote";
|
||||||
|
r.decisionBranch = 41;
|
||||||
|
} else {
|
||||||
|
r.decision = "skipUsingRemoteDelTooLarge";
|
||||||
|
r.decisionBranch = 42;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (remoteTooLargeToDelete) {
|
||||||
|
if (r.existLocal) {
|
||||||
|
r.decision = "errorLocalTooLargeConflictRemote";
|
||||||
|
r.decisionBranch = 43;
|
||||||
|
} else {
|
||||||
|
r.decision = "skipUsingRemoteDelTooLarge";
|
||||||
|
r.decisionBranch = 44;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
r.decision = "keepRemoteDelHist";
|
||||||
|
r.decisionBranch = 45;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
@@ -647,9 +899,14 @@ const assignOperationToFolderInplace = async (
|
|||||||
// if it was created after deletion, we should keep it as is
|
// if it was created after deletion, we should keep it as is
|
||||||
if (requireApiVersion(API_VER_STAT_FOLDER)) {
|
if (requireApiVersion(API_VER_STAT_FOLDER)) {
|
||||||
if (r.existLocal) {
|
if (r.existLocal) {
|
||||||
const { ctime, mtime } = await vault.adapter.stat(r.key);
|
const { ctime, mtime } = await statFix(vault, r.key);
|
||||||
const cmtime = Math.max(ctime, mtime);
|
const cmtime = Math.max(ctime ?? 0, mtime ?? 0);
|
||||||
if (cmtime > 0 && cmtime >= deltimeLocal && cmtime >= deltimeRemote) {
|
if (
|
||||||
|
!Number.isNaN(cmtime) &&
|
||||||
|
cmtime > 0 &&
|
||||||
|
cmtime >= deltimeLocal &&
|
||||||
|
cmtime >= deltimeRemote
|
||||||
|
) {
|
||||||
keptFolder.add(getParentFolder(r.key));
|
keptFolder.add(getParentFolder(r.key));
|
||||||
if (r.existLocal && r.existRemote) {
|
if (r.existLocal && r.existRemote) {
|
||||||
r.decision = "skipFolder";
|
r.decision = "skipFolder";
|
||||||
@@ -746,6 +1003,10 @@ const DELETION_DECISIONS: Set<DecisionType> = new Set([
|
|||||||
"uploadLocalDelHistToRemoteFolder",
|
"uploadLocalDelHistToRemoteFolder",
|
||||||
"keepRemoteDelHistFolder",
|
"keepRemoteDelHistFolder",
|
||||||
]);
|
]);
|
||||||
|
const SIZES_GO_WRONG_DECISIONS: Set<DecisionType> = new Set([
|
||||||
|
"errorLocalTooLargeConflictRemote",
|
||||||
|
"errorRemoteTooLargeConflictLocal",
|
||||||
|
]);
|
||||||
|
|
||||||
export const getSyncPlan = async (
|
export const getSyncPlan = async (
|
||||||
remoteStates: FileOrFolderMixedState[],
|
remoteStates: FileOrFolderMixedState[],
|
||||||
@@ -759,6 +1020,8 @@ export const getSyncPlan = async (
|
|||||||
syncConfigDir: boolean,
|
syncConfigDir: boolean,
|
||||||
configDir: string,
|
configDir: string,
|
||||||
syncUnderscoreItems: boolean,
|
syncUnderscoreItems: boolean,
|
||||||
|
skipSizeLargerThan: number,
|
||||||
|
ignorePaths: string[],
|
||||||
password: string = ""
|
password: string = ""
|
||||||
) => {
|
) => {
|
||||||
const mixedStates = await ensembleMixedStates(
|
const mixedStates = await ensembleMixedStates(
|
||||||
@@ -769,13 +1032,16 @@ export const getSyncPlan = async (
|
|||||||
localFileHistory,
|
localFileHistory,
|
||||||
syncConfigDir,
|
syncConfigDir,
|
||||||
configDir,
|
configDir,
|
||||||
syncUnderscoreItems
|
syncUnderscoreItems,
|
||||||
|
ignorePaths,
|
||||||
|
password
|
||||||
);
|
);
|
||||||
|
|
||||||
const sortedKeys = Object.keys(mixedStates).sort(
|
const sortedKeys = Object.keys(mixedStates).sort(
|
||||||
(k1, k2) => k2.length - k1.length
|
(k1, k2) => k2.length - k1.length
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const sizesGoWrong: FileOrFolderMixedState[] = [];
|
||||||
const deletions: DeletionOnRemote[] = [];
|
const deletions: DeletionOnRemote[] = [];
|
||||||
|
|
||||||
const keptFolder = new Set<string>();
|
const keptFolder = new Set<string>();
|
||||||
@@ -791,7 +1057,16 @@ export const getSyncPlan = async (
|
|||||||
} else {
|
} else {
|
||||||
// get all operations of files
|
// get all operations of files
|
||||||
// and at the same time get some helper info for folders
|
// and at the same time get some helper info for folders
|
||||||
assignOperationToFileInplace(val, keptFolder, password);
|
assignOperationToFileInplace(
|
||||||
|
val,
|
||||||
|
keptFolder,
|
||||||
|
skipSizeLargerThan,
|
||||||
|
password
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (SIZES_GO_WRONG_DECISIONS.has(val.decision)) {
|
||||||
|
sizesGoWrong.push(val);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (DELETION_DECISIONS.has(val.decision)) {
|
if (DELETION_DECISIONS.has(val.decision)) {
|
||||||
@@ -834,6 +1109,7 @@ export const getSyncPlan = async (
|
|||||||
plan: plan,
|
plan: plan,
|
||||||
sortedKeys: sortedKeys,
|
sortedKeys: sortedKeys,
|
||||||
deletions: deletions,
|
deletions: deletions,
|
||||||
|
sizesGoWrong: sizesGoWrong,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1015,6 +1291,14 @@ const dispatchOperationToActual = async (
|
|||||||
await clearDeleteRenameHistoryOfKeyAndVault(db, r.key, vaultRandomID);
|
await clearDeleteRenameHistoryOfKeyAndVault(db, r.key, vaultRandomID);
|
||||||
} else if (r.decision === "skipFolder") {
|
} else if (r.decision === "skipFolder") {
|
||||||
// do nothing!
|
// do nothing!
|
||||||
|
} else if (r.decision === "skipUploadingTooLarge") {
|
||||||
|
// do nothing!
|
||||||
|
} else if (r.decision === "skipDownloadingTooLarge") {
|
||||||
|
// do nothing!
|
||||||
|
} else if (r.decision === "skipUsingLocalDelTooLarge") {
|
||||||
|
// do nothing!
|
||||||
|
} else if (r.decision === "skipUsingRemoteDelTooLarge") {
|
||||||
|
// do nothing!
|
||||||
} else {
|
} else {
|
||||||
throw Error(`unknown decision in ${JSON.stringify(r)}`);
|
throw Error(`unknown decision in ${JSON.stringify(r)}`);
|
||||||
}
|
}
|
||||||
@@ -1033,7 +1317,14 @@ const splitThreeSteps = (syncPlan: SyncPlanType, sortedKeys: string[]) => {
|
|||||||
const key = sortedKeys[i];
|
const key = sortedKeys[i];
|
||||||
const val: FileOrFolderMixedState = Object.assign({}, mixedStates[key]); // copy to avoid issue
|
const val: FileOrFolderMixedState = Object.assign({}, mixedStates[key]); // copy to avoid issue
|
||||||
|
|
||||||
if (val.decision === "skipFolder" || val.decision === "skipUploading") {
|
if (
|
||||||
|
val.decision === "skipFolder" ||
|
||||||
|
val.decision === "skipUploading" ||
|
||||||
|
val.decision === "skipDownloadingTooLarge" ||
|
||||||
|
val.decision === "skipUploadingTooLarge" ||
|
||||||
|
val.decision === "skipUsingLocalDelTooLarge" ||
|
||||||
|
val.decision === "skipUsingRemoteDelTooLarge"
|
||||||
|
) {
|
||||||
// pass
|
// pass
|
||||||
} else if (val.decision === "createFolder") {
|
} else if (val.decision === "createFolder") {
|
||||||
const level = atWhichLevel(key);
|
const level = atWhichLevel(key);
|
||||||
@@ -1093,15 +1384,23 @@ export const doActualSync = async (
|
|||||||
sortedKeys: string[],
|
sortedKeys: string[],
|
||||||
metadataFile: FileOrFolderMixedState,
|
metadataFile: FileOrFolderMixedState,
|
||||||
origMetadata: MetadataOnRemote,
|
origMetadata: MetadataOnRemote,
|
||||||
|
sizesGoWrong: FileOrFolderMixedState[],
|
||||||
deletions: DeletionOnRemote[],
|
deletions: DeletionOnRemote[],
|
||||||
localDeleteFunc: any,
|
localDeleteFunc: any,
|
||||||
password: string = "",
|
password: string = "",
|
||||||
concurrency: number = 1,
|
concurrency: number = 1,
|
||||||
|
callbackSizesGoWrong?: any,
|
||||||
callbackSyncProcess?: any
|
callbackSyncProcess?: any
|
||||||
) => {
|
) => {
|
||||||
const mixedStates = syncPlan.mixedStates;
|
const mixedStates = syncPlan.mixedStates;
|
||||||
const totalCount = sortedKeys.length || 0;
|
const totalCount = sortedKeys.length || 0;
|
||||||
|
|
||||||
|
if (sizesGoWrong.length > 0) {
|
||||||
|
log.debug(`some sizes are larger than the threshold, abort and show hints`);
|
||||||
|
callbackSizesGoWrong(sizesGoWrong);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
log.debug(`start syncing extra data firstly`);
|
log.debug(`start syncing extra data firstly`);
|
||||||
await uploadExtraMeta(
|
await uploadExtraMeta(
|
||||||
client,
|
client,
|
||||||
|
|||||||
@@ -0,0 +1,90 @@
|
|||||||
|
import { App, Modal, Notice, PluginSettingTab, Setting } from "obsidian";
|
||||||
|
import type RemotelySavePlugin from "./main"; // unavoidable
|
||||||
|
import type { TransItemType } from "./i18n";
|
||||||
|
import type { FileOrFolderMixedState } from "./baseTypes";
|
||||||
|
|
||||||
|
import { log } from "./moreOnLog";
|
||||||
|
|
||||||
|
export class SizesConflictModal extends Modal {
|
||||||
|
readonly plugin: RemotelySavePlugin;
|
||||||
|
readonly skipSizeLargerThan: number;
|
||||||
|
readonly sizesGoWrong: FileOrFolderMixedState[];
|
||||||
|
readonly hasPassword: boolean;
|
||||||
|
constructor(
|
||||||
|
app: App,
|
||||||
|
plugin: RemotelySavePlugin,
|
||||||
|
skipSizeLargerThan: number,
|
||||||
|
sizesGoWrong: FileOrFolderMixedState[],
|
||||||
|
hasPassword: boolean
|
||||||
|
) {
|
||||||
|
super(app);
|
||||||
|
this.plugin = plugin;
|
||||||
|
this.skipSizeLargerThan = skipSizeLargerThan;
|
||||||
|
this.sizesGoWrong = sizesGoWrong;
|
||||||
|
this.hasPassword = hasPassword;
|
||||||
|
}
|
||||||
|
onOpen() {
|
||||||
|
let { contentEl } = this;
|
||||||
|
const t = (x: TransItemType, vars?: any) => {
|
||||||
|
return this.plugin.i18n.t(x, vars);
|
||||||
|
};
|
||||||
|
|
||||||
|
contentEl.createEl("h2", {
|
||||||
|
text: t("modal_sizesconflict_title"),
|
||||||
|
});
|
||||||
|
|
||||||
|
t("modal_sizesconflict_desc", {
|
||||||
|
thresholdMB: `${this.skipSizeLargerThan / 1000 / 1000}`,
|
||||||
|
thresholdBytes: `${this.skipSizeLargerThan}`,
|
||||||
|
})
|
||||||
|
.split("\n")
|
||||||
|
.forEach((val) => {
|
||||||
|
contentEl.createEl("p", { text: val });
|
||||||
|
});
|
||||||
|
|
||||||
|
const info = this.serialize();
|
||||||
|
|
||||||
|
contentEl.createDiv().createEl(
|
||||||
|
"button",
|
||||||
|
{
|
||||||
|
text: t("modal_sizesconflict_copybutton"),
|
||||||
|
},
|
||||||
|
(el) => {
|
||||||
|
el.onclick = async () => {
|
||||||
|
await navigator.clipboard.writeText(info);
|
||||||
|
new Notice(t("modal_sizesconflict_copynotice"));
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
contentEl.createEl("pre", {
|
||||||
|
text: info,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
serialize() {
|
||||||
|
return this.sizesGoWrong
|
||||||
|
.map((x) => {
|
||||||
|
return [
|
||||||
|
x.key,
|
||||||
|
this.hasPassword
|
||||||
|
? `encrypted name: ${x.remoteEncryptedKey}`
|
||||||
|
: undefined,
|
||||||
|
`local ${this.hasPassword ? "encrypted " : ""}bytes: ${
|
||||||
|
this.hasPassword ? x.sizeLocalEnc : x.sizeLocal
|
||||||
|
}`,
|
||||||
|
`remote ${this.hasPassword ? "encrypted " : ""}bytes: ${
|
||||||
|
this.hasPassword ? x.sizeRemoteEnc : x.sizeRemote
|
||||||
|
}`,
|
||||||
|
]
|
||||||
|
.filter((tmp) => tmp !== undefined)
|
||||||
|
.join("\n");
|
||||||
|
})
|
||||||
|
.join("\n\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
onClose() {
|
||||||
|
let { contentEl } = this;
|
||||||
|
contentEl.empty();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,6 +8,11 @@
|
|||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.settings-auth-related {
|
||||||
|
border-top: 1px solid var(--background-modifier-border);
|
||||||
|
padding-top: 18px;
|
||||||
|
}
|
||||||
|
|
||||||
.s3-disclaimer {
|
.s3-disclaimer {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
@@ -56,3 +61,7 @@
|
|||||||
width: 350px;
|
width: 350px;
|
||||||
height: 350px;
|
height: 350px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.ignorepaths-textarea {
|
||||||
|
font-family: monospace;
|
||||||
|
}
|
||||||
|
|||||||
+23
-1
@@ -29,6 +29,14 @@ describe("Encryption tests", () => {
|
|||||||
expect(await encryptStringToBase32(k, password)).to.not.equal(k);
|
expect(await encryptStringToBase32(k, password)).to.not.equal(k);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("should encrypt string and return different results each time", async () => {
|
||||||
|
const k = "dkjdhkfhdkjgsdklxxd";
|
||||||
|
const password = "hey";
|
||||||
|
const res1 = await encryptStringToBase32(k, password);
|
||||||
|
const res2 = await encryptStringToBase32(k, password);
|
||||||
|
expect(res1).to.not.equal(res2);
|
||||||
|
});
|
||||||
|
|
||||||
it("should raise error using different password", async () => {
|
it("should raise error using different password", async () => {
|
||||||
const k = "secret text";
|
const k = "secret text";
|
||||||
const password = "hey";
|
const password = "hey";
|
||||||
@@ -97,7 +105,21 @@ describe("Encryption tests", () => {
|
|||||||
expect(Buffer.from(enc).equals(Buffer.from(opensslArrBuf))).to.be.true;
|
expect(Buffer.from(enc).equals(Buffer.from(opensslArrBuf))).to.be.true;
|
||||||
});
|
});
|
||||||
|
|
||||||
it("should descypt binary file and get the same result as openssl", async () => {
|
it("should encrypt binary file not deterministically", async () => {
|
||||||
|
const testFolder = path.join(__dirname, "static_assets", "mona_lisa");
|
||||||
|
const testFileName =
|
||||||
|
"1374px-Mona_Lisa,_by_Leonardo_da_Vinci,_from_C2RMF_retouched.jpg";
|
||||||
|
const fileArrBuf = bufferToArrayBuffer(
|
||||||
|
await fs.readFileSync(path.join(testFolder, testFileName))
|
||||||
|
);
|
||||||
|
const password = "somepassword";
|
||||||
|
const res1 = await encryptArrayBuffer(fileArrBuf, password);
|
||||||
|
const res2 = await encryptArrayBuffer(fileArrBuf, password);
|
||||||
|
|
||||||
|
expect(Buffer.from(res1).equals(Buffer.from(res2))).to.be.false;
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should decrypt binary file and get the same result as openssl", async () => {
|
||||||
const testFolder = path.join(__dirname, "static_assets", "mona_lisa");
|
const testFolder = path.join(__dirname, "static_assets", "mona_lisa");
|
||||||
const testFileName =
|
const testFileName =
|
||||||
"1374px-Mona_Lisa,_by_Leonardo_da_Vinci,_from_C2RMF_retouched.jpg";
|
"1374px-Mona_Lisa,_by_Leonardo_da_Vinci,_from_C2RMF_retouched.jpg";
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
{
|
{
|
||||||
"0.3.2": "0.12.15",
|
"0.3.2": "0.12.15",
|
||||||
"0.3.21": "0.13.21"
|
"0.3.25": "0.13.21"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,6 +41,12 @@ module.exports = {
|
|||||||
test: /\.svg?$/,
|
test: /\.svg?$/,
|
||||||
type: "asset/source",
|
type: "asset/source",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
test: /\.m?js$/,
|
||||||
|
resolve: {
|
||||||
|
fullySpecified: false, // process/browser returns some errors before
|
||||||
|
},
|
||||||
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
resolve: {
|
resolve: {
|
||||||
@@ -55,7 +61,9 @@ module.exports = {
|
|||||||
// crypto: false,
|
// crypto: false,
|
||||||
// domain: require.resolve("domain-browser"),
|
// domain: require.resolve("domain-browser"),
|
||||||
// events: require.resolve("events"),
|
// events: require.resolve("events"),
|
||||||
|
http: false,
|
||||||
// http: require.resolve("stream-http"),
|
// http: require.resolve("stream-http"),
|
||||||
|
https: false,
|
||||||
// https: require.resolve("https-browserify"),
|
// https: require.resolve("https-browserify"),
|
||||||
net: false,
|
net: false,
|
||||||
// os: require.resolve("os-browserify/browser"),
|
// os: require.resolve("os-browserify/browser"),
|
||||||
|
|||||||
Reference in New Issue
Block a user