Compare commits
	
		
			589 Commits
		
	
	
		
			v0.24.4-be
			...
			v0.32.0-be
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | d614967d62 | ||
|  | 35648b9f37 | ||
|  | 494a980ecb | ||
|  | 810aa8c2fb | ||
|  | 027b3eaed8 | ||
|  | dedc1e708f | ||
|  | 79956b5676 | ||
|  | 48b1aece4d | ||
|  | eee75bd2e8 | ||
|  | 29828f8e8f | ||
|  | ced02b42b5 | ||
|  | 3fe9218ea8 | ||
|  | ff5ea8b311 | ||
|  | 32fae5e9e8 | ||
|  | 48b4488a58 | ||
|  | aead6a44de | ||
|  | f59f08fa0e | ||
|  | 119d7367da | ||
|  | ddb99a0917 | ||
|  | ecfba95841 | ||
|  | 597eb5a300 | ||
|  | f3e7e6bbe7 | ||
|  | 722380e7b8 | ||
|  | 8c46e96397 | ||
|  | f22cc37df7 | ||
|  | dd1fc23fe8 | ||
|  | 2178f82324 | ||
|  | 79d779dee8 | ||
|  | 93c0469aa0 | ||
|  | 81d10fa605 | ||
|  | 75ef766649 | ||
|  | fab8b77794 | ||
|  | 8b030a2323 | ||
|  | 14c420b782 | ||
|  | 637547a3fa | ||
|  | c39c1baa4d | ||
|  | b9edd0ecc7 | ||
|  | 2dec8f1ad6 | ||
|  | bd97df5ee9 | ||
|  | 8a501521e8 | ||
|  | be68391c37 | ||
|  | 89d4be504d | ||
|  | 0a2acbe4be | ||
|  | a7a42ff4af | ||
|  | bacf163c96 | ||
|  | db7e083a21 | ||
|  | 8eaf44735a | ||
|  | bfc61f8b36 | ||
|  | 4ea27e604f | ||
|  | aef0e552a0 | ||
|  | d36bff2a97 | ||
|  | 61696f0287 | ||
|  | 9a97fe09ee | ||
|  | b1d0cef33b | ||
|  | 7f0c92c56b | ||
|  | b21568806a | ||
|  | 80fb89b794 | ||
|  | 47d28b4eef | ||
|  | a9762c5139 | ||
|  | 32439ed006 | ||
|  | ff41904d72 | ||
|  | 39093cbc4c | ||
|  | c7b5784123 | ||
|  | 3e22804a76 | ||
|  | 7ce98b0b28 | ||
|  | 0d11cadc18 | ||
|  | 63ab82a076 | ||
|  | 7e03f14e01 | ||
|  | c9183f8bd4 | ||
|  | bc2d1f1ef9 | ||
|  | e7c053d273 | ||
|  | 3ccf553fda | ||
|  | 6d2eb7b187 | ||
|  | 7234324112 | ||
|  | 8205cdc288 | ||
|  | 29931bbddf | ||
|  | 68cd4c9a31 | ||
|  | f4b986e1c1 | ||
|  | c0496ebef3 | ||
|  | 6aa30a4c74 | ||
|  | 3035a948b9 | ||
|  | 7880cf62fe | ||
|  | ff76ba7d1b | ||
|  | 06be593fe4 | ||
|  | 91e3eb8ae7 | ||
|  | f7dd3558a7 | ||
|  | eac5ec6e26 | ||
|  | f273b4334e | ||
|  | 15eaf67189 | ||
|  | 983d9c4319 | ||
|  | a88a00b60e | ||
|  | a44f43b133 | ||
|  | 69677b15fe | ||
|  | 2573c3b8a6 | ||
|  | 0b0e9f2953 | ||
|  | 1990c9399e | ||
|  | 151641b659 | ||
|  | 36c6376220 | ||
|  | f0e22b70f6 | ||
|  | 225e893461 | ||
|  | 064a11d872 | ||
|  | 3760835608 | ||
|  | e7ac2ec4ed | ||
|  | 8da8dfc543 | ||
|  | 6b3c8b4bac | ||
|  | 25fe78012f | ||
|  | 147d79c65c | ||
|  | 6fddd2bd62 | ||
|  | 77c9b64dc7 | ||
|  | 47cb7c7f5e | ||
|  | 1bd769827d | ||
|  | 288ec88c2f | ||
|  | 71916b5e28 | ||
|  | b2d4330692 | ||
|  | 253a6ef081 | ||
|  | e1e020c1a4 | ||
|  | 2b4413a1bd | ||
|  | dae674a7cd | ||
|  | 751bf94758 | ||
|  | 4b934a4a81 | ||
|  | 7e374e795b | ||
|  | be378f71b0 | ||
|  | 27f74489fd | ||
|  | ae8f4ffbbe | ||
|  | 896776516b | ||
|  | a27525af9e | ||
|  | 83b4382787 | ||
|  | ef1b32d586 | ||
|  | fe3a0bc756 | ||
|  | 2259e1d44d | ||
|  | 9ca4a016eb | ||
|  | 2978a262f7 | ||
|  | f47f3461e6 | ||
|  | 06202c31e4 | ||
|  | 925dc258a6 | ||
|  | 3670800a51 | ||
|  | 90a331b989 | ||
|  | a4c8bdeda2 | ||
|  | 5bda254184 | ||
|  | 26621c0318 | ||
|  | c6806256fd | ||
|  | f00e1235f9 | ||
|  | 51bede6541 | ||
|  | 75dbaa4b77 | ||
|  | bec6576620 | ||
|  | 44551e0e8c | ||
|  | 67553cb40e | ||
|  | 7cafbda7cd | ||
|  | 9a5a085103 | ||
|  | cdb17ae937 | ||
|  | c240fb9896 | ||
|  | 4b41eddf44 | ||
|  | b51ac112a2 | ||
|  | a1ac609b34 | ||
|  | 66e2a12f3d | ||
|  | 9f69294f7f | ||
|  | a5fc8d5329 | ||
|  | 7bbf797caf | ||
|  | f479c0e10e | ||
|  | 0f32154b91 | ||
|  | f2019ee5f9 | ||
|  | 89b8e2bb08 | ||
|  | 8fb6edad67 | ||
|  | c2e3a3fe04 | ||
|  | b2052a6ccd | ||
|  | a07479cd5a | ||
|  | 3820384f51 | ||
|  | 0610576e5a | ||
|  | efac7701eb | ||
|  | 905eb303bc | ||
|  | 27cee1cf33 | ||
|  | 3c56d29fca | ||
|  | 946dae72d9 | ||
|  | 58f71c7300 | ||
|  | 07e9013152 | ||
|  | 29c60581a6 | ||
|  | 4bdcf32475 | ||
|  | 44c742e839 | ||
|  | 001bd1d004 | ||
|  | 6c7e2f0aa1 | ||
|  | 9fc5d328b4 | ||
|  | f6413d095c | ||
|  | d66ad4319e | ||
|  | 251fcaeb48 | ||
|  | 3311c6336c | ||
|  | fc13e1fa6a | ||
|  | 9ca680f842 | ||
|  | 616829464f | ||
|  | 0267468cd5 | ||
|  | ca0d17d93a | ||
|  | 3f656ea76f | ||
|  | 1faf2c6ecd | ||
|  | 33f2aaa650 | ||
|  | 177caec011 | ||
|  | 62650a4545 | ||
|  | 81dc907afc | ||
|  | 3ee33e1024 | ||
|  | 2326eb85f1 | ||
|  | 0885e60b80 | ||
|  | ef40c66344 | ||
|  | 0d0464549f | ||
|  | b68b0fe783 | ||
|  | b4c6d9f800 | ||
|  | 24c8b39d8e | ||
|  | 0144dc12df | ||
|  | 65684550a8 | ||
|  | 6d09931a39 | ||
|  | 1c41d459f0 | ||
|  | f65fefe7b1 | ||
|  | 0a906b5663 | ||
|  | dd9b7bbbb5 | ||
|  | d25a1e3ed9 | ||
|  | 05374becfd | ||
|  | 37d2a7939c | ||
|  | a432ad7483 | ||
|  | ae17e4dc60 | ||
|  | 02eddc347a | ||
|  | ee58bf3d5c | ||
|  | ecbaffa5f3 | ||
|  | fe86c09f22 | ||
|  | c8e01d6cce | ||
|  | fd0bd5dd00 | ||
|  | cd6d4fb527 | ||
|  | 8ed6851e85 | ||
|  | a6fd3bfb00 | ||
|  | 610dd8a783 | ||
|  | 7c404f03db | ||
|  | ed1cf6aad5 | ||
|  | 9703fd61e2 | ||
|  | 16790e388b | ||
|  | b48474998b | ||
|  | 95d8f07458 | ||
|  | e628c30c89 | ||
|  | 52a8aae74f | ||
|  | 54b5898582 | ||
|  | 64974d75d5 | ||
|  | bd118027fb | ||
|  | 36de217835 | ||
|  | b5283d58bb | ||
|  | 8414d97ffa | ||
|  | 9f30d4e673 | ||
|  | 8e0d1fa0df | ||
|  | 5b251b9977 | ||
|  | 8b3e721028 | ||
|  | 7e2a2baa5d | ||
|  | 003eed368b | ||
|  | 4b1cf05c0e | ||
|  | d9429c4f4b | ||
|  | b7bd94b6b0 | ||
|  | 51bbc10744 | ||
|  | fb5df33ee7 | ||
|  | d8ba0ccd7d | ||
|  | 886ea6c68c | ||
|  | ec384fafce | ||
|  | 936f85c09e | ||
|  | b25deea21d | ||
|  | cf5ec44303 | ||
|  | 6f956c2415 | ||
|  | 3533160bef | ||
|  | 60cbfdcabd | ||
|  | 604f036a54 | ||
|  | dd4f3ec264 | ||
|  | ff67b8a0ba | ||
|  | 1d5fb0b646 | ||
|  | 80931a318f | ||
|  | 16f16cb36a | ||
|  | 899f24cde5 | ||
|  | 9f29521ab8 | ||
|  | c1ce0c6b22 | ||
|  | a7fce33750 | ||
|  | 6fd8e73150 | ||
|  | 1359dd86c2 | ||
|  | a1b610fc50 | ||
|  | c849d719e9 | ||
|  | 96de2e7008 | ||
|  | f140b77e7c | ||
|  | 22228de63b | ||
|  | b0596c9eb2 | ||
|  | 2a2319d434 | ||
|  | dad47d115f | ||
|  | 502026359c | ||
|  | 47b0e4e4d3 | ||
|  | 6c927d9159 | ||
|  | ddc79b2517 | ||
|  | 4c2e12d2cb | ||
|  | 14f7a8b7b9 | ||
|  | caa7dd9619 | ||
|  | 8aa7e2d0a0 | ||
|  | 6be8a3f343 | ||
|  | a097cefba7 | ||
|  | e4c78f3887 | ||
|  | 5baa251944 | ||
|  | cde68abec9 | ||
|  | 51175e3676 | ||
|  | 45ddfef30a | ||
|  | 1e1d78999e | ||
|  | 92fcd7b345 | ||
|  | e04f1cd574 | ||
|  | 176c3a5d51 | ||
|  | c09570cf39 | ||
|  | 4a093000be | ||
|  | 6952b643ae | ||
|  | c487a95bc7 | ||
|  | 8884177d9f | ||
|  | 8b250ed523 | ||
|  | d8b78d8025 | ||
|  | 42112b8053 | ||
|  | 6cc0dd5a80 | ||
|  | afd5f4823f | ||
|  | b0cf82c91b | ||
|  | 6a67cdd5af | ||
|  | bad7b84993 | ||
|  | d3ca6b5ae6 | ||
|  | da5009f089 | ||
|  | c08524c977 | ||
|  | f89537037e | ||
|  | c153793766 | ||
|  | 0aec5927d5 | ||
|  | 8aea9a1801 | ||
|  | 73247e3220 | ||
|  | 89344a6eda | ||
|  | 40d2e6ea83 | ||
|  | 910cfe9a17 | ||
|  | e58a80fc00 | ||
|  | 4a2319cb33 | ||
|  | 5619088c41 | ||
|  | 60271993eb | ||
|  | 6695e8b011 | ||
|  | 707df18b93 | ||
|  | 90895f1288 | ||
|  | ba1ca506af | ||
|  | f90ed99a40 | ||
|  | 67630b1a22 | ||
|  | 2c1580ea65 | ||
|  | 840a0b5f64 | ||
|  | b39f6ef7ad | ||
|  | fb27088fcd | ||
|  | 76fbff68ba | ||
|  | 54de4d236d | ||
|  | e211dd65ad | ||
|  | a87f4d8653 | ||
|  | b59c175c2e | ||
|  | 580104c4c5 | ||
|  | 0fc3053b0a | ||
|  | 929e0f69c2 | ||
|  | e70af1300a | ||
|  | 4d0e46021b | ||
|  | 1a9a49b739 | ||
|  | 2ac560c56e | ||
|  | c23387c0fb | ||
|  | 0ff250fe15 | ||
|  | 52b1e58b26 | ||
|  | 484715e440 | ||
|  | 9d42c3d802 | ||
|  | c654172d33 | ||
|  | e17b26c883 | ||
|  | 24d02d9cf5 | ||
|  | 7208a311ac | ||
|  | ad7355372b | ||
|  | f18b5babad | ||
|  | 9831ec0ca9 | ||
|  | 596544eca3 | ||
|  | 1f853024ee | ||
|  | 0308b13460 | ||
|  | 06b8a82f70 | ||
|  | 91ca07929d | ||
|  | afabaa5fdb | ||
|  | a6fd3fa77c | ||
|  | 58a2c08dcd | ||
|  | 299bbff2f4 | ||
|  | 19d8947123 | ||
|  | 35edce7523 | ||
|  | bc4cec69a5 | ||
|  | cce8c1b674 | ||
|  | aa58788769 | ||
|  | 6c62ab7a52 | ||
|  | d6ab638b30 | ||
|  | bd4db406de | ||
|  | e50f9cd0a3 | ||
|  | 2b64cbce2c | ||
|  | 2797c942ab | ||
|  | f1c3278874 | ||
|  | 424c22dcde | ||
|  | 5c223dfd12 | ||
|  | 6a3e7a5a8e | ||
|  | f88cdac000 | ||
|  | eeead90f32 | ||
|  | b607857409 | ||
|  | 9268f88bc3 | ||
|  | f7f0560a9f | ||
|  | 3d8905207e | ||
|  | dbc312010b | ||
|  | b115a7cf19 | ||
|  | 348562352c | ||
|  | 70fd917e7c | ||
|  | d2b60764cd | ||
|  | 581b1fdaa5 | ||
|  | 3c19a712c0 | ||
|  | cc27f16088 | ||
|  | dffdb82288 | ||
|  | 2b32addade | ||
|  | 0b251530fa | ||
|  | f5b933149a | ||
|  | 48bbfb8bdb | ||
|  | 889971c4d6 | ||
|  | 0722494d41 | ||
|  | 4b977a3306 | ||
|  | 3ff3021acd | ||
|  | 99e56a9c42 | ||
|  | 77279dfe16 | ||
|  | 93f8050454 | ||
|  | 31cfede7a7 | ||
|  | c8ec86e537 | ||
|  | 05aee884b6 | ||
|  | 012ba9e060 | ||
|  | 8e8fd88857 | ||
|  | 523ccdad6b | ||
|  | ded3f605be | ||
|  | 62b44e3549 | ||
|  | 030d12a465 | ||
|  | 4d15628840 | ||
|  | 81b849898c | ||
|  | 3824486b85 | ||
|  | 081ab00a0a | ||
|  | 04f6af5c9a | ||
|  | 4dc1f1f6eb | ||
|  | 3930a02123 | ||
|  | 3112de105e | ||
|  | 3b8d7b8fba | ||
|  | 9fca7f09a5 | ||
|  | fd39d6b3a9 | ||
|  | a103886ea5 | ||
|  | 373408e401 | ||
|  | db44c1d8e6 | ||
|  | 95a34c9e2d | ||
|  | 6ce401f260 | ||
|  | 5d74dcd256 | ||
|  | 5a9fc1697b | ||
|  | 927415838c | ||
|  | d72fcefdc7 | ||
|  | 0be173a8f7 | ||
|  | c3913a8735 | ||
|  | e2dfe1b6de | ||
|  | fec3e47eb8 | ||
|  | d72efd2450 | ||
|  | ef1c840aa7 | ||
|  | 1581464d8c | ||
|  | 9de29584a4 | ||
|  | 9e2e6fb50c | ||
|  | c85979b66b | ||
|  | ecdc5865a6 | ||
|  | 1771ddb787 | ||
|  | 3ab657fe46 | ||
|  | 8785dae753 | ||
|  | 2f1c5b29d4 | ||
|  | 7135349a10 | ||
|  | 66c639d5e3 | ||
|  | 6704b755d8 | ||
|  | cf96baad48 | ||
|  | 32220476aa | ||
|  | 86bc84a2ad | ||
|  | de9e0c7929 | ||
|  | 6963e662ef | ||
|  | 7127822e8f | ||
|  | 0a35abf68f | ||
|  | 3f8e8f8561 | ||
|  | e02eca87b0 | ||
|  | 2f680c4326 | ||
|  | 0b4a44a403 | ||
|  | 89299f865c | ||
|  | f6db9a50ab | ||
|  | 78d9fac1e6 | ||
|  | 458ed1faff | ||
|  | 0657815de5 | ||
|  | a608832681 | ||
|  | d2f72529b3 | ||
|  | 28185af158 | ||
|  | 7aacd01ad7 | ||
|  | 74cc34696e | ||
|  | d4baac0bb5 | ||
|  | 35bc1421f1 | ||
|  | d4db265fd9 | ||
|  | 1dad919de9 | ||
|  | 246dfbdcb4 | ||
|  | f8d32d64f5 | ||
|  | 5dea271d6f | ||
|  | eeb62a6cf2 | ||
|  | 35cf8026b0 | ||
|  | e0028ab6f1 | ||
|  | a32645cdeb | ||
|  | 812f9f6fca | ||
|  | f7a670ec24 | ||
|  | d0d24f0f4a | ||
|  | 042f9b7f2d | ||
|  | 2d260cdbed | ||
|  | 6a786cad83 | ||
|  | 67019b3d6c | ||
|  | 1db6e59077 | ||
|  | 5e4770875e | ||
|  | e9a77f3f16 | ||
|  | cbec85f295 | ||
|  | 14bd5d301d | ||
|  | 321d0e8d64 | ||
|  | 84e1512031 | ||
|  | b036852b2d | ||
|  | f693dc31e8 | ||
|  | af8f5b11b8 | ||
|  | 8ca943f87b | ||
|  | 35cc9da626 | ||
|  | 44cc86a1a5 | ||
|  | 7c3bbfd45e | ||
|  | a1f939e3a0 | ||
|  | 4ca7886090 | ||
|  | b942163748 | ||
|  | 5b6d15acb3 | ||
|  | 841420360e | ||
|  | a680bb4612 | ||
|  | f763e13996 | ||
|  | e73e1262ae | ||
|  | b774d56cf7 | ||
|  | bae55f2e8b | ||
|  | 6c16cdb011 | ||
|  | 86fcbb0354 | ||
|  | 17d030e800 | ||
|  | 6fbf28b30d | ||
|  | 8171b68b18 | ||
|  | d30e3a4052 | ||
|  | 87aab7ac5b | ||
|  | c46f5805b1 | ||
|  | dd6a29dfc0 | ||
|  | a0933c7f10 | ||
|  | 492adc2909 | ||
|  | 90a52f57b5 | ||
|  | a1469854e8 | ||
|  | e2c2993255 | ||
|  | 270d63b265 | ||
|  | 1d004be91d | ||
|  | b8a74c727e | ||
|  | c87b592277 | ||
|  | cfa926602a | ||
|  | 350cb52c07 | ||
|  | af195beb7e | ||
|  | cb00d42546 | ||
|  | ee0b0c3dfe | ||
|  | ddcb4a0e10 | ||
|  | 8cbb29ee25 | ||
|  | 9da11ac144 | ||
|  | ba7c8e77e5 | ||
|  | 4577b03fc9 | ||
|  | 72d83aa85e | ||
|  | 8ee80cb5f1 | ||
|  | 4cc08bff8b | ||
|  | 295cfb2d75 | ||
|  | 7775376b33 | ||
|  | 9f64e994dc | ||
|  | ee1e4fc710 | ||
|  | 5ea62c710d | ||
|  | aeca31d06a | ||
|  | 9cb9ea6ab5 | ||
|  | e37dd69827 | ||
|  | 6c51696d1a | ||
|  | 27787c8f37 | ||
|  | e910595545 | ||
|  | a616739805 | ||
|  | bea28de6a0 | ||
|  | 4e198ca2f0 | ||
|  | 2fbd16a0e3 | ||
|  | 76fc49f037 | ||
|  | 139c99440f | ||
|  | 137b9dfa0b | ||
|  | 5f0fdd15eb | ||
|  | 61e1427b83 | ||
|  | b3aa0ba47c | ||
|  | 56e2b44c25 | ||
|  | 4d5a17583f | ||
|  | 71eda5aa3d | ||
|  | 0711ea8dc8 | ||
|  | be206872d1 | ||
|  | fcf3fe8dcd | ||
|  | 62dbd4062a | ||
|  | 196e8b4380 | ||
|  | 551e1255ff | ||
|  | e09b61d1ac | ||
|  | ee23bcc783 | ||
|  | 3e351bd8d3 | ||
|  | 0d3bc22d73 | ||
|  | d82898421e | ||
|  | 1db2f0c2c5 | ||
|  | 6cd8a2203e | 
| @@ -1,4 +1,7 @@ | ||||
| .git | ||||
| .idea | ||||
| /bin | ||||
| /dist | ||||
| /docs | ||||
| /npm-debug.log | ||||
| node_modules | ||||
| npm-debug.log | ||||
| dist | ||||
| .idea | ||||
							
								
								
									
										7
									
								
								.gitpod.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,7 @@ | ||||
