Skip to content

Commit

Permalink
Add update page button to pagebar
Browse files Browse the repository at this point in the history
  • Loading branch information
@c6p
c6p committed Sep 26, 2021
1 parent 3f568e6 commit 4cd9e1b
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 37 deletions.
88 changes: 54 additions & 34 deletions src/App.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<button id="fetch" @click="fetchUpdates()">Fetch Updates</button>
<label for="user">User:</label>
<input id="user" placeholder="[email protected]" :value="user" @change="setUser" />
<button id="create" @click="loadPageNotes(uri)">Get Selected Page</button>
<button id="create" @click="loadPage(uri)">Get Selected Page</button>
<v-select ref="select" class="select" id="uri" v-model="uri" :options="uris" :clearable="false"></v-select>
</div>
</div>
<div v-if="loading" class="lds-ripple"><div></div><div></div></div>
<div v-if="fetching || updating" class="lds-ripple"><div></div><div></div></div>
</div>
</template>

Expand All @@ -26,7 +26,9 @@ export default {
components: {},
data () {
return {
loading: false,
lastFetch: + new Date(),
fetching: false,
updating: false,
visible: false,
left: 0,
apiToken: "",
Expand Down Expand Up @@ -69,8 +71,13 @@ export default {
logseq.updateSettings({user})
this.user = user || "";
},
fetchUpdates() {
this.getAnnotations(logseq.settings);
async fetchUpdates() {
if (this.fetching || (new Date() - this.lastFetch) < 10000)
return
this.fetching = true;
await this.getAnnotations(logseq.settings);
this.lastFetch = + new Date();
this.fetching = false;
},
async getAnnotations(s) {
const a = s.annotations || [];
Expand Down Expand Up @@ -151,9 +158,9 @@ export default {
return {title, noteMap}
},
async loadPageNotes(uri) {
if (!uri) return
this.loading = true;
async loadPage(uri) {
if (!uri || this.updating) return
this.updating = true;
try {
const name = 'hypothesis__/' + uri.split('//')[1]
Expand All @@ -164,38 +171,51 @@ export default {
if (name !== page.originalName)
throw new Error('page error');
let {title, noteMap} = this.getPageNotes(uri);
let pageBlocksTree = await logseq.Editor.getCurrentPageBlocksTree();
let targetBlock = pageBlocksTree[0];
if (!targetBlock) {
targetBlock = await logseq.Editor.insertBlock(page.name, `[:a {:href "${uri}" :target "_blank" :class "external-link"} [:span {:class "icon-hypothesis forbid-edit"}] " ${title}"]`, { isPageBlock: true });
pageBlocksTree = [targetBlock];
}
await this.loadPageNotes(page, uri);
} finally {
this.updating = false;
}
},
async loadPageNotes(page, uri) {
if (!page || !uri) return
let {title, noteMap} = this.getPageNotes(uri);
const blocks = pageBlocksTree.slice(1);
const blockMap = new Map(flatten(blocks).map(b=>[b.properties.hid, b]));
const n_b = [...noteMap.values()].filter(n=>!blockMap.has(n.properties.hid));
let pageBlocksTree = await logseq.Editor.getCurrentPageBlocksTree();
let targetBlock = pageBlocksTree[0];
if (!targetBlock) {
targetBlock = await logseq.Editor.insertBlock(page.name, `[:a {:href "${uri}" :target "_blank" :class "external-link"} [:span {:class "icon-hypothesis forbid-edit"}] " ${title}"]`, { isPageBlock: true });
pageBlocksTree = [targetBlock];
}
for (const n of n_b) {
const {hid,updated} = n.properties;
const content = `${n.content}\n:PROPERTIES:\n:hid:${hid}\n:updated:${updated}\n:END:`;
const {parent, after} = n;
const source = blockMap.get(parent ?? after);
const block = await logseq.Editor.insertBlock(source?.uuid ?? page.name, content, {sibling: !parent, isPageBlock: !source});
blockMap.set(hid, block);
}
// TODO
// updated = map(notes, .updated) != map(blocks, .updated)
// updateBlock(updated, content)
// delete set(blocks).difference(set(notes))
const blocks = pageBlocksTree.slice(1);
const blockMap = new Map(flatten(blocks).map(b=>[b.properties.hid, b]));
const n_b = [...noteMap.values()].filter(n=>!blockMap.has(n.properties.hid));
await logseq.Editor.updateBlock(targetBlock.uuid, `[:a {:href "${uri}" :target "_blank" :class "external-link"} [:span {:class "icon-hypothesis forbid-edit"}] " ${title}"]`);
} finally {
this.loading = false;
for (const n of n_b) {
const {hid,updated} = n.properties;
const content = `${n.content}\n:PROPERTIES:\n:hid:${hid}\n:updated:${updated}\n:END:`;
const {parent, after} = n;
const source = blockMap.get(parent ?? after);
const block = await logseq.Editor.insertBlock(source?.uuid ?? page.name, content, {sibling: !parent, isPageBlock: !source});
blockMap.set(hid, block);
}
await logseq.Editor.updateBlock(targetBlock.uuid, `[:a {:href "${uri}" :target "_blank" :class "external-link"} [:span {:class "icon-hypothesis forbid-edit"}] " ${title}"]`);
},
async updatePage() {
const page = await logseq.Editor.getCurrentPage();
if (!page.name.startsWith("hypothesis__/"))
return;
const pageBlocksTree = await logseq.Editor.getCurrentPageBlocksTree();
if (pageBlocksTree.length < 1)
return;
const re = /{:href\s"(.*?)"/
const m = pageBlocksTree[0].content.match(re)
if (!m || !m[1])
return;
await this.fetchUpdates();
await this.loadPageNotes(page, m[1])
}
},
}
</script>
15 changes: 12 additions & 3 deletions src/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,16 @@ function main() {
console.info(`#${pluginId}: MAIN`);

Vue.component('v-select', vSelect)
new Vue({ el: '#app', render: h => h(App) });
const app = new Vue({ el: '#app', render: h => h(App) });

function createModel() {
return {
show() {
logseq.showMainUI();
},
updatePage() {
app.$children[0].updatePage();
}
};
}

Expand All @@ -36,13 +39,19 @@ function main() {
div[id^="hypothesis__/"] .block-properties:not(.page-properties) { display: none;
`);

logseq.provideUI({
logseq.App.registerUIItem('toolbar', {
key: 'hypothesis',
path: "#head > div.ui-items-container",
template: `<a data-on-click="show" title="Hypothes.is" class="opacity-40 hover:opacity-100">
<span class="icon-hypothesis"></span>
</a>`,
});

logseq.App.registerUIItem('pagebar', {
key: 'hypothesis-page',
template: `<a data-on-click="updatePage" title="Update current page" class="opacity-40 hover:opacity-100">
<span class="icon-hypothesis"></span>
</a>`,
});
}

logseq.ready(main).catch(console.error);

0 comments on commit 4cd9e1b

Please sign in to comment.