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

cleanup obsolete image code

Browse Source
This commit is contained in:
azivner
2018-11-08 11:14:13 +01:00
parent d7afbe4059
commit afcbfcfa03
12 changed files with 1 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/services/content_hash.js
View File

@@ -7,10 +7,8 @@ const eventLogService = require('./event_log');
const messagingService = require('./messaging');
const ApiToken = require('../entities/api_token');
const Branch = require('../entities/branch');
const Image = require('../entities/image');
const Note = require('../entities/note');
const Attribute = require('../entities/attribute');
const NoteImage = require('../entities/note_image');
const NoteRevision = require('../entities/note_revision');
const RecentNote = require('../entities/recent_note');
const Option = require('../entities/option');
@@ -38,8 +36,6 @@ async function getHashes() {
note_revisions: await getHash(NoteRevision),
recent_notes: await getHash(RecentNote),
options: await getHash(Option, "isSynced = 1"),
images: await getHash(Image),
note_images: await getHash(NoteImage),
attributes: await getHash(Attribute),
api_tokens: await getHash(ApiToken)
};

2
src/services/sql_init.js
View File

@@ -73,8 +73,6 @@ async function createInitialDatabase(username, password) {
const schema = fs.readFileSync(resourceDir.DB_INIT_DIR + '/schema.sql', 'UTF-8');
const notesSql = fs.readFileSync(resourceDir.DB_INIT_DIR + '/main_notes.sql', 'UTF-8');
const notesTreeSql = fs.readFileSync(resourceDir.DB_INIT_DIR + '/main_branches.sql', 'UTF-8');
const imagesSql = fs.readFileSync(resourceDir.DB_INIT_DIR + '/main_images.sql', 'UTF-8');
const notesImageSql = fs.readFileSync(resourceDir.DB_INIT_DIR + '/main_note_images.sql', 'UTF-8');
const attributesSql = fs.readFileSync(resourceDir.DB_INIT_DIR + '/main_attributes.sql', 'UTF-8');
await sql.transactional(async () => {

2
src/services/sync.js
View File

@@ -243,8 +243,6 @@ const primaryKeys = {
"branches": "branchId",
"note_revisions": "noteRevisionId",
"recent_notes": "branchId",
"images": "imageId",
"note_images": "noteImageId",
"api_tokens": "apiTokenId",
"options": "name",
"attributes": "attributeId",

11
src/services/sync_table.js
View File

@@ -32,14 +32,6 @@ async function addLinkSync(linkId, sourceId) {
await addEntitySync("links", linkId, sourceId);
}
async function addImageSync(imageId, sourceId) {
await addEntitySync("images", imageId, sourceId);
}
async function addNoteImageSync(noteImageId, sourceId) {
await addEntitySync("note_images", noteImageId, sourceId);
}
async function addAttributeSync(attributeId, sourceId) {
await addEntitySync("attributes", attributeId, sourceId);
}
@@ -108,10 +100,9 @@ module.exports = {
addNoteRevisionSync,
addOptionsSync,
addRecentNoteSync,
addImageSync,
addNoteImageSync,
addAttributeSync,
addApiTokenSync,
addLinkSync,
addEntitySync,
fillAllSyncRows
};

38
src/services/sync_update.js
View File

@@ -27,12 +27,6 @@ async function updateEntity(sync, entity, sourceId) {
else if (entityName === 'links') {
await updateLink(entity, sourceId);
}
else if (entityName === 'images') {
await updateImage(entity, sourceId);
}
else if (entityName === 'note_images') {
await updateNoteImage(entity, sourceId);
}
else if (entityName === 'attributes') {
await updateAttribute(entity, sourceId);
}
@@ -156,38 +150,6 @@ async function updateLink(entity, sourceId) {
}
}
async function updateImage(entity, sourceId) {
if (entity.data !== null) {
entity.data = Buffer.from(entity.data, 'base64');
}
const origImage = await sql.getRow("SELECT * FROM images WHERE imageId = ?", [entity.imageId]);
if (!origImage || origImage.dateModified <= entity.dateModified) {
await sql.transactional(async () => {
await sql.replace("images", entity);
await syncTableService.addImageSync(entity.imageId, sourceId);
});
log.info("Update/sync image " + entity.imageId);
}
}
async function updateNoteImage(entity, sourceId) {
const origNoteImage = await sql.getRow("SELECT * FROM note_images WHERE noteImageId = ?", [entity.noteImageId]);
if (!origNoteImage || origNoteImage.dateModified <= entity.dateModified) {
await sql.transactional(async () => {
await sql.replace("note_images", entity);
await syncTableService.addNoteImageSync(entity.noteImageId, sourceId);
});
log.info("Update/sync note image " + entity.noteImageId);
}
}
async function updateAttribute(entity, sourceId) {
const origAttribute = await sql.getRow("SELECT * FROM attributes WHERE attributeId = ?", [entity.attributeId]);