| tasks: | ||||
|     - before: nvm install 10 && nvm use 10 | ||||
|       init: npm install | ||||
|       command: npm run start | ||||
| ports: | ||||
|     - port: 8080 | ||||
|       onOpen: open-preview | ||||
| @@ -1,8 +1,8 @@ | ||||
| <?xml version="1.0" encoding="UTF-8"?> | ||||
| <dataSource name="document.db"> | ||||
|   <database-model serializer="dbm" dbms="SQLITE" family-id="SQLITE" format-version="4.14"> | ||||
|   <database-model serializer="dbm" dbms="SQLITE" family-id="SQLITE" format-version="4.15"> | ||||
|     <root id="1"> | ||||
|       <ServerVersion>3.16.1</ServerVersion> | ||||
|       <ServerVersion>3.25.1</ServerVersion> | ||||
|     </root> | ||||
|     <schema id="2" parent="1" name="main"> | ||||
|       <Current>1</Current> | ||||
| @@ -16,586 +16,633 @@ | ||||
|     <table id="8" parent="2" name="branches"/> | ||||
|     <table id="9" parent="2" name="event_log"/> | ||||
|     <table id="10" parent="2" name="links"/> | ||||
|     <table id="11" parent="2" name="note_revisions"/> | ||||
|     <table id="12" parent="2" name="notes"/> | ||||
|     <table id="13" parent="2" name="options"/> | ||||
|     <table id="14" parent="2" name="recent_notes"/> | ||||
|     <table id="15" parent="2" name="source_ids"/> | ||||
|     <table id="16" parent="2" name="sqlite_master"> | ||||
|     <table id="11" parent="2" name="note_contents"/> | ||||
|     <table id="12" parent="2" name="note_revisions"/> | ||||
|     <table id="13" parent="2" name="notes"/> | ||||
|     <table id="14" parent="2" name="options"/> | ||||
|     <table id="15" parent="2" name="recent_notes"/> | ||||
|     <table id="16" parent="2" name="source_ids"/> | ||||
|     <table id="17" parent="2" name="sqlite_master"> | ||||
|       <System>1</System> | ||||
|     </table> | ||||
|     <table id="17" parent="2" name="sqlite_sequence"> | ||||
|     <table id="18" parent="2" name="sqlite_sequence"> | ||||
|       <System>1</System> | ||||
|     </table> | ||||
|     <table id="18" parent="2" name="sync"/> | ||||
|     <column id="19" parent="6" name="apiTokenId"> | ||||
|     <table id="19" parent="2" name="sync"/> | ||||
|     <column id="20" parent="6" name="apiTokenId"> | ||||
|       <Position>1</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="20" parent="6" name="token"> | ||||
|     <column id="21" parent="6" name="token"> | ||||
|       <Position>2</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="21" parent="6" name="dateCreated"> | ||||
|     <column id="22" parent="6" name="utcDateCreated"> | ||||
|       <Position>3</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="22" parent="6" name="isDeleted"> | ||||
|     <column id="23" parent="6" name="isDeleted"> | ||||
|       <Position>4</Position> | ||||
|       <DataType>INT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>0</DefaultExpression> | ||||
|     </column> | ||||
|     <column id="23" parent="6" name="hash"> | ||||
|     <column id="24" parent="6" name="hash"> | ||||
|       <Position>5</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>""</DefaultExpression> | ||||
|     </column> | ||||
|     <index id="24" parent="6" name="sqlite_autoindex_api_tokens_1"> | ||||
|     <index id="25" parent="6" name="sqlite_autoindex_api_tokens_1"> | ||||
|       <NameSurrogate>1</NameSurrogate> | ||||
|       <ColNames>apiTokenId</ColNames> | ||||
|       <ColumnCollations></ColumnCollations> | ||||
|       <Unique>1</Unique> | ||||
|     </index> | ||||
|     <key id="25" parent="6"> | ||||
|     <key id="26" parent="6"> | ||||
|       <ColNames>apiTokenId</ColNames> | ||||
|       <Primary>1</Primary> | ||||
|       <UnderlyingIndexName>sqlite_autoindex_api_tokens_1</UnderlyingIndexName> | ||||
|     </key> | ||||
|     <column id="26" parent="7" name="attributeId"> | ||||
|     <column id="27" parent="7" name="attributeId"> | ||||
|       <Position>1</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="27" parent="7" name="noteId"> | ||||
|     <column id="28" parent="7" name="noteId"> | ||||
|       <Position>2</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="28" parent="7" name="type"> | ||||
|     <column id="29" parent="7" name="type"> | ||||
|       <Position>3</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="29" parent="7" name="name"> | ||||
|     <column id="30" parent="7" name="name"> | ||||
|       <Position>4</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="30" parent="7" name="value"> | ||||
|     <column id="31" parent="7" name="value"> | ||||
|       <Position>5</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>''</DefaultExpression> | ||||
|     </column> | ||||
|     <column id="31" parent="7" name="position"> | ||||
|     <column id="32" parent="7" name="position"> | ||||
|       <Position>6</Position> | ||||
|       <DataType>INT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>0</DefaultExpression> | ||||
|     </column> | ||||
|     <column id="32" parent="7" name="dateCreated"> | ||||
|     <column id="33" parent="7" name="utcDateCreated"> | ||||
|       <Position>7</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="33" parent="7" name="dateModified"> | ||||
|     <column id="34" parent="7" name="utcDateModified"> | ||||
|       <Position>8</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="34" parent="7" name="isDeleted"> | ||||
|     <column id="35" parent="7" name="isDeleted"> | ||||
|       <Position>9</Position> | ||||
|       <DataType>INT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="35" parent="7" name="hash"> | ||||
|     <column id="36" parent="7" name="hash"> | ||||
|       <Position>10</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>""</DefaultExpression> | ||||
|     </column> | ||||
|     <column id="36" parent="7" name="isInheritable"> | ||||
|     <column id="37" parent="7" name="isInheritable"> | ||||
|       <Position>11</Position> | ||||
|       <DataType>int|0s</DataType> | ||||
|       <DefaultExpression>0</DefaultExpression> | ||||
|     </column> | ||||
|     <index id="37" parent="7" name="sqlite_autoindex_attributes_1"> | ||||
|     <index id="38" parent="7" name="sqlite_autoindex_attributes_1"> | ||||
|       <NameSurrogate>1</NameSurrogate> | ||||
|       <ColNames>attributeId</ColNames> | ||||
|       <ColumnCollations></ColumnCollations> | ||||
|       <Unique>1</Unique> | ||||
|     </index> | ||||
|     <key id="38" parent="7"> | ||||
|     <index id="39" parent="7" name="IDX_attributes_noteId_index"> | ||||
|       <ColNames>noteId</ColNames> | ||||
|     </index> | ||||
|     <index id="40" parent="7" name="IDX_attributes_name_value"> | ||||
|       <ColNames>name | ||||
| value</ColNames> | ||||
|     </index> | ||||
|     <index id="41" parent="7" name="IDX_attributes_name_index"> | ||||
|       <ColNames>name</ColNames> | ||||
|     </index> | ||||
|     <index id="42" parent="7" name="IDX_attributes_value_index"> | ||||
|       <ColNames>value</ColNames> | ||||
|     </index> | ||||
|     <key id="43" parent="7"> | ||||
|       <ColNames>attributeId</ColNames> | ||||
|       <Primary>1</Primary> | ||||
|       <UnderlyingIndexName>sqlite_autoindex_attributes_1</UnderlyingIndexName> | ||||
|     </key> | ||||
|     <column id="39" parent="8" name="branchId"> | ||||
|     <column id="44" parent="8" name="branchId"> | ||||
|       <Position>1</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="40" parent="8" name="noteId"> | ||||
|     <column id="45" parent="8" name="noteId"> | ||||
|       <Position>2</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="41" parent="8" name="parentNoteId"> | ||||
|     <column id="46" parent="8" name="parentNoteId"> | ||||
|       <Position>3</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="42" parent="8" name="notePosition"> | ||||
|     <column id="47" parent="8" name="notePosition"> | ||||
|       <Position>4</Position> | ||||
|       <DataType>INTEGER|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="43" parent="8" name="prefix"> | ||||
|     <column id="48" parent="8" name="prefix"> | ||||
|       <Position>5</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|     </column> | ||||
|     <column id="44" parent="8" name="isExpanded"> | ||||
|     <column id="49" parent="8" name="isExpanded"> | ||||
|       <Position>6</Position> | ||||
|       <DataType>BOOLEAN|0s</DataType> | ||||
|     </column> | ||||
|     <column id="45" parent="8" name="isDeleted"> | ||||
|     <column id="50" parent="8" name="isDeleted"> | ||||
|       <Position>7</Position> | ||||
|       <DataType>INTEGER|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>0</DefaultExpression> | ||||
|     </column> | ||||
|     <column id="46" parent="8" name="dateModified"> | ||||
|     <column id="51" parent="8" name="utcDateModified"> | ||||
|       <Position>8</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="47" parent="8" name="hash"> | ||||
|     <column id="52" parent="8" name="utcDateCreated"> | ||||
|       <Position>9</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="53" parent="8" name="hash"> | ||||
|       <Position>10</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>""</DefaultExpression> | ||||
|     </column> | ||||
|     <column id="48" parent="8" name="dateCreated"> | ||||
|       <Position>10</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>'1970-01-01T00:00:00.000Z'</DefaultExpression> | ||||
|     </column> | ||||
|     <index id="49" parent="8" name="sqlite_autoindex_branches_1"> | ||||
|     <index id="54" parent="8" name="sqlite_autoindex_branches_1"> | ||||
|       <NameSurrogate>1</NameSurrogate> | ||||
|       <ColNames>branchId</ColNames> | ||||
|       <ColumnCollations></ColumnCollations> | ||||
|       <Unique>1</Unique> | ||||
|     </index> | ||||
|     <index id="50" parent="8" name="IDX_branches_noteId_parentNoteId"> | ||||
|     <index id="55" parent="8" name="IDX_branches_noteId_parentNoteId"> | ||||
|       <ColNames>noteId | ||||
| parentNoteId</ColNames> | ||||
|       <ColumnCollations></ColumnCollations> | ||||
|     </index> | ||||
|     <index id="51" parent="8" name="IDX_branches_noteId"> | ||||
|     <index id="56" parent="8" name="IDX_branches_noteId"> | ||||
|       <ColNames>noteId</ColNames> | ||||
|       <ColumnCollations></ColumnCollations> | ||||
|     </index> | ||||
|     <index id="52" parent="8" name="IDX_branches_parentNoteId"> | ||||
|     <index id="57" parent="8" name="IDX_branches_parentNoteId"> | ||||
|       <ColNames>parentNoteId</ColNames> | ||||
|       <ColumnCollations></ColumnCollations> | ||||
|     </index> | ||||
|     <key id="53" parent="8"> | ||||
|     <key id="58" parent="8"> | ||||
|       <ColNames>branchId</ColNames> | ||||
|       <Primary>1</Primary> | ||||
|       <UnderlyingIndexName>sqlite_autoindex_branches_1</UnderlyingIndexName> | ||||
|     </key> | ||||
|     <column id="54" parent="9" name="eventId"> | ||||
|     <column id="59" parent="9" name="eventId"> | ||||
|       <Position>1</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="55" parent="9" name="noteId"> | ||||
|     <column id="60" parent="9" name="noteId"> | ||||
|       <Position>2</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|     </column> | ||||
|     <column id="56" parent="9" name="comment"> | ||||
|     <column id="61" parent="9" name="comment"> | ||||
|       <Position>3</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|     </column> | ||||
|     <column id="57" parent="9" name="dateCreated"> | ||||
|     <column id="62" parent="9" name="utcDateCreated"> | ||||
|       <Position>4</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <index id="58" parent="9" name="sqlite_autoindex_event_log_1"> | ||||
|     <index id="63" parent="9" name="sqlite_autoindex_event_log_1"> | ||||
|       <NameSurrogate>1</NameSurrogate> | ||||
|       <ColNames>eventId</ColNames> | ||||
|       <ColumnCollations></ColumnCollations> | ||||
|       <Unique>1</Unique> | ||||
|     </index> | ||||
|     <key id="59" parent="9"> | ||||
|     <key id="64" parent="9"> | ||||
|       <ColNames>eventId</ColNames> | ||||
|       <Primary>1</Primary> | ||||
|       <UnderlyingIndexName>sqlite_autoindex_event_log_1</UnderlyingIndexName> | ||||
|     </key> | ||||
|     <column id="60" parent="10" name="linkId"> | ||||
|     <column id="65" parent="10" name="linkId"> | ||||
|       <Position>1</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="61" parent="10" name="noteId"> | ||||
|     <column id="66" parent="10" name="noteId"> | ||||
|       <Position>2</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="62" parent="10" name="targetNoteId"> | ||||
|     <column id="67" parent="10" name="targetNoteId"> | ||||
|       <Position>3</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="63" parent="10" name="type"> | ||||
|     <column id="68" parent="10" name="type"> | ||||
|       <Position>4</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="64" parent="10" name="isDeleted"> | ||||
|     <column id="69" parent="10" name="hash"> | ||||
|       <Position>5</Position> | ||||
|       <DataType>INTEGER|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>0</DefaultExpression> | ||||
|     </column> | ||||
|     <column id="65" parent="10" name="dateCreated"> | ||||
|       <Position>6</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="66" parent="10" name="dateModified"> | ||||
|       <Position>7</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="67" parent="10" name="hash"> | ||||
|       <Position>8</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>""</DefaultExpression> | ||||
|     </column> | ||||
|     <index id="68" parent="10" name="sqlite_autoindex_links_1"> | ||||
|     <column id="70" parent="10" name="isDeleted"> | ||||
|       <Position>6</Position> | ||||
|       <DataType>INTEGER|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>0</DefaultExpression> | ||||
|     </column> | ||||
|     <column id="71" parent="10" name="utcDateCreated"> | ||||
|       <Position>7</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="72" parent="10" name="utcDateModified"> | ||||
|       <Position>8</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <index id="73" parent="10" name="sqlite_autoindex_links_1"> | ||||
|       <NameSurrogate>1</NameSurrogate> | ||||
|       <ColNames>linkId</ColNames> | ||||
|       <ColumnCollations></ColumnCollations> | ||||
|       <Unique>1</Unique> | ||||
|     </index> | ||||
|     <key id="69" parent="10"> | ||||
|     <index id="74" parent="10" name="IDX_links_noteId_index"> | ||||
|       <ColNames>noteId</ColNames> | ||||
|     </index> | ||||
|     <index id="75" parent="10" name="IDX_links_targetNoteId_index"> | ||||
|       <ColNames>targetNoteId</ColNames> | ||||
|     </index> | ||||
|     <key id="76" parent="10"> | ||||
|       <ColNames>linkId</ColNames> | ||||
|       <Primary>1</Primary> | ||||
|       <UnderlyingIndexName>sqlite_autoindex_links_1</UnderlyingIndexName> | ||||
|     </key> | ||||
|     <column id="70" parent="11" name="noteRevisionId"> | ||||
|     <column id="77" parent="11" name="noteId"> | ||||
|       <Position>1</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="71" parent="11" name="noteId"> | ||||
|     <column id="78" parent="11" name="content"> | ||||
|       <Position>2</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <DefaultExpression>NULL</DefaultExpression> | ||||
|     </column> | ||||
|     <column id="79" parent="11" name="hash"> | ||||
|       <Position>3</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>""</DefaultExpression> | ||||
|     </column> | ||||
|     <column id="80" parent="11" name="utcDateModified"> | ||||
|       <Position>4</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <index id="81" parent="11" name="sqlite_autoindex_note_contents_1"> | ||||
|       <NameSurrogate>1</NameSurrogate> | ||||
|       <ColNames>noteId</ColNames> | ||||
|       <Unique>1</Unique> | ||||
|     </index> | ||||
|     <key id="82" parent="11"> | ||||
|       <ColNames>noteId</ColNames> | ||||
|       <Primary>1</Primary> | ||||
|       <UnderlyingIndexName>sqlite_autoindex_note_contents_1</UnderlyingIndexName> | ||||
|     </key> | ||||
|     <column id="83" parent="12" name="noteRevisionId"> | ||||
|       <Position>1</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="84" parent="12" name="noteId"> | ||||
|       <Position>2</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="72" parent="11" name="title"> | ||||
|     <column id="85" parent="12" name="title"> | ||||
|       <Position>3</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|     </column> | ||||
|     <column id="73" parent="11" name="content"> | ||||
|     <column id="86" parent="12" name="content"> | ||||
|       <Position>4</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|     </column> | ||||
|     <column id="74" parent="11" name="isProtected"> | ||||
|     <column id="87" parent="12" name="isProtected"> | ||||
|       <Position>5</Position> | ||||
|       <DataType>INT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>0</DefaultExpression> | ||||
|     </column> | ||||
|     <column id="75" parent="11" name="dateModifiedFrom"> | ||||
|     <column id="88" parent="12" name="utcDateModifiedFrom"> | ||||
|       <Position>6</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="76" parent="11" name="dateModifiedTo"> | ||||
|     <column id="89" parent="12" name="utcDateModifiedTo"> | ||||
|       <Position>7</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="77" parent="11" name="type"> | ||||
|     <column id="90" parent="12" name="dateModifiedFrom"> | ||||
|       <Position>8</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>''</DefaultExpression> | ||||
|     </column> | ||||
|     <column id="78" parent="11" name="mime"> | ||||
|     <column id="91" parent="12" name="dateModifiedTo"> | ||||
|       <Position>9</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="92" parent="12" name="type"> | ||||
|       <Position>10</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>''</DefaultExpression> | ||||
|     </column> | ||||
|     <column id="79" parent="11" name="hash"> | ||||
|       <Position>10</Position> | ||||
|     <column id="93" parent="12" name="mime"> | ||||
|       <Position>11</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>''</DefaultExpression> | ||||
|     </column> | ||||
|     <column id="94" parent="12" name="hash"> | ||||
|       <Position>12</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>""</DefaultExpression> | ||||
|     </column> | ||||
|     <index id="80" parent="11" name="sqlite_autoindex_note_revisions_1"> | ||||
|     <index id="95" parent="12" name="sqlite_autoindex_note_revisions_1"> | ||||
|       <NameSurrogate>1</NameSurrogate> | ||||
|       <ColNames>noteRevisionId</ColNames> | ||||
|       <ColumnCollations></ColumnCollations> | ||||
|       <Unique>1</Unique> | ||||
|     </index> | ||||
|     <index id="81" parent="11" name="IDX_note_revisions_noteId"> | ||||
|     <index id="96" parent="12" name="IDX_note_revisions_noteId"> | ||||
|       <ColNames>noteId</ColNames> | ||||
|       <ColumnCollations></ColumnCollations> | ||||
|     </index> | ||||
|     <index id="82" parent="11" name="IDX_note_revisions_dateModifiedFrom"> | ||||
|       <ColNames>dateModifiedFrom</ColNames> | ||||
|       <ColumnCollations></ColumnCollations> | ||||
|     <index id="97" parent="12" name="IDX_note_revisions_dateModifiedFrom"> | ||||
|       <ColNames>utcDateModifiedFrom</ColNames> | ||||
|     </index> | ||||
|     <index id="83" parent="11" name="IDX_note_revisions_dateModifiedTo"> | ||||
|       <ColNames>dateModifiedTo</ColNames> | ||||
|       <ColumnCollations></ColumnCollations> | ||||
|     <index id="98" parent="12" name="IDX_note_revisions_dateModifiedTo"> | ||||
|       <ColNames>utcDateModifiedTo</ColNames> | ||||
|     </index> | ||||
|     <key id="84" parent="11"> | ||||
|     <key id="99" parent="12"> | ||||
|       <ColNames>noteRevisionId</ColNames> | ||||
|       <Primary>1</Primary> | ||||
|       <UnderlyingIndexName>sqlite_autoindex_note_revisions_1</UnderlyingIndexName> | ||||
|     </key> | ||||
|     <column id="85" parent="12" name="noteId"> | ||||
|     <column id="100" parent="13" name="noteId"> | ||||
|       <Position>1</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="86" parent="12" name="title"> | ||||
|     <column id="101" parent="13" name="title"> | ||||
|       <Position>2</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>"note"</DefaultExpression> | ||||
|     </column> | ||||
|     <column id="87" parent="12" name="content"> | ||||
|     <column id="102" parent="13" name="isProtected"> | ||||
|       <Position>3</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <DefaultExpression>NULL</DefaultExpression> | ||||
|     </column> | ||||
|     <column id="88" parent="12" name="isProtected"> | ||||
|       <Position>4</Position> | ||||
|       <DataType>INT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>0</DefaultExpression> | ||||
|     </column> | ||||
|     <column id="89" parent="12" name="type"> | ||||
|       <Position>5</Position> | ||||
|     <column id="103" parent="13" name="type"> | ||||
|       <Position>4</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>'text'</DefaultExpression> | ||||
|     </column> | ||||
|     <column id="90" parent="12" name="mime"> | ||||
|       <Position>6</Position> | ||||
|     <column id="104" parent="13" name="mime"> | ||||
|       <Position>5</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>'text/html'</DefaultExpression> | ||||
|     </column> | ||||
|     <column id="91" parent="12" name="hash"> | ||||
|       <Position>7</Position> | ||||
|     <column id="105" parent="13" name="hash"> | ||||
|       <Position>6</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>""</DefaultExpression> | ||||
|     </column> | ||||
|     <column id="92" parent="12" name="isDeleted"> | ||||
|       <Position>8</Position> | ||||
|     <column id="106" parent="13" name="isDeleted"> | ||||
|       <Position>7</Position> | ||||
|       <DataType>INT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>0</DefaultExpression> | ||||
|     </column> | ||||
|     <column id="93" parent="12" name="dateCreated"> | ||||
|     <column id="107" parent="13" name="dateCreated"> | ||||
|       <Position>8</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="108" parent="13" name="dateModified"> | ||||
|       <Position>9</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="94" parent="12" name="dateModified"> | ||||
|     <column id="109" parent="13" name="utcDateCreated"> | ||||
|       <Position>10</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <index id="95" parent="12" name="sqlite_autoindex_notes_1"> | ||||
|     <column id="110" parent="13" name="utcDateModified"> | ||||
|       <Position>11</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <index id="111" parent="13" name="sqlite_autoindex_notes_1"> | ||||
|       <NameSurrogate>1</NameSurrogate> | ||||
|       <ColNames>noteId</ColNames> | ||||
|       <ColumnCollations></ColumnCollations> | ||||
|       <Unique>1</Unique> | ||||
|     </index> | ||||
|     <key id="96" parent="12"> | ||||
|     <key id="112" parent="13"> | ||||
|       <ColNames>noteId</ColNames> | ||||
|       <Primary>1</Primary> | ||||
|       <UnderlyingIndexName>sqlite_autoindex_notes_1</UnderlyingIndexName> | ||||
|     </key> | ||||
|     <column id="97" parent="13" name="name"> | ||||
|     <column id="113" parent="14" name="name"> | ||||
|       <Position>1</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="98" parent="13" name="value"> | ||||
|     <column id="114" parent="14" name="value"> | ||||
|       <Position>2</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|     </column> | ||||
|     <column id="99" parent="13" name="dateModified"> | ||||
|     <column id="115" parent="14" name="isSynced"> | ||||
|       <Position>3</Position> | ||||
|       <DataType>INT|0s</DataType> | ||||
|     </column> | ||||
|     <column id="100" parent="13" name="isSynced"> | ||||
|       <Position>4</Position> | ||||
|       <DataType>INTEGER|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>0</DefaultExpression> | ||||
|     </column> | ||||
|     <column id="101" parent="13" name="hash"> | ||||
|       <Position>5</Position> | ||||
|     <column id="116" parent="14" name="hash"> | ||||
|       <Position>4</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>""</DefaultExpression> | ||||
|     </column> | ||||
|     <column id="102" parent="13" name="dateCreated"> | ||||
|     <column id="117" parent="14" name="utcDateCreated"> | ||||
|       <Position>5</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="118" parent="14" name="utcDateModified"> | ||||
|       <Position>6</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>'1970-01-01T00:00:00.000Z'</DefaultExpression> | ||||
|     </column> | ||||
|     <index id="103" parent="13" name="sqlite_autoindex_options_1"> | ||||
|     <index id="119" parent="14" name="sqlite_autoindex_options_1"> | ||||
|       <NameSurrogate>1</NameSurrogate> | ||||
|       <ColNames>name</ColNames> | ||||
|       <ColumnCollations></ColumnCollations> | ||||
|       <Unique>1</Unique> | ||||
|     </index> | ||||
|     <key id="104" parent="13"> | ||||
|     <key id="120" parent="14"> | ||||
|       <ColNames>name</ColNames> | ||||
|       <Primary>1</Primary> | ||||
|       <UnderlyingIndexName>sqlite_autoindex_options_1</UnderlyingIndexName> | ||||
|     </key> | ||||
|     <column id="105" parent="14" name="branchId"> | ||||
|     <column id="121" parent="15" name="branchId"> | ||||
|       <Position>1</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="106" parent="14" name="notePath"> | ||||
|     <column id="122" parent="15" name="notePath"> | ||||
|       <Position>2</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="107" parent="14" name="hash"> | ||||
|     <column id="123" parent="15" name="hash"> | ||||
|       <Position>3</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <DefaultExpression>""</DefaultExpression> | ||||
|     </column> | ||||
|     <column id="108" parent="14" name="dateCreated"> | ||||
|     <column id="124" parent="15" name="utcDateCreated"> | ||||
|       <Position>4</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="109" parent="14" name="isDeleted"> | ||||
|     <column id="125" parent="15" name="isDeleted"> | ||||
|       <Position>5</Position> | ||||
|       <DataType>INT|0s</DataType> | ||||
|     </column> | ||||
|     <index id="110" parent="14" name="sqlite_autoindex_recent_notes_1"> | ||||
|     <index id="126" parent="15" name="sqlite_autoindex_recent_notes_1"> | ||||
|       <NameSurrogate>1</NameSurrogate> | ||||
|       <ColNames>branchId</ColNames> | ||||
|       <ColumnCollations></ColumnCollations> | ||||
|       <Unique>1</Unique> | ||||
|     </index> | ||||
|     <key id="111" parent="14"> | ||||
|     <key id="127" parent="15"> | ||||
|       <ColNames>branchId</ColNames> | ||||
|       <Primary>1</Primary> | ||||
|       <UnderlyingIndexName>sqlite_autoindex_recent_notes_1</UnderlyingIndexName> | ||||
|     </key> | ||||
|     <column id="112" parent="15" name="sourceId"> | ||||
|     <column id="128" parent="16" name="sourceId"> | ||||
|       <Position>1</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="113" parent="15" name="dateCreated"> | ||||
|     <column id="129" parent="16" name="utcDateCreated"> | ||||
|       <Position>2</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <index id="114" parent="15" name="sqlite_autoindex_source_ids_1"> | ||||
|     <index id="130" parent="16" name="sqlite_autoindex_source_ids_1"> | ||||
|       <NameSurrogate>1</NameSurrogate> | ||||
|       <ColNames>sourceId</ColNames> | ||||
|       <ColumnCollations></ColumnCollations> | ||||
|       <Unique>1</Unique> | ||||
|     </index> | ||||
|     <key id="115" parent="15"> | ||||
|     <key id="131" parent="16"> | ||||
|       <ColNames>sourceId</ColNames> | ||||
|       <Primary>1</Primary> | ||||
|       <UnderlyingIndexName>sqlite_autoindex_source_ids_1</UnderlyingIndexName> | ||||
|     </key> | ||||
|     <column id="116" parent="16" name="type"> | ||||
|     <column id="132" parent="17" name="type"> | ||||
|       <Position>1</Position> | ||||
|       <DataType>text|0s</DataType> | ||||
|     </column> | ||||
|     <column id="117" parent="16" name="name"> | ||||
|     <column id="133" parent="17" name="name"> | ||||
|       <Position>2</Position> | ||||
|       <DataType>text|0s</DataType> | ||||
|     </column> | ||||
|     <column id="118" parent="16" name="tbl_name"> | ||||
|     <column id="134" parent="17" name="tbl_name"> | ||||
|       <Position>3</Position> | ||||
|       <DataType>text|0s</DataType> | ||||
|     </column> | ||||
|     <column id="119" parent="16" name="rootpage"> | ||||
|     <column id="135" parent="17" name="rootpage"> | ||||
|       <Position>4</Position> | ||||
|       <DataType>integer|0s</DataType> | ||||
|       <DataType>int|0s</DataType> | ||||
|     </column> | ||||
|     <column id="120" parent="16" name="sql"> | ||||
|     <column id="136" parent="17" name="sql"> | ||||
|       <Position>5</Position> | ||||
|       <DataType>text|0s</DataType> | ||||
|     </column> | ||||
|     <column id="121" parent="17" name="name"> | ||||
|     <column id="137" parent="18" name="name"> | ||||
|       <Position>1</Position> | ||||
|     </column> | ||||
|     <column id="122" parent="17" name="seq"> | ||||
|     <column id="138" parent="18" name="seq"> | ||||
|       <Position>2</Position> | ||||
|     </column> | ||||
|     <column id="123" parent="18" name="id"> | ||||
|     <column id="139" parent="19" name="id"> | ||||
|       <Position>1</Position> | ||||
|       <DataType>INTEGER|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|       <SequenceIdentity>1</SequenceIdentity> | ||||
|     </column> | ||||
|     <column id="124" parent="18" name="entityName"> | ||||
|     <column id="140" parent="19" name="entityName"> | ||||
|       <Position>2</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="125" parent="18" name="entityId"> | ||||
|     <column id="141" parent="19" name="entityId"> | ||||
|       <Position>3</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="126" parent="18" name="sourceId"> | ||||
|     <column id="142" parent="19" name="sourceId"> | ||||
|       <Position>4</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <column id="127" parent="18" name="syncDate"> | ||||
|     <column id="143" parent="19" name="utcSyncDate"> | ||||
|       <Position>5</Position> | ||||
|       <DataType>TEXT|0s</DataType> | ||||
|       <NotNull>1</NotNull> | ||||
|     </column> | ||||
|     <index id="128" parent="18" name="IDX_sync_entityName_entityId"> | ||||
|     <index id="144" parent="19" name="IDX_sync_entityName_entityId"> | ||||
|       <ColNames>entityName | ||||
| entityId</ColNames> | ||||
|       <ColumnCollations></ColumnCollations> | ||||
|       <Unique>1</Unique> | ||||
|     </index> | ||||
|     <index id="129" parent="18" name="IDX_sync_syncDate"> | ||||
|       <ColNames>syncDate</ColNames> | ||||
|       <ColumnCollations></ColumnCollations> | ||||
|     <index id="145" parent="19" name="IDX_sync_utcSyncDate"> | ||||
|       <ColNames>utcSyncDate</ColNames> | ||||
|     </index> | ||||
|     <key id="130" parent="18"> | ||||
|     <key id="146" parent="19"> | ||||
|       <ColNames>id</ColNames> | ||||
|       <Primary>1</Primary> | ||||
|     </key> | ||||
|   | ||||
							
								
								
									
										27
									
								
								Dockerfile
									
									
									
									
									
								
							
							
						
						| @@ -1,21 +1,28 @@ | ||||
