backend import unification

This commit is contained in:
zadam
2021-06-29 22:15:57 +02:00
parent b9ff481eb7
commit b660238a40
64 changed files with 172 additions and 200 deletions

View File

@@ -3,8 +3,8 @@
const sql = require('../../services/sql');
const log = require('../../services/log');
const attributeService = require('../../services/attributes');
const Attribute = require('../../becca/entities/attribute.js');
const becca = require("../../becca/becca.js");
const Attribute = require('../../becca/entities/attribute');
const becca = require("../../becca/becca");
function getEffectiveNoteAttributes(req) {
const note = becca.getNote(req.params.noteId);

View File

@@ -1,11 +1,11 @@
"use strict";
const beccaService = require('../../becca/becca_service.js');
const searchService = require('../../services/search/services/search.js');
const beccaService = require('../../becca/becca_service');
const searchService = require('../../services/search/services/search');
const log = require('../../services/log');
const utils = require('../../services/utils');
const cls = require('../../services/cls');
const becca = require("../../becca/becca.js");
const becca = require("../../becca/becca");
function getAutocomplete(req) {
const query = req.query.query.trim();

View File

@@ -2,7 +2,7 @@
const fs = require('fs');
const dateUtils = require('../../services/date_utils');
const {LOG_DIR} = require('../../services/data_dir.js');
const {LOG_DIR} = require('../../services/data_dir');
function getBackendLog() {
const file = `${LOG_DIR}/trilium-${dateUtils.localNowDate()}.log`;

View File

@@ -2,10 +2,10 @@
const sql = require('../../services/sql');
const utils = require('../../services/utils');
const entityChangesService = require('../../services/entity_changes.js');
const entityChangesService = require('../../services/entity_changes');
const treeService = require('../../services/tree');
const noteService = require('../../services/notes');
const becca = require('../../becca/becca.js');
const becca = require('../../becca/becca');
const TaskContext = require('../../services/task_context');
/**

View File

@@ -6,13 +6,13 @@ const dateNoteService = require('../../services/date_notes');
const dateUtils = require('../../services/date_utils');
const imageService = require('../../services/image');
const appInfo = require('../../services/app_info');
const ws = require('../../services/ws.js');
const ws = require('../../services/ws');
const log = require('../../services/log');
const utils = require('../../services/utils');
const path = require('path');
const Attribute = require('../../becca/entities/attribute.js');
const Attribute = require('../../becca/entities/attribute');
const htmlSanitizer = require('../../services/html_sanitizer');
const {formatAttrForSearch} = require("../../services/attribute_formatter.js");
const {formatAttrForSearch} = require("../../services/attribute_formatter");
function findClippingNote(todayNote, pageUrl) {
const notes = todayNote.searchNoteInSubtree(

View File

@@ -9,7 +9,7 @@ const fs = require('fs');
const { Readable } = require('stream');
const chokidar = require('chokidar');
const ws = require('../../services/ws');
const becca = require("../../becca/becca.js");
const becca = require("../../becca/becca");
function updateFile(req) {
const {noteId} = req.params;

View File

@@ -1,7 +1,7 @@
"use strict";
const imageService = require('../../services/image');
const becca = require('../../becca/becca.js');
const becca = require('../../becca/becca');
const RESOURCE_DIR = require('../../services/resource_dir').RESOURCE_DIR;
const fs = require('fs');

View File

@@ -6,9 +6,9 @@ const zipImportService = require('../../services/import/zip');
const singleImportService = require('../../services/import/single');
const cls = require('../../services/cls');
const path = require('path');
const beccaLoader = require('../../becca/becca_loader.js');
const beccaLoader = require('../../becca/becca_loader');
const log = require('../../services/log');
const TaskContext = require('../../services/task_context.js');
const TaskContext = require('../../services/task_context');
async function importToBranch(req) {
const {parentNoteId} = req.params;

View File

@@ -11,8 +11,8 @@ const eventService = require('../../services/events');
const sqlInit = require('../../services/sql_init');
const sql = require('../../services/sql');
const optionService = require('../../services/options');
const ApiToken = require('../../becca/entities/api_token.js');
const ws = require("../../services/ws.js");
const ApiToken = require('../../becca/entities/api_token');
const ws = require("../../services/ws");
function loginSync(req) {
if (!sqlInit.schemaExists()) {

View File

@@ -1,12 +1,12 @@
"use strict";
const beccaService = require('../../becca/becca_service.js');
const beccaService = require('../../becca/becca_service');
const protectedSessionService = require('../../services/protected_session');
const noteRevisionService = require('../../services/note_revisions');
const utils = require('../../services/utils');
const sql = require('../../services/sql');
const path = require('path');
const becca = require("../../becca/becca.js");
const becca = require("../../becca/becca");
function getNoteRevisions(req) {
return becca.getNoteRevisionsFromQuery(`

View File

@@ -7,8 +7,8 @@ const utils = require('../../services/utils');
const log = require('../../services/log');
const TaskContext = require('../../services/task_context');
const fs = require('fs');
const noteRevisionService = require("../../services/note_revisions.js");
const becca = require("../../becca/becca.js");
const noteRevisionService = require("../../services/note_revisions");
const becca = require("../../becca/becca");
function getNote(req) {
const noteId = req.params.noteId;

View File

@@ -3,7 +3,7 @@
const sql = require('../../services/sql');
const protectedSessionService = require('../../services/protected_session');
const noteService = require('../../services/notes');
const beccaService = require('../../becca/becca_service.js');
const beccaService = require('../../becca/becca_service');
function getRecentChanges(req) {
const {ancestorNoteId} = req.params;

View File

@@ -1,6 +1,6 @@
"use strict";
const RecentNote = require('../../becca/entities/recent_note.js');
const RecentNote = require('../../becca/entities/recent_note');
const sql = require('../../services/sql');
const dateUtils = require('../../services/date_utils');

View File

@@ -2,7 +2,7 @@
const scriptService = require('../../services/script');
const attributeService = require('../../services/attributes');
const becca = require('../../becca/becca.js');
const becca = require('../../becca/becca');
const syncService = require('../../services/sync');
function exec(req) {

View File

@@ -1,6 +1,6 @@
"use strict";
const becca = require('../../becca/becca.js');
const becca = require('../../becca/becca');
const SearchContext = require('../../services/search/search_context');
const log = require('../../services/log');
const scriptService = require('../../services/script');

View File

@@ -1,7 +1,7 @@
"use strict";
const similarityService = require('../../becca/similarity.js');
const becca = require("../../becca/becca.js");
const similarityService = require('../../becca/similarity');
const becca = require("../../becca/becca");
async function getSimilarNotes(req) {
const noteId = req.params.noteId;

View File

@@ -1,5 +1,5 @@
const sql = require('../../services/sql');
const becca = require('../../becca/becca.js');
const becca = require('../../becca/becca');
function getNoteSize(req) {
const {noteId} = req.params;

View File

@@ -2,7 +2,7 @@
const syncService = require('../../services/sync');
const syncUpdateService = require('../../services/sync_update');
const entityChangesService = require('../../services/entity_changes.js');
const entityChangesService = require('../../services/entity_changes');
const sql = require('../../services/sql');
const sqlInit = require('../../services/sql_init');
const optionService = require('../../services/options');

View File

@@ -1,6 +1,6 @@
"use strict";
const becca = require('../../becca/becca.js');
const becca = require('../../becca/becca');
const log = require('../../services/log');
function getNotesAndBranchesAndAttributes(noteIds) {

View File

@@ -1,9 +1,9 @@
const log = require('../services/log');
const fileUploadService = require('./api/files.js');
const fileUploadService = require('./api/files');
const scriptService = require('../services/script');
const cls = require('../services/cls');
const sql = require("../services/sql");
const becca = require("../becca/becca.js");
const becca = require("../becca/becca");
function handleRequest(req, res) {
// express puts content after first slash into 0 index element

View File

@@ -7,7 +7,7 @@ const config = require('../services/config');
const optionService = require('../services/options');
const log = require('../services/log');
const env = require('../services/env');
const protectedSessionService = require("../services/protected_session.js");
const protectedSessionService = require("../services/protected_session");
function index(req, res) {
const options = optionService.getOptionsMap();

View File

@@ -45,7 +45,7 @@ const router = express.Router();
const auth = require('../services/auth');
const cls = require('../services/cls');
const sql = require('../services/sql');
const entityChangesService = require('../services/entity_changes.js');
const entityChangesService = require('../services/entity_changes');
const csurf = require('csurf');
const {createPartialContentHandler} = require("express-partial-content");
const rateLimit = require("express-rate-limit");