refactoring

karthikg7 · Feb 13, 2023 · c190296 · c190296
1 parent e411ad0
commit c190296
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 16 deletions.
diff --git a/.idea/git_toolbox_prj.xml b/.idea/git_toolbox_prj.xml
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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, '');