From bd69eefa1a9ca273218d14ffc6dd2c1d681b4f68 Mon Sep 17 00:00:00 2001 From: lin onetwo Date: Mon, 19 Jun 2023 17:42:44 +0800 Subject: [PATCH] fix: prevent adaptor wikitext overwrite by tiddlyweb plugin Try to workaround https://github.com/Jermolene/TiddlyWiki5/issues/7553 --- scripts/compilePlugins.mjs | 18 +++++++++++------- .../Startup/install-electron-ipc-cat.js | 2 +- .../Startup/install-electron-ipc-cat.js.meta | 2 +- .../ipcSyncAdaptor/electron-ipc-cat.js.meta | 2 +- .../plugin/ipcSyncAdaptor/electron-ipc-cat.ts | 2 +- .../ipcSyncAdaptor/ipc-syncadaptor.js.meta | 2 +- .../plugin/ipcSyncAdaptor/ipc-syncadaptor.ts | 2 +- .../wiki/plugin/ipcSyncAdaptor/plugin.info | 8 ++++---- .../wiki/plugin/ipcSyncAdaptor/readme.tid | 2 +- .../wiki/plugin/ipcSyncAdaptor/tree.tid | 4 ++-- .../ui/SaveWikiButtonTemplate.tid | 3 --- .../ui/syncer-actions-copy-logs.tid | 6 ------ .../ui/syncer-actions-refresh.tid | 9 --------- .../ipcSyncAdaptor/ui/tags-syncerdropdown.tid | 2 -- .../wiki/plugin/ipcSyncAdaptorUI/plugin.info | 13 +++++++++++++ .../wiki/plugin/ipcSyncAdaptorUI/readme.tid | 6 ++++++ .../tiddlyweb-templates/css-tiddler.tid | 0 .../html-div-skinny-tiddler.tid | 0 .../tiddlyweb-templates/html-div-tiddler.tid | 0 .../html-json-skinny-tiddler.tid | 0 .../tiddlyweb-templates/html-json-tiddler.tid | 0 .../tiddlyweb-templates/javascript-tiddler.tid | 0 .../wiki/plugin/ipcSyncAdaptorUI/tree.tid | 4 ++++ .../ui/SaveWikiButtonTemplate.tid | 3 +++ .../ui/icon-cloud.tid | 2 +- .../ui/readonly-styles.tid | 2 +- .../ui/save-offline.tid | 4 ++-- .../ui/save-wiki-button.tid | 8 ++++---- .../ui/styles.tid | 2 +- .../ui/syncer-actions-copy-logs.tid | 6 ++++++ .../ui/syncer-actions-refresh.tid | 9 +++++++++ .../ui/syncer-actions-save-snapshot.tid | 4 ++-- .../ui/tags-syncerdropdown.tid | 2 ++ .../wiki/wikiWorker/startNodeJSWiki.ts | 3 ++- 34 files changed, 80 insertions(+), 52 deletions(-) delete mode 100644 src/services/wiki/plugin/ipcSyncAdaptor/ui/SaveWikiButtonTemplate.tid delete mode 100644 src/services/wiki/plugin/ipcSyncAdaptor/ui/syncer-actions-copy-logs.tid delete mode 100644 src/services/wiki/plugin/ipcSyncAdaptor/ui/syncer-actions-refresh.tid delete mode 100644 src/services/wiki/plugin/ipcSyncAdaptor/ui/tags-syncerdropdown.tid create mode 100644 src/services/wiki/plugin/ipcSyncAdaptorUI/plugin.info create mode 100644 src/services/wiki/plugin/ipcSyncAdaptorUI/readme.tid rename src/services/wiki/plugin/{ipcSyncAdaptor => ipcSyncAdaptorUI}/tiddlyweb-templates/css-tiddler.tid (100%) rename src/services/wiki/plugin/{ipcSyncAdaptor => ipcSyncAdaptorUI}/tiddlyweb-templates/html-div-skinny-tiddler.tid (100%) rename src/services/wiki/plugin/{ipcSyncAdaptor => ipcSyncAdaptorUI}/tiddlyweb-templates/html-div-tiddler.tid (100%) rename src/services/wiki/plugin/{ipcSyncAdaptor => ipcSyncAdaptorUI}/tiddlyweb-templates/html-json-skinny-tiddler.tid (100%) rename src/services/wiki/plugin/{ipcSyncAdaptor => ipcSyncAdaptorUI}/tiddlyweb-templates/html-json-tiddler.tid (100%) rename src/services/wiki/plugin/{ipcSyncAdaptor => ipcSyncAdaptorUI}/tiddlyweb-templates/javascript-tiddler.tid (100%) create mode 100644 src/services/wiki/plugin/ipcSyncAdaptorUI/tree.tid create mode 100644 src/services/wiki/plugin/ipcSyncAdaptorUI/ui/SaveWikiButtonTemplate.tid rename src/services/wiki/plugin/{ipcSyncAdaptor => ipcSyncAdaptorUI}/ui/icon-cloud.tid (94%) rename src/services/wiki/plugin/{ipcSyncAdaptor => ipcSyncAdaptorUI}/ui/readonly-styles.tid (95%) rename src/services/wiki/plugin/{ipcSyncAdaptor => ipcSyncAdaptorUI}/ui/save-offline.tid (72%) rename src/services/wiki/plugin/{ipcSyncAdaptor => ipcSyncAdaptorUI}/ui/save-wiki-button.tid (72%) rename src/services/wiki/plugin/{ipcSyncAdaptor => ipcSyncAdaptorUI}/ui/styles.tid (93%) create mode 100644 src/services/wiki/plugin/ipcSyncAdaptorUI/ui/syncer-actions-copy-logs.tid create mode 100644 src/services/wiki/plugin/ipcSyncAdaptorUI/ui/syncer-actions-refresh.tid rename src/services/wiki/plugin/{ipcSyncAdaptor => ipcSyncAdaptorUI}/ui/syncer-actions-save-snapshot.tid (72%) create mode 100644 src/services/wiki/plugin/ipcSyncAdaptorUI/ui/tags-syncerdropdown.tid diff --git a/scripts/compilePlugins.mjs b/scripts/compilePlugins.mjs index 7d0444ce..42c8c788 100644 --- a/scripts/compilePlugins.mjs +++ b/scripts/compilePlugins.mjs @@ -7,31 +7,35 @@ import esbuild from 'esbuild'; // put it here, so it can be loaded via `'+plugins/linonetwo/tidgi'` in cli, and get copied in scripts/afterPack.js when copying tiddlywiki (no need to copy this plugin again) -const outDir = path.join(__dirname, '../node_modules/@tiddlygit/tiddlywiki/plugins/linonetwo/tidgi'); -await fs.mkdirp(outDir); +const tidgiIpcSyncadaptorOutDir = path.join(__dirname, '../node_modules/@tiddlygit/tiddlywiki/plugins/linonetwo/tidgi-ipc-syncadaptor'); +await fs.mkdirp(tidgiIpcSyncadaptorOutDir); const tsconfigPath = path.join(__dirname, '../tsconfig.json'); -const sourceFolder = '../src/services/wiki/plugin/ipcSyncAdaptor'; +const tidgiIpcSyncadaptorSourceFolder = '../src/services/wiki/plugin/ipcSyncAdaptor'; const sharedConfig = { logLevel: 'info', bundle: true, // use node so we have `exports`, otherwise `module.adaptorClass` in $:/core/modules/startup.js will be undefined platform: 'node', minify: true, - outdir: outDir, + outdir: tidgiIpcSyncadaptorOutDir, tsconfig: tsconfigPath, target: 'ESNEXT', }; await Promise.all([ esbuild.build({ ...sharedConfig, - entryPoints: [path.join(__dirname, sourceFolder, 'ipc-syncadaptor.ts')], + entryPoints: [path.join(__dirname, tidgiIpcSyncadaptorSourceFolder, 'ipc-syncadaptor.ts')], }), esbuild.build({ ...sharedConfig, - entryPoints: [path.join(__dirname, sourceFolder, 'electron-ipc-cat.ts')], + entryPoints: [path.join(__dirname, tidgiIpcSyncadaptorSourceFolder, 'electron-ipc-cat.ts')], }), ]); const filterFunc = (src) => { return !src.endsWith('.ts'); }; -await fs.copy(path.join(__dirname, sourceFolder), outDir, { filter: filterFunc }); +await fs.copy(path.join(__dirname, tidgiIpcSyncadaptorSourceFolder), tidgiIpcSyncadaptorOutDir, { filter: filterFunc }); + +const tidgiIpcSyncadaptorUISourceFolder = '../src/services/wiki/plugin/ipcSyncAdaptorUI'; +const tidgiIpcSyncadaptorUIOutDir = path.join(__dirname, '../node_modules/@tiddlygit/tiddlywiki/plugins/linonetwo/tidgi-ipc-syncadaptor-ui'); +await fs.copy(path.join(__dirname, tidgiIpcSyncadaptorUISourceFolder), tidgiIpcSyncadaptorUIOutDir, { filter: filterFunc }); diff --git a/src/services/wiki/plugin/ipcSyncAdaptor/Startup/install-electron-ipc-cat.js b/src/services/wiki/plugin/ipcSyncAdaptor/Startup/install-electron-ipc-cat.js index 57b1a840..04e34157 100644 --- a/src/services/wiki/plugin/ipcSyncAdaptor/Startup/install-electron-ipc-cat.js +++ b/src/services/wiki/plugin/ipcSyncAdaptor/Startup/install-electron-ipc-cat.js @@ -6,7 +6,7 @@ exports.after = ['startup']; exports.synchronous = true; exports.startup = function() { if ('service' in window && 'descriptors' in window.service && window.service.descriptors !== undefined) { - require('$:/plugins/linonetwo/tidgi/Startup/electron-ipc-cat.js'); + require('$:/plugins/linonetwo/tidgi-ipc-syncadaptor/Startup/electron-ipc-cat.js'); // call setupSSE in `src/services/wiki/plugin/ipcSyncAdaptor/ipc-syncadaptor.ts` of TidGi-Desktop if (typeof $tw !== 'undefined') { // eslint-disable-next-line @typescript-eslint/no-unsafe-call diff --git a/src/services/wiki/plugin/ipcSyncAdaptor/Startup/install-electron-ipc-cat.js.meta b/src/services/wiki/plugin/ipcSyncAdaptor/Startup/install-electron-ipc-cat.js.meta index bea36c1f..60483a61 100644 --- a/src/services/wiki/plugin/ipcSyncAdaptor/Startup/install-electron-ipc-cat.js.meta +++ b/src/services/wiki/plugin/ipcSyncAdaptor/Startup/install-electron-ipc-cat.js.meta @@ -1,4 +1,4 @@ creator: LinOnetwo -title: $:/plugins/linonetwo/tidgi/Startup/install-electron-ipc-cat.js +title: $:/plugins/linonetwo/tidgi-ipc-syncadaptor/Startup/install-electron-ipc-cat.js type: application/javascript module-type: startup \ No newline at end of file diff --git a/src/services/wiki/plugin/ipcSyncAdaptor/electron-ipc-cat.js.meta b/src/services/wiki/plugin/ipcSyncAdaptor/electron-ipc-cat.js.meta index 610a4fc2..7c55a35a 100644 --- a/src/services/wiki/plugin/ipcSyncAdaptor/electron-ipc-cat.js.meta +++ b/src/services/wiki/plugin/ipcSyncAdaptor/electron-ipc-cat.js.meta @@ -1,4 +1,4 @@ creator: LinOnetwo -title: $:/plugins/linonetwo/tidgi/Startup/electron-ipc-cat.js +title: $:/plugins/linonetwo/tidgi-ipc-syncadaptor/Startup/electron-ipc-cat.js type: application/javascript module-type: library \ No newline at end of file diff --git a/src/services/wiki/plugin/ipcSyncAdaptor/electron-ipc-cat.ts b/src/services/wiki/plugin/ipcSyncAdaptor/electron-ipc-cat.ts index 474158bf..fbbace1b 100644 --- a/src/services/wiki/plugin/ipcSyncAdaptor/electron-ipc-cat.ts +++ b/src/services/wiki/plugin/ipcSyncAdaptor/electron-ipc-cat.ts @@ -1,2 +1,2 @@ import 'electron-ipc-cat/fixContextIsolation'; -console.log('electron-ipc-cat/fixContextIsolation in $:/plugins/linonetwo/tidgi'); +console.log('electron-ipc-cat/fixContextIsolation in $:/plugins/linonetwo/tidgi-ipc-syncadaptor'); diff --git a/src/services/wiki/plugin/ipcSyncAdaptor/ipc-syncadaptor.js.meta b/src/services/wiki/plugin/ipcSyncAdaptor/ipc-syncadaptor.js.meta index 2a4e4352..704c1074 100644 --- a/src/services/wiki/plugin/ipcSyncAdaptor/ipc-syncadaptor.js.meta +++ b/src/services/wiki/plugin/ipcSyncAdaptor/ipc-syncadaptor.js.meta @@ -1,3 +1,3 @@ -title: $:/plugins/linonetwo/tidgi/ipc-syncadaptor.js +title: $:/plugins/linonetwo/tidgi-ipc-syncadaptor/ipc-syncadaptor.js type: application/javascript module-type: syncadaptor \ No newline at end of file diff --git a/src/services/wiki/plugin/ipcSyncAdaptor/ipc-syncadaptor.ts b/src/services/wiki/plugin/ipcSyncAdaptor/ipc-syncadaptor.ts index c2308dc3..f4c2ade7 100644 --- a/src/services/wiki/plugin/ipcSyncAdaptor/ipc-syncadaptor.ts +++ b/src/services/wiki/plugin/ipcSyncAdaptor/ipc-syncadaptor.ts @@ -48,7 +48,7 @@ class TidGiIPCSyncAdaptor { } /** - * This should be called after install-electron-ipc-cat, so this is called in `$:/plugins/linonetwo/tidgi/Startup/install-electron-ipc-cat.js` + * This should be called after install-electron-ipc-cat, so this is called in `$:/plugins/linonetwo/tidgi-ipc-syncadaptor/Startup/install-electron-ipc-cat.js` */ setupSSE() { if (window.observables?.wiki?.getWikiChangeObserver$ === undefined) { diff --git a/src/services/wiki/plugin/ipcSyncAdaptor/plugin.info b/src/services/wiki/plugin/ipcSyncAdaptor/plugin.info index bbfad480..890d6f4c 100644 --- a/src/services/wiki/plugin/ipcSyncAdaptor/plugin.info +++ b/src/services/wiki/plugin/ipcSyncAdaptor/plugin.info @@ -1,13 +1,13 @@ { - "title": "$:/plugins/linonetwo/tidgi", + "title": "$:/plugins/linonetwo/tidgi-ipc-syncadaptor", "name": "TidGi", - "description": "Plugin that make TidGi works", + "description": "Save/load data to tidgi's main process", "author": "LinOnetwo", "core-version": ">=5.1.22", "plugin-type": "plugin", "version": "0.1.0", - "dependents": ["$:/plugins/tiddlywiki/tiddlyweb"], + "dependents": [], "list": "readme tree", - "plugin-priority-comment": "lower than $:/plugins/tiddlywiki/tiddlyweb's 10, so we load before it, so our syncadaptor load first in core/modules/server/server.js", + "plugin-priority-comment": "lower than $:/plugins/tiddlywiki/tiddlyweb's 10, so the js load before it to register", "plugin-priority": 9 } diff --git a/src/services/wiki/plugin/ipcSyncAdaptor/readme.tid b/src/services/wiki/plugin/ipcSyncAdaptor/readme.tid index 1e977582..b0c32ced 100644 --- a/src/services/wiki/plugin/ipcSyncAdaptor/readme.tid +++ b/src/services/wiki/plugin/ipcSyncAdaptor/readme.tid @@ -1,4 +1,4 @@ -title: $:/plugins/linonetwo/tidgi/readme +title: $:/plugins/linonetwo/tidgi-ipc-syncadaptor/readme type: text/vnd.tiddlywiki !! SyncAdaptor diff --git a/src/services/wiki/plugin/ipcSyncAdaptor/tree.tid b/src/services/wiki/plugin/ipcSyncAdaptor/tree.tid index af26dc08..2eba196e 100644 --- a/src/services/wiki/plugin/ipcSyncAdaptor/tree.tid +++ b/src/services/wiki/plugin/ipcSyncAdaptor/tree.tid @@ -1,4 +1,4 @@ -title: $:/plugins/linonetwo/tidgi/tree +title: $:/plugins/linonetwo/tidgi-ipc-syncadaptor/tree caption: {{$:/language/SideBar/Explorer/Caption}} -<> +<> diff --git a/src/services/wiki/plugin/ipcSyncAdaptor/ui/SaveWikiButtonTemplate.tid b/src/services/wiki/plugin/ipcSyncAdaptor/ui/SaveWikiButtonTemplate.tid deleted file mode 100644 index cd502a6a..00000000 --- a/src/services/wiki/plugin/ipcSyncAdaptor/ui/SaveWikiButtonTemplate.tid +++ /dev/null @@ -1,3 +0,0 @@ -title: $:/config/SaveWikiButton/Template - -$:/plugins/linonetwo/tidgi/save/offline \ No newline at end of file diff --git a/src/services/wiki/plugin/ipcSyncAdaptor/ui/syncer-actions-copy-logs.tid b/src/services/wiki/plugin/ipcSyncAdaptor/ui/syncer-actions-copy-logs.tid deleted file mode 100644 index 28a953d6..00000000 --- a/src/services/wiki/plugin/ipcSyncAdaptor/ui/syncer-actions-copy-logs.tid +++ /dev/null @@ -1,6 +0,0 @@ -title: $:/plugins/linonetwo/tidgi/syncer-actions/copy-logs -tags: $:/tags/SyncerDropdown - -<$button message="tm-copy-syncer-logs-to-clipboard" class="tc-btn-invisible"> -{{$:/core/images/copy-clipboard}} Copy syncer logs to clipboard - diff --git a/src/services/wiki/plugin/ipcSyncAdaptor/ui/syncer-actions-refresh.tid b/src/services/wiki/plugin/ipcSyncAdaptor/ui/syncer-actions-refresh.tid deleted file mode 100644 index a068d6b4..00000000 --- a/src/services/wiki/plugin/ipcSyncAdaptor/ui/syncer-actions-refresh.tid +++ /dev/null @@ -1,9 +0,0 @@ -title: $:/plugins/linonetwo/tidgi/syncer-actions/refresh -tags: $:/tags/SyncerDropdown - -<$reveal state="$:/status/IsLoggedIn" type="match" text="yes"> -<$button tooltip="Get latest changes from the server" aria-label="Refresh from server" class="tc-btn-invisible"> -<$action-sendmessage $message="tm-server-refresh"/> -{{$:/core/images/refresh-button}}<$text text="Get latest changes from the server"/> - - diff --git a/src/services/wiki/plugin/ipcSyncAdaptor/ui/tags-syncerdropdown.tid b/src/services/wiki/plugin/ipcSyncAdaptor/ui/tags-syncerdropdown.tid deleted file mode 100644 index 04215bf2..00000000 --- a/src/services/wiki/plugin/ipcSyncAdaptor/ui/tags-syncerdropdown.tid +++ /dev/null @@ -1,2 +0,0 @@ -title: $:/tags/SyncerDropdown -list: $:/plugins/linonetwo/tidgi/syncer-actions/refresh $:/plugins/linonetwo/tidgi/syncer-actions/save-snapshot $:/plugins/linonetwo/tidgi/syncer-actions/copy-logs diff --git a/src/services/wiki/plugin/ipcSyncAdaptorUI/plugin.info b/src/services/wiki/plugin/ipcSyncAdaptorUI/plugin.info new file mode 100644 index 00000000..405d5d2f --- /dev/null +++ b/src/services/wiki/plugin/ipcSyncAdaptorUI/plugin.info @@ -0,0 +1,13 @@ +{ + "title": "$:/plugins/linonetwo/tidgi-ipc-syncadaptor-ui", + "name": "TidGi", + "description": "UI for $:/plugins/linonetwo/tidgi-ipc-syncadaptor", + "author": "LinOnetwo", + "core-version": ">=5.1.22", + "plugin-type": "plugin", + "version": "0.1.0", + "dependents": ["$:/plugins/linonetwo/tidgi-ipc-syncadaptor"], + "list": "readme tree", + "plugin-priority-comment": "higher than $:/plugins/tiddlywiki/tiddlyweb's 10, so we load after it to overwrite it", + "plugin-priority": 11 +} diff --git a/src/services/wiki/plugin/ipcSyncAdaptorUI/readme.tid b/src/services/wiki/plugin/ipcSyncAdaptorUI/readme.tid new file mode 100644 index 00000000..2c395e78 --- /dev/null +++ b/src/services/wiki/plugin/ipcSyncAdaptorUI/readme.tid @@ -0,0 +1,6 @@ +title: $:/plugins/linonetwo/tidgi-ipc-syncadaptor-ui/readme +type: text/vnd.tiddlywiki + +!! UI + +To fix [[https://github.com/Jermolene/TiddlyWiki5/issues/7553]] \ No newline at end of file diff --git a/src/services/wiki/plugin/ipcSyncAdaptor/tiddlyweb-templates/css-tiddler.tid b/src/services/wiki/plugin/ipcSyncAdaptorUI/tiddlyweb-templates/css-tiddler.tid similarity index 100% rename from src/services/wiki/plugin/ipcSyncAdaptor/tiddlyweb-templates/css-tiddler.tid rename to src/services/wiki/plugin/ipcSyncAdaptorUI/tiddlyweb-templates/css-tiddler.tid diff --git a/src/services/wiki/plugin/ipcSyncAdaptor/tiddlyweb-templates/html-div-skinny-tiddler.tid b/src/services/wiki/plugin/ipcSyncAdaptorUI/tiddlyweb-templates/html-div-skinny-tiddler.tid similarity index 100% rename from src/services/wiki/plugin/ipcSyncAdaptor/tiddlyweb-templates/html-div-skinny-tiddler.tid rename to src/services/wiki/plugin/ipcSyncAdaptorUI/tiddlyweb-templates/html-div-skinny-tiddler.tid diff --git a/src/services/wiki/plugin/ipcSyncAdaptor/tiddlyweb-templates/html-div-tiddler.tid b/src/services/wiki/plugin/ipcSyncAdaptorUI/tiddlyweb-templates/html-div-tiddler.tid similarity index 100% rename from src/services/wiki/plugin/ipcSyncAdaptor/tiddlyweb-templates/html-div-tiddler.tid rename to src/services/wiki/plugin/ipcSyncAdaptorUI/tiddlyweb-templates/html-div-tiddler.tid diff --git a/src/services/wiki/plugin/ipcSyncAdaptor/tiddlyweb-templates/html-json-skinny-tiddler.tid b/src/services/wiki/plugin/ipcSyncAdaptorUI/tiddlyweb-templates/html-json-skinny-tiddler.tid similarity index 100% rename from src/services/wiki/plugin/ipcSyncAdaptor/tiddlyweb-templates/html-json-skinny-tiddler.tid rename to src/services/wiki/plugin/ipcSyncAdaptorUI/tiddlyweb-templates/html-json-skinny-tiddler.tid diff --git a/src/services/wiki/plugin/ipcSyncAdaptor/tiddlyweb-templates/html-json-tiddler.tid b/src/services/wiki/plugin/ipcSyncAdaptorUI/tiddlyweb-templates/html-json-tiddler.tid similarity index 100% rename from src/services/wiki/plugin/ipcSyncAdaptor/tiddlyweb-templates/html-json-tiddler.tid rename to src/services/wiki/plugin/ipcSyncAdaptorUI/tiddlyweb-templates/html-json-tiddler.tid diff --git a/src/services/wiki/plugin/ipcSyncAdaptor/tiddlyweb-templates/javascript-tiddler.tid b/src/services/wiki/plugin/ipcSyncAdaptorUI/tiddlyweb-templates/javascript-tiddler.tid similarity index 100% rename from src/services/wiki/plugin/ipcSyncAdaptor/tiddlyweb-templates/javascript-tiddler.tid rename to src/services/wiki/plugin/ipcSyncAdaptorUI/tiddlyweb-templates/javascript-tiddler.tid diff --git a/src/services/wiki/plugin/ipcSyncAdaptorUI/tree.tid b/src/services/wiki/plugin/ipcSyncAdaptorUI/tree.tid new file mode 100644 index 00000000..65f42530 --- /dev/null +++ b/src/services/wiki/plugin/ipcSyncAdaptorUI/tree.tid @@ -0,0 +1,4 @@ +title: $:/plugins/linonetwo/tidgi-ipc-syncadaptor-ui/tree +caption: {{$:/language/SideBar/Explorer/Caption}} + +<> diff --git a/src/services/wiki/plugin/ipcSyncAdaptorUI/ui/SaveWikiButtonTemplate.tid b/src/services/wiki/plugin/ipcSyncAdaptorUI/ui/SaveWikiButtonTemplate.tid new file mode 100644 index 00000000..e5e606a9 --- /dev/null +++ b/src/services/wiki/plugin/ipcSyncAdaptorUI/ui/SaveWikiButtonTemplate.tid @@ -0,0 +1,3 @@ +title: $:/config/SaveWikiButton/Template + +$:/plugins/linonetwo/tidgi-ipc-syncadaptor-ui/save/offline \ No newline at end of file diff --git a/src/services/wiki/plugin/ipcSyncAdaptor/ui/icon-cloud.tid b/src/services/wiki/plugin/ipcSyncAdaptorUI/ui/icon-cloud.tid similarity index 94% rename from src/services/wiki/plugin/ipcSyncAdaptor/ui/icon-cloud.tid rename to src/services/wiki/plugin/ipcSyncAdaptorUI/ui/icon-cloud.tid index 2feb40a6..ee42fc42 100644 --- a/src/services/wiki/plugin/ipcSyncAdaptor/ui/icon-cloud.tid +++ b/src/services/wiki/plugin/ipcSyncAdaptorUI/ui/icon-cloud.tid @@ -1,4 +1,4 @@ -title: $:/plugins/linonetwo/tidgi/icon/cloud +title: $:/plugins/linonetwo/tidgi-ipc-syncadaptor-ui/icon/cloud tags: $:/tags/Image \ No newline at end of file diff --git a/src/services/wiki/plugin/ipcSyncAdaptor/ui/readonly-styles.tid b/src/services/wiki/plugin/ipcSyncAdaptorUI/ui/readonly-styles.tid similarity index 95% rename from src/services/wiki/plugin/ipcSyncAdaptor/ui/readonly-styles.tid rename to src/services/wiki/plugin/ipcSyncAdaptorUI/ui/readonly-styles.tid index 57909e2c..7d8c6ce9 100644 --- a/src/services/wiki/plugin/ipcSyncAdaptor/ui/readonly-styles.tid +++ b/src/services/wiki/plugin/ipcSyncAdaptorUI/ui/readonly-styles.tid @@ -1,4 +1,4 @@ -title: $:/plugins/linonetwo/tidgi/readonly +title: $:/plugins/linonetwo/tidgi-ipc-syncadaptor-ui/readonly tags: [[$:/tags/Stylesheet]] \define button-selector(title) diff --git a/src/services/wiki/plugin/ipcSyncAdaptor/ui/save-offline.tid b/src/services/wiki/plugin/ipcSyncAdaptorUI/ui/save-offline.tid similarity index 72% rename from src/services/wiki/plugin/ipcSyncAdaptor/ui/save-offline.tid rename to src/services/wiki/plugin/ipcSyncAdaptorUI/ui/save-offline.tid index 82509b8e..8ebc630f 100644 --- a/src/services/wiki/plugin/ipcSyncAdaptor/ui/save-offline.tid +++ b/src/services/wiki/plugin/ipcSyncAdaptorUI/ui/save-offline.tid @@ -1,7 +1,7 @@ -title: $:/plugins/linonetwo/tidgi/save/offline +title: $:/plugins/linonetwo/tidgi-ipc-syncadaptor-ui/save/offline \import [subfilter{$:/core/config/GlobalImportFilter}] \define saveTiddlerFilter() -[is[tiddler]] -[[$:/boot/boot.css]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/linonetwo/tidgi]] -[prefix[$:/temp/]] +[sort[title]] $(publishFilter)$ +[is[tiddler]] -[[$:/boot/boot.css]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/linonetwo/tidgi-ipc-syncadaptor-ui]] -[prefix[$:/temp/]] +[sort[title]] $(publishFilter)$ \end {{$:/core/templates/tiddlywiki5.html}} diff --git a/src/services/wiki/plugin/ipcSyncAdaptor/ui/save-wiki-button.tid b/src/services/wiki/plugin/ipcSyncAdaptorUI/ui/save-wiki-button.tid similarity index 72% rename from src/services/wiki/plugin/ipcSyncAdaptor/ui/save-wiki-button.tid rename to src/services/wiki/plugin/ipcSyncAdaptorUI/ui/save-wiki-button.tid index 09efaf7e..298a3f36 100644 --- a/src/services/wiki/plugin/ipcSyncAdaptor/ui/save-wiki-button.tid +++ b/src/services/wiki/plugin/ipcSyncAdaptorUI/ui/save-wiki-button.tid @@ -1,7 +1,7 @@ title: $:/core/ui/Buttons/save-wiki tags: $:/tags/PageControls -caption: {{$:/plugins/linonetwo/tidgi/icon/cloud}} Server status -description: Status of synchronisation with server +caption: {{$:/plugins/linonetwo/tidgi-ipc-syncadaptor-ui/icon/cloud}} TidGi status +description: Status of synchronisation with TidGi \whitespace trim \define config-title() @@ -10,7 +10,7 @@ $:/config/PageControlButtons/Visibility/$(listItem)$ <$button popup=<> tooltip="Status of synchronisation with server" aria-label="Server status" class=<> selectedClass="tc-selected"> <$list filter="[match[yes]]"> -{{$:/plugins/linonetwo/tidgi/icon/cloud}} +{{$:/plugins/linonetwo/tidgi-ipc-syncadaptor-ui/icon/cloud}} <$list filter="[match[yes]]"> <$text text="Server status"/> @@ -19,7 +19,7 @@ $:/config/PageControlButtons/Visibility/$(listItem)$ <$reveal state=<> type="popup" position="belowleft" animate="yes">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/SyncerDropdown]!has[draft.of]]" variable="listItem"> +<$list filter="[all[shadows+tiddlers]tag[$:/tags/TidgiSyncadaptorDropdown]!has[draft.of]]" variable="listItem"> <$transclude tiddler=<>/>
diff --git a/src/services/wiki/plugin/ipcSyncAdaptor/ui/styles.tid b/src/services/wiki/plugin/ipcSyncAdaptorUI/ui/styles.tid similarity index 93% rename from src/services/wiki/plugin/ipcSyncAdaptor/ui/styles.tid rename to src/services/wiki/plugin/ipcSyncAdaptorUI/ui/styles.tid index ceb5eff6..76c27629 100644 --- a/src/services/wiki/plugin/ipcSyncAdaptor/ui/styles.tid +++ b/src/services/wiki/plugin/ipcSyncAdaptorUI/ui/styles.tid @@ -1,4 +1,4 @@ -title: $:/plugins/linonetwo/tidgi/styles +title: $:/plugins/linonetwo/tidgi-ipc-syncadaptor-ui/styles tags: [[$:/tags/Stylesheet]] \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock diff --git a/src/services/wiki/plugin/ipcSyncAdaptorUI/ui/syncer-actions-copy-logs.tid b/src/services/wiki/plugin/ipcSyncAdaptorUI/ui/syncer-actions-copy-logs.tid new file mode 100644 index 00000000..4e11e6a8 --- /dev/null +++ b/src/services/wiki/plugin/ipcSyncAdaptorUI/ui/syncer-actions-copy-logs.tid @@ -0,0 +1,6 @@ +title: $:/plugins/linonetwo/tidgi-ipc-syncadaptor-ui/syncer-actions/copy-logs +tags: $:/tags/TidgiSyncadaptorDropdown + +<$button message="tm-copy-syncer-logs-to-clipboard" class="tc-btn-invisible"> +{{$:/core/images/copy-clipboard}} Copy TidGi syncer logs to clipboard + diff --git a/src/services/wiki/plugin/ipcSyncAdaptorUI/ui/syncer-actions-refresh.tid b/src/services/wiki/plugin/ipcSyncAdaptorUI/ui/syncer-actions-refresh.tid new file mode 100644 index 00000000..c9563e1e --- /dev/null +++ b/src/services/wiki/plugin/ipcSyncAdaptorUI/ui/syncer-actions-refresh.tid @@ -0,0 +1,9 @@ +title: $:/plugins/linonetwo/tidgi-ipc-syncadaptor-ui/syncer-actions/refresh +tags: $:/tags/TidgiSyncadaptorDropdown + +<$reveal state="$:/status/IsLoggedIn" type="match" text="yes"> +<$button tooltip="Sync from TidGi main process" aria-label="Refresh from server" class="tc-btn-invisible"> +<$action-sendmessage $message="tm-server-refresh"/> +{{$:/core/images/refresh-button}}<$text text="Sync from TidGi main process"/> + + diff --git a/src/services/wiki/plugin/ipcSyncAdaptor/ui/syncer-actions-save-snapshot.tid b/src/services/wiki/plugin/ipcSyncAdaptorUI/ui/syncer-actions-save-snapshot.tid similarity index 72% rename from src/services/wiki/plugin/ipcSyncAdaptor/ui/syncer-actions-save-snapshot.tid rename to src/services/wiki/plugin/ipcSyncAdaptorUI/ui/syncer-actions-save-snapshot.tid index 65965036..caea8d37 100644 --- a/src/services/wiki/plugin/ipcSyncAdaptor/ui/syncer-actions-save-snapshot.tid +++ b/src/services/wiki/plugin/ipcSyncAdaptorUI/ui/syncer-actions-save-snapshot.tid @@ -1,5 +1,5 @@ -title: $:/plugins/linonetwo/tidgi/syncer-actions/save-snapshot -tags: $:/tags/SyncerDropdown +title: $:/plugins/linonetwo/tidgi-ipc-syncadaptor-ui/syncer-actions/save-snapshot +tags: $:/tags/TidgiSyncadaptorDropdown <$button class="tc-btn-invisible"> <$wikify name="site-title" text={{$:/config/SaveWikiButton/Filename}}> diff --git a/src/services/wiki/plugin/ipcSyncAdaptorUI/ui/tags-syncerdropdown.tid b/src/services/wiki/plugin/ipcSyncAdaptorUI/ui/tags-syncerdropdown.tid new file mode 100644 index 00000000..6ba73e04 --- /dev/null +++ b/src/services/wiki/plugin/ipcSyncAdaptorUI/ui/tags-syncerdropdown.tid @@ -0,0 +1,2 @@ +title: $:/tags/TidgiSyncadaptorDropdown +list: $:/plugins/linonetwo/tidgi-ipc-syncadaptor-ui/syncer-actions/refresh $:/plugins/linonetwo/tidgi-ipc-syncadaptor-ui/syncer-actions/save-snapshot $:/plugins/linonetwo/tidgi-ipc-syncadaptor-ui/syncer-actions/copy-logs diff --git a/src/services/wiki/wikiWorker/startNodeJSWiki.ts b/src/services/wiki/wikiWorker/startNodeJSWiki.ts index d3dd0b1c..2c3659fa 100644 --- a/src/services/wiki/wikiWorker/startNodeJSWiki.ts +++ b/src/services/wiki/wikiWorker/startNodeJSWiki.ts @@ -65,7 +65,8 @@ export function startNodeJSWiki({ * Install $:/plugins/linonetwo/tidgi instead of +plugins/tiddlywiki/tiddlyweb to speedup (without JSON.parse) and fix http errors when network change. * See scripts/compilePlugins.mjs for how it is built. */ - 'plugins/linonetwo/tidgi', + 'plugins/linonetwo/tidgi-ipc-syncadaptor', + 'plugins/linonetwo/tidgi-ipc-syncadaptor-ui', enableHTTPAPI ? 'plugins/tiddlywiki/tiddlyweb' : undefined, // we use $:/plugins/linonetwo/tidgi instead // 'plugins/linonetwo/watch-fs', ].filter(Boolean) as string[];