Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-17 18:50:41 +01:00
Code Issues Packages Projects Releases Activity

rename becca entities to have B-prefix, #3476

Browse Source
This commit is contained in:
zadam
2023-01-03 13:52:37 +01:00
parent da161c7ce0
commit bff7434921
51 changed files with 224 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/services/import/enex.js
View File

@@ -9,7 +9,7 @@ const imageService = require("../image");
const protectedSessionService = require('../protected_session');
const htmlSanitizer = require("../html_sanitizer");
const attributeService = require("../attributes");
const {sanitizeAttributeName} = require("../sanitize_attribute_name.js");
const {sanitizeAttributeName} = require("../sanitize_attribute_name");
// date format is e.g. 20181121T193703Z
function parseDate(text) {

2
src/services/import/opml.js
View File

@@ -8,7 +8,7 @@ const htmlSanitizer = require('../html_sanitizer');
/**
* @param {TaskContext} taskContext
* @param {Buffer} fileBuffer
* @param {Note} parentNote
* @param {BNote} parentNote
* @return {Promise<*[]|*>}
*/
async function importOpml(taskContext, fileBuffer, parentNote) {

12
src/services/import/zip.js
View File

@@ -1,11 +1,11 @@
"use strict";
const Attribute = require('../../becca/entities/attribute');
const BAttribute = require('../../becca/entities/battribute');
const utils = require('../../services/utils');
const log = require('../../services/log');
const noteService = require('../../services/notes');
const attributeService = require('../../services/attributes');
const Branch = require('../../becca/entities/branch');
const BBranch = require('../../becca/entities/bbranch');
const path = require('path');
const commonmark = require('commonmark');
const protectedSessionService = require('../protected_session');
@@ -18,7 +18,7 @@ const becca = require("../../becca/becca");
/**
* @param {TaskContext} taskContext
* @param {Buffer} fileBuffer
* @param {Note} importRootNote
* @param {BNote} importRootNote
* @return {Promise<*>}
*/
async function importZip(taskContext, fileBuffer, importRootNote) {
@@ -369,7 +369,7 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
if (noteMeta?.isClone) {
if (!becca.getBranchFromChildAndParent(noteId, parentNoteId)) {
new Branch({
new BBranch({
noteId,
parentNoteId,
isExpanded: noteMeta.isExpanded,
@@ -410,7 +410,7 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
note.setContent(content);
if (!becca.getBranchFromChildAndParent(noteId, parentNoteId)) {
new Branch({
new BBranch({
noteId,
parentNoteId,
isExpanded: noteMeta.isExpanded,
@@ -504,7 +504,7 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
// are already in the database (we don't want to have "broken" relations, not even transitionally)
for (const attr of attributes) {
if (attr.type !== 'relation' || attr.value in becca.notes) {
new Attribute(attr).save();
new BAttribute(attr).save();
}
else {
log.info(`Relation not imported since the target note doesn't exist: ${JSON.stringify(attr)}`);