From c190296bf91151475ffa702a7dbff2dd99379eba Mon Sep 17 00:00:00 2001 From: zadam Date: Mon, 13 Feb 2023 16:22:34 +0100 Subject: [PATCH] refactoring --- .idea/git_toolbox_prj.xml | 15 +++++++++++++++ spec/search/becca_mocking.js | 6 +++--- spec/search/search.spec.js | 2 -- src-build/docs-website/build_docs_website.js | 2 +- src/becca/becca.js | 1 - src/etapi/notes.js | 1 - src/routes/api/sender.js | 4 ++-- src/services/import/enex.js | 2 +- src/services/note_ancillaries.js | 4 ++-- src/services/text_extracting.js | 2 -- src/services/user_guide_import.js | 2 +- 11 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 .idea/git_toolbox_prj.xml diff --git a/.idea/git_toolbox_prj.xml b/.idea/git_toolbox_prj.xml new file mode 100644 index 000000000..02b915b85 --- /dev/null +++ b/.idea/git_toolbox_prj.xml @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/spec/search/becca_mocking.js b/spec/search/becca_mocking.js index b7b48c26f..78a3229bb 100644 --- a/spec/search/becca_mocking.js +++ b/spec/search/becca_mocking.js @@ -1,6 +1,6 @@ -const Note = require('../../src/becca/entities/bnote.js'); -const Branch = require('../../src/becca/entities/bbranch.js'); -const Attribute = require('../../src/becca/entities/battribute.js'); +const Note = require('../../src/becca/entities/bnote'); +const Branch = require('../../src/becca/entities/bbranch'); +const Attribute = require('../../src/becca/entities/battribute'); const becca = require('../../src/becca/becca'); const randtoken = require('rand-token').generator({source: 'crypto'}); diff --git a/spec/search/search.spec.js b/spec/search/search.spec.js index aef74c172..5fd196545 100644 --- a/spec/search/search.spec.js +++ b/spec/search/search.spec.js @@ -1,6 +1,4 @@ const searchService = require('../../src/services/search/services/search'); -const Note = require('../../src/becca/entities/bnote.js'); -const Branch = require('../../src/becca/entities/bbranch.js'); const SearchContext = require('../../src/services/search/search_context'); const dateUtils = require('../../src/services/date_utils'); const becca = require('../../src/becca/becca'); diff --git a/src-build/docs-website/build_docs_website.js b/src-build/docs-website/build_docs_website.js index 29564aa76..bdcb913c5 100644 --- a/src-build/docs-website/build_docs_website.js +++ b/src-build/docs-website/build_docs_website.js @@ -1,5 +1,5 @@ const fs = require("fs-extra"); -const utils = require("../../src/services/utils.js"); +const utils = require("../../src/services/utils"); const html = require("html"); const SRC_DIR = './src-build/docs-website'; diff --git a/src/becca/becca.js b/src/becca/becca.js index 2cae47e0e..3f142f35b 100644 --- a/src/becca/becca.js +++ b/src/becca/becca.js @@ -2,7 +2,6 @@ const sql = require("../services/sql"); const NoteSet = require("../services/search/note_set"); -const BNoteRevision = require("./entities/bnote_revision.js"); /** * Becca is a backend cache of all notes, branches and attributes. There's a similar frontend cache Froca. diff --git a/src/etapi/notes.js b/src/etapi/notes.js index 8ed0759ec..683544fff 100644 --- a/src/etapi/notes.js +++ b/src/etapi/notes.js @@ -8,7 +8,6 @@ const v = require("./validators"); const searchService = require("../services/search/services/search"); const SearchContext = require("../services/search/search_context"); const zipExportService = require("../services/export/zip"); -const noteRevisionService = require("../services/note_revisions.js"); function register(router) { eu.route(router, 'get', '/etapi/notes', (req, res, next) => { diff --git a/src/routes/api/sender.js b/src/routes/api/sender.js index f7ac768ca..7d434b2f8 100644 --- a/src/routes/api/sender.js +++ b/src/routes/api/sender.js @@ -3,8 +3,8 @@ const imageType = require('image-type'); const imageService = require('../../services/image'); const noteService = require('../../services/notes'); -const {sanitizeAttributeName} = require("../../services/sanitize_attribute_name.js"); -const specialNotesService = require("../../services/special_notes.js"); +const {sanitizeAttributeName} = require("../../services/sanitize_attribute_name"); +const specialNotesService = require("../../services/special_notes"); function uploadImage(req) { const file = req.file; diff --git a/src/services/import/enex.js b/src/services/import/enex.js index 2b2c19200..5e8eab780 100644 --- a/src/services/import/enex.js +++ b/src/services/import/enex.js @@ -8,7 +8,7 @@ const noteService = require("../notes"); const imageService = require("../image"); const protectedSessionService = require('../protected_session'); const htmlSanitizer = require("../html_sanitizer"); -const {sanitizeAttributeName} = require("../sanitize_attribute_name.js"); +const {sanitizeAttributeName} = require("../sanitize_attribute_name"); /** * date format is e.g. 20181121T193703Z or 2013-04-14T16:19:00.000Z (Mac evernote, see #3496) diff --git a/src/services/note_ancillaries.js b/src/services/note_ancillaries.js index 1a09dc543..9336b14bb 100644 --- a/src/services/note_ancillaries.js +++ b/src/services/note_ancillaries.js @@ -1,5 +1,5 @@ -const protectedSession = require("./protected_session.js"); -const log = require("./log.js"); +const protectedSession = require("./protected_session"); +const log = require("./log"); /** * @param {BNote} note diff --git a/src/services/text_extracting.js b/src/services/text_extracting.js index 206c5ec18..6b155afd5 100644 --- a/src/services/text_extracting.js +++ b/src/services/text_extracting.js @@ -126,8 +126,6 @@ async function ocrTextFromBuffer(buffer) { } async function runOcr(note, buffer) { - console.log("buffer length", buffer.length); - if (!note.isImage() || !optionService.getOptionBool('ocrImages') || cls.isOcrDisabled() diff --git a/src/services/user_guide_import.js b/src/services/user_guide_import.js index 695a40ab9..baee9b5fc 100644 --- a/src/services/user_guide_import.js +++ b/src/services/user_guide_import.js @@ -90,7 +90,7 @@ async function importZip(fileBuffer, importRootNote) { } function getNoteId(noteMeta) { - let userGuideNoteId = noteMeta.attributes?.find(attr => attr.type === 'label' && attr.name === 'helpNoteId')?.value; + let userGuideNoteId;// = noteMeta.attributes?.find(attr => attr.type === 'label' && attr.name === 'helpNoteId')?.value; userGuideNoteId = '_userGuide' + noteMeta.title.replace(/[^a-z0-9]/ig, '');