Skip to content

Release 1.2.1 #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
versx merged 4 commits into from
Apr 22, 2020
Merged

Release 1.2.1 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
694ac45
Fix screenshot path
versx Apr 22, 2020
10ec304
Change to mysql compatible migration
versx Apr 22, 2020
2c4f199
Fix screenshots folder path
versx Apr 22, 2020
ec81a98
Fix screenshot display path
versx Apr 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion migrations/2.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ALTER TABLE `devices` ADD COLUMN IF NOT EXISTS `clientip` VARCHAR(40) DEFAULT NULL;
ALTER TABLE `devices` ADD COLUMN `clientip` VARCHAR(40) DEFAULT NULL;
10 changes: 5 additions & 5 deletions src/routes/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ const multer = require('multer');
const config = require('../config.json');
const query = require('../db.js');
const utils = require('../utils.js');
const upload = multer({ dest: '../../screenshots' });

const screenshotsDir = path.resolve(__dirname, '../../screenshots');
const upload = multer({ dest: screenshotsDir });

const Config = require('../models/config.js');
const Device = require('../models/device.js');
Expand All @@ -20,9 +22,8 @@ router.get('/devices', async function(req, res) {
try {
var devices = await Device.getAll();
devices.forEach(function(device) {
var screenshot = `/screenshots/${device.uuid}.png`;
var exists = fs.existsSync(path.join(__dirname, `..${screenshot}`));
var image = exists ? screenshot : '/img/offline.png';
var exists = fs.existsSync(path.join(screenshotsDir, device.uuid + '.png'));
var image = exists ? `/screenshots/${device.uuid}.png` : '/img/offline.png';
device.image = `<a href='${image}' target='_blank'><img src='${image}' width='64' height='96'/></a>`;
device.last_seen = utils.getDateTime(device.last_seen);
device.buttons = `
Expand Down Expand Up @@ -60,7 +61,6 @@ router.post('/device/:uuid/screen', upload.single('file'), function(req, res) {
var uuid = req.params.uuid;
var fileName = uuid + '.png';
const tempPath = req.file.path;
const screenshotsDir = path.resolve(__dirname, '../screenshots');
const targetPath = path.join(screenshotsDir, fileName);
if (!fs.existsSync(screenshotsDir)) {
fs.mkdirSync(screenshotsDir);
Expand Down