| FROM node:10.13.0 | ||||
|  | ||||
| RUN apt-get update && apt-get install -y nasm | ||||
| FROM node:10.15.3-alpine | ||||
|  | ||||
| # Create app directory | ||||
| WORKDIR /usr/src/app | ||||
|  | ||||
| # Install app dependencies | ||||
| # A wildcard is used to ensure both package.json AND package-lock.json are copied | ||||
| # Copy both package.json and package-lock.json | ||||
| # where available (npm@5+) | ||||
| COPY package*.json ./ | ||||
| COPY package.json package-lock.json ./ | ||||
|  | ||||
| RUN npm install --production | ||||
| # If you are building your code for production | ||||
| # RUN npm install --only=production | ||||
| # Install app dependencies | ||||
| RUN set -x \ | ||||
|     && apk add --no-cache --virtual .build-dependencies \ | ||||
|         autoconf \ | ||||
|         automake \ | ||||
|         g++ \ | ||||
|         gcc \ | ||||
|         libtool \ | ||||
|         make \ | ||||
|         nasm \ | ||||
|         libpng-dev \ | ||||
|     && npm install --production \ | ||||
|     && apk del .build-dependencies | ||||
|  | ||||
| # Bundle app source | ||||
| COPY . . | ||||
|  | ||||
| EXPOSE 8080 | ||||
| CMD [ "node", "src/www" ] | ||||
| CMD [ "node", "./src/www" ] | ||||
|   | ||||
							
								
								
									
										32
									
								
								README.md
									
									
									
									
									
								
							
							
						
						| @@ -1,37 +1,49 @@ | ||||
