gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix clipType searching for web-clipper

Browse Source
This commit is contained in:
manto89 2023-07-02 12:51:23 +02:00
parent ebccd48013
commit 0c86dece5f
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/routes/api/clipper.js
View File

@ -15,7 +15,7 @@ const BAttribute = require('../../becca/entities/battribute');
const htmlSanitizer = require('../../services/html_sanitizer'); const htmlSanitizer = require('../../services/html_sanitizer');
const {formatAttrForSearch} = require("../../services/attribute_formatter"); const {formatAttrForSearch} = require("../../services/attribute_formatter");
function findClippingNote(clipperInboxNote, pageUrl) { function findClippingNote(clipperInboxNote, pageUrl, clipType) {
//Avoid searching for empty of browser pages like about:blank //Avoid searching for empty of browser pages like about:blank
if (pageUrl.trim().length > 1 && pageUrl.trim().indexOf('about:') != 0 ){ if (pageUrl.trim().length > 1 && pageUrl.trim().indexOf('about:') != 0 ){
const notes = clipperInboxNote.searchNotesInSubtree( const notes = clipperInboxNote.searchNotesInSubtree(
@ -27,7 +27,12 @@ function findClippingNote(clipperInboxNote, pageUrl) {
); );
for (const note of notes) { for (const note of notes) {
if (note.getOwnedLabelValue('clipType') === 'note') { if (clipType){
if (note.getOwnedLabelValue('clipType') === clipType) {
return note;
}
}
else{
return note; return note;
} }
} }
@ -51,13 +56,14 @@ function addClipping(req) {
//and clone it under today's inbox //and clone it under today's inbox
//otherwise just create a new note under today's inbox //otherwise just create a new note under today's inbox
let {title, content, pageUrl, images} = req.body; let {title, content, pageUrl, images} = req.body;
const clipType = 'clippings';
//this is only for reference //this is only for reference
const clipperInbox = getClipperInboxNote(); const clipperInbox = getClipperInboxNote();
const dailyNote = dateNoteService.getDayNote(dateUtils.localNowDate()); const dailyNote = dateNoteService.getDayNote(dateUtils.localNowDate());
pageUrl = htmlSanitizer.sanitizeUrl(pageUrl); pageUrl = htmlSanitizer.sanitizeUrl(pageUrl);
let clippingNote = findClippingNote(clipperInbox, pageUrl); let clippingNote = findClippingNote(clipperInbox, pageUrl, clipType);
if (!clippingNote) { if (!clippingNote) {
clippingNote = noteService.createNewNote({ clippingNote = noteService.createNewNote({
@ -94,19 +100,21 @@ function createNote(req) {
title = `Clipped note from ${pageUrl}`; title = `Clipped note from ${pageUrl}`;
} }
clipType = htmlSanitizer.sanitize(clipType);
const clipperInbox = getClipperInboxNote(); const clipperInbox = getClipperInboxNote();
const dailyNote = dateNoteService.getDayNote(dateUtils.localNowDate()); const dailyNote = dateNoteService.getDayNote(dateUtils.localNowDate());
pageUrl = htmlSanitizer.sanitizeUrl(pageUrl); pageUrl = htmlSanitizer.sanitizeUrl(pageUrl);
let note = findClippingNote(clipperInbox, pageUrl); let note = findClippingNote(clipperInbox, pageUrl, clipType);
if (!note){ if (!note){
note = noteService.createNewNote({ note = noteService.createNewNote({
parentNoteId: dailyNote.noteId, parentNoteId: dailyNote.noteId,
title, title,
content, content: '',
type: 'text' type: 'text'
}).note; }).note;
clipType = htmlSanitizer.sanitize(clipType);
note.setLabel('clipType', clipType); note.setLabel('clipType', clipType);
if (pageUrl) { if (pageUrl) {
@ -212,7 +220,7 @@ function handshake() {
function findNotesByUrl(req){ function findNotesByUrl(req){
let pageUrl = req.params.noteUrl; let pageUrl = req.params.noteUrl;
const clipperInbox = getClipperInboxNote(); const clipperInbox = getClipperInboxNote();
let foundPage = findClippingNote(clipperInbox, pageUrl); let foundPage = findClippingNote(clipperInbox, pageUrl, null);
return { return {
noteId: foundPage ? foundPage.noteId : null noteId: foundPage ? foundPage.noteId : null
} }