mirror of
				https://github.com/zadam/trilium.git
				synced 2025-11-04 05:28:59 +01:00 
			
		
		
		
	added basic support for uploading and serving files
This commit is contained in:
		
							parent
							
								
									663bd1a8fe
								
							
						
					
					
						commit
						23a5e38e02
					
				
							
								
								
									
										11
									
								
								migrations/0063__image_table.sql
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								migrations/0063__image_table.sql
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,11 @@
 | 
			
		||||
CREATE TABLE images
 | 
			
		||||
(
 | 
			
		||||
  image_id TEXT PRIMARY KEY NOT NULL,
 | 
			
		||||
  format TEXT NOT NULL,
 | 
			
		||||
  checksum TEXT NOT NULL,
 | 
			
		||||
  name TEXT NOT NULL,
 | 
			
		||||
  data BLOB,
 | 
			
		||||
  is_deleted INT NOT NULL DEFAULT 0,
 | 
			
		||||
  date_modified TEXT NOT NULL,
 | 
			
		||||
  date_created TEXT NOT NULL
 | 
			
		||||
);
 | 
			
		||||
							
								
								
									
										51
									
								
								routes/api/image.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										51
									
								
								routes/api/image.js
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,51 @@
 | 
			
		||||
"use strict";
 | 
			
		||||
 | 
			
		||||
const express = require('express');
 | 
			
		||||
const router = express.Router();
 | 
			
		||||
const sql = require('../../services/sql');
 | 
			
		||||
const auth = require('../../services/auth');
 | 
			
		||||
const utils = require('../../services/utils');
 | 
			
		||||
const multer = require('multer')();
 | 
			
		||||
 | 
			
		||||
router.get('/:imageId/:filename', auth.checkApiAuth, async (req, res, next) => {
 | 
			
		||||
    const image = await sql.getFirst("SELECT * FROM images WHERE image_id = ?", [req.params.imageId]);
 | 
			
		||||
 | 
			
		||||
    if (!image) {
 | 
			
		||||
        return res.status(404).send({});
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    res.set('Content-Type', 'image/' + image.format);
 | 
			
		||||
 | 
			
		||||
    res.send(image.data);
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
router.post('/upload', auth.checkApiAuth, multer.single('upload'), async (req, res, next) => {
 | 
			
		||||
    const file = req.file;
 | 
			
		||||
    console.log("File: ", file);
 | 
			
		||||
 | 
			
		||||
    const imageId = utils.newNoteId();
 | 
			
		||||
 | 
			
		||||
    if (!file.mimetype.startsWith("image/")) {
 | 
			
		||||
        return req.send("Unknown image type: " + file.mimetype);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    const now = utils.nowDate();
 | 
			
		||||
 | 
			
		||||
    await sql.insert("images", {
 | 
			
		||||
        image_id: imageId,
 | 
			
		||||
        format: file.mimetype.substr(6),
 | 
			
		||||
        name: file.originalname,
 | 
			
		||||
        checksum: utils.hash(file.buffer),
 | 
			
		||||
        data: file.buffer,
 | 
			
		||||
        is_deleted: 0,
 | 
			
		||||
        date_modified: now,
 | 
			
		||||
        date_created: now
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    res.send({
 | 
			
		||||
        uploaded: true,
 | 
			
		||||
        url: `/api/image/${imageId}/${file.originalname}`
 | 
			
		||||
    });
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
module.exports = router;
 | 
			
		||||
@ -24,6 +24,7 @@ const setupApiRoute = require('./api/setup');
 | 
			
		||||
const sqlRoute = require('./api/sql');
 | 
			
		||||
const anonymizationRoute = require('./api/anonymization');
 | 
			
		||||
const cleanupRoute = require('./api/cleanup');
 | 
			
		||||
const imageRoute = require('./api/image');
 | 
			
		||||
 | 
			
		||||
function register(app) {
 | 
			
		||||
    app.use('/', indexRoute);
 | 
			
		||||
@ -51,6 +52,7 @@ function register(app) {
 | 
			
		||||
    app.use('/api/sql', sqlRoute);
 | 
			
		||||
    app.use('/api/anonymization', anonymizationRoute);
 | 
			
		||||
    app.use('/api/cleanup', cleanupRoute);
 | 
			
		||||
    app.use('/api/image', imageRoute);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
module.exports = {
 | 
			
		||||
 | 
			
		||||
@ -3,7 +3,7 @@
 | 
			
		||||
const build = require('./build');
 | 
			
		||||
const packageJson = require('../package');
 | 
			
		||||
 | 
			
		||||
const APP_DB_VERSION = 62;
 | 
			
		||||
const APP_DB_VERSION = 63;
 | 
			
		||||
 | 
			
		||||
module.exports = {
 | 
			
		||||
    app_version: packageJson.version,
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user