| # Trilium Notes | ||||
|  | ||||
| [](https://gitter.im/trilium-notes/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) | ||||
| Trilium Notes is a hierarchical note taking application. Picture tells a thousand words: | ||||
| Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases. See [screenshots](https://github.com/zadam/trilium/wiki/Screenshot-tour) for quick overview: | ||||
|  | ||||
|  | ||||
|  | ||||
| See other pictures in [screenshot tour](https://github.com/zadam/trilium/wiki/Screenshot-tour). | ||||
|  | ||||
| ## Features | ||||
|  | ||||
| * Notes can be arranged into arbitrarily deep hierarchy (tree) | ||||
|    * Notes can have more than 1 parents - see [cloning](https://github.com/zadam/trilium/wiki/Cloning-notes) | ||||
| * Notes can be arranged into arbitrarily deep tree. Single note can be placed into multiple places in the tree (see [cloning](https://github.com/zadam/trilium/wiki/Cloning-notes)) | ||||
| * Rich WYSIWYG note editing including e.g. tables and images with markdown [autoformat](https://github.com/zadam/trilium/wiki/Text-editor#autoformat) | ||||
| * Support for editing [notes with source code](https://github.com/zadam/trilium/wiki/Code-notes), including syntax highlighting | ||||
| * Fast and easy [navigation between notes](https://github.com/zadam/trilium/wiki/Note-navigation) | ||||
| * Fast and easy [navigation between notes](https://github.com/zadam/trilium/wiki/Note-navigation), full text search and [note hoisting](https://github.com/zadam/trilium/wiki/Note-hoisting) | ||||
| * Seamless [note versioning](https://github.com/zadam/trilium/wiki/Note-revisions) | ||||
| * Note [attributes](https://github.com/zadam/trilium/wiki/Attributes) can be used for note organization, querying and advanced [scripting](https://github.com/zadam/trilium/wiki/Scripts) | ||||
| * [Synchronization](https://github.com/zadam/trilium/wiki/Synchronization) with self-hosted sync server | ||||
| * Strong [note encryption](https://github.com/zadam/trilium/wiki/Protected-notes) | ||||
| * Strong [note encryption](https://github.com/zadam/trilium/wiki/Protected-notes) with per-note granularity | ||||
| * [Relation maps](https://github.com/zadam/trilium/wiki/Relation-map) for visualizing notes and their relations | ||||
| * [Scripting](https://github.com/zadam/trilium/wiki/Scripts) - see [Advanced showcases](https://github.com/zadam/trilium/wiki/Advanced-showcases) | ||||
| * Scales well in both usability and performance upwards of 100 000 notes | ||||
| * Touch optimized [mobile frontend](https://github.com/zadam/trilium/wiki/Mobile-frontend) for smartphones and tablets | ||||
| * [Night theme](https://github.com/zadam/trilium/wiki/Themes) | ||||
| * [Evernote](https://github.com/zadam/trilium/wiki/Evernote-import) and [Markdown import & export](https://github.com/zadam/trilium/wiki/Markdown) | ||||
|  | ||||
| ## Builds | ||||
|  | ||||
| Trilium is provided as either desktop application ([Electron](https://electronjs.org)-based) or web application hosted on your server. | ||||
| Trilium is provided as either desktop application (Linux, Windows, Mac) or web application hosted on your server (Linux). | ||||
|  | ||||
| * If you want to use Trilium on the desktop, download binary release for your platform (currently Linux and Windows are supported) from [latest release](https://github.com/zadam/trilium/releases/latest), unzip the package and run ```trilium``` executable. | ||||
| * If you want to use Trilium on the desktop, download binary release for your platform from [latest release](https://github.com/zadam/trilium/releases/latest), unzip the package and run ```trilium``` executable. | ||||
| * If you want to install Trilium on server, follow [this page](https://github.com/zadam/trilium/wiki/Server-installation). | ||||
|   * Currently only recent Chrome and Firefox are supported (tested) browsers. | ||||
|  | ||||
| ## Documentation | ||||
|  | ||||
| [See wiki for complete list of documentation pages.](https://github.com/zadam/trilium/wiki/) | ||||
| [See wiki for complete list of documentation pages.](https://github.com/zadam/trilium/wiki/) | ||||
|  | ||||
| You can also read [Patterns of personal knowledge base](https://github.com/zadam/trilium/wiki/Patterns-of-personal-knowledge-base) to get some inspiration on how you might use Trilium. | ||||
|  | ||||
| ## Contribute | ||||
|  | ||||
| Use a browser based dev environment | ||||
|  | ||||
| [](https://gitpod.io/#https://github.com/zadam/trilium) | ||||
|  | ||||
| Or clone locally and run | ||||
| ``` | ||||
| npm install | ||||
| npm run start | ||||
| ``` | ||||
							
								
								
									
										7
									
								
								bin/build-debian.sh
									
									
									
									
									
										Executable file
									
								
							
							
						
						| @@ -0,0 +1,7 @@ | ||||
| #!/usr/bin/env bash | ||||
|  | ||||
| echo "Packaging debian x64 distribution..." | ||||
|  | ||||
| VERSION=`jq -r ".version" package.json` | ||||
|  | ||||
| ./node_modules/.bin/electron-installer-debian --config bin/deb-options.json --options.version=${VERSION} --arch amd64 | ||||
| @@ -1,8 +1,10 @@ | ||||
| #!/usr/bin/env bash | ||||
|  | ||||
| if [[ $# -eq 0 ]] ; then | ||||
|     echo "Missing argument of new version" | ||||
|     exit 1 | ||||
| fi | ||||
| VERSION=`jq -r ".version" package.json` | ||||
| SERIES=${VERSION:0:4}-latest | ||||
|  | ||||
| sudo docker build -t zadam/trilium:latest -t zadam/trilium:$1 . | ||||
| sudo docker build -t zadam/trilium:$VERSION -t zadam/trilium:$SERIES . | ||||
|  | ||||
| if [[ $VERSION != *"beta"* ]]; then | ||||
|   sudo docker tag zadam/trilium:$VERSION zadam/trilium:latest | ||||
| fi | ||||
|   | ||||
							
								
								
									
										24
									
								
								bin/build-linux-x64.sh
									
									
									
									
									
										Executable file
									
								
							
							
						
						| @@ -0,0 +1,24 @@ | ||||
| #!/usr/bin/env bash | ||||
|  | ||||
| BUILD_DIR=./dist/trilium-linux-x64 | ||||
| rm -rf $BUILD_DIR | ||||
|  | ||||
| rm -r node_modules/sqlite3/lib/binding/* | ||||
|  | ||||
| cp -r bin/deps/linux-x64/sqlite/* node_modules/sqlite3/lib/binding/ | ||||
|  | ||||
| ./node_modules/.bin/electron-packager . --asar --out=dist --executable-name=trilium --platform=linux --arch=x64 --overwrite | ||||
|  | ||||
| mv "./dist/Trilium Notes-linux-x64" $BUILD_DIR | ||||
|  | ||||
| cp images/app-icons/png/128x128.png $BUILD_DIR/icon.png | ||||
|  | ||||
| # removing software WebGL binaries because they are pretty huge and not necessary | ||||
| rm -r $BUILD_DIR/swiftshader | ||||
|  | ||||
| echo "Packaging linux x64 electron distribution..." | ||||
| VERSION=`jq -r ".version" package.json` | ||||
|  | ||||
| cd dist | ||||
|  | ||||
| tar cJf trilium-linux-x64-${VERSION}.tar.xz trilium-linux-x64 | ||||
							
								
								
									
										32
									
								
								bin/build-mac-x64.sh
									
									
									
									
									
										Executable file
									
								
							
							
						
						| @@ -0,0 +1,32 @@ | ||||
| #!/usr/bin/env bash | ||||
|  | ||||
| BUILD_DIR=./dist/trilium-mac-x64 | ||||
| rm -rf $BUILD_DIR | ||||
|  | ||||
| echo "Copying required mac binaries" | ||||
|  | ||||
| rm -r node_modules/sqlite3/lib/binding/* | ||||
| rm -r node_modules/mozjpeg/vendor/* | ||||
| rm -r node_modules/pngquant-bin/vendor/* | ||||
| rm -r node_modules/giflossy/vendor/* | ||||
|  | ||||
| cp -r bin/deps/mac-x64/sqlite/* node_modules/sqlite3/lib/binding/ | ||||
| cp bin/deps/mac-x64/image/cjpeg node_modules/mozjpeg/vendor/ | ||||
| cp bin/deps/mac-x64/image/pngquant node_modules/pngquant-bin/vendor/ | ||||
| cp bin/deps/mac-x64/image/gifsicle node_modules/giflossy/vendor/ | ||||
|  | ||||
| ./node_modules/.bin/electron-packager . --asar --out=dist --executable-name=trilium --platform=darwin --arch=x64 --overwrite --icon=images/app-icons/mac/icon.icns | ||||
|  | ||||
| # Mac build has by default useless directory level | ||||
| mv "./dist/Trilium Notes-darwin-x64" $BUILD_DIR | ||||
|  | ||||
| ./bin/reset-local.sh | ||||
|  | ||||
| echo "Zipping mac x64 electron distribution..." | ||||
|  | ||||
| VERSION=`jq -r ".version" package.json` | ||||
|  | ||||
| cd dist | ||||
|  | ||||
| rm trilium-mac-x64-${VERSION}.zip | ||||
| zip -r9 --symlinks trilium-mac-x64-${VERSION}.zip trilium-mac-x64 | ||||
| @@ -1,13 +1,7 @@ | ||||
| #!/usr/bin/env bash | ||||
|  | ||||
| if [[ $# -eq 0 ]] ; then | ||||
|     echo "Missing argument of new version" | ||||
|     exit 1 | ||||
| fi | ||||
|  | ||||
| VERSION=$1 | ||||
| PKG_DIR=dist/trilium-linux-x64-server | ||||
| NODE_VERSION=10.13.0 | ||||
| NODE_VERSION=10.15.3 | ||||
|  | ||||
| rm -r $PKG_DIR | ||||
| mkdir $PKG_DIR | ||||
| @@ -20,6 +14,8 @@ rm node-v${NODE_VERSION}-linux-x64.tar.xz | ||||
| mv node-v${NODE_VERSION}-linux-x64 node | ||||
|  | ||||
| cp -r ../../node_modules/ ./ | ||||
| cp -r ../../images/ ./ | ||||
| cp -r ../../libraries/ ./ | ||||
| cp -r ../../src/ ./ | ||||
| cp -r ../../db/ ./ | ||||
| cp -r ../../package.json ./ | ||||
| @@ -30,9 +26,15 @@ cp -r ../../config-sample.ini ./ | ||||
|  | ||||
| rm -r ./node_modules/electron* | ||||
|  | ||||
| rm -r ./node_modules/sqlite3/lib/binding/* | ||||
|  | ||||
| cp -r ../../bin/deps/linux-x64/sqlite/node* ./node_modules/sqlite3/lib/binding/ | ||||
|  | ||||
| printf "#/bin/sh\n./node/bin/node src/www" > trilium.sh | ||||
| chmod 755 trilium.sh | ||||
|  | ||||
| cd .. | ||||
|  | ||||
| 7z a trilium-linux-x64-server-${VERSION}.7z trilium-linux-x64-server | ||||
| VERSION=`jq -r ".version" ../package.json` | ||||
|  | ||||
| tar cJf trilium-linux-x64-server-${VERSION}.tar.xz trilium-linux-x64-server | ||||
							
								
								
									
										32
									
								
								bin/build-win-x64.sh
									
									
									
									
									
										Executable file
									
								
							
							
						
						| @@ -0,0 +1,32 @@ | ||||
| #!/usr/bin/env bash | ||||
|  | ||||
| BUILD_DIR=./dist/trilium-windows-x64 | ||||
| rm -rf $BUILD_DIR | ||||
|  | ||||
| echo "Copying required windows binaries" | ||||
|  | ||||
| rm -r node_modules/sqlite3/lib/binding/* | ||||
| rm -r node_modules/mozjpeg/vendor/* | ||||
| rm -r node_modules/pngquant-bin/vendor/* | ||||
| rm -r node_modules/giflossy/vendor/* | ||||
|  | ||||
| cp -r bin/deps/win-x64/sqlite/* node_modules/sqlite3/lib/binding/ | ||||
| cp bin/deps/win-x64/image/cjpeg.exe node_modules/mozjpeg/vendor/ | ||||
| cp bin/deps/win-x64/image/pngquant.exe node_modules/pngquant-bin/vendor/ | ||||
| cp bin/deps/win-x64/image/gifsicle.exe node_modules/giflossy/vendor/ | ||||
|  | ||||
| ./node_modules/.bin/electron-packager . --asar --out=dist --executable-name=trilium --platform=win32  --arch=x64 --overwrite --icon=images/app-icons/win/icon.ico | ||||
|  | ||||
| mv "./dist/Trilium Notes-win32-x64" $BUILD_DIR | ||||
|  | ||||
| # removing software WebGL binaries because they are pretty huge and not necessary | ||||
| rm -r $BUILD_DIR/swiftshader | ||||
|  | ||||
| ./bin/reset-local.sh | ||||
|  | ||||
| echo "Zipping windows x64 electron distribution..." | ||||
| VERSION=`jq -r ".version" package.json` | ||||
|  | ||||
| cd dist | ||||
|  | ||||
| zip -r9 trilium-windows-x64-${VERSION}.zip trilium-windows-x64 | ||||
							
								
								
									
										36
									
								
								bin/build.sh
									
									
									
									
									
								
							
							
						
						| @@ -8,36 +8,14 @@ echo "Deleting existing builds" | ||||
|  | ||||
| rm -r dist/* | ||||
|  | ||||
| echo "Rebuilding binaries for linux-ia32" | ||||
| ./node_modules/.bin/electron-rebuild --arch=ia32 | ||||
| bin/build-win-x64.sh | ||||
|  | ||||
| ./node_modules/.bin/electron-packager . --out=dist --executable-name=trilium --platform=linux --arch=ia32 --overwrite | ||||
| bin/build-mac-x64.sh | ||||
|  | ||||
| mv "./dist/Trilium Notes-linux-ia32" ./dist/trilium-linux-ia32 | ||||
| # building X64 linux as the last so electron-rebuild will prepare X64 binaries for local development | ||||
| bin/build-linux-x64.sh | ||||
|  | ||||
| ./node_modules/.bin/electron-packager . --out=dist --executable-name=trilium --platform=win32  --arch=x64 --overwrite --icon=src/public/images/app-icons/win/icon.ico | ||||
| # this needs to be run after linux build | ||||
| bin/build-debian.sh | ||||
|  | ||||
| mv "./dist/Trilium Notes-win32-x64" ./dist/trilium-win32-x64 | ||||
|  | ||||
| # we build x64 as second so that we keep X64 binaries in node_modules for local development and server build | ||||
| echo "Rebuilding binaries for linux-x64" | ||||
| ./node_modules/.bin/electron-rebuild --arch=x64 | ||||
|  | ||||
| ./node_modules/.bin/electron-packager . --out=dist --executable-name=trilium --platform=linux --arch=x64 --overwrite | ||||
|  | ||||
| mv "./dist/Trilium Notes-linux-x64" ./dist/trilium-linux-x64 | ||||
|  | ||||
| echo "Copying required windows binaries" | ||||
|  | ||||
| WIN_RES_DIR=./dist/trilium-win32-x64/resources/app | ||||
|  | ||||
| cp -r bin/deps/sqlite/* $WIN_RES_DIR/node_modules/sqlite3/lib/binding/ | ||||
| cp bin/deps/image/cjpeg.exe $WIN_RES_DIR/node_modules/mozjpeg/vendor/ | ||||
| cp bin/deps/image/pngquant.exe $WIN_RES_DIR/node_modules/pngquant-bin/vendor/ | ||||
| cp bin/deps/image/gifsicle.exe $WIN_RES_DIR/node_modules/giflossy/vendor/ | ||||
|  | ||||
| echo "Cleaning up unnecessary binaries from all builds" | ||||
|  | ||||
| rm -r ./dist/trilium-linux-ia32/resources/app/bin/deps | ||||
| rm -r ./dist/trilium-linux-x64/resources/app/bin/deps | ||||
| rm -r ./dist/trilium-win32-x64/resources/app/bin/deps | ||||
| bin/build-server.sh | ||||
							
								
								
									
										14
									
								
								bin/deb-options.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,14 @@ | ||||
| { | ||||
|   "src": "dist/trilium-linux-x64", | ||||
|   "dest": "dist/", | ||||
|   "name": "trilium", | ||||
|   "productName": "Trilium Notes", | ||||
|   "genericName": "Note taker", | ||||
|   "description": "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases.", | ||||
|   "sections": "misc", | ||||
|   "maintainer": "zadam.apps@gmail.com", | ||||
|   "homepage": "https://github.com/zadam/trilium", | ||||
|   "bin": "trilium", | ||||
|   "icon": "dist/trilium-linux-x64/icon.png", | ||||
|   "categories": [ "Office" ] | ||||
| } | ||||
							
								
								
									
										
											BIN
										
									
								
								bin/deps/linux-x64/sqlite/electron-v4.0-linux-x64/node_sqlite3.node
									
									
									
									
									
										Executable file
									
								
							
							
						
						
							
								
								
									
										
											BIN
										
									
								
								bin/deps/linux-x64/sqlite/node-v64-linux-x64/node_sqlite3.node
									
									
									
									
									
										Executable file
									
								
							
							
						
						
							
								
								
									
										
											BIN
										
									
								
								bin/deps/mac-x64/image/cjpeg
									
									
									
									
									
										Executable file
									
								
							
							
						
						
							
								
								
									
										
											BIN
										
									
								
								bin/deps/mac-x64/image/gifsicle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
							
								
								
									
										
											BIN
										
									
								
								bin/deps/mac-x64/image/pngquant
									
									
									
									
									
										Normal file
									
								
							
							
						
						
							
								
								
									
										0
									
								
								bin/deps/image/cjpeg.exe → bin/deps/win-x64/image/cjpeg.exe
									
									
									
									
									
										
										
										Normal file → Executable file
									
								
							
							
						
						
							
								
								
									
										0
									
								
								bin/generate-cert.sh
									
									
									
									
									
										
										
										Normal file → Executable file
									
								
							
							
						
						| @@ -1,14 +0,0 @@ | ||||
| #!/usr/bin/env bash | ||||
|  | ||||
| VERSION=`jq -r ".version" package.json` | ||||
|  | ||||
| cd dist | ||||
|  | ||||
| echo "Packaging linux x64 electron distribution..." | ||||
| 7z a trilium-linux-x64-${VERSION}.7z trilium-linux-x64 | ||||
|  | ||||
| echo "Packaging linux ia32 electron distribution..." | ||||
| 7z a trilium-linux-ia32-${VERSION}.7z trilium-linux-ia32 | ||||
|  | ||||
| echo "Packaging windows x64 electron distribution..." | ||||
| 7z a trilium-windows-x64-${VERSION}.7z trilium-win32-x64 | ||||
| @@ -5,5 +5,12 @@ if [[ $# -eq 0 ]] ; then | ||||
|     exit 1 | ||||
| fi | ||||
|  | ||||
| sudo docker push zadam/trilium:latest | ||||
| sudo docker push zadam/trilium:$1 | ||||
| VERSION=$1 | ||||
| SERIES=${VERSION:0:4}-latest | ||||
|  | ||||
| sudo docker push zadam/trilium:$VERSION | ||||
| sudo docker push zadam/trilium:$SERIES | ||||
|  | ||||
| if [[ $1 != *"beta"* ]]; then | ||||
|   sudo docker push zadam/trilium:latest | ||||
| fi | ||||
|   | ||||
| @@ -42,18 +42,30 @@ git push origin $TAG | ||||
|  | ||||
| bin/build.sh | ||||
|  | ||||
| bin/package.sh | ||||
|  | ||||
| LINUX_X64_BUILD=trilium-linux-x64-$VERSION.7z | ||||
| LINUX_IA32_BUILD=trilium-linux-ia32-$VERSION.7z | ||||
| WINDOWS_X64_BUILD=trilium-windows-x64-$VERSION.7z | ||||
| SERVER_BUILD=trilium-linux-x64-server-$VERSION.7z | ||||
| LINUX_X64_BUILD=trilium-linux-x64-$VERSION.tar.xz | ||||
| DEBIAN_X64_BUILD=trilium_${VERSION}_amd64.deb | ||||
| WINDOWS_X64_BUILD=trilium-windows-x64-$VERSION.zip | ||||
| MAC_X64_BUILD=trilium-mac-x64-$VERSION.zip | ||||
| SERVER_BUILD=trilium-linux-x64-server-$VERSION.tar.xz | ||||
|  | ||||
| echo "Creating release in GitHub" | ||||
|  | ||||
| EXTRA= | ||||
|  | ||||
| if [[ $TAG == *"beta"* ]]; then | ||||
|   EXTRA=--pre-release | ||||
| fi | ||||
|  | ||||
| github-release release \ | ||||
|     --tag $TAG \ | ||||
|     --name "$TAG release" | ||||
|     --name "$TAG release" $EXTRA | ||||
|  | ||||
| echo "Uploading debian x64 package" | ||||
|  | ||||
| github-release upload \ | ||||
|     --tag $TAG \ | ||||
|     --name "$DEBIAN_X64_BUILD" \ | ||||
|     --file "dist/$DEBIAN_X64_BUILD" | ||||
|  | ||||
| echo "Uploading linux x64 build" | ||||
|  | ||||
| @@ -62,13 +74,6 @@ github-release upload \ | ||||
|     --name "$LINUX_X64_BUILD" \ | ||||
|     --file "dist/$LINUX_X64_BUILD" | ||||
|  | ||||
| echo "Uploading linux ia32 build" | ||||
|  | ||||
| github-release upload \ | ||||
|     --tag $TAG \ | ||||
|     --name "$LINUX_IA32_BUILD" \ | ||||
|     --file "dist/$LINUX_IA32_BUILD" | ||||
|  | ||||
| echo "Uploading windows x64 build" | ||||
|  | ||||
| github-release upload \ | ||||
| @@ -76,9 +81,14 @@ github-release upload \ | ||||
|     --name "$WINDOWS_X64_BUILD" \ | ||||
|     --file "dist/$WINDOWS_X64_BUILD" | ||||
|  | ||||
| echo "Packaging server version" | ||||
| echo "Uploading mac x64 build" | ||||
|  | ||||
| bin/build-server.sh $VERSION | ||||
| github-release upload \ | ||||
|     --tag $TAG \ | ||||
|     --name "$MAC_X64_BUILD" \ | ||||
|     --file "dist/$MAC_X64_BUILD" | ||||
|  | ||||
| echo "Uploading linux x64 server build" | ||||
|  | ||||
| github-release upload \ | ||||
|     --tag $TAG \ | ||||
|   | ||||
							
								
								
									
										3
									
								
								bin/reset-local.sh
									
									
									
									
									
										Executable file
									
								
							
							
						
						| @@ -0,0 +1,3 @@ | ||||
| #!/usr/bin/env bash | ||||
|  | ||||
| ./node_modules/.bin/electron-rebuild --arch=x64 | ||||
							
								
								
									
										
											BIN
										
									
								
								db/demo.tar
									
									
									
									
									
								
							
							
						
						| @@ -0,0 +1 @@ | ||||
| UPDATE attributes SET name = 'archived' where name = 'hideInAutocomplete'; | ||||
							
								
								
									
										2
									
								
								db/migrations/0121__add_hoisting_option.sql
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,2 @@ | ||||
| INSERT INTO options (name, value, dateCreated, dateModified, isSynced) | ||||
| VALUES ('hoistedNoteId', 'root', '2018-12-11T18:31:00.874Z', '2018-12-11T18:31:00.874Z', 0); | ||||
							
								
								
									
										62
									
								
								db/migrations/0122__add_iv_to_columns.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,62 @@ | ||||
| const sql = require('../../src/services/sql'); | ||||
|  | ||||
| function prependIv(cipherText, ivText) { | ||||
|     const arr = ivText.split("").map(c => parseInt(c) || 0); | ||||
|     const iv = Buffer.from(arr); | ||||
|     const payload = Buffer.from(cipherText, 'base64'); | ||||
|     const complete = Buffer.concat([iv, payload]); | ||||
|  | ||||
|     return complete.toString('base64'); | ||||
| } | ||||
|  | ||||
| async function updateEncryptedDataKey() { | ||||
|     const encryptedDataKey = await sql.getValue("SELECT value FROM options WHERE name = 'encryptedDataKey'"); | ||||
|     const encryptedDataKeyIv = await sql.getValue("SELECT value FROM options WHERE name = 'encryptedDataKeyIv'"); | ||||
|  | ||||
|     const newEncryptedDataKey = prependIv(encryptedDataKey, encryptedDataKeyIv); | ||||
|  | ||||
|     await sql.execute("UPDATE options SET value = ? WHERE name = 'encryptedDataKey'", [newEncryptedDataKey]); | ||||
|  | ||||
|     await sql.execute("DELETE FROM options WHERE name = 'encryptedDataKeyIv'"); | ||||
|     await sql.execute("DELETE FROM sync WHERE entityName = 'options' AND entityId = 'encryptedDataKeyIv'"); | ||||
| } | ||||
|  | ||||
| async function updateNotes() { | ||||
|     const protectedNotes = await sql.getRows("SELECT noteId, title, content FROM notes WHERE isProtected = 1"); | ||||
|  | ||||
|     for (const note of protectedNotes) { | ||||
|         if (note.title !== null) { | ||||
|             note.title = prependIv(note.title, "0" + note.noteId); | ||||
|         } | ||||
|  | ||||
|         if (note.content !== null) { | ||||
|             note.content = prependIv(note.content, "1" + note.noteId); | ||||
|         } | ||||
|  | ||||
|         await sql.execute("UPDATE notes SET title = ?, content = ? WHERE noteId = ?", [note.title, note.content, note.noteId]); | ||||
|     } | ||||
| } | ||||
|  | ||||
| async function updateNoteRevisions() { | ||||
|     const protectedNoteRevisions = await sql.getRows("SELECT noteRevisionId, title, content FROM note_revisions WHERE isProtected = 1"); | ||||
|  | ||||
|     for (const noteRevision of protectedNoteRevisions) { | ||||
|         if (noteRevision.title !== null) { | ||||
|             noteRevision.title = prependIv(noteRevision.title, "0" + noteRevision.noteRevisionId); | ||||
|         } | ||||
|  | ||||
|         if (noteRevision.content !== null) { | ||||
|             noteRevision.content = prependIv(noteRevision.content, "1" + noteRevision.noteRevisionId); | ||||
|         } | ||||
|  | ||||
|         await sql.execute("UPDATE note_revisions SET title = ?, content = ? WHERE noteRevisionId = ?", [noteRevision.title, noteRevision.content, noteRevision.noteRevisionId]); | ||||
|     } | ||||
| } | ||||
|  | ||||
| module.exports = async () => { | ||||
|     await updateEncryptedDataKey(); | ||||
|  | ||||
|     await updateNotes(); | ||||
|  | ||||
|     await updateNoteRevisions(); | ||||
| }; | ||||
							
								
								
									
										8
									
								
								db/migrations/0123__add_options_for_font_sizes.sql
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,8 @@ | ||||
| INSERT INTO options (name, value, dateCreated, dateModified, isSynced) | ||||
| VALUES ('mainFontSize', '100', '2019-01-13T18:31:00.874Z', '2019-01-13T18:31:00.874Z', 0); | ||||
|  | ||||
| INSERT INTO options (name, value, dateCreated, dateModified, isSynced) | ||||
| VALUES ('treeFontSize', '100', '2019-01-13T18:31:00.874Z', '2019-01-13T18:31:00.874Z', 0); | ||||
|  | ||||
| INSERT INTO options (name, value, dateCreated, dateModified, isSynced) | ||||
| VALUES ('detailFontSize', '110', '2019-01-13T18:31:00.874Z', '2019-01-13T18:31:00.874Z', 0); | ||||
							
								
								
									
										11
									
								
								db/migrations/0124__readd_font_sizes.sql
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,11 @@ | ||||
| INSERT INTO options (name, value, dateCreated, dateModified, isSynced) | ||||
|   SELECT 'mainFontSize', '100', '2019-01-13T18:31:00.874Z', '2019-01-13T18:31:00.874Z', 0 | ||||
|     WHERE NOT EXISTS (SELECT 1 FROM options WHERE name = 'mainFontSize'); | ||||
|  | ||||
| INSERT INTO options (name, value, dateCreated, dateModified, isSynced) | ||||
|   SELECT 'treeFontSize', '100', '2019-01-13T18:31:00.874Z', '2019-01-13T18:31:00.874Z', 0 | ||||
|     WHERE NOT EXISTS (SELECT 1 FROM options WHERE name = 'treeFontSize'); | ||||
|  | ||||
| INSERT INTO options (name, value, dateCreated, dateModified, isSynced) | ||||
|   SELECT 'detailFontSize', '110', '2019-01-13T18:31:00.874Z', '2019-01-13T18:31:00.874Z', 0 | ||||
|     WHERE NOT EXISTS (SELECT 1 FROM options WHERE name = 'detailFontSize'); | ||||
							
								
								
									
										35
									
								
								db/migrations/0125__create_note_content_table.sql
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,35 @@ | ||||
| CREATE TABLE IF NOT EXISTS "note_contents" ( | ||||
|   `noteContentId`	TEXT NOT NULL, | ||||
|   `noteId`	TEXT NOT NULL, | ||||
|   `isProtected`	INT NOT NULL DEFAULT 0, | ||||
|   `content`	TEXT NULL DEFAULT NULL, | ||||
|   `hash` TEXT DEFAULT "" NOT NULL, | ||||
|   `dateCreated`	TEXT NOT NULL, | ||||
|   `dateModified` TEXT NOT NULL, | ||||
|   PRIMARY KEY(`noteContentId`) | ||||
| ); | ||||
|  | ||||
| CREATE UNIQUE INDEX `IDX_note_contents_noteId` ON `note_contents` (`noteId`); | ||||
|  | ||||
| INSERT INTO note_contents (noteContentId, noteId, isProtected, content, dateCreated, dateModified) | ||||
|   SELECT 'C' || SUBSTR(noteId, 2), noteId, isProtected, content, dateCreated, dateModified FROM notes; | ||||
|  | ||||
| CREATE TABLE IF NOT EXISTS "notes_mig" ( | ||||
|   `noteId`	TEXT NOT NULL, | ||||
|   `title`	TEXT NOT NULL DEFAULT "note", | ||||
|   `isProtected`	INT NOT NULL DEFAULT 0, | ||||
|   `type` TEXT NOT NULL DEFAULT 'text', | ||||
|   `mime` TEXT NOT NULL DEFAULT 'text/html', | ||||
|   `hash` TEXT DEFAULT "" NOT NULL, | ||||
|   `isDeleted`	INT NOT NULL DEFAULT 0, | ||||
|   `dateCreated`	TEXT NOT NULL, | ||||
|   `dateModified`	TEXT NOT NULL, | ||||
|   PRIMARY KEY(`noteId`) | ||||
| ); | ||||
|  | ||||
| INSERT INTO notes_mig (noteId, title, isProtected, isDeleted, dateCreated, dateModified, type, mime, hash) | ||||
| SELECT noteId, title, isProtected, isDeleted, dateCreated, dateModified, type, mime, hash FROM notes; | ||||
|  | ||||
| DROP TABLE notes; | ||||
|  | ||||
| ALTER TABLE notes_mig RENAME TO notes; | ||||
							
								
								
									
										2
									
								
								db/migrations/0126__fill_sync_for_note_contents.sql
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,2 @@ | ||||
| INSERT OR REPLACE INTO sync (entityName, entityId, sourceId, syncDate) | ||||
| SELECT 'note_contents', noteContentId, '', '2019-03-02T18:07:29.182Z' FROM note_contents; | ||||
							
								
								
									
										6
									
								
								db/migrations/0127__fix_inconsistent_isProtected.sql
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,6 @@ | ||||
| UPDATE notes SET title = 'Recovered protected note', isProtected = 0 WHERE noteId IN ( | ||||
|     SELECT noteId FROM notes JOIN note_contents USING(noteId) | ||||
|     WHERE notes.isProtected = 1 | ||||
|       AND note_contents.isProtected = 0 | ||||
|       AND notes.isDeleted = 0 | ||||
| ) | ||||
							
								
								
									
										0
									
								
								db/migrations/0128__add_note_fulltext.sql
									
									
									
									
									
										Normal file
									
								
							
							
						
						
							
								
								
									
										1
									
								
								db/migrations/0129__fill_note_fulltext.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1 @@ | ||||
| module.exports = async () => {}; | ||||
							
								
								
									
										236
									
								
								db/migrations/0130__rename_dates_to_utc.sql
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,236 @@ | ||||
| CREATE TABLE IF NOT EXISTS "sync_mig" ( | ||||
|                                     `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, | ||||
|                                     `entityName`	TEXT NOT NULL, | ||||
|                                     `entityId`	TEXT NOT NULL, | ||||
|                                     `sourceId` TEXT NOT NULL, | ||||
|                                     `utcSyncDate`	TEXT NOT NULL); | ||||
|  | ||||
| INSERT INTO sync_mig (id, entityName, entityId, sourceId, utcSyncDate) | ||||
|   SELECT id, entityName, entityId, sourceId, REPLACE(syncDate, 'T', ' ') FROM sync; | ||||
|  | ||||
| DROP TABLE sync; | ||||
| ALTER TABLE sync_mig RENAME TO sync; | ||||
|  | ||||
|  | ||||
| CREATE TABLE IF NOT EXISTS "source_ids_mig" ( | ||||
|                                           `sourceId`	TEXT NOT NULL, | ||||
|                                           `utcDateCreated`	TEXT NOT NULL, | ||||
|                                           PRIMARY KEY(`sourceId`) | ||||
| ); | ||||
|  | ||||
| INSERT INTO source_ids_mig (sourceId, utcDateCreated) | ||||
|   SELECT sourceId, REPLACE(dateCreated, 'T', ' ') FROM source_ids; | ||||
|  | ||||
| DROP TABLE source_ids; | ||||
| ALTER TABLE source_ids_mig RENAME TO source_ids; | ||||
|  | ||||
| CREATE TABLE IF NOT EXISTS "note_revisions_mig" ( | ||||
|                                               `noteRevisionId`	TEXT NOT NULL PRIMARY KEY, | ||||
|                                               `noteId`	TEXT NOT NULL, | ||||
|                                               `title`	TEXT, | ||||
|                                               `content`	TEXT, | ||||
|                                               `isProtected`	INT NOT NULL DEFAULT 0, | ||||
|                                               `utcDateModifiedFrom` TEXT NOT NULL, | ||||
|                                               `utcDateModifiedTo` TEXT NOT NULL, | ||||
|                                               `dateModifiedFrom` TEXT NOT NULL, | ||||
|                                               `dateModifiedTo` TEXT NOT NULL, | ||||
|                                               type TEXT DEFAULT '' NOT NULL, | ||||
|                                               mime TEXT DEFAULT '' NOT NULL, | ||||
|                                               hash TEXT DEFAULT "" NOT NULL); | ||||
|  | ||||
| INSERT INTO note_revisions_mig (noteRevisionId, noteId, title, content, isProtected, utcDateModifiedFrom, utcDateModifiedTo, dateModifiedFrom, dateModifiedTo, type, mime, hash) | ||||
| SELECT noteRevisionId, noteId, title, content, isProtected, REPLACE(dateModifiedFrom, 'T', ' '), REPLACE(dateModifiedTo, 'T', ' '), REPLACE(REPLACE(dateModifiedFrom, 'T', ' '), 'Z', '+0000'), REPLACE(REPLACE(dateModifiedTo, 'T', ' '), 'Z', '+0000'), type, mime, hash FROM note_revisions; | ||||
|  | ||||
| DROP TABLE note_revisions; | ||||
| ALTER TABLE note_revisions_mig RENAME TO note_revisions; | ||||
|  | ||||
| CREATE TABLE IF NOT EXISTS "api_tokens_mig" | ||||
| ( | ||||
|   apiTokenId TEXT PRIMARY KEY NOT NULL, | ||||
|   token TEXT NOT NULL, | ||||
|   utcDateCreated TEXT NOT NULL, | ||||
|   isDeleted INT NOT NULL DEFAULT 0, | ||||
|   hash TEXT DEFAULT "" NOT NULL); | ||||
|  | ||||
| INSERT INTO api_tokens_mig (apiTokenId, token, utcDateCreated, isDeleted, hash) | ||||
|   SELECT apiTokenId, token, REPLACE(dateCreated, 'T', ' '), isDeleted, hash FROM api_tokens; | ||||
|  | ||||
| DROP TABLE api_tokens; | ||||
| ALTER TABLE api_tokens_mig RENAME TO api_tokens; | ||||
|  | ||||
| CREATE TABLE IF NOT EXISTS "branches_mig" ( | ||||
|                                         `branchId`	TEXT NOT NULL, | ||||
|                                         `noteId`	TEXT NOT NULL, | ||||
|                                         `parentNoteId`	TEXT NOT NULL, | ||||
|                                         `notePosition`	INTEGER NOT NULL, | ||||
|                                         `prefix`	TEXT, | ||||
|                                         `isExpanded`	BOOLEAN, | ||||
|                                         `isDeleted`	INTEGER NOT NULL DEFAULT 0, | ||||
|                                         `utcDateModified`	TEXT NOT NULL, | ||||
|                                         utcDateCreated TEXT NOT NULL, | ||||
|                                         hash TEXT DEFAULT "" NOT NULL, | ||||
|                                         PRIMARY KEY(`branchId`) | ||||
| ); | ||||
|  | ||||
| INSERT INTO branches_mig (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, utcDateModified, utcDateCreated, hash) | ||||
|   SELECT branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, REPLACE(dateModified, 'T', ' '), REPLACE(dateCreated, 'T', ' '), hash FROM branches; | ||||
|  | ||||
| DROP TABLE branches; | ||||
| ALTER TABLE branches_mig RENAME TO branches; | ||||
|  | ||||
| CREATE TABLE IF NOT EXISTS "recent_notes_mig" ( | ||||
|                                             `branchId` TEXT NOT NULL PRIMARY KEY, | ||||
|                                             `notePath` TEXT NOT NULL, | ||||
|                                             hash TEXT DEFAULT "" NOT NULL, | ||||
|                                             `utcDateCreated` TEXT NOT NULL, | ||||
|                                             isDeleted INT | ||||
| ); | ||||
|  | ||||
| INSERT INTO recent_notes_mig (branchId, notePath, hash, utcDateCreated, isDeleted) | ||||
|   SELECT branchId, notePath, hash, REPLACE(dateCreated, 'T', ' '), isDeleted FROM recent_notes; | ||||
|  | ||||
| DROP TABLE recent_notes; | ||||
| ALTER TABLE recent_notes_mig RENAME TO recent_notes; | ||||
|  | ||||
| CREATE TABLE IF NOT EXISTS "event_log_mig" ( | ||||
|                                          `eventId`	TEXT NOT NULL PRIMARY KEY, | ||||
|                                          `noteId`	TEXT, | ||||
|                                          `comment`	TEXT, | ||||
|                                          `utcDateCreated`	TEXT NOT NULL | ||||
| ); | ||||
|  | ||||
| INSERT INTO event_log_mig (eventId, noteId, comment, utcDateCreated) | ||||
|   SELECT eventId, noteId, comment, REPLACE(dateCreated, 'T', ' ') FROM event_log; | ||||
|  | ||||
| DROP TABLE event_log; | ||||
| ALTER TABLE event_log_mig RENAME TO event_log; | ||||
|  | ||||
| CREATE TABLE IF NOT EXISTS "options_mig" | ||||
| ( | ||||
|   name TEXT not null PRIMARY KEY, | ||||
|   value TEXT, | ||||
|   isSynced INTEGER default 0 not null, | ||||
|   hash TEXT default "" not null, | ||||
|   utcDateCreated TEXT not null, | ||||
|   utcDateModified TEXT NOT NULL | ||||
| ); | ||||
|  | ||||
| INSERT INTO options_mig (name, value, isSynced, hash, utcDateCreated, utcDateModified) | ||||
|   SELECT name, value, isSynced, hash, REPLACE(dateCreated, 'T', ' '), REPLACE(dateModified, 'T', ' ') FROM options; | ||||
|  | ||||
| DROP TABLE options; | ||||
| ALTER TABLE options_mig RENAME TO options; | ||||
|  | ||||
| CREATE TABLE attributes_mig | ||||
| ( | ||||
|   attributeId      TEXT not null primary key, | ||||
|   noteId       TEXT not null, | ||||
|   type         TEXT not null, | ||||
|   name         TEXT not null, | ||||
|   value        TEXT default '' not null, | ||||
|   position     INT  default 0 not null, | ||||
|   utcDateCreated  TEXT not null, | ||||
|   utcDateModified TEXT not null, | ||||
|   isDeleted    INT  not null, | ||||
|   hash         TEXT default "" not null, | ||||
|   isInheritable int DEFAULT 0 NULL); | ||||
|  | ||||
| INSERT INTO attributes_mig (attributeId, noteId, type, name, value, position, utcDateCreated, utcDateModified, isDeleted, hash, isInheritable) | ||||
|   SELECT attributeId, noteId, type, name, value, position, REPLACE(dateCreated, 'T', ' '), REPLACE(dateModified, 'T', ' '), isDeleted, hash, isInheritable FROM attributes; | ||||
|  | ||||
| DROP TABLE attributes; | ||||
| ALTER TABLE attributes_mig RENAME TO attributes; | ||||
|  | ||||
| CREATE TABLE IF NOT EXISTS "links_mig" ( | ||||
|                                      `linkId`	TEXT NOT NULL, | ||||
|                                      `noteId`	TEXT NOT NULL, | ||||
|                                      `targetNoteId`	TEXT NOT NULL, | ||||
|                                      `type` TEXT NOT NULL, | ||||
|                                      `hash` TEXT DEFAULT "" NOT NULL, | ||||
|                                      `isDeleted`	INTEGER NOT NULL DEFAULT 0, | ||||
|                                      `utcDateCreated`	TEXT NOT NULL, | ||||
|                                      `utcDateModified`	TEXT NOT NULL, | ||||
|                                      PRIMARY KEY(`linkId`) | ||||
| ); | ||||
|  | ||||
| INSERT INTO links_mig (linkId, noteId, targetNoteId, type, hash, isDeleted, utcDateCreated, utcDateModified) | ||||
|   SELECT linkId, noteId, targetNoteId, type, hash, isDeleted, REPLACE(dateCreated, 'T', ' '), REPLACE(dateModified, 'T', ' ') FROM links; | ||||
|  | ||||
| DROP TABLE links; | ||||
| ALTER TABLE links_mig RENAME TO links; | ||||
|  | ||||
| CREATE TABLE IF NOT EXISTS "note_contents_mig" ( | ||||
|                                              `noteContentId`	TEXT NOT NULL, | ||||
|                                              `noteId`	TEXT NOT NULL, | ||||
|                                              `isProtected`	INT NOT NULL DEFAULT 0, | ||||
|                                              `content`	TEXT NULL DEFAULT NULL, | ||||
|                                              `hash` TEXT DEFAULT "" NOT NULL, | ||||
|                                              `utcDateCreated`	TEXT NOT NULL, | ||||
|                                              `utcDateModified` TEXT NOT NULL, | ||||
|                                              PRIMARY KEY(`noteContentId`) | ||||
| ); | ||||
|  | ||||
| INSERT INTO note_contents_mig (noteContentId, noteId, isProtected, content, hash, utcDateCreated, utcDateModified) | ||||
|   SELECT noteContentId, noteId, isProtected, content, hash, REPLACE(dateCreated, 'T', ' '), REPLACE(dateModified, 'T', ' ') FROM note_contents; | ||||
|  | ||||
| DROP TABLE note_contents; | ||||
| ALTER TABLE note_contents_mig RENAME TO note_contents; | ||||
|  | ||||
| CREATE TABLE IF NOT EXISTS "notes_mig" ( | ||||
|                                      `noteId`	TEXT NOT NULL, | ||||
|                                      `title`	TEXT NOT NULL DEFAULT "note", | ||||
|                                      `isProtected`	INT NOT NULL DEFAULT 0, | ||||
|                                      `type` TEXT NOT NULL DEFAULT 'text', | ||||
|                                      `mime` TEXT NOT NULL DEFAULT 'text/html', | ||||
|                                      `hash` TEXT DEFAULT "" NOT NULL, | ||||
|                                      `isDeleted`	INT NOT NULL DEFAULT 0, | ||||
|                                      `dateCreated`	TEXT NOT NULL, | ||||
|                                      `dateModified`	TEXT NOT NULL, | ||||
|                                      `utcDateCreated`	TEXT NOT NULL, | ||||
|                                      `utcDateModified`	TEXT NOT NULL, | ||||
|                                      PRIMARY KEY(`noteId`) | ||||
| ); | ||||
|  | ||||
| INSERT INTO notes_mig (noteId, title, isProtected, type, mime, hash, isDeleted, dateCreated, dateModified, utcDateCreated, utcDateModified) | ||||
|   SELECT noteId, title, isProtected, type, mime, hash, isDeleted, REPLACE(REPLACE(dateCreated, 'T', ' '), 'Z', '+0000'), REPLACE(REPLACE(dateModified, 'T', ' '), 'Z', '+0000'), REPLACE(dateCreated, 'T', ' '), REPLACE(dateModified, 'T', ' ') FROM notes; | ||||
|  | ||||
| DROP TABLE notes; | ||||
| ALTER TABLE notes_mig RENAME TO notes; | ||||
|  | ||||
| CREATE UNIQUE INDEX `IDX_sync_entityName_entityId` ON `sync` ( | ||||
|                                                               `entityName`, | ||||
|                                                               `entityId` | ||||
|   ); | ||||
| CREATE INDEX `IDX_sync_utcSyncDate` ON `sync` ( | ||||
|                                             `utcSyncDate` | ||||
|   ); | ||||
| CREATE INDEX `IDX_note_revisions_noteId` ON `note_revisions` ( | ||||
|                                                               `noteId` | ||||
|   ); | ||||
| CREATE INDEX `IDX_note_revisions_dateModifiedFrom` ON `note_revisions` ( | ||||
|                                                                         `utcDateModifiedFrom` | ||||
|   ); | ||||
| CREATE INDEX `IDX_note_revisions_dateModifiedTo` ON `note_revisions` ( | ||||
|                                                                       `utcDateModifiedTo` | ||||
|   ); | ||||
| CREATE INDEX `IDX_branches_noteId` ON `branches` ( | ||||
|                                                   `noteId` | ||||
|   ); | ||||
| CREATE INDEX `IDX_branches_noteId_parentNoteId` ON `branches` ( | ||||
|                                                                `noteId`, | ||||
|                                                                `parentNoteId` | ||||
|   ); | ||||
| CREATE INDEX IDX_branches_parentNoteId ON branches (parentNoteId); | ||||
| CREATE INDEX IDX_attributes_name_value | ||||
|   on attributes (name, value); | ||||
| CREATE INDEX IDX_links_noteId_index | ||||
|   on links (noteId); | ||||
| CREATE INDEX IDX_links_targetNoteId_index | ||||
|   on links (targetNoteId); | ||||
| CREATE INDEX IDX_attributes_name_index | ||||
|   on attributes (name); | ||||
| CREATE INDEX IDX_attributes_noteId_index | ||||
|   on attributes (noteId); | ||||
| CREATE INDEX IDX_attributes_value_index | ||||
|   on attributes (value); | ||||
| CREATE UNIQUE INDEX `IDX_note_contents_noteId` ON `note_contents` (`noteId`); | ||||
							
								
								
									
										13
									
								
								db/migrations/0131__cleanup_note_contents.sql
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,13 @@ | ||||
| CREATE TABLE IF NOT EXISTS "note_contents_mig" ( | ||||
|                                                    `noteId`	TEXT NOT NULL, | ||||
|                                                    `content`	TEXT NULL DEFAULT NULL, | ||||
|                                                    `hash` TEXT DEFAULT "" NOT NULL, | ||||
|                                                    `utcDateModified` TEXT NOT NULL, | ||||
|                                                    PRIMARY KEY(`noteId`) | ||||
| ); | ||||
|  | ||||
| INSERT INTO note_contents_mig (noteId, content, hash, utcDateModified) | ||||
| SELECT noteId, content, hash, utcDateModified FROM note_contents; | ||||
|  | ||||
| DROP TABLE note_contents; | ||||
| ALTER TABLE note_contents_mig RENAME TO note_contents; | ||||
							
								
								
									
										5
									
								
								db/migrations/0132__fill_sync.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,5 @@ | ||||
| const syncTableService = require('../../src/services/sync_table'); | ||||
|  | ||||
| module.exports = async () => { | ||||
|     await syncTableService.fillAllSyncRows(); | ||||
| }; | ||||
							
								
								
									
										1
									
								
								db/migrations/0133__drop_note_fulltext.sql
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1 @@ | ||||
| DROP TABLE IF EXISTS note_fulltext; | ||||
							
								
								
									
										4
									
								
								db/migrations/0134__create_openTabs_option.sql
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,4 @@ | ||||
| INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced) | ||||
|     SELECT 'openTabs', '[{"notePath":"' || value || '","active": true,"tabId":"1111"}]', '2019-05-01T18:31:00.874Z', '2019-05-01T18:31:00.874Z', 0 FROM options WHERE name = 'startNotePath'; | ||||
|  | ||||
| DELETE FROM options WHERE name = 'startNotePath'; | ||||
							
								
								
									
										2
									
								
								db/migrations/0135__add_hideTabRowForOneTab_option.sql
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,2 @@ | ||||
| INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced) | ||||
|     VALUES ('hideTabRowForOneTab', 'false', '2019-05-01T18:31:00.874Z', '2019-05-01T18:31:00.874Z', 0); | ||||
							
								
								
									
										12
									
								
								db/migrations/0136__update_recent_notes.sql
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,12 @@ | ||||
| drop table recent_notes; | ||||
|  | ||||
| create table recent_notes | ||||
| ( | ||||
|     noteId TEXT not null primary key, | ||||
|     notePath TEXT not null, | ||||
|     hash TEXT default "" not null, | ||||
|     utcDateCreated TEXT not null, | ||||
|     isDeleted INT | ||||
| ); | ||||
|  | ||||
| delete from sync where entityName = 'recent_notes'; | ||||
							
								
								
									
										197
									
								
								db/schema.sql
									
									
									
									
									
								
							
							
						
						| @@ -1,88 +1,70 @@ | ||||
| CREATE TABLE IF NOT EXISTS "sync" ( | ||||
|   `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, | ||||
|   `entityName`	TEXT NOT NULL, | ||||
|   `entityId`	TEXT NOT NULL, | ||||
|   `sourceId` TEXT NOT NULL, | ||||
|   `syncDate`	TEXT NOT NULL); | ||||
| CREATE UNIQUE INDEX `IDX_sync_entityName_entityId` ON `sync` ( | ||||
|   `entityName`, | ||||
|   `entityId` | ||||
| ); | ||||
| CREATE INDEX `IDX_sync_syncDate` ON `sync` ( | ||||
|   `syncDate` | ||||
| ); | ||||
|                                     `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, | ||||
|                                     `entityName`	TEXT NOT NULL, | ||||
|                                     `entityId`	TEXT NOT NULL, | ||||
|                                     `sourceId` TEXT NOT NULL, | ||||
|                                     `utcSyncDate`	TEXT NOT NULL); | ||||
| CREATE TABLE IF NOT EXISTS "source_ids" ( | ||||
|   `sourceId`	TEXT NOT NULL, | ||||
|   `dateCreated`	TEXT NOT NULL, | ||||
|   PRIMARY KEY(`sourceId`) | ||||
|                                           `sourceId`	TEXT NOT NULL, | ||||
|                                           `utcDateCreated`	TEXT NOT NULL, | ||||
|                                           PRIMARY KEY(`sourceId`) | ||||
| ); | ||||
| CREATE TABLE IF NOT EXISTS "note_revisions" ( | ||||
|   `noteRevisionId`	TEXT NOT NULL PRIMARY KEY, | ||||
|   `noteId`	TEXT NOT NULL, | ||||
|   `title`	TEXT, | ||||
|   `content`	TEXT, | ||||
|   `isProtected`	INT NOT NULL DEFAULT 0, | ||||
|   `dateModifiedFrom` TEXT NOT NULL, | ||||
|   `dateModifiedTo` TEXT NOT NULL | ||||
| , type TEXT DEFAULT '' NOT NULL, mime TEXT DEFAULT '' NOT NULL, hash TEXT DEFAULT "" NOT NULL); | ||||
| CREATE INDEX `IDX_note_revisions_noteId` ON `note_revisions` ( | ||||
|   `noteId` | ||||
| ); | ||||
| CREATE INDEX `IDX_note_revisions_dateModifiedFrom` ON `note_revisions` ( | ||||
|   `dateModifiedFrom` | ||||
| ); | ||||
| CREATE INDEX `IDX_note_revisions_dateModifiedTo` ON `note_revisions` ( | ||||
|   `dateModifiedTo` | ||||
| ); | ||||
|                                               `noteRevisionId`	TEXT NOT NULL PRIMARY KEY, | ||||
|                                               `noteId`	TEXT NOT NULL, | ||||
|                                               `title`	TEXT, | ||||
|                                               `content`	TEXT, | ||||
|                                               `isProtected`	INT NOT NULL DEFAULT 0, | ||||
|                                               `utcDateModifiedFrom` TEXT NOT NULL, | ||||
|                                               `utcDateModifiedTo` TEXT NOT NULL, | ||||
|                                               `dateModifiedFrom` TEXT NOT NULL, | ||||
|                                               `dateModifiedTo` TEXT NOT NULL, | ||||
|                                               type TEXT DEFAULT '' NOT NULL, | ||||
|                                               mime TEXT DEFAULT '' NOT NULL, | ||||
|                                               hash TEXT DEFAULT "" NOT NULL); | ||||
| CREATE TABLE IF NOT EXISTS "api_tokens" | ||||
| ( | ||||
|   apiTokenId TEXT PRIMARY KEY NOT NULL, | ||||
|   token TEXT NOT NULL, | ||||
|   dateCreated TEXT NOT NULL, | ||||
|   isDeleted INT NOT NULL DEFAULT 0 | ||||
| , hash TEXT DEFAULT "" NOT NULL); | ||||
|   utcDateCreated TEXT NOT NULL, | ||||
|   isDeleted INT NOT NULL DEFAULT 0, | ||||
|   hash TEXT DEFAULT "" NOT NULL); | ||||
| CREATE TABLE IF NOT EXISTS "branches" ( | ||||
|   `branchId`	TEXT NOT NULL, | ||||
|   `noteId`	TEXT NOT NULL, | ||||
|   `parentNoteId`	TEXT NOT NULL, | ||||
|   `notePosition`	INTEGER NOT NULL, | ||||
|   `prefix`	TEXT, | ||||
|   `isExpanded`	BOOLEAN, | ||||
|   `isDeleted`	INTEGER NOT NULL DEFAULT 0, | ||||
|   `dateModified`	TEXT NOT NULL, hash TEXT DEFAULT "" NOT NULL, dateCreated TEXT NOT NULL DEFAULT '1970-01-01T00:00:00.000Z', | ||||
|   PRIMARY KEY(`branchId`) | ||||
|                                         `branchId`	TEXT NOT NULL, | ||||
|                                         `noteId`	TEXT NOT NULL, | ||||
|                                         `parentNoteId`	TEXT NOT NULL, | ||||
|                                         `notePosition`	INTEGER NOT NULL, | ||||
|                                         `prefix`	TEXT, | ||||
|                                         `isExpanded`	BOOLEAN, | ||||
|                                         `isDeleted`	INTEGER NOT NULL DEFAULT 0, | ||||
|                                         `utcDateModified`	TEXT NOT NULL, | ||||
|                                         utcDateCreated TEXT NOT NULL, | ||||
|                                         hash TEXT DEFAULT "" NOT NULL, | ||||
|                                         PRIMARY KEY(`branchId`) | ||||
| ); | ||||
| CREATE INDEX `IDX_branches_noteId` ON `branches` ( | ||||
|   `noteId` | ||||
| ); | ||||
| CREATE INDEX `IDX_branches_noteId_parentNoteId` ON `branches` ( | ||||
|   `noteId`, | ||||
|   `parentNoteId` | ||||
| ); | ||||
| CREATE INDEX IDX_branches_parentNoteId ON branches (parentNoteId); | ||||
| CREATE TABLE IF NOT EXISTS "recent_notes" ( | ||||
|   `branchId` TEXT NOT NULL PRIMARY KEY, | ||||
|   `notePath` TEXT NOT NULL, | ||||
|   hash TEXT DEFAULT "" NOT NULL, | ||||
|   `dateCreated` TEXT NOT NULL, | ||||
|   isDeleted INT | ||||
|                                             `branchId` TEXT NOT NULL PRIMARY KEY, | ||||
|                                             `notePath` TEXT NOT NULL, | ||||
|                                             hash TEXT DEFAULT "" NOT NULL, | ||||
|                                             `utcDateCreated` TEXT NOT NULL, | ||||
|                                             isDeleted INT | ||||
| ); | ||||
| CREATE TABLE IF NOT EXISTS "event_log" ( | ||||
|   `eventId`	TEXT NOT NULL PRIMARY KEY, | ||||
|   `noteId`	TEXT, | ||||
|   `comment`	TEXT, | ||||
|   `dateCreated`	TEXT NOT NULL | ||||
|                                          `eventId`	TEXT NOT NULL PRIMARY KEY, | ||||
|                                          `noteId`	TEXT, | ||||
|                                          `comment`	TEXT, | ||||
|                                          `utcDateCreated`	TEXT NOT NULL | ||||
| ); | ||||
| CREATE TABLE IF NOT EXISTS "options" | ||||
| ( | ||||
|   name TEXT not null PRIMARY KEY, | ||||
|   value TEXT, | ||||
|   dateModified INT, | ||||
|   isSynced INTEGER default 0 not null, | ||||
|   hash TEXT default "" not null, | ||||
|   dateCreated TEXT default '1970-01-01T00:00:00.000Z' not null | ||||
|   utcDateCreated TEXT not null, | ||||
|   utcDateModified TEXT NOT NULL | ||||
| ); | ||||
| CREATE TABLE attributes | ||||
| CREATE TABLE IF NOT EXISTS "attributes" | ||||
| ( | ||||
|   attributeId      TEXT not null primary key, | ||||
|   noteId       TEXT not null, | ||||
| @@ -90,36 +72,62 @@ CREATE TABLE attributes | ||||
|   name         TEXT not null, | ||||
|   value        TEXT default '' not null, | ||||
|   position     INT  default 0 not null, | ||||
|   dateCreated  TEXT not null, | ||||
|   dateModified TEXT not null, | ||||
|   utcDateCreated  TEXT not null, | ||||
|   utcDateModified TEXT not null, | ||||
|   isDeleted    INT  not null, | ||||
|   hash         TEXT default "" not null, isInheritable int DEFAULT 0 NULL); | ||||
|   hash         TEXT default "" not null, | ||||
|   isInheritable int DEFAULT 0 NULL); | ||||
| CREATE TABLE IF NOT EXISTS "links" ( | ||||
|                                      `linkId`	TEXT NOT NULL, | ||||
|                                      `noteId`	TEXT NOT NULL, | ||||
|                                      `targetNoteId`	TEXT NOT NULL, | ||||
|                                      `type` TEXT NOT NULL, | ||||
|                                      `hash` TEXT DEFAULT "" NOT NULL, | ||||
|                                      `isDeleted`	INTEGER NOT NULL DEFAULT 0, | ||||
|                                      `utcDateCreated`	TEXT NOT NULL, | ||||
|                                      `utcDateModified`	TEXT NOT NULL, | ||||
|                                      PRIMARY KEY(`linkId`) | ||||
| ); | ||||
| CREATE TABLE IF NOT EXISTS "notes" ( | ||||
|                                      `noteId`	TEXT NOT NULL, | ||||
|                                      `title`	TEXT NOT NULL DEFAULT "note", | ||||
|                                      `isProtected`	INT NOT NULL DEFAULT 0, | ||||
|                                      `type` TEXT NOT NULL DEFAULT 'text', | ||||
|                                      `mime` TEXT NOT NULL DEFAULT 'text/html', | ||||
|                                      `hash` TEXT DEFAULT "" NOT NULL, | ||||
|                                      `isDeleted`	INT NOT NULL DEFAULT 0, | ||||
|                                      `dateCreated`	TEXT NOT NULL, | ||||
|                                      `dateModified`	TEXT NOT NULL, | ||||
|                                      `utcDateCreated`	TEXT NOT NULL, | ||||
|                                      `utcDateModified`	TEXT NOT NULL, | ||||
|                                      PRIMARY KEY(`noteId`) | ||||
| ); | ||||
| CREATE UNIQUE INDEX `IDX_sync_entityName_entityId` ON `sync` ( | ||||
|                                                               `entityName`, | ||||
|                                                               `entityId` | ||||
|   ); | ||||
| CREATE INDEX `IDX_sync_utcSyncDate` ON `sync` ( | ||||
|                                             `utcSyncDate` | ||||
|   ); | ||||
| CREATE INDEX `IDX_note_revisions_noteId` ON `note_revisions` ( | ||||
|                                                               `noteId` | ||||
|   ); | ||||
| CREATE INDEX `IDX_note_revisions_dateModifiedFrom` ON `note_revisions` ( | ||||
|                                                                         `utcDateModifiedFrom` | ||||
|   ); | ||||
| CREATE INDEX `IDX_note_revisions_dateModifiedTo` ON `note_revisions` ( | ||||
|                                                                       `utcDateModifiedTo` | ||||
|   ); | ||||
| CREATE INDEX `IDX_branches_noteId` ON `branches` ( | ||||
|                                                   `noteId` | ||||
|   ); | ||||
| CREATE INDEX `IDX_branches_noteId_parentNoteId` ON `branches` ( | ||||
|                                                                `noteId`, | ||||
|                                                                `parentNoteId` | ||||
|   ); | ||||
| CREATE INDEX IDX_branches_parentNoteId ON branches (parentNoteId); | ||||
| CREATE INDEX IDX_attributes_name_value | ||||
|   on attributes (name, value); | ||||
| CREATE TABLE IF NOT EXISTS "notes" ( | ||||
|   `noteId`	TEXT NOT NULL, | ||||
|   `title`	TEXT NOT NULL DEFAULT "note", | ||||
|   `content`	TEXT NULL DEFAULT NULL, | ||||
|   `isProtected`	INT NOT NULL DEFAULT 0, | ||||
|   `type` TEXT NOT NULL DEFAULT 'text', | ||||
|   `mime` TEXT NOT NULL DEFAULT 'text/html', | ||||
|   `hash` TEXT DEFAULT "" NOT NULL, | ||||
|   `isDeleted`	INT NOT NULL DEFAULT 0, | ||||
|   `dateCreated`	TEXT NOT NULL, | ||||
|   `dateModified`	TEXT NOT NULL, | ||||
|   PRIMARY KEY(`noteId`) | ||||
| ); | ||||
| CREATE TABLE IF NOT EXISTS "links" ( | ||||
|   `linkId`	TEXT NOT NULL, | ||||
|   `noteId`	TEXT NOT NULL, | ||||
|   `targetNoteId`	TEXT NOT NULL, | ||||
|   `type` TEXT NOT NULL, | ||||
|   `hash` TEXT DEFAULT "" NOT NULL, | ||||
|   `isDeleted`	INTEGER NOT NULL DEFAULT 0, | ||||
|   `dateCreated`	TEXT NOT NULL, | ||||
|   `dateModified`	TEXT NOT NULL, | ||||
|   PRIMARY KEY(`linkId`) | ||||
| ); | ||||
| CREATE INDEX IDX_links_noteId_index | ||||
|   on links (noteId); | ||||
| CREATE INDEX IDX_links_targetNoteId_index | ||||
| @@ -130,3 +138,10 @@ CREATE INDEX IDX_attributes_noteId_index | ||||
|   on attributes (noteId); | ||||
| CREATE INDEX IDX_attributes_value_index | ||||
|   on attributes (value); | ||||
| CREATE TABLE IF NOT EXISTS "note_contents" ( | ||||
|                                                    `noteId`	TEXT NOT NULL, | ||||
|                                                    `content`	TEXT NULL DEFAULT NULL, | ||||
|                                                    `hash` TEXT DEFAULT "" NOT NULL, | ||||
|                                                    `utcDateModified` TEXT NOT NULL, | ||||
|                                                    PRIMARY KEY(`noteId`) | ||||
| ); | ||||
|   | ||||
							
								
								
									
										17
									
								
								docker-compose.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,17 @@ | ||||
| version: '2.1' | ||||
| services: | ||||
|   trilium: | ||||
|     build: | ||||
|       context: . | ||||
|     image: zadam/trilium | ||||
|     restart: always | ||||
|     environment: | ||||
|       - TRILIUM_DATA_DIR=/data | ||||
|     ports: | ||||
|       - "8080:8080" | ||||
|     volumes: | ||||
|       - trilium:/data | ||||
|  | ||||
| volumes: | ||||
|   trilium: | ||||
|  | ||||
| @@ -28,7 +28,7 @@ | ||||
|  | ||||
| <header> | ||||
|      | ||||
|         <h2><span class="attribs"><span class="type-signature"></span></span>ApiToken<span class="signature">(apiTokenId, token, isDeleted, dateCreated)</span><span class="type-signature"></span></h2> | ||||
|         <h2><span class="attribs"><span class="type-signature"></span></span>ApiToken<span class="signature">(apiTokenId, token, isDeleted, utcDateCreated)</span><span class="type-signature"></span></h2> | ||||
|          | ||||
|             <div class="class-description">ApiToken is an entity representing token used to authenticate against Trilium API from client applications. Currently used only by Trilium Sender.</div> | ||||
|          | ||||
| @@ -45,7 +45,7 @@ | ||||
|      | ||||
|  | ||||
|      | ||||
|     <h4 class="name" id="ApiToken"><span class="type-signature"></span>new ApiToken<span class="signature">(apiTokenId, token, isDeleted, dateCreated)</span><span class="type-signature"></span></h4> | ||||
|     <h4 class="name" id="ApiToken"><span class="type-signature"></span>new ApiToken<span class="signature">(apiTokenId, token, isDeleted, utcDateCreated)</span><span class="type-signature"></span></h4> | ||||
|      | ||||
|  | ||||
|      | ||||
| @@ -154,7 +154,7 @@ | ||||
|  | ||||
|         <tr> | ||||
|              | ||||
|                 <td class="name"><code>dateCreated</code></td> | ||||
|                 <td class="name"><code>utcDateCreated</code></td> | ||||
|              | ||||
|  | ||||
|             <td class="type"> | ||||
|   | ||||
| @@ -28,7 +28,7 @@ | ||||
|  | ||||
| <header> | ||||
|      | ||||
|         <h2><span class="attribs"><span class="type-signature"></span></span>Attribute<span class="signature">(attributeId, noteId, type, name, value, position, isInheritable, isDeleted, dateCreated, dateModified)</span><span class="type-signature"></span></h2> | ||||
|         <h2><span class="attribs"><span class="type-signature"></span></span>Attribute<span class="signature">(attributeId, noteId, type, name, value, position, isInheritable, isDeleted, utcDateCreated, utcDateModified)</span><span class="type-signature"></span></h2> | ||||
|          | ||||
|             <div class="class-description">Attribute is key value pair owned by a note.</div> | ||||
|          | ||||
| @@ -45,7 +45,7 @@ | ||||
|      | ||||
|  | ||||
|      | ||||
|     <h4 class="name" id="Attribute"><span class="type-signature"></span>new Attribute<span class="signature">(attributeId, noteId, type, name, value, position, isInheritable, isDeleted, dateCreated, dateModified)</span><span class="type-signature"></span></h4> | ||||
|     <h4 class="name" id="Attribute"><span class="type-signature"></span>new Attribute<span class="signature">(attributeId, noteId, type, name, value, position, isInheritable, isDeleted, utcDateCreated, utcDateModified)</span><span class="type-signature"></span></h4> | ||||
|      | ||||
|  | ||||
|      | ||||
| @@ -269,7 +269,7 @@ | ||||
|  | ||||
|         <tr> | ||||
|              | ||||
|                 <td class="name"><code>dateCreated</code></td> | ||||
|                 <td class="name"><code>utcDateCreated</code></td> | ||||
|              | ||||
|  | ||||
|             <td class="type"> | ||||
| @@ -292,7 +292,7 @@ | ||||
|  | ||||
|         <tr> | ||||
|              | ||||
|                 <td class="name"><code>dateModified</code></td> | ||||
|                 <td class="name"><code>utcDateModified</code></td> | ||||
|              | ||||
|  | ||||
|             <td class="type"> | ||||
|   | ||||
| @@ -28,7 +28,7 @@ | ||||
|  | ||||
| <header> | ||||
|      | ||||
|         <h2><span class="attribs"><span class="type-signature"></span></span>Branch<span class="signature">(branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified, dateCreated)</span><span class="type-signature"></span></h2> | ||||
|         <h2><span class="attribs"><span class="type-signature"></span></span>Branch<span class="signature">(branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, utcDateModified, utcDateCreated)</span><span class="type-signature"></span></h2> | ||||
|          | ||||
|             <div class="class-description">Branch represents note's placement in the tree - it's essentially pair of noteId and parentNoteId. | ||||
| Each note can have multiple (at least one) branches, meaning it can be placed into multiple places in the tree.</div> | ||||
| @@ -46,7 +46,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in | ||||
|      | ||||
|  | ||||
|      | ||||
|     <h4 class="name" id="Branch"><span class="type-signature"></span>new Branch<span class="signature">(branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified, dateCreated)</span><span class="type-signature"></span></h4> | ||||
|     <h4 class="name" id="Branch"><span class="type-signature"></span>new Branch<span class="signature">(branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, utcDateModified, utcDateCreated)</span><span class="type-signature"></span></h4> | ||||
|      | ||||
|  | ||||
|      | ||||
| @@ -247,7 +247,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in | ||||
|  | ||||
|         <tr> | ||||
|              | ||||
|                 <td class="name"><code>dateModified</code></td> | ||||
|                 <td class="name"><code>utcDateModified</code></td> | ||||
|              | ||||
|  | ||||
|             <td class="type"> | ||||
| @@ -270,7 +270,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in | ||||
|  | ||||
|         <tr> | ||||
|              | ||||
|                 <td class="name"><code>dateCreated</code></td> | ||||
|                 <td class="name"><code>utcDateCreated</code></td> | ||||
|              | ||||
|  | ||||
|             <td class="type"> | ||||
|   | ||||
| @@ -28,7 +28,7 @@ | ||||
|  | ||||
| <header> | ||||
|      | ||||
|         <h2><span class="attribs"><span class="type-signature"></span></span>Link<span class="signature">(linkId, noteId, targetNoteId, type, isDeleted, dateModified, dateCreated)</span><span class="type-signature"></span></h2> | ||||
|         <h2><span class="attribs"><span class="type-signature"></span></span>Link<span class="signature">(linkId, noteId, targetNoteId, type, isDeleted, utcDateModified, utcDateCreated)</span><span class="type-signature"></span></h2> | ||||
|          | ||||
|             <div class="class-description">This class represents link from one note to another in the form of hyperlink or image reference. Note that | ||||
| this is different concept than attribute/relation.</div> | ||||
| @@ -46,7 +46,7 @@ this is different concept than attribute/relation.</div> | ||||
|      | ||||
|  | ||||
|      | ||||
|     <h4 class="name" id="Link"><span class="type-signature"></span>new Link<span class="signature">(linkId, noteId, targetNoteId, type, isDeleted, dateModified, dateCreated)</span><span class="type-signature"></span></h4> | ||||
|     <h4 class="name" id="Link"><span class="type-signature"></span>new Link<span class="signature">(linkId, noteId, targetNoteId, type, isDeleted, utcDateModified, utcDateCreated)</span><span class="type-signature"></span></h4> | ||||
|      | ||||
|  | ||||
|      | ||||
| @@ -201,7 +201,7 @@ this is different concept than attribute/relation.</div> | ||||
|  | ||||
|         <tr> | ||||
|              | ||||
|                 <td class="name"><code>dateModified</code></td> | ||||
|                 <td class="name"><code>utcDateModified</code></td> | ||||
|              | ||||
|  | ||||
|             <td class="type"> | ||||
| @@ -224,7 +224,7 @@ this is different concept than attribute/relation.</div> | ||||
|  | ||||
|         <tr> | ||||
|              | ||||
|                 <td class="name"><code>dateCreated</code></td> | ||||
|                 <td class="name"><code>utcDateCreated</code></td> | ||||
|              | ||||
|  | ||||
|             <td class="type"> | ||||
|   | ||||
| @@ -28,7 +28,7 @@ | ||||
|  | ||||
| <header> | ||||
|      | ||||
|         <h2><span class="attribs"><span class="type-signature"></span></span>NoteRevision<span class="signature">(noteRevisionId, noteId, type, mime, title, content, isProtected, dateModifiedFrom, dateModifiedTo)</span><span class="type-signature"></span></h2> | ||||
|         <h2><span class="attribs"><span class="type-signature"></span></span>NoteRevision<span class="signature">(noteRevisionId, noteId, type, mime, title, content, isProtected, dateModifiedFrom, dateModifiedTo, utcDateModifiedFrom, utcDateModifiedTo)</span><span class="type-signature"></span></h2> | ||||
|          | ||||
|             <div class="class-description">NoteRevision represents snapshot of note's title and content at some point in the past. It's used for seamless note versioning.</div> | ||||
|          | ||||
| @@ -45,7 +45,7 @@ | ||||
|      | ||||
|  | ||||
|      | ||||
|     <h4 class="name" id="NoteRevision"><span class="type-signature"></span>new NoteRevision<span class="signature">(noteRevisionId, noteId, type, mime, title, content, isProtected, dateModifiedFrom, dateModifiedTo)</span><span class="type-signature"></span></h4> | ||||
|     <h4 class="name" id="NoteRevision"><span class="type-signature"></span>new NoteRevision<span class="signature">(noteRevisionId, noteId, type, mime, title, content, isProtected, dateModifiedFrom, dateModifiedTo, utcDateModifiedFrom, utcDateModifiedTo)</span><span class="type-signature"></span></h4> | ||||
|      | ||||
|  | ||||
|      | ||||
| @@ -285,6 +285,52 @@ | ||||
|  | ||||
|              | ||||
|  | ||||
|             <td class="description last"></td> | ||||
|         </tr> | ||||
|  | ||||
|      | ||||
|  | ||||
|         <tr> | ||||
|              | ||||
|                 <td class="name"><code>utcDateModifiedFrom</code></td> | ||||
|              | ||||
|  | ||||
|             <td class="type"> | ||||
|              | ||||
|                  | ||||
| <span class="param-type">string</span> | ||||
|  | ||||
|  | ||||
|              | ||||
|             </td> | ||||
|  | ||||
|              | ||||
|  | ||||
|              | ||||
|  | ||||
|             <td class="description last"></td> | ||||
|         </tr> | ||||
|  | ||||
|      | ||||
|  | ||||
|         <tr> | ||||
|              | ||||
|                 <td class="name"><code>utcDateModifiedTo</code></td> | ||||
|              | ||||
|  | ||||
|             <td class="type"> | ||||
|              | ||||
|                  | ||||
| <span class="param-type">string</span> | ||||
|  | ||||
|  | ||||
|              | ||||
|             </td> | ||||
|  | ||||
|              | ||||
|  | ||||
|              | ||||
|  | ||||
|             <td class="description last"></td> | ||||
|         </tr> | ||||
|  | ||||
| @@ -326,7 +372,7 @@ | ||||
|      | ||||
|     <dt class="tag-source">Source:</dt> | ||||
|     <dd class="tag-source"><ul class="dummy"><li> | ||||
|         <a href="entities_note_revision.js.html">entities/note_revision.js</a>, <a href="entities_note_revision.js.html#line22">line 22</a> | ||||
|         <a href="entities_note_revision.js.html">entities/note_revision.js</a>, <a href="entities_note_revision.js.html#line24">line 24</a> | ||||
|     </li></ul></dd> | ||||
|      | ||||
|  | ||||
|   | ||||
| @@ -28,7 +28,7 @@ | ||||
|  | ||||
| <header> | ||||
|      | ||||
|         <h2><span class="attribs"><span class="type-signature"></span></span>Option<span class="signature">(name, value, isSynced, dateModified, dateCreated)</span><span class="type-signature"></span></h2> | ||||
|         <h2><span class="attribs"><span class="type-signature"></span></span>Option<span class="signature">(name, value, isSynced, utcDateModified, utcDateCreated)</span><span class="type-signature"></span></h2> | ||||
|          | ||||
|             <div class="class-description">Option represents name-value pair, either directly configurable by the user or some system property.</div> | ||||
|          | ||||
| @@ -45,7 +45,7 @@ | ||||
|      | ||||
|  | ||||
|      | ||||
|     <h4 class="name" id="Option"><span class="type-signature"></span>new Option<span class="signature">(name, value, isSynced, dateModified, dateCreated)</span><span class="type-signature"></span></h4> | ||||
|     <h4 class="name" id="Option"><span class="type-signature"></span>new Option<span class="signature">(name, value, isSynced, utcDateModified, utcDateCreated)</span><span class="type-signature"></span></h4> | ||||
|      | ||||
|  | ||||
|      | ||||
| @@ -154,7 +154,7 @@ | ||||
|  | ||||
|         <tr> | ||||
|              | ||||
|                 <td class="name"><code>dateModified</code></td> | ||||
|                 <td class="name"><code>utcDateModified</code></td> | ||||
|              | ||||
|  | ||||
|             <td class="type"> | ||||
| @@ -177,7 +177,7 @@ | ||||
|  | ||||
|         <tr> | ||||
|              | ||||
|                 <td class="name"><code>dateCreated</code></td> | ||||
|                 <td class="name"><code>utcDateCreated</code></td> | ||||
|              | ||||
|  | ||||
|             <td class="type"> | ||||
|   | ||||
| @@ -28,7 +28,7 @@ | ||||
|  | ||||
| <header> | ||||
|      | ||||
|         <h2><span class="attribs"><span class="type-signature"></span></span>RecentNote<span class="signature">(branchId, notePath, isDeleted, dateModified)</span><span class="type-signature"></span></h2> | ||||
|         <h2><span class="attribs"><span class="type-signature"></span></span>RecentNote<span class="signature">(noteId, notePath, isDeleted, utcDateModified)</span><span class="type-signature"></span></h2> | ||||
|          | ||||
|             <div class="class-description">RecentNote represents recently visited note.</div> | ||||
|          | ||||
| @@ -45,7 +45,7 @@ | ||||
|      | ||||
|  | ||||
|      | ||||
|     <h4 class="name" id="RecentNote"><span class="type-signature"></span>new RecentNote<span class="signature">(branchId, notePath, isDeleted, dateModified)</span><span class="type-signature"></span></h4> | ||||
|     <h4 class="name" id="RecentNote"><span class="type-signature"></span>new RecentNote<span class="signature">(noteId, notePath, isDeleted, utcDateModified)</span><span class="type-signature"></span></h4> | ||||
|      | ||||
|  | ||||
|      | ||||
| @@ -85,7 +85,7 @@ | ||||
|  | ||||
|         <tr> | ||||
|              | ||||
|                 <td class="name"><code>branchId</code></td> | ||||
|                 <td class="name"><code>noteId</code></td> | ||||
|              | ||||
|  | ||||
|             <td class="type"> | ||||
| @@ -154,7 +154,7 @@ | ||||
|  | ||||
|         <tr> | ||||
|              | ||||
|                 <td class="name"><code>dateModified</code></td> | ||||
|                 <td class="name"><code>utcDateModified</code></td> | ||||
|              | ||||
|  | ||||
|             <td class="type"> | ||||
|   | ||||
| @@ -37,22 +37,22 @@ const dateUtils = require('../services/date_utils'); | ||||
|  * @param {string} apiTokenId - primary key | ||||
|  * @param {string} token | ||||
|  * @param {boolean} isDeleted - true if API token is deleted | ||||
|  * @param {string} dateCreated | ||||
|  * @param {string} utcDateCreated | ||||
|  * | ||||
|  * @extends Entity | ||||
|  */ | ||||
| class ApiToken extends Entity { | ||||
|     static get entityName() { return "api_tokens"; } | ||||
|     static get primaryKeyName() { return "apiTokenId"; } | ||||
|     static get hashedProperties() { return ["apiTokenId", "token", "dateCreated", "isDeleted"]; } | ||||
|     static get hashedProperties() { return ["apiTokenId", "token", "utcDateCreated", "isDeleted"]; } | ||||
|  | ||||
|     beforeSaving() { | ||||
|         if (!this.isDeleted) { | ||||
|             this.isDeleted = false; | ||||
|         } | ||||
|  | ||||
|         if (!this.dateCreated) { | ||||
|             this.dateCreated = dateUtils.nowDate(); | ||||
|         if (!this.utcDateCreated) { | ||||
|             this.utcDateCreated = dateUtils.utcNowDateTime(); | ||||
|         } | ||||
|  | ||||
|         super.beforeSaving(); | ||||
|   | ||||
| @@ -44,15 +44,15 @@ const sql = require('../services/sql'); | ||||
|  * @param {int} position | ||||
|  * @param {boolean} isInheritable | ||||
|  * @param {boolean} isDeleted | ||||
|  * @param {string} dateCreated | ||||
|  * @param {string} dateModified | ||||
|  * @param {string} utcDateCreated | ||||
|  * @param {string} utcDateModified | ||||
|  * | ||||
|  * @extends Entity | ||||
|  */ | ||||
| class Attribute extends Entity { | ||||
|     static get entityName() { return "attributes"; } | ||||
|     static get primaryKeyName() { return "attributeId"; } | ||||
|     static get hashedProperties() { return ["attributeId", "noteId", "type", "name", "value", "isInheritable", "isDeleted", "dateCreated"]; } | ||||
|     static get hashedProperties() { return ["attributeId", "noteId", "type", "name", "value", "isInheritable", "isDeleted", "utcDateCreated"]; } | ||||
|  | ||||
|     constructor(row) { | ||||
|         super(row); | ||||
| @@ -123,16 +123,21 @@ class Attribute extends Entity { | ||||
|             this.isDeleted = false; | ||||
|         } | ||||
|  | ||||
|         if (!this.dateCreated) { | ||||
|             this.dateCreated = dateUtils.nowDate(); | ||||
|         if (!this.utcDateCreated) { | ||||
|             this.utcDateCreated = dateUtils.utcNowDateTime(); | ||||
|         } | ||||
|  | ||||
|         super.beforeSaving(); | ||||
|  | ||||
|         if (this.isChanged) { | ||||
|             this.dateModified = dateUtils.nowDate(); | ||||
|             this.utcDateModified = dateUtils.utcNowDateTime(); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     // cannot be static! | ||||
|     updatePojo(pojo) { | ||||
|         delete pojo.isOwned; | ||||
|     } | ||||
| } | ||||
|  | ||||
| module.exports = Attribute;</code></pre> | ||||
|   | ||||
| @@ -44,8 +44,8 @@ const sql = require('../services/sql'); | ||||
|  * @param {string} prefix | ||||
|  * @param {boolean} isExpanded | ||||
|  * @param {boolean} isDeleted | ||||
|  * @param {string} dateModified | ||||
|  * @param {string} dateCreated | ||||
|  * @param {string} utcDateModified | ||||
|  * @param {string} utcDateCreated | ||||
|  * | ||||
|  * @extends Entity | ||||
|  */ | ||||
| @@ -77,16 +77,21 @@ class Branch extends Entity { | ||||
|             this.isDeleted = false; | ||||
|         } | ||||
|  | ||||
|         if (!this.dateCreated) { | ||||
|             this.dateCreated = dateUtils.nowDate(); | ||||
|         if (!this.utcDateCreated) { | ||||
|             this.utcDateCreated = dateUtils.utcNowDateTime(); | ||||
|         } | ||||
|  | ||||
|         super.beforeSaving(); | ||||
|  | ||||
|         if (this.isChanged) { | ||||
|             this.dateModified = dateUtils.nowDate(); | ||||
|             this.utcDateModified = dateUtils.utcNowDateTime(); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     // cannot be static! | ||||
|     updatePojo(pojo) { | ||||
|         delete pojo.origParentNoteId; | ||||
|     } | ||||
| } | ||||
|  | ||||
| module.exports = Branch;</code></pre> | ||||
|   | ||||
| @@ -36,7 +36,10 @@ class Entity { | ||||
|      */ | ||||
|     constructor(row = {}) { | ||||
|         for (const key in row) { | ||||
|             this[key] = row[key]; | ||||
|             // ! is used when joint-fetching notes and note_contents objects for performance | ||||
|             if (!key.startsWith('!')) { | ||||
|                 this[key] = row[key]; | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         if ('isDeleted' in this) { | ||||
| @@ -51,7 +54,13 @@ class Entity { | ||||
|  | ||||
|         this.hash = this.generateHash(); | ||||
|  | ||||
|         this.isChanged = origHash !== this.hash; | ||||
|         if (this.forcedChange) { | ||||
|             this.isChanged = true; | ||||
|             delete this.forcedChange; | ||||
|         } | ||||
|         else { | ||||
|             this.isChanged = origHash !== this.hash; | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     generateIdIfNecessary() { | ||||
|   | ||||
| @@ -41,15 +41,15 @@ const dateUtils = require('../services/date_utils'); | ||||
|  * @param {string} targetNoteId | ||||
|  * @param {string} type | ||||
|  * @param {boolean} isDeleted | ||||
|  * @param {string} dateModified | ||||
|  * @param {string} dateCreated | ||||
|  * @param {string} utcDateModified | ||||
|  * @param {string} utcDateCreated | ||||
|  * | ||||
|  * @extends Entity | ||||
|  */ | ||||
| class Link extends Entity { | ||||
|     static get entityName() { return "links"; } | ||||
|     static get primaryKeyName() { return "linkId"; } | ||||
|     static get hashedProperties() { return ["linkId", "noteId", "targetNoteId", "type", "isDeleted", "dateCreated", "dateModified"]; } | ||||
|     static get hashedProperties() { return ["linkId", "noteId", "targetNoteId", "type", "isDeleted", "utcDateCreated", "utcDateModified"]; } | ||||
|  | ||||
|     async getNote() { | ||||
|         return await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]); | ||||
| @@ -64,14 +64,14 @@ class Link extends Entity { | ||||
|             this.isDeleted = false; | ||||
|         } | ||||
|  | ||||
|         if (!this.dateCreated) { | ||||
|             this.dateCreated = dateUtils.nowDate(); | ||||
|         if (!this.utcDateCreated) { | ||||
|             this.utcDateCreated = dateUtils.utcNowDateTime(); | ||||
|         } | ||||
|  | ||||
|         super.beforeSaving(); | ||||
|  | ||||
|         if (this.isChanged) { | ||||
|             this.dateModified = dateUtils.nowDate(); | ||||
|             this.utcDateModified = dateUtils.utcNowDateTime(); | ||||
|         } | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -32,13 +32,18 @@ const Entity = require('./entity'); | ||||
| const Attribute = require('./attribute'); | ||||
| const protectedSessionService = require('../services/protected_session'); | ||||
| const repository = require('../services/repository'); | ||||
| const sql = require('../services/sql'); | ||||
| const utils = require('../services/utils'); | ||||
| const dateUtils = require('../services/date_utils'); | ||||
| const syncTableService = require('../services/sync_table'); | ||||
|  | ||||
| const LABEL = 'label'; | ||||
| const LABEL_DEFINITION = 'label-definition'; | ||||
| const RELATION = 'relation'; | ||||
| const RELATION_DEFINITION = 'relation-definition'; | ||||
|  | ||||
| const STRING_MIME_TYPES = ["application/x-javascript"]; | ||||
|  | ||||
| /** | ||||
|  * This represents a Note which is a central object in the Trilium Notes project. | ||||
|  * | ||||
| @@ -46,18 +51,19 @@ const RELATION_DEFINITION = 'relation-definition'; | ||||
|  * @property {string} type - one of "text", "code", "file" or "render" | ||||
|  * @property {string} mime - MIME type, e.g. "text/html" | ||||
|  * @property {string} title - note title | ||||
|  * @property {string} content - note content - e.g. HTML text for text notes, file payload for files | ||||
|  * @property {boolean} isProtected - true if note is protected | ||||
|  * @property {boolean} isDeleted - true if note is deleted | ||||
|  * @property {string} dateCreated | ||||
|  * @property {string} dateModified | ||||
|  * @property {string} dateCreated - local date time (with offset) | ||||
|  * @property {string} dateModified - local date time (with offset) | ||||
|  * @property {string} utcDateCreated | ||||
|  * @property {string} utcDateModified | ||||
|  * | ||||
|  * @extends Entity | ||||
|  */ | ||||
| class Note extends Entity { | ||||
|     static get entityName() { return "notes"; } | ||||
|     static get primaryKeyName() { return "noteId"; } | ||||
|     static get hashedProperties() { return ["noteId", "title", "content", "type", "isProtected", "isDeleted"]; } | ||||
|     static get hashedProperties() { return ["noteId", "title", "type", "isProtected", "isDeleted"]; } | ||||
|  | ||||
|     /** | ||||
|      * @param row - object containing database row from "notes" table | ||||
| @@ -74,19 +80,98 @@ class Note extends Entity { | ||||
|         if (this.isProtected && this.noteId) { | ||||
|             this.isContentAvailable = protectedSessionService.isProtectedSessionAvailable(); | ||||
|  | ||||
|             protectedSessionService.decryptNote(this); | ||||
|             if (this.isContentAvailable) { | ||||
|                 protectedSessionService.decryptNote(this); | ||||
|             } | ||||
|             else { | ||||
|                 this.title = "[protected]"; | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         this.setContent(this.content); | ||||
|     } | ||||
|  | ||||
|     setContent(content) { | ||||
|     /* | ||||
|      * Note content has quite special handling - it's not a separate entity, but a lazily loaded | ||||
|      * part of Note entity with it's own sync. Reasons behind this hybrid design has been: | ||||
|      * | ||||
|      * - content can be quite large and it's not necessary to load it / fill memory for any note access even if we don't need a content, especially for bulk operations like search | ||||
|      * - changes in the note metadata or title should not trigger note content sync (so we keep separate utcDateModified and sync rows) | ||||
|      * - but to the user note content and title changes are one and the same - single dateModified (so all changes must go through Note and content is not a separate entity) | ||||
|      */ | ||||
|  | ||||
|     /** @returns {Promise<*>} */ | ||||
|     async getContent(silentNotFoundError = false) { | ||||
|         if (this.content === undefined) { | ||||
|             const res = await sql.getRow(`SELECT content, hash FROM note_contents WHERE noteId = ?`, [this.noteId]); | ||||
|  | ||||
|             if (!res) { | ||||
|                 if (silentNotFoundError) { | ||||
|                     return undefined; | ||||
|                 } | ||||
|                 else { | ||||
|                     throw new Error("Cannot find note content for noteId=" + this.noteId); | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|             this.content = res.content; | ||||
|  | ||||
|             if (this.isProtected) { | ||||
|                 if (this.isContentAvailable) { | ||||
|                     protectedSessionService.decryptNoteContent(this); | ||||
|                 } | ||||
|                 else { | ||||
|                     this.content = ""; | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|             if (this.isStringNote()) { | ||||
|                 this.content = this.content === null | ||||
|                     ? "" | ||||
|                     : this.content.toString("UTF-8"); | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         return this.content; | ||||
|     } | ||||
|  | ||||
|     /** @returns {Promise<*>} */ | ||||
|     async getJsonContent() { | ||||
|         const content = await this.getContent(); | ||||
|  | ||||
|         return JSON.parse(content); | ||||
|     } | ||||
|  | ||||
|     /** @returns {Promise} */ | ||||
|     async setContent(content) { | ||||
|         // force updating note itself so that dateChanged is represented correctly even for the content | ||||
|         this.forcedChange = true; | ||||
|         await this.save(); | ||||
|  | ||||
|         this.content = content; | ||||
|  | ||||
|         try { | ||||
|             this.jsonContent = JSON.parse(this.content); | ||||
|         const pojo = { | ||||
|             noteId: this.noteId, | ||||
|             content: content, | ||||
|             utcDateModified: dateUtils.utcNowDateTime(), | ||||
|             hash: utils.hash(this.noteId + "|" + content) | ||||
|         }; | ||||
|  | ||||
|         if (this.isProtected) { | ||||
|             if (this.isContentAvailable) { | ||||
|                 protectedSessionService.encryptNoteContent(pojo); | ||||
|             } | ||||
|             else { | ||||
|                 throw new Error(`Cannot update content of noteId=${this.noteId} since we're out of protected session.`); | ||||
|             } | ||||
|         } | ||||
|         catch(e) {} | ||||
|  | ||||
|         await sql.upsert("note_contents", "noteId", pojo); | ||||
|  | ||||
|         await syncTableService.addNoteContentSync(this.noteId); | ||||
|     } | ||||
|  | ||||
|     /** @returns {Promise} */ | ||||
|     async setJsonContent(content) { | ||||
|         await this.setContent(JSON.stringify(content, null, '\t')); | ||||
|     } | ||||
|  | ||||
|     /** @returns {boolean} true if this note is the root of the note tree. Root note has "root" noteId */ | ||||
| @@ -102,7 +187,9 @@ class Note extends Entity { | ||||
|     /** @returns {boolean} true if this note is JavaScript (code or attachment) */ | ||||
|     isJavaScript() { | ||||
|         return (this.type === "code" || this.type === "file") | ||||
|             && (this.mime.startsWith("application/javascript") || this.mime === "application/x-javascript"); | ||||
|             && (this.mime.startsWith("application/javascript") | ||||
|                 || this.mime === "application/x-javascript" | ||||
|                 || this.mime === "text/javascript"); | ||||
|     } | ||||
|  | ||||
|     /** @returns {boolean} true if this note is HTML */ | ||||
| @@ -110,6 +197,13 @@ class Note extends Entity { | ||||
|         return (this.type === "code" || this.type === "file" || this.type === "render") && this.mime === "text/html"; | ||||
|     } | ||||
|  | ||||
|     /** @returns {boolean} true if the note has string content (not binary) */ | ||||
|     isStringNote() { | ||||
|         return ["text", "code", "relation-map", "search"].includes(this.type) | ||||
|             || this.mime.startsWith('text/') | ||||
|             || STRING_MIME_TYPES.includes(this.mime); | ||||
|     } | ||||
|  | ||||
|     /** @returns {string} JS script environment - either "frontend" or "backend" */ | ||||
|     getScriptEnv() { | ||||
|         if (this.isHtml() || (this.isJavaScript() && this.mime.endsWith('env=frontend'))) { | ||||
| @@ -394,6 +488,16 @@ class Note extends Entity { | ||||
|      */ | ||||
|     async getRelationValue(name) { return await this.getAttributeValue(RELATION, name); } | ||||
|  | ||||
|     /** | ||||
|      * @param {string} name | ||||
|      * @returns {Promise<Note>|null} target note of the relation or null (if target is empty or note was not found) | ||||
|      */ | ||||
|     async getRelationTarget(name) { | ||||
|         const relation = await this.getRelation(name); | ||||
|  | ||||
|         return relation ? await repository.getNote(relation.value) : null; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Based on enabled, label is either set or removed. | ||||
|      * | ||||
| @@ -451,24 +555,32 @@ class Note extends Entity { | ||||
|     async removeRelation(name, value) { return await this.removeAttribute(RELATION, name, value); } | ||||
|  | ||||
|     /** | ||||
|      * @param {string} name | ||||
|      * @returns {Promise<Note>|null} target note of the relation or null (if target is empty or note was not found) | ||||
|      * @return {Promise<string[]>} return list of all descendant noteIds of this note. Returning just noteIds because number of notes can be huge. Includes also this note's noteId | ||||
|      */ | ||||
|     async getRelationTarget(name) { | ||||
|         const relation = await this.getRelation(name); | ||||
|  | ||||
|         return relation ? await repository.getNote(relation.value) : null; | ||||
|     async getDescendantNoteIds() { | ||||
|         return await sql.getColumn(` | ||||
|             WITH RECURSIVE | ||||
|             tree(noteId) AS ( | ||||
|                 SELECT ? | ||||
|                 UNION | ||||
|                 SELECT branches.noteId FROM branches | ||||
|                     JOIN tree ON branches.parentNoteId = tree.noteId | ||||
|                     JOIN notes ON notes.noteId = branches.noteId | ||||
|                 WHERE notes.isDeleted = 0 | ||||
|                   AND branches.isDeleted = 0 | ||||
|             ) | ||||
|             SELECT noteId FROM tree`, [this.noteId]); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Finds child notes with given attribute name and value. Only own attributes are considered, not inherited ones | ||||
|      * Finds descendant notes with given attribute name and value. Only own attributes are considered, not inherited ones | ||||
|      * | ||||
|      * @param {string} type - attribute type (label, relation, etc.) | ||||
|      * @param {string} name - attribute name | ||||
|      * @param {string} [value] - attribute value | ||||
|      * @returns {Promise<Note[]>} | ||||
|      */ | ||||
|     async findChildNotesWithAttribute(type, name, value) { | ||||
|     async getDescendantNotesWithAttribute(type, name, value) { | ||||
|         const params = [this.noteId, name]; | ||||
|         let valueCondition = ""; | ||||
|  | ||||
| @@ -500,22 +612,22 @@ class Note extends Entity { | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Finds notes with given label name and value. Only own labels are considered, not inherited ones | ||||
|      * Finds descendant notes with given label name and value. Only own labels are considered, not inherited ones | ||||
|      * | ||||
|      * @param {string} name - label name | ||||
|      * @param {string} [value] - label value | ||||
|      * @returns {Promise<Note[]>} | ||||
|      */ | ||||
|     async findChildNotesWithLabel(name, value) { return await this.findChildNotesWithAttribute(LABEL, name, value); } | ||||
|     async getDescendantNotesWithLabel(name, value) { return await this.getDescendantNotesWithAttribute(LABEL, name, value); } | ||||
|  | ||||
|     /** | ||||
|      * Finds notes with given relation name and value. Only own relations are considered, not inherited ones | ||||
|      * Finds descendant notes with given relation name and value. Only own relations are considered, not inherited ones | ||||
|      * | ||||
|      * @param {string} name - relation name | ||||
|      * @param {string} [value] - relation value | ||||
|      * @returns {Promise<Note[]>} | ||||
|      */ | ||||
|     async findChildNotesWithRelation(name, value) { return await this.findChildNotesWithAttribute(RELATION, name, value); } | ||||
|     async getDescendantNotesWithRelation(name, value) { return await this.getDescendantNotesWithAttribute(RELATION, name, value); } | ||||
|  | ||||
|     /** | ||||
|      * Returns note revisions of this note. | ||||
| @@ -608,31 +720,43 @@ class Note extends Entity { | ||||
|     } | ||||
|  | ||||
|     beforeSaving() { | ||||
|         if (this.isJson() && this.jsonContent) { | ||||
|             this.content = JSON.stringify(this.jsonContent, null, '\t'); | ||||
|         } | ||||
|  | ||||
|         // we do this here because encryption needs the note ID for the IV | ||||
|         this.generateIdIfNecessary(); | ||||
|  | ||||
|         if (this.isProtected) { | ||||
|             protectedSessionService.encryptNote(this); | ||||
|         } | ||||
|  | ||||
|         if (!this.isDeleted) { | ||||
|             this.isDeleted = false; | ||||
|         } | ||||
|  | ||||
|         if (!this.dateCreated) { | ||||
|             this.dateCreated = dateUtils.nowDate(); | ||||
|             this.dateCreated = dateUtils.localNowDateTime(); | ||||
|         } | ||||
|  | ||||
|         if (!this.utcDateCreated) { | ||||
|             this.utcDateCreated = dateUtils.utcNowDateTime(); | ||||
|         } | ||||
|  | ||||
|         super.beforeSaving(); | ||||
|  | ||||
|         if (this.isChanged) { | ||||
|             this.dateModified = dateUtils.nowDate(); | ||||
|             this.dateModified = dateUtils.localNowDateTime(); | ||||
|             this.utcDateModified = dateUtils.utcNowDateTime(); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     // cannot be static! | ||||
|     updatePojo(pojo) { | ||||
|         if (pojo.isProtected) { | ||||
|             if (this.isContentAvailable) { | ||||
|                 protectedSessionService.encryptNote(pojo); | ||||
|             } | ||||
|             else { | ||||
|                 // updating protected note outside of protected session means we will keep original ciphertexts | ||||
|                 delete pojo.title; | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         delete pojo.isContentAvailable; | ||||
|         delete pojo.__attributeCache; | ||||
|         delete pojo.content; | ||||
|         delete pojo.contentHash; | ||||
|     } | ||||
| } | ||||
|  | ||||
| module.exports = Note;</code></pre> | ||||
|   | ||||
| @@ -44,13 +44,15 @@ const repository = require('../services/repository'); | ||||
|  * @param {string} isProtected | ||||
|  * @param {string} dateModifiedFrom | ||||
|  * @param {string} dateModifiedTo | ||||
|  * @param {string} utcDateModifiedFrom | ||||
|  * @param {string} utcDateModifiedTo | ||||
|  * | ||||
|  * @extends Entity | ||||
|  */ | ||||
| class NoteRevision extends Entity { | ||||
|     static get entityName() { return "note_revisions"; } | ||||
|     static get primaryKeyName() { return "noteRevisionId"; } | ||||
|     static get hashedProperties() { return ["noteRevisionId", "noteId", "title", "content", "isProtected", "dateModifiedFrom", "dateModifiedTo"]; } | ||||
|     static get hashedProperties() { return ["noteRevisionId", "noteId", "title", "content", "isProtected", "dateModifiedFrom", "dateModifiedTo", "utcDateModifiedFrom", "utcDateModifiedTo"]; } | ||||
|  | ||||
|     constructor(row) { | ||||
|         super(row); | ||||
|   | ||||
| @@ -37,8 +37,8 @@ const dateUtils = require('../services/date_utils'); | ||||
|  * @param {string} name | ||||
|  * @param {string} value | ||||
|  * @param {boolean} isSynced | ||||
|  * @param {string} dateModified | ||||
|  * @param {string} dateCreated | ||||
|  * @param {string} utcDateModified | ||||
|  * @param {string} utcDateCreated | ||||
|  * | ||||
|  * @extends Entity | ||||
|  */ | ||||
| @@ -54,10 +54,14 @@ class Option extends Entity { | ||||
|     } | ||||
|  | ||||
|     beforeSaving() { | ||||
|         if (!this.utcDateCreated) { | ||||
|             this.utcDateCreated = dateUtils.utcNowDateTime(); | ||||
|         } | ||||
|  | ||||
|         super.beforeSaving(); | ||||
|  | ||||
|         if (this.isChanged) { | ||||
|             this.dateModified = dateUtils.nowDate(); | ||||
|             this.utcDateModified = dateUtils.utcNowDateTime(); | ||||
|         } | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -34,25 +34,25 @@ const dateUtils = require('../services/date_utils'); | ||||
| /** | ||||
|  * RecentNote represents recently visited note. | ||||
|  * | ||||
|  * @param {string} branchId | ||||
|  * @param {string} noteId | ||||
|  * @param {string} notePath | ||||
|  * @param {boolean} isDeleted | ||||
|  * @param {string} dateModified | ||||
|  * @param {string} utcDateModified | ||||
|  * | ||||
|  * @extends Entity | ||||
|  */ | ||||
| class RecentNote extends Entity { | ||||
|     static get entityName() { return "recent_notes"; } | ||||
|     static get primaryKeyName() { return "branchId"; } | ||||
|     static get hashedProperties() { return ["branchId", "notePath", "dateCreated", "isDeleted"]; } | ||||
|     static get primaryKeyName() { return "noteId"; } | ||||
|     static get hashedProperties() { return ["noteId", "notePath", "utcDateCreated", "isDeleted"]; } | ||||
|  | ||||
|     beforeSaving() { | ||||
|         if (!this.isDeleted) { | ||||
|             this.isDeleted = false; | ||||
|         } | ||||
|  | ||||
|         if (!this.dateCreated) { | ||||
|             this.dateCreated = dateUtils.nowDate(); | ||||
|         if (!this.utcDateCreated) { | ||||
|             this.utcDateCreated = dateUtils.utcNowDateTime(); | ||||
|         } | ||||
|  | ||||
|         super.beforeSaving(); | ||||
|   | ||||
| @@ -272,7 +272,7 @@ | ||||
|      | ||||
|     <dt class="tag-source">Source:</dt> | ||||
|     <dd class="tag-source"><ul class="dummy"><li> | ||||
|         <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line144">line 144</a> | ||||
|         <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line173">line 173</a> | ||||
|     </li></ul></dd> | ||||
|      | ||||
|  | ||||
| @@ -558,7 +558,7 @@ | ||||
|      | ||||
|     <dt class="tag-source">Source:</dt> | ||||
|     <dd class="tag-source"><ul class="dummy"><li> | ||||
|         <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line151">line 151</a> | ||||
|         <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line180">line 180</a> | ||||
|     </li></ul></dd> | ||||
|      | ||||
|  | ||||
|   | ||||
| @@ -30,15 +30,17 @@ | ||||
| const noteService = require('./notes'); | ||||
| const sql = require('./sql'); | ||||
| const utils = require('./utils'); | ||||
| const dateUtils = require('./date_utils'); | ||||
| const attributeService = require('./attributes'); | ||||
| const dateNoteService = require('./date_notes'); | ||||
| const treeService = require('./tree'); | ||||
| const config = require('./config'); | ||||
| const repository = require('./repository'); | ||||
| const axios = require('axios'); | ||||
| const dayjs = require('dayjs'); | ||||
| const cloningService = require('./cloning'); | ||||
| const messagingService = require('./messaging'); | ||||
| const appInfo = require('./app_info'); | ||||
| const searchService = require('./search'); | ||||
|  | ||||
| /** | ||||
|  * This is the main backend API interface for scripts. It's published in the local "api" object. | ||||
| @@ -46,20 +48,23 @@ const messagingService = require('./messaging'); | ||||
|  * @constructor | ||||
|  * @hideconstructor | ||||
|  */ | ||||
| function BackendScriptApi(startNote, currentNote, originEntity) { | ||||
| function BackendScriptApi(currentNote, apiParams) { | ||||
|     /** @property {Note} note where script started executing */ | ||||
|     this.startNote = startNote; | ||||
|     /** @property {Note} note where script is currently executing */ | ||||
|     this.startNote = apiParams.startNote; | ||||
|     /** @property {Note} note where script is currently executing. Don't mix this up with concept of active note */ | ||||
|     this.currentNote = currentNote; | ||||
|     /** @property {Entity} entity whose event triggered this executions */ | ||||
|     this.originEntity = originEntity; | ||||
|     this.originEntity = apiParams.originEntity; | ||||
|  | ||||
|     for (const key in apiParams) { | ||||
|         this[key] = apiParams[key]; | ||||
|     } | ||||
|  | ||||
|     this.axios = axios; | ||||
|     this.dayjs = dayjs; | ||||
|  | ||||
|     this.utils = { | ||||
|         unescapeHtml: utils.unescapeHtml, | ||||
|         isoDateTimeStr: dateUtils.dateStr, | ||||
|         isoDateStr: date => dateUtils.dateStr(date).substr(0, 10) | ||||
|         unescapeHtml: utils.unescapeHtml | ||||
|     }; | ||||
|  | ||||
|     /** | ||||
| @@ -116,6 +121,30 @@ function BackendScriptApi(startNote, currentNote, originEntity) { | ||||
|      */ | ||||
|     this.getEntities = repository.getEntities; | ||||
|  | ||||
|     /** | ||||
|      * This is a powerful search method - you can search by attributes and their values, e.g.: | ||||
|      * "@dateModified =* MONTH AND @log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search | ||||
|      * | ||||
|      * @method | ||||
|      * @param {string} searchString | ||||
|      * @returns {Promise<Note[]>} | ||||
|      */ | ||||
|     this.searchForNotes = searchService.searchForNotes; | ||||
|  | ||||
|     /** | ||||
|      * This is a powerful search method - you can search by attributes and their values, e.g.: | ||||
|      * "@dateModified =* MONTH AND @log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search | ||||
|      * | ||||
|      * @method | ||||
|      * @param {string} searchString | ||||
|      * @returns {Promise<Note|null>} | ||||
|      */ | ||||
|     this.searchForNote = async searchString => { | ||||
|         const notes = await searchService.searchForNotes(searchString); | ||||
|  | ||||
|         return notes.length > 0 ? notes[0] : null; | ||||
|     }; | ||||
|  | ||||
|     /** | ||||
|      * Retrieves notes with given label name & value | ||||
|      * | ||||
| @@ -196,6 +225,23 @@ function BackendScriptApi(startNote, currentNote, originEntity) { | ||||
|      */ | ||||
|     this.createNote = noteService.createNote; | ||||
|  | ||||
|     /** | ||||
|      * Creates new note according to given params and force all connected clients to refresh their tree. | ||||
|      * | ||||
|      * @method | ||||
|      * | ||||
|      * @param {string} parentNoteId - create new note under this parent | ||||
|      * @param {string} title | ||||
|      * @param {string} [content=""] | ||||
|      * @param {CreateNoteExtraOptions} [extraOptions={}] | ||||
|      * @returns {Promise<{note: Note, branch: Branch}>} object contains newly created entities note and branch | ||||
|      */ | ||||
|     this.createNoteAndRefresh = async function(parentNoteId, title, content, extraOptions) { | ||||
|         await noteService.createNote(parentNoteId, title, content, extraOptions); | ||||
|  | ||||
|         messagingService.refreshTree(); | ||||
|     }; | ||||
|  | ||||
|     /** | ||||
|      * Log given message to trilium logs. | ||||
|      * | ||||
| @@ -212,14 +258,42 @@ function BackendScriptApi(startNote, currentNote, originEntity) { | ||||
|     this.getRootCalendarNote = dateNoteService.getRootCalendarNote; | ||||
|  | ||||
|     /** | ||||
|      * Returns day note for given date (YYYY-MM-DD format). If such note doesn't exist, it is created. | ||||
|      * Returns day note for given date. If such note doesn't exist, it is created. | ||||
|      * | ||||
|      * @method | ||||
|      * @param {string} date | ||||
|      * @param {string} date in YYYY-MM-DD format | ||||
|      * @returns {Promise<Note|null>} | ||||
|      */ | ||||
|     this.getDateNote = dateNoteService.getDateNote; | ||||
|  | ||||
|     /** | ||||
|      * Returns note for the first date of the week of the given date. | ||||
|      * | ||||
|      * @method | ||||
|      * @param {string} date in YYYY-MM-DD format | ||||
|      * @param {object} options - "startOfTheWeek" - either "monday" (default) or "sunday" | ||||
|      * @returns {Promise<Note|null>} | ||||
|      */ | ||||
|     this.getWeekNote = dateNoteService.getWeekNote; | ||||
|  | ||||
|     /** | ||||
|      * Returns month note for given date. If such note doesn't exist, it is created. | ||||
|      * | ||||
|      * @method | ||||
|      * @param {string} date in YYYY-MM format | ||||
|      * @returns {Promise<Note|null>} | ||||
|      */ | ||||
|     this.getMonthNote = dateNoteService.getMonthNote; | ||||
|  | ||||
|     /** | ||||
|      * Returns year note for given year. If such note doesn't exist, it is created. | ||||
|      * | ||||
|      * @method | ||||
|      * @param {string} year in YYYY format | ||||
|      * @returns {Promise<Note|null>} | ||||
|      */ | ||||
|     this.getYearNote = dateNoteService.getYearNote; | ||||
|  | ||||
|     /** | ||||
|      * @method | ||||
|      * @param {string} parentNoteId - this note's child notes will be sorted | ||||
| @@ -253,13 +327,20 @@ function BackendScriptApi(startNote, currentNote, originEntity) { | ||||
|      */ | ||||
|     this.transactional = sql.transactional; | ||||
|  | ||||
|     this.sql = sql; | ||||
|  | ||||
|     /** | ||||
|      * Trigger tree refresh in all connected clients. This is required when some tree change happens in | ||||
|      * the backend. | ||||
|      * | ||||
|      * @returns {Promise<void>} | ||||
|      */ | ||||
|     this.refreshTree = () => messagingService.sendMessageToAllClients({ type: 'refresh-tree' }); | ||||
|     this.refreshTree = messagingService.refreshTree; | ||||
|  | ||||
|     /** | ||||
|      * @return {{syncVersion, appVersion, buildRevision, dbVersion, dataDirectory, buildDate}|*} - object representing basic info about running Trilium version | ||||
|      */ | ||||
|     this.getAppInfo = () => appInfo | ||||
| } | ||||
|  | ||||
| module.exports = BackendScriptApi;</code></pre> | ||||
|   | ||||
| @@ -199,7 +199,7 @@ | ||||
|  | ||||
|          | ||||
|              | ||||
| <h4 class="name" id="jsonContent"><span class="type-signature"></span>jsonContent<span class="type-signature"></span></h4> | ||||
| <h4 class="name" id="dateCreated"><span class="type-signature"></span>dateCreated<span class="type-signature"></span></h4> | ||||
|  | ||||
|  | ||||
|  | ||||
| @@ -239,7 +239,181 @@ | ||||
|      | ||||
|     <dt class="tag-source">Source:</dt> | ||||
|     <dd class="tag-source"><ul class="dummy"><li> | ||||
|         <a href="entities_note_full.js.html">entities/note_full.js</a>, <a href="entities_note_full.js.html#line16">line 16</a> | ||||
|         <a href="entities_note_full.js.html">entities/note_full.js</a>, <a href="entities_note_full.js.html#line14">line 14</a> | ||||
|     </li></ul></dd> | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
| </dl> | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|          | ||||
|              | ||||
| <h4 class="name" id="dateModified"><span class="type-signature"></span>dateModified<span class="type-signature"></span></h4> | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
| <dl class="details"> | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|     <dt class="tag-source">Source:</dt> | ||||
|     <dd class="tag-source"><ul class="dummy"><li> | ||||
|         <a href="entities_note_full.js.html">entities/note_full.js</a>, <a href="entities_note_full.js.html#line17">line 17</a> | ||||
|     </li></ul></dd> | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
| </dl> | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|          | ||||
|              | ||||
| <h4 class="name" id="utcDateCreated"><span class="type-signature"></span>utcDateCreated<span class="type-signature"></span></h4> | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
| <dl class="details"> | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|     <dt class="tag-source">Source:</dt> | ||||
|     <dd class="tag-source"><ul class="dummy"><li> | ||||
|         <a href="entities_note_full.js.html">entities/note_full.js</a>, <a href="entities_note_full.js.html#line20">line 20</a> | ||||
|     </li></ul></dd> | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
| </dl> | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|          | ||||
|              | ||||
| <h4 class="name" id="utcDateModified"><span class="type-signature"></span>utcDateModified<span class="type-signature"></span></h4> | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
| <dl class="details"> | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|  | ||||
|      | ||||
|     <dt class="tag-source">Source:</dt> | ||||
|     <dd class="tag-source"><ul class="dummy"><li> | ||||
|         <a href="entities_note_full.js.html">entities/note_full.js</a>, <a href="entities_note_full.js.html#line23">line 23</a> | ||||
|     </li></ul></dd> | ||||
|      | ||||
|  | ||||
|   | ||||
							
								
								
									
										86
									
								
								docs/frontend_api/entities_attribute.js.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,86 @@ | ||||
| <!DOCTYPE html> | ||||
| <html lang="en"> | ||||
| <head> | ||||
|     <meta charset="utf-8"> | ||||
|     <title>JSDoc: Source: entities/attribute.js</title> | ||||
|  | ||||
|     <script src="scripts/prettify/prettify.js"> </script> | ||||
|     <script src="scripts/prettify/lang-css.js"> </script> | ||||
|     <!--[if lt IE 9]> | ||||
|       <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script> | ||||
|     <![endif]--> | ||||
|     <link type="text/css" rel="stylesheet" href="styles/prettify-tomorrow.css"> | ||||
|     <link type="text/css" rel="stylesheet" href="styles/jsdoc-default.css"> | ||||
| </head> | ||||
|  | ||||
| <body> | ||||
|  | ||||
| <div id="main"> | ||||
|  | ||||
|     <h1 class="page-title">Source: entities/attribute.js</h1> | ||||
|  | ||||
|      | ||||
|  | ||||
|  | ||||
|  | ||||
|      | ||||
|     <section> | ||||
|         <article> | ||||
|             <pre class="prettyprint source linenums"><code>class Attribute { | ||||
|     constructor(treeCache, row) { | ||||
|         this.treeCache = treeCache; | ||||
|         /** @param {string} attributeId */ | ||||
|         this.attributeId = row.attributeId; | ||||
|         /** @param {string} noteId */ | ||||
|         this.noteId = row.noteId; | ||||
|         /** @param {string} type */ | ||||
|         this.type = row.type; | ||||
|         /** @param {string} name */ | ||||
|         this.name = row.name; | ||||
|         /** @param {string} value */ | ||||
|         this.value = row.value; | ||||
|         /** @param {int} position */ | ||||
|         this.position = row.position; | ||||
|         /** @param {boolean} isInheritable */ | ||||
|         this.isInheritable = row.isInheritable; | ||||
|         /** @param {boolean} isDeleted */ | ||||
|         this.isDeleted = row.isDeleted; | ||||
|         /** @param {string} utcDateCreated */ | ||||
|         this.utcDateCreated = row.utcDateCreated; | ||||
|         /** @param {string} utcDateModified */ | ||||
|         this.utcDateModified = row.utcDateModified; | ||||
|     } | ||||
|  | ||||
|     /** @returns {NoteShort} */ | ||||
|     async getNote() { | ||||
|         return await this.treeCache.getNote(this.noteId); | ||||
|     } | ||||
|  | ||||
|     get toString() { | ||||
|         return `Attribute(attributeId=${this.attributeId}, type=${this.type}, name=${this.name})`; | ||||
|     } | ||||
| } | ||||
|  | ||||
| export default Attribute;</code></pre> | ||||
|         </article> | ||||
|     </section> | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
| </div> | ||||
|  | ||||
| <nav> | ||||
|     <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteFull.html">NoteFull</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3><a href="global.html">Global</a></h3> | ||||
| </nav> | ||||
|  | ||||
| <br class="clear"> | ||||
|  | ||||
| <footer> | ||||
|     Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> | ||||
| </footer> | ||||
|  | ||||
| <script> prettyPrint(); </script> | ||||
| <script src="scripts/linenumber.js"> </script> | ||||
| </body> | ||||
| </html> | ||||
| @@ -42,7 +42,7 @@ class Branch { | ||||
|         /** @param {string} */ | ||||
|         this.prefix = row.prefix; | ||||
|         /** @param {boolean} */ | ||||
|         this.isExpanded = row.isExpanded; | ||||
|         this.isExpanded = !!row.isExpanded; | ||||
|     } | ||||
|  | ||||
|     /** @returns {NoteShort} */ | ||||
|   | ||||
| @@ -38,13 +38,17 @@ class NoteFull extends NoteShort { | ||||
|         /** @param {string} */ | ||||
|         this.content = row.content; | ||||
|  | ||||
|         if (this.content !== "" && this.isJson()) { | ||||
|             try { | ||||
|                 /** @param {object} */ | ||||
|                 this.jsonContent = JSON.parse(this.content); | ||||
|             } | ||||
|             catch(e) {} | ||||
|         } | ||||
|         /** @param {string} */ | ||||
|         this.dateCreated = row.dateCreated; | ||||
|  | ||||
|         /** @param {string} */ | ||||
|         this.dateModified = row.dateModified; | ||||
|  | ||||
|         /** @param {string} */ | ||||
|         this.utcDateCreated = row.utcDateCreated; | ||||
|  | ||||
|         /** @param {string} */ | ||||
|         this.utcDateModified = row.utcDateModified; | ||||
|     } | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -26,7 +26,14 @@ | ||||
|      | ||||
|     <section> | ||||
|         <article> | ||||
|             <pre class="prettyprint source linenums"><code>/** | ||||
|             <pre class="prettyprint source linenums"><code>import server from '../services/server.js'; | ||||
|  | ||||
| const LABEL = 'label'; | ||||
| const LABEL_DEFINITION = 'label-definition'; | ||||
| const RELATION = 'relation'; | ||||
| const RELATION_DEFINITION = 'relation-definition'; | ||||
|  | ||||
| /** | ||||
|  * This note's representation is used in note tree and is kept in TreeCache. | ||||
|  * Its notable omission is the note content. | ||||
|  */ | ||||
| @@ -99,6 +106,140 @@ class NoteShort { | ||||
|         return await this.treeCache.getNotes(this.getChildNoteIds()); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @param {string} [name] - attribute name to filter | ||||
|      * @returns {Promise<Attribute[]>} | ||||
|      */ | ||||
|     async getAttributes(name) { | ||||
|         if (!this.attributeCache) { | ||||
|             this.attributeCache = await server.get('notes/' + this.noteId + '/attributes'); | ||||
|         } | ||||
|  | ||||
|         if (name) { | ||||
|             return this.attributeCache.filter(attr => attr.name === name); | ||||
|         } | ||||
|         else { | ||||
|             return this.attributeCache; | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @param {string} [name] - label name to filter | ||||
|      * @returns {Promise<Attribute[]>} all note's labels (attributes with type label), including inherited ones | ||||
|      */ | ||||
|     async getLabels(name) { | ||||
|         return (await this.getAttributes(name)).filter(attr => attr.type === LABEL); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @param {string} [name] - label name to filter | ||||
|      * @returns {Promise<Attribute[]>} all note's label definitions, including inherited ones | ||||
|      */ | ||||
|     async getLabelDefinitions(name) { | ||||
|         return (await this.getAttributes(name)).filter(attr => attr.type === LABEL_DEFINITION); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @param {string} [name] - relation name to filter | ||||
|      * @returns {Promise<Attribute[]>} all note's relations (attributes with type relation), including inherited ones | ||||
|      */ | ||||
|     async getRelations(name) { | ||||
|         return (await this.getAttributes(name)).filter(attr => attr.type === RELATION); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @param {string} [name] - relation name to filter | ||||
|      * @returns {Promise<Attribute[]>} all note's relation definitions including inherited ones | ||||
|      */ | ||||
|     async getRelationDefinitions(name) { | ||||
|         return (await this.getAttributes(name)).filter(attr => attr.type === RELATION_DEFINITION); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @param {string} type - attribute type (label, relation, etc.) | ||||
|      * @param {string} name - attribute name | ||||
|      * @returns {Promise<boolean>} true if note has an attribute with given type and name (including inherited) | ||||
|      */ | ||||
|     async hasAttribute(type, name) { | ||||
|         return !!await this.getAttribute(type, name); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @param {string} type - attribute type (label, relation, etc.) | ||||
|      * @param {string} name - attribute name | ||||
|      * @returns {Promise<Attribute>} attribute of given type and name. If there's more such attributes, first is  returned. Returns null if there's no such attribute belonging to this note. | ||||
|      */ | ||||
|     async getAttribute(type, name) { | ||||
|         const attributes = await this.getAttributes(); | ||||
|  | ||||
|         return attributes.find(attr => attr.type === type && attr.name === name); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @param {string} type - attribute type (label, relation, etc.) | ||||
|      * @param {string} name - attribute name | ||||
|      * @returns {Promise<string>} attribute value of given type and name or null if no such attribute exists. | ||||
|      */ | ||||
|     async getAttributeValue(type, name) { | ||||
|         const attr = await this.getAttribute(type, name); | ||||
|  | ||||
|         return attr ? attr.value : null; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @param {string} name - label name | ||||
|      * @returns {Promise<boolean>} true if label exists (including inherited) | ||||
|      */ | ||||
|     async hasLabel(name) { return await this.hasAttribute(LABEL, name); } | ||||
|  | ||||
|     /** | ||||
|      * @param {string} name - relation name | ||||
|      * @returns {Promise<boolean>} true if relation exists (including inherited) | ||||
|      */ | ||||
|     async hasRelation(name) { return await this.hasAttribute(RELATION, name); } | ||||
|  | ||||
|     /** | ||||
|      * @param {string} name - label name | ||||
|      * @returns {Promise<Attribute>} label if it exists, null otherwise | ||||
|      */ | ||||
|     async getLabel(name) { return await this.getAttribute(LABEL, name); } | ||||
|  | ||||
|     /** | ||||
|      * @param {string} name - relation name | ||||
|      * @returns {Promise<Attribute>} relation if it exists, null otherwise | ||||
|      */ | ||||
|     async getRelation(name) { return await this.getAttribute(RELATION, name); } | ||||
|  | ||||
|     /** | ||||
|      * @param {string} name - label name | ||||
|      * @returns {Promise<string>} label value if label exists, null otherwise | ||||
|      */ | ||||
|     async getLabelValue(name) { return await this.getAttributeValue(LABEL, name); } | ||||
|  | ||||
|     /** | ||||
|      * @param {string} name - relation name | ||||
|      * @returns {Promise<string>} relation value if relation exists, null otherwise | ||||
|      */ | ||||
|     async getRelationValue(name) { return await this.getAttributeValue(RELATION, name); } | ||||
|  | ||||
|     /** | ||||
|      * @param {string} name | ||||
|      * @returns {Promise<Note>|null} target note of the relation or null (if target is empty or note was not found) | ||||
|      */ | ||||
|     async getRelationTarget(name) { | ||||
|         const relation = await this.getRelation(name); | ||||
|  | ||||
|         return relation ? await repository.getNote(relation.value) : null; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Clear note's attributes cache to force fresh reload for next attribute request. | ||||
|      * Cache is note instance scoped. | ||||
|      */ | ||||
|     invalidateAttributeCache() { | ||||
|         this.attributeCache = null; | ||||
|     } | ||||
|  | ||||
|     get toString() { | ||||
|         return `Note(noteId=${this.noteId}, title=${this.title})`; | ||||
|     } | ||||
| @@ -107,6 +248,7 @@ class NoteShort { | ||||
|         const dto = Object.assign({}, this); | ||||
|         delete dto.treeCache; | ||||
|         delete dto.archived; | ||||
|         delete dto.attributeCache; | ||||
|  | ||||
|         return dto; | ||||
|     } | ||||
|   | ||||
| @@ -303,7 +303,7 @@ | ||||
|      | ||||
|     <dt class="tag-source">Source:</dt> | ||||
|     <dd class="tag-source"><ul class="dummy"><li> | ||||
|         <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line47">line 47</a> | ||||
|         <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line56">line 56</a> | ||||
|     </li></ul></dd> | ||||
|      | ||||
|  | ||||
|   | ||||
| @@ -34,6 +34,9 @@ import linkService from './link.js'; | ||||
| import treeCache from './tree_cache.js'; | ||||
| import noteDetailService from './note_detail.js'; | ||||
| import noteTypeService from './note_type.js'; | ||||
| import noteTooltipService from './note_tooltip.js'; | ||||
| import protectedSessionService from'./protected_session.js'; | ||||
| import dateNotesService from'./date_notes.js'; | ||||
|  | ||||
| /** | ||||
|  * This is the main frontend API interface for scripts. It's published in the local "api" object. | ||||
| @@ -41,7 +44,7 @@ import noteTypeService from './note_type.js'; | ||||
|  * @constructor | ||||
|  * @hideconstructor | ||||
|  */ | ||||
| function FrontendScriptApi(startNote, currentNote, originEntity = null) { | ||||
| function FrontendScriptApi(startNote, currentNote, originEntity = null, tabContext = null) { | ||||
|     const $pluginButtons = $("#plugin-buttons"); | ||||
|  | ||||
|     /** @property {object} note where script started executing */ | ||||
| @@ -51,6 +54,12 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null) { | ||||
|     /** @property {object|null} entity whose event triggered this execution */ | ||||
|     this.originEntity = originEntity; | ||||
|  | ||||
|     // to keep consistency with backend API | ||||
|     this.dayjs = dayjs; | ||||
|  | ||||
|     /** @property {TabContext|null} - experimental! */ | ||||
|     this.tabContext = tabContext; | ||||
|  | ||||
|     /** | ||||
|      * Activates note in the tree and in the note detail. | ||||
|      * | ||||
| @@ -69,7 +78,7 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null) { | ||||
|     this.activateNewNote = async notePath => { | ||||
|         await treeService.reload(); | ||||
|  | ||||
|         await treeService.activateNote(notePath, true); | ||||
|         await treeService.activateNote(notePath, noteDetailService.focusAndSelectTitle); | ||||
|     }; | ||||
|  | ||||
|     /** | ||||
| @@ -157,6 +166,46 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null) { | ||||
|         } | ||||
|     }; | ||||
|  | ||||
|     /** | ||||
|      * This is a powerful search method - you can search by attributes and their values, e.g.: | ||||
|      * "@dateModified =* MONTH AND @log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search | ||||
|      * | ||||
|      * @method | ||||
|      * @param {string} searchString | ||||
|      * @returns {Promise<NoteShort[]>} | ||||
|      */ | ||||
|     this.searchForNotes = async searchString => { | ||||
|         const noteIds = await this.runOnServer(async searchString => { | ||||
|             const notes = await api.searchForNotes(searchString); | ||||
|  | ||||
|             return notes.map(note => note.noteId); | ||||
|         }, [searchString]); | ||||
|  | ||||
|         return await treeCache.getNotes(noteIds); | ||||
|     }; | ||||
|  | ||||
|     /** | ||||
|      * This is a powerful search method - you can search by attributes and their values, e.g.: | ||||
|      * "@dateModified =* MONTH AND @log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search | ||||
|      * | ||||
|      * @method | ||||
|      * @param {string} searchString | ||||
|      * @returns {Promise<NoteShort|null>} | ||||
|      */ | ||||
|     this.searchForNote = async searchString => { | ||||
|         const notes = await this.searchForNotes(searchString); | ||||
|  | ||||
|         return notes.length > 0 ? notes[0] : null; | ||||
|     }; | ||||
|  | ||||
|     /** | ||||
|      * Returns note by given noteId. If note is missing from cache, it's loaded. | ||||
|      ** | ||||
|      * @param {string} noteId | ||||
|      * @return {Promise<NoteShort>} | ||||
|      */ | ||||
|     this.getNote = async noteId => await treeCache.getNote(noteId); | ||||
|  | ||||
|     /** | ||||
|      * Returns list of notes. If note is missing from cache, it's loaded. | ||||
|      * | ||||
| @@ -169,6 +218,18 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null) { | ||||
|      */ | ||||
|     this.getNotes = async (noteIds, silentNotFoundError = false) => await treeCache.getNotes(noteIds, silentNotFoundError); | ||||
|  | ||||
|     /** | ||||
|      * @param {string} noteId | ||||
|      * @method | ||||
|      */ | ||||
|     this.reloadChildren = async noteId => await treeCache.reloadChildren(noteId); | ||||
|  | ||||
|     /** | ||||
|      * @param {string} noteId | ||||
|      * @method | ||||
|      */ | ||||
|     this.reloadParents = async noteId => await treeCache.reloadParents(noteId); | ||||
|  | ||||
|     /** | ||||
|      * Instance name identifies particular Trilium instance. It can be useful for scripts | ||||
|      * if some action needs to happen on only one specific instance. | ||||
| @@ -226,9 +287,32 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null) { | ||||
|  | ||||
|     /** | ||||
|      * @method | ||||
|      * @returns {string} content of currently loaded note in the editor (HTML, code etc.) | ||||
|      * @returns {NoteFull} active note (loaded into right pane) | ||||
|      */ | ||||
|     this.getCurrentNoteContent = noteDetailService.getCurrentNoteContent; | ||||
|     this.getActiveNote = noteDetailService.getActiveNote; | ||||
|  | ||||
|     /** | ||||
|      * @method | ||||
|      * @returns {Promise<string|null>} returns note path of active note or null if there isn't active note | ||||
|      */ | ||||
|     this.getActiveNotePath = () => { | ||||
|         const activeTabContext = noteDetailService.getActiveTabContext(); | ||||
|  | ||||
|         return activeTabContext ? activeTabContext.notePath : null; | ||||
|     }; | ||||
|  | ||||
|     /** | ||||
|      * This method checks whether user navigated away from the note from which the scripts has been started. | ||||
|      * This is necessary because script execution is async and by the time it is finished, the user might have | ||||
|      * already navigated away from this page - the end result would be that script might return data for the wrong | ||||
|      * note. | ||||
|      * | ||||
|      * @method | ||||
|      * @return {boolean} returns true if the original note is still loaded, false if user switched to another | ||||
|      */ | ||||
|     this.isNoteStillActive = () => { | ||||
|         return this.originEntity.noteId === noteDetailService.getActiveNoteId(); | ||||
|     }; | ||||
|  | ||||
|     /** | ||||
|      * @method | ||||
| @@ -253,6 +337,52 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null) { | ||||
|      * @param {array} types - list of mime types to be used | ||||
|      */ | ||||
|     this.setCodeMimeTypes = noteTypeService.setCodeMimeTypes; | ||||
|  | ||||
|     /** | ||||
|      * @method | ||||
|      * @param {object} $el - jquery object on which to setup the tooltip | ||||
|      */ | ||||
|     this.setupElementTooltip = noteTooltipService.setupElementTooltip; | ||||
|  | ||||
|     /** | ||||
|      * @method | ||||
|      */ | ||||
|     this.protectActiveNote = protectedSessionService.protectNoteAndSendToServer; | ||||
|  | ||||
|     /** | ||||
|      * Returns date-note for today. If it doesn't exist, it is automatically created. | ||||
|      * | ||||
|      * @method | ||||
|      * @return {Promise<NoteShort>} | ||||
|      */ | ||||
|     this.getTodayNote = dateNotesService.getTodayNote; | ||||
|  | ||||
|     /** | ||||
|      * Returns date-note. If it doesn't exist, it is automatically created. | ||||
|      * | ||||
|      * @method | ||||
|      * @param {string} date - e.g. "2019-04-29" | ||||
|      * @return {Promise<NoteShort>} | ||||
|      */ | ||||
|     this.getDateNote = dateNotesService.getDateNote; | ||||
|  | ||||
|     /** | ||||
|      * Returns month-note. If it doesn't exist, it is automatically created. | ||||
|      * | ||||
|      * @method | ||||
|      * @param {string} month - e.g. "2019-04" | ||||
|      * @return {Promise<NoteShort>} | ||||
|      */ | ||||
|     this.getMonthNote = dateNotesService.getMonthNote; | ||||
|  | ||||
|     /** | ||||
|      * Returns year-note. If it doesn't exist, it is automatically created. | ||||
|      * | ||||
|      * @method | ||||
|      * @param {string} year - e.g. "2019" | ||||
|      * @return {Promise<NoteShort>} | ||||
|      */ | ||||
|     this.getYearNote = dateNotesService.getYearNote; | ||||
| } | ||||
|  | ||||
| export default FrontendScriptApi;</code></pre> | ||||
|   | ||||
							
								
								
									
										38
									
								
								electron.js
									
									
									
									
									
								
							
							
						
						| @@ -3,10 +3,12 @@ | ||||
| const electron = require('electron'); | ||||
| const path = require('path'); | ||||
| const log = require('./src/services/log'); | ||||
| const sqlInit = require('./src/services/sql_init'); | ||||
| const cls = require('./src/services/cls'); | ||||
| const url = require("url"); | ||||
| const port = require('./src/services/port'); | ||||
| const appIconService = require('./src/services/app_icon'); | ||||
| const windowStateKeeper = require('electron-window-state'); | ||||
|  | ||||
| const app = electron.app; | ||||
| const globalShortcut = electron.globalShortcut; | ||||
| @@ -28,14 +30,31 @@ function onClosed() { | ||||
| } | ||||
|  | ||||
| async function createMainWindow() { | ||||
|     const win = new electron.BrowserWindow({ | ||||
|         // initial window width & height so it's usable on 1600 * 900 display (including some extra panels etc.) | ||||
|         width: 1200, | ||||
|         height: 800, | ||||
|         title: 'Trilium Notes', | ||||
|         icon: path.join(__dirname, 'src/public/images/app-icons/png/256x256.png') | ||||
|     await sqlInit.dbConnection; | ||||
|  | ||||
|     // if schema doesn't exist -> setup process | ||||
|     // if schema exists, then we need to wait until the migration process is finished | ||||
|     if (await sqlInit.schemaExists()) { | ||||
|         await sqlInit.dbReady; | ||||
|     } | ||||
|  | ||||
|     const mainWindowState = windowStateKeeper({ | ||||
|         // default window width & height so it's usable on 1600 * 900 display (including some extra panels etc.) | ||||
|         defaultWidth: 1200, | ||||
|         defaultHeight: 800 | ||||
|     }); | ||||
|  | ||||
|     const win = new electron.BrowserWindow({ | ||||
|         x: mainWindowState.x, | ||||
|         y: mainWindowState.y, | ||||
|         width: mainWindowState.width, | ||||
|         height: mainWindowState.height, | ||||
|         title: 'Trilium Notes', | ||||
|         icon: path.join(__dirname, 'images/app-icons/png/256x256.png') | ||||
|     }); | ||||
|  | ||||
|     mainWindowState.manage(win); | ||||
|  | ||||
|     win.setMenu(null); | ||||
|     win.loadURL('http://localhost:' + await port); | ||||
|     win.on('closed', onClosed); | ||||
| @@ -78,15 +97,10 @@ app.on('ready', async () => { | ||||
|     mainWindow = await createMainWindow(); | ||||
|  | ||||
|     const result = globalShortcut.register('CommandOrControl+Alt+P', cls.wrap(async () => { | ||||
|         const dateNoteService = require('./src/services/date_notes'); | ||||
|         const dateUtils = require('./src/services/date_utils'); | ||||
|  | ||||
|         const parentNote = await dateNoteService.getDateNote(dateUtils.nowDate()); | ||||
|  | ||||
|         // window may be hidden / not in focus | ||||
|         mainWindow.focus(); | ||||
|  | ||||
|         mainWindow.webContents.send('create-day-sub-note', parentNote.noteId); | ||||
|         mainWindow.webContents.send('create-day-sub-note'); | ||||
|     })); | ||||
|  | ||||
|     if (!result) { | ||||
|   | ||||
							
								
								
									
										
											BIN
										
									
								
								images/app-icons/ios/apple-touch-icon.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 3.4 KiB | 
							
								
								
									
										
											BIN
										
									
								
								images/app-icons/mac/icon.icns
									
									
									
									
									
										Normal file
									
								
							
							
						
						| Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB | 
| Before Width: | Height: | Size: 820 B After Width: | Height: | Size: 820 B | 
| Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB | 
| Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB | 
| Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB | 
| Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB | 
| Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 48 KiB | 
| Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 4.7 KiB | 
| Before Width: | Height: | Size: 353 KiB After Width: | Height: | Size: 353 KiB | 
							
								
								
									
										1
									
								
								images/shield.svg
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1 @@ | ||||
| <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-opacity="0.03" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-shield"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"></path></svg> | ||||
| After Width: | Height: | Size: 296 B | 
| Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB | 
							
								
								
									
										5
									
								
								issue_template.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,5 @@ | ||||
| For bug reports, please mention **version of the application** and include **log files** from following location: | ||||
|  | ||||
| * `/home/[user]/.local/share/trilium-data/log` for Linux | ||||
| * `C:\Users\[user]\AppData\Roaming\trilium-data\log` for Windows Vista and up | ||||
| * `/Users/[user]/Library/Application Support/trilium-data/log` for Mac OS | ||||