refactoring

This commit is contained in:
zadam 2023-02-13 16:22:34 +01:00
parent e411ad0eb1
commit c190296bf9
11 changed files with 25 additions and 16 deletions

15
.idea/git_toolbox_prj.xml generated Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GitToolBoxProjectSettings">
<option name="commitMessageIssueKeyValidationOverride">
<BoolValueOverride>
<option name="enabled" value="true" />
</BoolValueOverride>
</option>
<option name="commitMessageValidationEnabledOverride">
<BoolValueOverride>
<option name="enabled" value="true" />
</BoolValueOverride>
</option>
</component>
</project>

View File

@ -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'});

View File

@ -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');

View File

@ -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';

View File

@ -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.

View File

@ -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) => {

View File

@ -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;

View File

@ -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)

View File

@ -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

View File

@ -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()

View File

@ -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, '');